Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert to \define colour macro for backwards compatibility #8327

Merged
merged 3 commits into from
Jul 1, 2024

Conversation

pmario
Copy link
Member

@pmario pmario commented Jun 30, 2024

This PR should fix #8326

Please test.

The new functions @ericshulman suggested are implemented like this:

  • core functions are prefixed tf. to allow us to use them like tf.colour<name> instead of function[tf.colour],<name>
    • Both versions should be possible
  • For convenience there are 2 colou?r functions: tf.colour(name) and tf.color(name)
    • They should work with eg: <div style.background=<<tf.colour alert-background>>>
  • Test: <<tf.colour sidebar-tab-border>> lets you test the recursive resolution "since sidebar-tab-border" uses <<colour tab-border>> in vanilla
  • The regexp should be able to allow unicode whitespace

Sorry for the trouble :(
I'll add some tests and some docs if it gets merged.

Copy link

vercel bot commented Jun 30, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
tiddlywiki5 ✅ Ready (Inspect) Visit Preview Jul 1, 2024 7:36pm

@Jermolene
Copy link
Member

Hi @pmario given my comment on Talk, I would rather we just reverted the changes, and not introduce the new functions.

@pmario pmario mentioned this pull request Jul 1, 2024
@pmario
Copy link
Member Author

pmario commented Jul 1, 2024

@Jermolene -- I did remove the new functionality. So it only reverts to the old colour-macros

@Jermolene Jermolene merged commit 84d1c81 into TiddlyWiki:master Jul 1, 2024
4 checks passed
@Jermolene
Copy link
Member

Thanks @pmario

@Jermolene
Copy link
Member

Hi @pmario wasn't the \whitespace trim new in v5.3.4? I think we should probably revert that too.

@pmario pmario deleted the fix-8326-colour-macro branch July 2, 2024 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG]
2 participants