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

…o develop
rism-digital · Oct 11, 2024 · dee17a9 · dee17a9
2 parents 6e6bd93 + 0d36ed9
commit dee17a9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 33 deletions.
diff --git a/include/vrv/fraction.h b/include/vrv/fraction.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        faction.h
+// Name:        fraction.h
 // Author:      Laurent Pugin
 // Created:     2024
 // Copyright (c) Authors and others. All rights reserved.

diff --git a/include/vrv/page.h b/include/vrv/page.h
@@ -166,9 +166,9 @@ class Page : public Object {
     void AdjustSylSpacingByVerse(const IntTree &verseTree, Doc *doc);
 
     /**
-     * Check whether vertical justification is required for the current page
+     * Reduces the justifiable height based on the --justification-max-vertical option
      */
-    bool IsJustificationRequired(const Doc *doc);
+    void ReduceJustifiableHeight(const Doc *doc);
 
     //
 public:

diff --git a/src/options.cpp b/src/options.cpp
@@ -1353,7 +1353,7 @@ Options::Options()
 
     m_justificationMaxVertical.SetInfo("Maximum ratio of justifiable height for page",
         "Maximum ratio of justifiable height to page height that can be used for the vertical justification");
-    m_justificationMaxVertical.Init(0.3, 0.0, 1.0);
+    m_justificationMaxVertical.Init(0.2, 0.0, 1.0);
     this->Register(&m_justificationMaxVertical, "justificationMaxVertical", &m_generalLayout);
 
     m_ledgerLineThickness.SetInfo("Ledger line thickness", "The thickness of the ledger lines");

diff --git a/src/page.cpp b/src/page.cpp
@@ -626,8 +626,7 @@ void Page::JustifyVertically()
         return;
     }
 
-    // Ignore vertical justification if it's not required
-    if (!this->IsJustificationRequired(doc)) return;
+    this->ReduceJustifiableHeight(doc);
 
     // Justify Y position
     JustifyYFunctor justifyY(doc);
@@ -643,42 +642,25 @@ void Page::JustifyVertically()
     }
 }
 
-bool Page::IsJustificationRequired(const Doc *doc)
+void Page::ReduceJustifiableHeight(const Doc *doc)
 {
     const Pages *pages = doc->GetPages();
     assert(pages);
 
-    const int childSystems = this->GetChildCount(SYSTEM);
-    // Last page and justification of last page is not enabled
+    double maxRatio = doc->GetOptions()->m_justificationMaxVertical.GetValue();
+    // Special handling for justification of last page
     if (pages->GetLast() == this) {
-        const int idx = this->GetIdx();
-        if (idx > 0) {
-            const Page *previousPage = dynamic_cast<const Page *>(pages->GetPrevious(this));
-            assert(previousPage);
-            const int previousJustifiableHeight = previousPage->m_drawingJustifiableHeight;
-            const int previousJustificationSum = previousPage->m_justificationSum;
-
-            if (previousJustifiableHeight < m_drawingJustifiableHeight) {
-                m_drawingJustifiableHeight = previousJustifiableHeight;
+        const Page *previousPage = vrv_cast<const Page *>(pages->GetPrevious(this, PAGE));
+        if (previousPage) {
+            const int systemCount = this->GetChildCount(SYSTEM);
+            const int previousSystemCount = previousPage->GetChildCount(SYSTEM);
+            if (systemCount < previousSystemCount) {
+                maxRatio *= (double)systemCount / (double)previousSystemCount;
             }
-
-            const int maxSystemsPerPage = doc->GetOptions()->m_systemMaxPerPage.GetValue();
-            if ((childSystems <= 2) || (childSystems < maxSystemsPerPage)) {
-                m_justificationSum = previousJustificationSum;
-            }
-        }
-        else {
-            const int stavesPerSystem = m_drawingScoreDef.GetDescendantCount(STAFFDEF);
-            if (childSystems * stavesPerSystem < 8) return false;
         }
     }
-    const double ratio = (double)m_drawingJustifiableHeight / (double)doc->m_drawingPageHeight;
-    if (ratio > doc->GetOptions()->m_justificationMaxVertical.GetValue()) {
-        m_drawingJustifiableHeight
-            = doc->m_drawingPageHeight * doc->GetOptions()->m_justificationMaxVertical.GetValue();
-    }
 
-    return true;
+    m_drawingJustifiableHeight = std::min<int>(doc->m_drawingPageHeight * maxRatio, m_drawingJustifiableHeight);
 }
 
 void Page::LayOutPitchPos()