[MusicXML] invisible notations

Backport of musescore#27422

Author: rettinghaus

importexport/musicxml/exportxml.cpp

@@ -397,7 +397,6 @@ class ExportMusicXml {
       Fraction tick() const { return _tick; }
       void writeInstrumentChange(const InstrumentChange* instrChange);
       void writeInstrumentDetails(const Instrument* instrument, const bool concertPitch);
-      static bool canWrite(const Element* e);
       };
 
 //---------------------------------------------------------
@@ -768,7 +767,7 @@ void SlurHandler::doSlurs(const ChordRest* chordRest, Notations& notations, XmlW
             // search for slur(s) starting or stopping at this chord
             for (const auto& it : chordRest->score()->spanner()) {
                   auto sp = it.second;
-                  if (sp->generated() || sp->type() != ElementType::SLUR || !ExportMusicXml::canWrite(sp))
+                  if (sp->generated() || sp->type() != ElementType::SLUR)
                         continue;
                   if (chordRest == sp->startElement() || chordRest == sp->endElement()) {
                         const Slur* s = static_cast<const Slur*>(sp);
@@ -1035,7 +1034,7 @@ static void findTrills(const Measure* const measure, int strack, int etrack, Tri
       for (auto it = measure->score()->spanner().lower_bound(stick.ticks()); it != measure->score()->spanner().upper_bound(etick.ticks()); ++it) {
             Element* e = it->second;
             //qDebug("1 trill %p type %d track %d tick %s", e, e->type(), e->track(), qPrintable(e->tick().print()));
-            if (e->isTrill() && ExportMusicXml::canWrite(e) && strack <= e->track() && e->track() < etrack
+            if (e->isTrill() && strack <= e->track() && e->track() < etrack
                 && e->tick() >= measure->tick() && e->tick() < (measure->tick() + measure->ticks()))
                   {
                   //qDebug("2 trill %p", e);
@@ -2776,7 +2775,7 @@ void ExportMusicXml::wavyLineStartStop(const ChordRest* const cr, Notations& not
 static void tremoloSingleStartStop(Chord* chord, Notations& notations, Ornaments& ornaments, XmlWriter& xml)
       {
       Tremolo* tr = chord->tremolo();
-      if (tr && ExportMusicXml::canWrite(tr)) {
+      if (tr) {
             int count = 0;
             TremoloType st = tr->tremoloType();
             QString type;
@@ -2839,7 +2838,7 @@ static void tremoloSingleStartStop(Chord* chord, Notations& notations, Ornaments
 static void fermatas(const QVector<Element*>& cra, XmlWriter& xml, Notations& notations)
       {
       for (const Element* e : cra) {
-            if (!e->isFermata() || !ExportMusicXml::canWrite(e))
+            if (!e->isFermata())
                   continue;
             notations.tag(xml);
             fermata(toFermata(e), xml);
@@ -3093,8 +3092,8 @@ static void writeChordLines(const Chord* const chord, XmlWriter& xml, Notations&
                         default:
                               qDebug("unknown ChordLine subtype %d", int(cl->chordLineType()));
                         }
-                  subtype += color2xml(cl);
                   if (!subtype.isEmpty()) {
+                        subtype += color2xml(cl);
                         notations.tag(xml);
                         articulations.tag(xml);
                         xml.tagE(subtype);
@@ -3109,7 +3108,7 @@ static void writeChordLines(const Chord* const chord, XmlWriter& xml, Notations&
 
 static void writeBreathMark(const Breath* const breath, XmlWriter& xml, Notations& notations, Articulations& articulations)
       {
-      if (breath && ExportMusicXml::canWrite(breath)) {
+      if (breath) {
             QString tagName;
             QString type;
 
@@ -3192,9 +3191,6 @@ void ExportMusicXml::chordAttributes(Chord* chord, Notations& notations, Technic
       // first the attributes whose elements are children of <articulations>
       Articulations articulations;
       for (const Articulation* a : na) {
-            if (!ExportMusicXml::canWrite(a))
-                  continue;
-
             SymId sid = a->symId();
             std::vector<QString> mxmlArtics = symIdToArtics(sid);
 
@@ -3229,8 +3225,6 @@ void ExportMusicXml::chordAttributes(Chord* chord, Notations& notations, Technic
       // then the attributes whose elements are children of <ornaments>
       Ornaments ornaments;
       for (const Articulation* a : na) {
-            if (!ExportMusicXml::canWrite(a))
-                  continue;
             if (!a->isOrnament())
                   continue;
 
@@ -3257,9 +3251,6 @@ void ExportMusicXml::chordAttributes(Chord* chord, Notations& notations, Technic
 
       // and finally the attributes whose elements are children of <technical>
       for (const Articulation* a : na) {
-            if (!ExportMusicXml::canWrite(a))
-                  continue;
-
             SymId sid = a->symId();
             QString placement;
             QString direction;
@@ -3347,9 +3338,6 @@ void ExportMusicXml::chordAttributes(Chord* chord, Notations& notations, Technic
 
       // check if all articulations were handled
       for (const Articulation* a : na) {
-            if (!ExportMusicXml::canWrite(a))
-                  continue;
-
             SymId sid = a->symId();
             if (symIdToArtics(sid).empty()
                 && symIdToTechn(sid).isEmpty()
@@ -3389,9 +3377,6 @@ static Arpeggio* findArpeggio(Note* note)
 
 static void arpeggiate(Arpeggio* arp, bool front, bool back, XmlWriter& xml, Notations& notations)
       {
-      if (!ExportMusicXml::canWrite(arp))
-            return;
-
       QString tagName;
       switch (arp->arpeggioType()) {
             case ArpeggioType::NORMAL:
@@ -3644,9 +3629,6 @@ static void writeNotehead(XmlWriter& xml, const Note* const note)
 static void writeFingering(XmlWriter& xml, Notations& notations, Technical& technical, const Note* const note)
       {
       for (const Element* e : note->el()) {
-            if (!ExportMusicXml::canWrite(e))
-                  continue;
-
             if (e->type() == ElementType::FINGERING) {
                   const TextBase* f = toTextBase(e);
                   notations.tag(xml);
@@ -3999,17 +3981,17 @@ void ExportMusicXml::chord(Chord* chord, int staff, const std::vector<Lyrics*>*
             Technical technical;
 
             const Tie* tieBack = note->tieBack();
-            if (tieBack && ExportMusicXml::canWrite(tieBack)) {
+            if (tieBack) {
                   notations.tag(_xml);
                   _xml.tagE("tied type=\"stop\"");
                   }
             const Tie* tieFor = note->tieFor();
-            if (tieFor && ExportMusicXml::canWrite(tieFor)) {
+            if (tieFor) {
                   notations.tag(_xml);
                   QString rest = slurTieLineStyle(tieFor);
                   _xml.tagE(QString("tied type=\"start\"%1").arg(rest));
                   }
-            if (hasLaissezVibrer(chord)/* && ExportMusicXml::canWrite(laissezVibrer)*/) {
+            if (hasLaissezVibrer(chord)) {
                   notations.tag(_xml);
                   _xml.tagE("tied type=\"let-ring\"");
                   }
@@ -4039,11 +4021,11 @@ void ExportMusicXml::chord(Chord* chord, int staff, const std::vector<Lyrics*>*
                   arpeggiate(arp, note == nl.front(), note == nl.back(), _xml, notations);
                   }
             for (Spanner* spanner : note->spannerFor())
-                  if (spanner->type() == ElementType::GLISSANDO && ExportMusicXml::canWrite(spanner)) {
+                  if (spanner->type() == ElementType::GLISSANDO) {
                         gh.doGlissandoStart(static_cast<Glissando*>(spanner), notations, _xml);
                         }
             for (Spanner* spanner : note->spannerBack())
-                  if (spanner->type() == ElementType::GLISSANDO && ExportMusicXml::canWrite(spanner)) {
+                  if (spanner->type() == ElementType::GLISSANDO) {
                         gh.doGlissandoStop(static_cast<Glissando*>(spanner), notations, _xml);
                         }
             // write glissando (only for last note)
@@ -8207,17 +8189,4 @@ void ExportMusicXml::harmony(Harmony const* const h, FretDiagram const* const fd
             }
       _xml.etag();       // harmony
       }
-//---------------------------------------------------------
-//  canWrite
-//---------------------------------------------------------
-
-/**
- Whether a tag corresponding to the given element \p e
- should be included to the exported MusicXML file.
- */
-
-bool ExportMusicXml::canWrite(const Element* e)
-      {
-      return e->visible() || preferences.getBool(PREF_EXPORT_MUSICXML_EXPORTINVISIBLEELEMENTS);
-      }
 }