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

XML ottava fixes #24776

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

XML ottava fixes #24776

wants to merge 4 commits into from

Conversation

miiizen
Copy link
Contributor

@miiizen miiizen commented Sep 17, 2024

Resolves: #24729
Resolves: #24711

This PR fixes a few outstanding issues with ottavas.

  • The default placement for 8vb & 15mb is now below the stave
  • The 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 the direction 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.

bool MusicXMLParserPass1::sibOrDolet() const
{
return m_exporterSoftware == MusicXMLExporterSoftware::SIBELIUS || m_exporterSoftware == MusicXMLExporterSoftware::DOLET6
|| m_exporterSoftware == MusicXMLExporterSoftware::DOLET8;
Copy link
Contributor

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") {
Copy link
Contributor

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
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 18, 2024
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 19, 2024
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 19, 2024
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 19, 2024
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 19, 2024
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.

MusicXML import of <octave-shift> with <offset> is broken MusicXML import of Sibelius ottava handling broken
2 participants