Skip to content

Commit

Permalink
Merge pull request #2528 from lvinken/musicxmlfixes
Browse files Browse the repository at this point in the history
fix #42281 - [MusicXML] Title converted to copyright on import if pos…
  • Loading branch information
lasconic committed Apr 15, 2016
2 parents 5822cd2 + 32e36c4 commit 64f633b
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions mscore/importmxmlpass1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,6 @@ static void doCredits(Score* score, const CreditWordsList& credits, const int pa
VBox* vbox = new VBox(score);
vbox->setBoxHeight(Spatium(vboxHeight));

QString remainingFooterText;
QMap<int, CreditWords*> creditMap; // store credit-words sorted on y pos
bool creditWordsUsed = false;

Expand Down Expand Up @@ -755,8 +754,10 @@ static void doCredits(Score* score, const CreditWordsList& credits, const int pa
}
// keep remaining footer text for possible use as copyright
else if (useHeader && defy < ph2) {
// found credit words in both header and footer
// header was used to create a vbox at the top of the first page
// footer is ignored as it conflicts with the default MuseScore footer style
//qDebug("add to copyright: '%s'", qPrintable(w->words));
remainingFooterText += w->words;
}
} // end for (ciCreditWords ...

Expand Down Expand Up @@ -836,16 +837,6 @@ static void doCredits(Score* score, const CreditWordsList& credits, const int pa
vbox->setTick(0);
score->measures()->add(vbox);
}

// if no <rights> element was read and some text was found in the footer
// set the rights metadata to the value found
// TODO: remove formatting
// note that MusicXML files can contain at least two different copyright statements:
// - in the <rights> element (metadata)
// - in the <credit-words> (the printed version)
// while MuseScore supports only the first one
if (score->metaTag("copyright") == "" && remainingFooterText != "")
score->setMetaTag("copyright", remainingFooterText);
}

//---------------------------------------------------------
Expand Down

0 comments on commit 64f633b

Please sign in to comment.