Merge branch 'develop' of https://github.com/rism-digital/verovio int…

…o develop
rettinghaus · Sep 21, 2023 · 1dec6a3 · 1dec6a3
2 parents 974243d + 4bead81
commit 1dec6a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@ def get_commit():
     """Call tools/get_git_commit.sh on any platform."""
     if os.path.exists('./tools'):
         print('running tools/get_git_commit.sh')
-        os.system('bash -c "cd tools; ./get_git_commit.sh"')
+        os.system('sh -c "cd tools; ./get_git_commit.sh"')
     else:
         print('tools directory is missing')
 

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
@@ -3701,6 +3701,10 @@ void MusicXmlInput::ReadMusicXmlPrint(pugi::xml_node node, Section *section)
         Sb *sb = new Sb();
         section->AddChild(sb);
     }
+
+    if (std::string(node.child("measure-numbering").text().as_string()) == "none") {
+        m_doc->GetCurrentScoreDef()->SetMnumVisible(BOOLEAN_false);
+    }
 }
 
 bool MusicXmlInput::ReadMusicXmlBeamsAndTuplets(const pugi::xml_node &node, Layer *layer, bool isChord)

diff --git a/src/view_control.cpp b/src/view_control.cpp
@@ -1860,7 +1860,7 @@ void View::DrawFermata(DeviceContext *dc, Fermata *fermata, Measure *measure, Sy
             continue;
         }
 
-        const int staffSize = staff->m_drawingStaffSize;
+        const int staffSize = staff->GetDrawingStaffNotationSize();
         const int y = fermata->GetDrawingY();
 
         const int width = (symbolDef) ? symbolDef->GetSymbolWidth(m_doc, staffSize, drawingCueSize)