-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
XML ottava fixes #24776
Open
miiizen
wants to merge
4
commits into
musescore:master
Choose a base branch
from
miiizen:xml-ottavas
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
XML ottava fixes #24776
+502
−108
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These ottavas need their offsets removed
bool MusicXMLParserPass1::sibOrDolet() const | ||
{ | ||
return m_exporterSoftware == MusicXMLExporterSoftware::SIBELIUS || m_exporterSoftware == MusicXMLExporterSoftware::DOLET6 | ||
|| m_exporterSoftware == MusicXMLExporterSoftware::DOLET8; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not reuse dolet()
here?
if (type == u"up" && ottavasize == 15) { | ||
o->setOttavaType(OttavaType::OTTAVA_15MB); | ||
|
||
if (type == u"up") { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wouldn#t this rather be else
(we don't get here otherwise) or at least else if
?
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 18, 2024
Backport of musescore#24776
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 18, 2024
Backport of musescore#24776
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 19, 2024
Backport of musescore#24776
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 19, 2024
Backport of musescore#24776
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 19, 2024
Backport of musescore#24776
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 19, 2024
Backport of musescore#24776
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves: #24729
Resolves: #24711
This PR fixes a few outstanding issues with ottavas.
offset
value is ignored. This causes more issues than it solves currently. For Sibelius scores, the offset was used to move the end point to the following note in the XML. We have a more robust solution for this. For Dolet, Finale and other exporters, the position of thedirection
tag in the file is enough to place the end anchor correctly. The offset moves it to an incorrect location.I've also added a nicer way of accessing the exporting software. This also fixes an issue with confusion between Sibelius and Dolet scores.