Fix #320973: Support .cap and .capx import of (Griffschrift's) X-note…

…heads Duplicate of musescore#8071 resp. backport of musescore#8072
Jojo-Schmitz · Sep 2, 2021 · b31d9ec · b31d9ec
1 parent b8e2480
commit b31d9ec
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/importexport/capella/capella.cpp b/importexport/capella/capella.cpp
@@ -790,6 +790,7 @@ static Fraction readCapVoice(Score* score, CapVoice* cvoice, int staffIdx, const
 
                               chord->add(note);
                               note->setPitch(pitch);
+                              note->setHeadGroup(NoteHead::Group(n.headGroup));
                               // TODO: compute tpc from pitch & line
                               note->setTpcFromPitch();
                               if (o->rightTie) {
@@ -1976,12 +1977,18 @@ void ChordObj::read()
                   }
             unsigned char b = cap->readByte();
             n.headType      = b & 7;
+            if (n.headType == 6) {
+                  n.headType = 0;
+                  n.headGroup = int(NoteHead::Group::HEAD_CROSS);
+                  }
+            else
+                  n.headGroup = int(NoteHead::Group::HEAD_NORMAL);
             n.alteration    = ((b >> 3) & 7) - 2;  // -2 -- +2
             if (b & 0x40)
                   n.explAlteration = 1;
             n.silent = b & 0x80;
-            qDebug("ChordObj::read() note pitch %d explAlt %d head %d alt %d silent %d",
-                   n.pitch, n.explAlteration, n.headType, n.alteration, n.silent);
+            qDebug("ChordObj::read() note pitch %d explAlt %d head %d group %d alt %d silent %d",
+                   n.pitch, n.explAlteration, n.headType, n.headGroup, n.alteration, n.silent);
             notes.append(n);
             }
       }

diff --git a/importexport/capella/capella.h b/importexport/capella/capella.h
@@ -557,6 +557,7 @@ struct CNote {
       signed char pitch;
       int explAlteration;     // 1 force, 2 suppress
       int headType;
+      int headGroup;
       int alteration;
       int silent;
       };

diff --git a/importexport/capella/capxml.cpp b/importexport/capella/capxml.cpp
@@ -415,6 +415,7 @@ void ChordObj::readCapxNotes(XmlReader& e)
             if (e.name() == "head") {
                   QString pitch = e.attribute("pitch");
                   QString sstep;
+                  QString shape = e.attribute("shape");
                   while (e.readNextStartElement()) {
                         const QStringRef& tag(e.name());
                         if (tag == "alter") {
@@ -428,13 +429,17 @@ void ChordObj::readCapxNotes(XmlReader& e)
                         else
                               e.unknown();
                         }
-                  qDebug("ChordObj::readCapxNotes: pitch '%s' altstep '%s'",
-                         qPrintable(pitch), qPrintable(sstep));
+                  qDebug("ChordObj::readCapxNotes: pitch '%s' altstep '%s' shape '%s'",
+                         qPrintable(pitch), qPrintable(sstep), qPrintable(shape));
                   int istep = sstep.toInt();
                   CNote n;
                   n.pitch = pitchStr2Char(pitch);
                   n.explAlteration = 0;
                   n.headType = 0;
+                  if (shape == "none")
+                       n.headGroup = int(NoteHead::Group::HEAD_CROSS);
+                  else
+                       n.headGroup = int(NoteHead::Group::HEAD_NORMAL);
                   n.alteration = istep;
                   n.silent = 0;
                   notes.append(n);