Implementation for issue humdrum-tools/verovio-humdrum-viewer#855

rism-digital · Oct 3, 2023 · ef1868d · ef1868d
1 parent ad474b6
commit ef1868d
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/src/iohumdrum.cpp b/src/iohumdrum.cpp
@@ -7433,18 +7433,6 @@ void HumdrumInput::setClef(StaffDef *staff, const std::string &clef, hum::HTp cl
         setLocationId(vrvclef, cleftok);
     }
 
-    if (clef.find("clefGG") != std::string::npos) {
-        vrvclef->SetShape(CLEFSHAPE_GG);
-    }
-    else if (clef.find("clefG") != std::string::npos) {
-        vrvclef->SetShape(CLEFSHAPE_G);
-    }
-    else if (clef.find("clefF") != std::string::npos) {
-        vrvclef->SetShape(CLEFSHAPE_F);
-    }
-    else if (clef.find("clefC") != std::string::npos) {
-        vrvclef->SetShape(CLEFSHAPE_C);
-    }
     if (clef.find("clefX") != std::string::npos) {
         vrvclef->SetShape(CLEFSHAPE_perc);
         hum::HumRegex hre;
@@ -7467,6 +7455,11 @@ void HumdrumInput::setClef(StaffDef *staff, const std::string &clef, hum::HTp cl
     std::string tok;
     if (cleftok) {
         tok = *cleftok;
+        if (cleftok->isMens()) {
+            if (*cleftok == "*clefGv2") {
+                tok = "*clefC4";
+            }
+        }
     }
     else {
         tok = clef;
@@ -19908,7 +19901,10 @@ Clef *HumdrumInput::insertClefElement(
 
 void HumdrumInput::setClefBasicShape(Clef *clef, const std::string &tok)
 {
-    if (tok.find("clefG") != std::string::npos) {
+    if (tok.find("clefGG") != std::string::npos) {
+        clef->SetShape(CLEFSHAPE_GG);
+    }
+    else if (tok.find("clefG") != std::string::npos) {
         clef->SetShape(CLEFSHAPE_G);
     }
     else if (tok.find("clefF") != std::string::npos) {