Skip to content

Commit

Permalink
Fix #269926 MusicXML: Fermatas on notes with grace notes
Browse files Browse the repository at this point in the history
Previously, if a note had both a fermata and a grace note then the
grace note would gain a fermata during export.

Backport of musescore#7621, resp. duplicate of musescore#7870
  • Loading branch information
shoogle authored and Jojo-Schmitz committed Jul 1, 2021
1 parent 888b790 commit c1bb8d6
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions importexport/musicxml/exportxml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2678,12 +2678,14 @@ static void writeChordLines(const Chord* const chord, XmlWriter& xml, Notations&
void ExportMusicXml::chordAttributes(Chord* chord, Notations& notations, Technical& technical,
TrillHash& trillStart, TrillHash& trillStop)
{
QVector<Element*> fl;
for (Element* e : chord->segment()->annotations()) {
if (e->track() == chord->track() && e->isFermata())
fl.push_back(e);
if (!chord->isGrace()) {
QVector<Element*> fl;
for (Element* e : chord->segment()->annotations()) {
if (e->track() == chord->track() && e->isFermata())
fl.push_back(e);
}
fermatas(fl, _xml, notations);
}
fermatas(fl, _xml, notations);

const QVector<Articulation*> na = chord->articulations();
// first the attributes whose elements are children of <articulations>
Expand Down

0 comments on commit c1bb8d6

Please sign in to comment.