Merge pull request #3951 from rism-digital/develop-fix-neumes

Develop fix neumes
rism-digital · Feb 13, 2025 · b7df70e · b7df70e
2 parents 8243030 + d782bbb
commit b7df70e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/convertfunctor.cpp b/src/convertfunctor.cpp
@@ -280,7 +280,7 @@ bool ConvertToCastOffMensuralFunctor::IsValidBreakPoint(const Alignment *alignme
         }
         // When we have more than one neume in a syllable, every neume has its own alignment.
         // Only the first one, which is shared with the syllable, is a valid break point
-        if (child->FindDescendantByType(NEUME) && !child->FindDescendantByType(SYLLABLE)) {
+        if (child->FindDescendantByType(NC) && !child->FindDescendantByType(SYLLABLE)) {
             return false;
         }
     }

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
@@ -775,6 +775,11 @@ Fraction LayerElement::GetAlignmentDuration(
         // Add a larger gap after the last neume of the syllable
         return (syllable->GetLast() == this) ? NEUME_MEDIUM_SPACE : NEUME_SMALL_SPACE;
     }
+    // This is called only with syallable without neume
+    // Otherwise the duration is given by the neume (or by the nc with --neume-as-note)
+    else if (this->Is(SYLLABLE) && !this->FindDescendantByType(NEUME)) {
+        return NEUME_MEDIUM_SPACE;
+    }
     else {
         return Fraction(0);
     }