From 10e9a1fb4d3008be87995bd3c8a08db3553b61b5 Mon Sep 17 00:00:00 2001 From: martha-thomae Date: Thu, 19 Sep 2024 16:35:00 +0200 Subject: [PATCH 1/2] Fix formatting --- src/iocmme.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/iocmme.cpp b/src/iocmme.cpp index ccadfafb1d6..aafc23787b3 100644 --- a/src/iocmme.cpp +++ b/src/iocmme.cpp @@ -292,9 +292,9 @@ void CmmeInput::ReadEvents(pugi::xml_node eventsNode) else if (name == "Dot") { CreateDot(eventNode); } - else if (name == "LineEnd") { - CreateBreak(eventNode); - } + else if (name == "LineEnd") { + CreateBreak(eventNode); + } else if (name == "Mensuration") { CreateMensuration(eventNode); } @@ -449,12 +449,13 @@ void CmmeInput::CreateBreak(pugi::xml_node breakNode) { assert(m_currentContainer); - // This is either a system or page break (usually only + // This is either a system or page break (usually only // in one part, so not easy to visualise in score) - if (breakNode.select_node("./PageEnd")){ + if (breakNode.select_node("./PageEnd")) { GenericLayerElement *pb = new GenericLayerElement("pb"); m_currentContainer->AddChild(pb); - } else { + } + else { GenericLayerElement *sb = new GenericLayerElement("sb"); m_currentContainer->AddChild(sb); } From 979e97528a6f441a4b022659d998b8a936b1e89e Mon Sep 17 00:00:00 2001 From: martha-thomae Date: Thu, 19 Sep 2024 16:41:05 +0200 Subject: [PATCH 2/2] Add support for CMME NoScoreEffect --- src/iocmme.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/iocmme.cpp b/src/iocmme.cpp index aafc23787b3..f3e3fed6d7d 100644 --- a/src/iocmme.cpp +++ b/src/iocmme.cpp @@ -668,6 +668,12 @@ void CmmeInput::CreateMensuration(pugi::xml_node mensurationNode) mensur->m_unsupported.push_back(std::make_pair("fontsize", "small")); } + /// Mesuration/NoScoreEffect to @type = cmme_no_score_effect + pugi::xml_node noScoreEffect = mensurationNode.child("NoScoreEffect"); + if (noScoreEffect != NULL) { + mensur->SetType("cmme_no_score_effect"); + } + /// Mensuration/Number/Num to @num and Number/Den to @numbase /// However, Number/Den cannot be entered in the CMME Editor. /// It can only be added in the XML manually and imported into the CMME Editor,