Skip to content

Conversation

miiizen
Copy link
Contributor

@miiizen miiizen commented Feb 13, 2024

Sibelius exports its ottavas inconsistently with other programs - ottava tags should start before the notes under the ottava, and finish after the last note. Sibelius stops before, leaving the ottava a note short. This PR delays adding ottavas until the following note if the score was exported from Sibelius.
Before:
Screenshot 2024-02-13 at 15 14 10

After:
Screenshot 2024-02-13 at 15 05 24

(Depends on the commit identiying exporter software 2978b7b in #21483)

@igorkorsukov igorkorsukov force-pushed the master branch 6 times, most recently from fa1f8d3 to 525a11a Compare February 14, 2024 09:08
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Feb 14, 2024
while (m_e.readNextStartElement()) {
if (m_e.name() == "software") {
m_exporterString += m_e.readText();
m_exporterString += m_e.readText().toLower();
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz Feb 14, 2024

Choose a reason for hiding this comment

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

This doesn't mix and match with

if (m_pass1.exporterString().contains(u"Dolet")) {

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Feb 14, 2024
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Feb 14, 2024
String m_sndFine;
String m_sndSegno;
String m_sndToCoda;
bool visible = true;
Copy link
Member

Choose a reason for hiding this comment

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

This seems unused

Comment on lines 3215 to 3216
std::map<String, SymId> otherDirectionSyms;
otherDirectionSyms = { { String(u"Rhythm dot"), SymId::augmentationDot },
Copy link
Member

Choose a reason for hiding this comment

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

For now, maybe nicer to do this one like this:

Suggested change
std::map<String, SymId> otherDirectionSyms;
otherDirectionSyms = { { String(u"Rhythm dot"), SymId::augmentationDot },
static const std::map<String, SymId> otherDirectionSyms = { { String(u"Rhythm dot"), SymId::augmentationDot },

delete desc.sp;
} else {
if (spdesc.isStarted) {
if (spdesc.sp && spdesc.sp->isOttava() && delayOttava) {
Copy link
Member

Choose a reason for hiding this comment

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

Is it correct that you don't need to check spdesc.isStarted here?

Copy link
Contributor

Choose a reason for hiding this comment

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

It is the else branch of if (spdesc._isStopped), can it have a 3rd state?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cbjeukendrup I probably ought to, it can't hurt to be safe

@cbjeukendrup
Copy link
Member

And a rebase is needed

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Feb 24, 2024
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Feb 26, 2024
@cbjeukendrup cbjeukendrup merged commit 5a682ba into musescore:master Feb 27, 2024
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Feb 27, 2024
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Apr 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

No open projects

Development

Successfully merging this pull request may close these issues.

5 participants