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.

Sign up for GitHub

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

Jump to bottom

'Musical symbols scale' option #20934

Merged
merged 1 commit into from
Feb 9, 2024
Merged

'Musical symbols scale' option #20934

merged 1 commit into from
Feb 9, 2024

Conversation

XiaoMigros
Copy link
Contributor

@XiaoMigros XiaoMigros commented Jan 10, 2024 •
edited

Rebase of #20772
Resolves: #19366
Resolves: #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.

@bkunda bkunda self-requested a review January 19, 2024 11:18
@oktophonie oktophonie requested review from oktophonie and removed request for bkunda January 19, 2024 11:18
@rettinghaus
Copy link
Contributor

Saving

<text>&lt;sym&gt;tuplet3&lt;/sym&gt;</text>

instead of

<text>3</text>

doesn't seem to be a good idea.

@XiaoMigros
Copy link
Contributor Author

The utests agree with you! A more elegant solution is underway...

@XiaoMigros XiaoMigros force-pushed the musical-symbols-scale branch 22 times, most recently from c5e793a to f83b86e Compare February 7, 2024 10:11
@XiaoMigros XiaoMigros force-pushed the musical-symbols-scale branch 6 times, most recently from a35a16d to 84bf2a6 Compare February 7, 2024 13:46
@oktophonie oktophonie added the vtests This PR produces approved changes to vtest results label Feb 8, 2024
cbjeukendrup
cbjeukendrup approved these changes Feb 9, 2024
View reviewed changes
Copy link
Contributor

@cbjeukendrup cbjeukendrup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some tiny almost-optional comments but for the rest this looks good to me!

src/engraving/dom/pedal.cpp Outdated Show resolved Hide resolved
src/engraving/dom/property.h Outdated Show resolved Hide resolved
src/notation/view/widgets/editstyle.cpp Outdated Show resolved Hide resolved
src/notation/view/widgets/editstyle.cpp Outdated Show resolved Hide resolved
@cbjeukendrup cbjeukendrup merged commit 6471d40 into musescore:master Feb 9, 2024
10 of 11 checks passed
@XiaoMigros XiaoMigros deleted the musical-symbols-scale branch February 9, 2024 15:06
@oktophonie oktophonie mentioned this pull request Feb 29, 2024
Closed
@XiaoMigros XiaoMigros mentioned this pull request Mar 25, 2024
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oktophonie oktophonie oktophonie approved these changes

@cbjeukendrup cbjeukendrup cbjeukendrup approved these changes

@bkunda bkunda bkunda approved these changes

@mike-spa mike-spa mike-spa approved these changes

Assignees
No one assigned
Labels
vtests This PR produces approved changes to vtest results
Projects
None yet
Milestone
No milestone
6 participants
@XiaoMigros @rettinghaus @oktophonie @cbjeukendrup @bkunda @mike-spa