Skip to content

Conversation

@XiaoMigros
Copy link
Contributor

@XiaoMigros XiaoMigros commented Dec 30, 2023

Resolves: #19366, #17885

This PR changes the following:

  • An option for tuplets to use SMuFL number symbols, rather than plain text
  • Pedal line text now uses the musical symbols font instead of musical text font.
  • A new text style property, 'Musical symbols scale', to control the size of musical symbols in text-based elements (similar to the existing control for dynamics). This option is available for tuplets, ottava, and pedal lines.

For tuplets, should the using symbols be the default?

@XiaoMigros XiaoMigros force-pushed the smufl-tuplets branch 2 times, most recently from 30e90d2 to 72a4765 Compare December 30, 2023 21:35
@its-not-nice
Copy link
Contributor

It should, but it also needs to have a 'Scale' parameter for when people resize them (where the default 100% = 20pt) - like how dynamics now work. When we did dynamics we removed the 'Dynamics' text style (so all settings are now in Style > Dynamics) but we can't do that here because we need to keep the option to use any text font for tuplets. So there's a design question about how to arrange these settings, which are now split between Style > Tuplets and Style > Text styles > Tuplet.

@its-not-nice its-not-nice requested a review from bkunda December 31, 2023 09:29
@XiaoMigros
Copy link
Contributor Author

FWIW, the scale is still influenced by the font size.

@its-not-nice
Copy link
Contributor

Well it shouldn't, and I've just finished writing my comment about that on the other PR

@XiaoMigros XiaoMigros force-pushed the smufl-tuplets branch 2 times, most recently from c8c4f00 to 44b2f1b Compare January 1, 2024 12:04
@XiaoMigros XiaoMigros changed the title Tuplet numbers from musical symbols font 'Musical symbols scale' option & option to use tuplet number symbols Jan 1, 2024
@XiaoMigros XiaoMigros force-pushed the smufl-tuplets branch 3 times, most recently from 7031885 to b4ef824 Compare January 2, 2024 11:05
@XiaoMigros XiaoMigros changed the title 'Musical symbols scale' option & option to use tuplet number symbols 'Musical symbols scale' option & more Jan 2, 2024
@XiaoMigros
Copy link
Contributor Author

Needs rebasing, closing...

@Jojo-Schmitz
Copy link
Contributor

Jojo-Schmitz commented Jan 10, 2024

You can rebase without closing: git pull --rebase upstream master; git push -f

@XiaoMigros
Copy link
Contributor Author

It changed my commit order, and as a consequence I could no longer force push the actual changes to the same commit as I had been doing previously.

@cbjeukendrup
Copy link
Member

It doesn't really matter at all, but just as a hint for the future: force-pushing is something you do with a branch, not with a commit. What you probably mean is that you wanted to amend the same commit again and again. Indeed, amending the last commit is easier than amending a non-last commit, but even the latter is possible using an interactive rebase.
So, you can always force-push a branch, and you can also amend any commit except that amending the last commit is much easier than any other commit.
However, it seems strange that a rebase changed the order of your commits. A few things to make sure:

  • make sure you are rebasing rather than merging. When using git pull, explicitly specify --rebase. Merging creates a merge commit that can indeed get in the way inconveniently.
  • make sure you are pulling from upstream rather than origin, and make sure that upstream points to the musescore/MuseScore repo and not to the XiaoMigros/MuseScore repo.

Anyway, as said, there's not really a problem but I thought you might be happy to know these things for the future.

@XiaoMigros XiaoMigros deleted the smufl-tuplets branch August 26, 2024 05:54
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.

Allow SMuFL tuplet symbols to be used in tuplets

4 participants