From da8a7f32f6cdd9803e1791f555e1cef51befc686 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 12 Sep 2023 13:43:35 +0200
Subject: [PATCH 01/18] Store list of scores in Doc

---
 include/vrv/doc.h | 21 ++++++++++++++++-----
 src/doc.cpp       | 27 +++++++++++++++------------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index d1cfdc7a7af..099a5e90702 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -121,11 +121,6 @@ class Doc : public Object {
      */
     bool HasPage(int pageIdx) const;
 
-    /**
-     * Get all the Score in the visible Mdiv.
-     */
-    std::list<Score *> GetScores();
-
     /**
      * Get the Pages in the visible Mdiv.
      * Will find it only when having read a pages-based MEI file,
@@ -141,6 +136,11 @@ class Doc : public Object {
      */
     int GetPageCount() const;
 
+    /**
+     * Get all scores
+     */
+    std::list<Score *> GetScores() { return m_scores; }
+
     /**
      * Return true if the MIDI generation is already done
      */
@@ -477,6 +477,11 @@ class Doc : public Object {
      */
     void PrepareMeasureIndices();
 
+    /**
+     * Determine all scores
+     */
+    void CollectScores();
+
 public:
     Page *m_selectionPreceding;
     Page *m_selectionFollowing;
@@ -545,6 +550,12 @@ class Doc : public Object {
      */
     Resources m_resources;
 
+    /**
+     * The list of all scores
+     * Used in Doc::GetScoreDefFor to quickly determine the corresponding score for an object
+     */
+    std::list<Score *> m_scores;
+
     /**
      * @name Holds a pointer to the current score/scoreDef.
      * Set by Doc::GetCurrentScoreDef or explicitly through Doc::SetCurrentScoreDef
diff --git a/src/doc.cpp b/src/doc.cpp
index 3fd5b393d28..7fd1c9e1501 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -574,6 +574,10 @@ void Doc::PrepareData()
 
     this->PrepareMeasureIndices();
 
+    /************ Collect all scores ************/
+
+    this->CollectScores();
+
     /************ Store default durations ************/
 
     PrepareDurationFunctor prepareDuration;
@@ -1446,18 +1450,6 @@ bool Doc::HasPage(int pageIdx) const
     return ((pageIdx >= 0) && (pageIdx < pages->GetChildCount()));
 }
 
-std::list<Score *> Doc::GetScores()
-{
-    std::list<Score *> scores;
-    ListOfObjects objects = this->FindAllDescendantsByType(SCORE, false, 3);
-    for (const auto object : objects) {
-        Score *score = vrv_cast<Score *>(object);
-        assert(score);
-        scores.push_back(score);
-    }
-    return scores;
-}
-
 Pages *Doc::GetPages()
 {
     return vrv_cast<Pages *>(this->FindDescendantByType(PAGES));
@@ -1474,6 +1466,17 @@ int Doc::GetPageCount() const
     return ((pages) ? pages->GetChildCount() : 0);
 }
 
+void Doc::CollectScores()
+{
+    m_scores.clear();
+    ListOfObjects objects = this->FindAllDescendantsByType(SCORE, false, 3);
+    for (Object *object : objects) {
+        Score *score = vrv_cast<Score *>(object);
+        assert(score);
+        m_scores.push_back(score);
+    }
+}
+
 int Doc::GetGlyphHeight(char32_t code, int staffSize, bool graceSize) const
 {
     int x, y, w, h;

From d4e6fa9004956fe02844fbd5cca1e91dac960126 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 14 Sep 2023 17:08:37 +0200
Subject: [PATCH 02/18] Replace current scoreDef in import/export

---
 include/vrv/doc.h   |  8 ++++++++
 include/vrv/iomei.h |  2 +-
 src/doc.cpp         | 14 ++++++++++++++
 src/ioabc.cpp       |  2 +-
 src/iodarms.cpp     |  2 +-
 src/iohumdrum.cpp   | 34 +++++++++++++++++-----------------
 src/iomei.cpp       | 19 ++++++++++---------
 src/iomusxml.cpp    | 10 +++++-----
 src/iopae.cpp       | 18 +++++++++---------
 9 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index 099a5e90702..a41b88558da 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -141,6 +141,14 @@ class Doc : public Object {
      */
     std::list<Score *> GetScores() { return m_scores; }
 
+    /**
+     * Get the first scoreDef
+     */
+    ///@{
+    ScoreDef *GetFirstScoreDef();
+    const ScoreDef *GetFirstScoreDef() const;
+    ///@}
+
     /**
      * Return true if the MIDI generation is already done
      */
diff --git a/include/vrv/iomei.h b/include/vrv/iomei.h
index e162f386646..6b0d7800119 100644
--- a/include/vrv/iomei.h
+++ b/include/vrv/iomei.h
@@ -306,7 +306,7 @@ class MEIOutput : public Output {
      * Scoredef manipulation
      */
     ///@{
-    void WriteCustomScoreDef();
+    void WriteCustomScoreDef(ScoreDef *scoreDef);
     void AdjustStaffDef(StaffDef *staffDef, Measure *measure);
     bool AdjustLabel(Label *label);
     ///@}
diff --git a/src/doc.cpp b/src/doc.cpp
index 7fd1c9e1501..7be35f4dac1 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -1466,6 +1466,20 @@ int Doc::GetPageCount() const
     return ((pages) ? pages->GetChildCount() : 0);
 }
 
+ScoreDef *Doc::GetFirstScoreDef()
+{
+    return const_cast<ScoreDef *>(std::as_const(*this).GetFirstScoreDef());
+}
+
+const ScoreDef *Doc::GetFirstScoreDef() const
+{
+    // Use precalculated list of scores, if possible
+    const Score *score
+        = m_scores.empty() ? vrv_cast<const Score *>(this->FindDescendantByType(SCORE, 3)) : m_scores.front();
+
+    return score ? score->GetScoreDef() : NULL;
+}
+
 void Doc::CollectScores()
 {
     m_scores.clear();
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 5ce7bdae43d..a7473bdae60 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -224,7 +224,7 @@ int ABCInput::SetBarLine(const std::string &musicCode, int i)
 
 void ABCInput::CalcUnitNoteLength()
 {
-    MeterSig *meterSig = vrv_cast<MeterSig *>(m_doc->GetCurrentScoreDef()->FindDescendantByType(METERSIG));
+    MeterSig *meterSig = vrv_cast<MeterSig *>(m_doc->GetFirstScoreDef()->FindDescendantByType(METERSIG));
     if (!meterSig || !meterSig->HasUnit() || double(meterSig->GetTotalCount()) / double(meterSig->GetUnit()) >= 0.75) {
         m_unitDur = 8;
         m_durDefault = DURATION_8;
diff --git a/src/iodarms.cpp b/src/iodarms.cpp
index 36082e95284..debf3f3181a 100644
--- a/src/iodarms.cpp
+++ b/src/iodarms.cpp
@@ -521,7 +521,7 @@ bool DarmsInput::Import(const std::string &data_str)
     StaffDef *staffDef = new StaffDef();
     staffDef->SetN(1);
     staffGrp->AddChild(staffDef);
-    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
+    m_doc->GetFirstScoreDef()->AddChild(staffGrp);
 
     m_doc->ConvertToPageBasedDoc();
 
diff --git a/src/iohumdrum.cpp b/src/iohumdrum.cpp
index 801556e9b85..907caf7992c 100644
--- a/src/iohumdrum.cpp
+++ b/src/iohumdrum.cpp
@@ -3411,7 +3411,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
     const std::vector<hum::HTp> &staffstarts = m_staffstarts;
 
     if (staffstarts.size() > 0) {
-        addMidiTempo(m_doc->GetCurrentScoreDef(), staffstarts[0], top, bot);
+        addMidiTempo(m_doc->GetFirstScoreDef(), staffstarts[0], top, bot);
     }
     hum::HumRegex hre;
     for (int i = 0; i < (int)staffstarts.size(); ++i) {
@@ -3445,7 +3445,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
         // If there is one staff, then no extra decoration.
         else if (staffstarts.size() == 1) {
             StaffGrp *sg = new StaffGrp();
-            m_doc->GetCurrentScoreDef()->AddChild(sg);
+            m_doc->GetFirstScoreDef()->AddChild(sg);
             sg->AddChild(m_staffdef[0]);
         }
         // do something if there is no staff in the score?
@@ -3454,7 +3454,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
         bool status = processStaffDecoration(decoration);
         if (!status) {
             StaffGrp *sg = new StaffGrp();
-            m_doc->GetCurrentScoreDef()->AddChild(sg);
+            m_doc->GetFirstScoreDef()->AddChild(sg);
             sg->SetBarThru(BOOLEAN_false);
             // setGroupSymbol(sg, staffGroupingSym_SYMBOL_bracket);
             for (int i = 0; i < (int)m_staffdef.size(); ++i) {
@@ -3481,7 +3481,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
 
 void HumdrumInput::promoteInstrumentNamesToGroup()
 {
-    ScoreDef *sdf = m_doc->GetCurrentScoreDef();
+    ScoreDef *sdf = m_doc->GetFirstScoreDef();
     int count = sdf->GetChildCount();
     for (int i = 0; i < count; ++i) {
         Object *obj = sdf->GetChild(i);
@@ -3555,7 +3555,7 @@ void HumdrumInput::promoteInstrumentsForStaffGroup(StaffGrp *group)
 
 void HumdrumInput::promoteInstrumentAbbreviationsToGroup()
 {
-    ScoreDef *sdf = m_doc->GetCurrentScoreDef();
+    ScoreDef *sdf = m_doc->GetFirstScoreDef();
     int count = sdf->GetChildCount();
 
     for (int i = 0; i < count; ++i) {
@@ -4007,14 +4007,14 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
         // There is no barline across the staves in this case.
         root = new StaffGrp();
         root->SetBarThru(BOOLEAN_false);
-        m_doc->GetCurrentScoreDef()->AddChild(root);
+        m_doc->GetFirstScoreDef()->AddChild(root);
     }
     else if (d[0] == '(') {
         // The outer group is not bracketed, but bar goes all of
         // the way through system.
         root = new StaffGrp();
         root->SetBarThru(BOOLEAN_true);
-        m_doc->GetCurrentScoreDef()->AddChild(root);
+        m_doc->GetFirstScoreDef()->AddChild(root);
     }
     else if (pairing.back() == 0) {
         skipfirst = true;
@@ -4030,7 +4030,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
         else if (d[0] == '[') {
             setGroupSymbol(root, staffGroupingSym_SYMBOL_bracket);
         }
-        m_doc->GetCurrentScoreDef()->AddChild(root);
+        m_doc->GetFirstScoreDef()->AddChild(root);
     }
 
     std::vector<int> spine; // kernstart index
@@ -4271,7 +4271,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
             root->AddChild(sg);
         }
         else {
-            m_doc->GetCurrentScoreDef()->AddChild(sg);
+            m_doc->GetFirstScoreDef()->AddChild(sg);
         }
         for (int i = 0; i < (int)m_staffdef.size(); ++i) {
             sg->AddChild(m_staffdef[i]);
@@ -4294,7 +4294,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
                 root->AddChild(sg);
             }
             else {
-                m_doc->GetCurrentScoreDef()->AddChild(sg);
+                m_doc->GetFirstScoreDef()->AddChild(sg);
             }
         }
 
@@ -4371,7 +4371,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
         }
         else {
             root_sg = new StaffGrp();
-            m_doc->GetCurrentScoreDef()->AddChild(root_sg);
+            m_doc->GetFirstScoreDef()->AddChild(root_sg);
             root_sg->SetBarThru(BOOLEAN_false);
         }
         for (int i = 0; i < (int)newgroups.size(); ++i) {
@@ -4857,7 +4857,7 @@ bool HumdrumInput::prepareFooter(
     // std::cout << "MEI CONTENT " << meicontent << std::endl;
 
     AttFormeworkComparison comparison(PGFOOT, PGFUNC_first);
-    Object *pgfoot = tempdoc.GetCurrentScoreDef()->FindDescendantByComparison(&comparison);
+    Object *pgfoot = tempdoc.GetFirstScoreDef()->FindDescendantByComparison(&comparison);
     if (pgfoot == NULL) {
         return false;
     }
@@ -4875,10 +4875,10 @@ bool HumdrumInput::prepareFooter(
         return false;
     }
 
-    m_doc->GetCurrentScoreDef()->AddChild(pgfoot);
+    m_doc->GetFirstScoreDef()->AddChild(pgfoot);
 
     AttFormeworkComparison comparison2(PGFOOT, PGFUNC_all);
-    Object *pgfoot2 = tempdoc.GetCurrentScoreDef()->FindDescendantByComparison(&comparison2);
+    Object *pgfoot2 = tempdoc.GetFirstScoreDef()->FindDescendantByComparison(&comparison2);
     if (pgfoot2 == NULL) {
         return true;
     }
@@ -4896,7 +4896,7 @@ bool HumdrumInput::prepareFooter(
         return true;
     }
 
-    m_doc->GetCurrentScoreDef()->AddChild(pgfoot2);
+    m_doc->GetFirstScoreDef()->AddChild(pgfoot2);
 
     return true;
 }
@@ -5032,7 +5032,7 @@ bool HumdrumInput::prepareHeader(
     // std::string meicontent = meioutput.GetOutput();
     // std::cout << "MEI CONTENT " << meicontent << std::endl;
 
-    Object *pghead = tempdoc.GetCurrentScoreDef()->FindDescendantByType(ClassId::PGHEAD);
+    Object *pghead = tempdoc.GetFirstScoreDef()->FindDescendantByType(ClassId::PGHEAD);
     if (pghead == NULL) {
         return false;
     }
@@ -5050,7 +5050,7 @@ bool HumdrumInput::prepareHeader(
         return false;
     }
 
-    m_doc->GetCurrentScoreDef()->AddChild(pghead);
+    m_doc->GetFirstScoreDef()->AddChild(pghead);
 
     return true;
 }
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 9f3e2b6c52f..e11544cc1c2 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -914,12 +914,13 @@ bool MEIOutput::WriteObjectInternal(Object *object, bool useCustomScoreDef)
     if (this->IsTreeObject(object)) m_nodeStack.push_back(m_currentNode);
 
     if (object->Is(SCORE)) {
+        ScoreDef *scoreDef = vrv_cast<Score *>(object)->GetScoreDef();
         if (useCustomScoreDef) {
-            this->WriteCustomScoreDef();
+            this->WriteCustomScoreDef(scoreDef);
         }
         else {
             // Save the main scoreDef
-            m_doc->GetCurrentScoreDef()->SaveObject(this, this->GetBasic());
+            scoreDef->SaveObject(this, this->GetBasic());
         }
     }
 
@@ -1278,7 +1279,7 @@ void MEIOutput::WriteStackedObjectsEnd()
         [this](Object *object) { this->WriteObjectInternalEnd(object); });
 }
 
-void MEIOutput::WriteCustomScoreDef()
+void MEIOutput::WriteCustomScoreDef(ScoreDef *scoreDef)
 {
     // Determine the first measure with respect to the first filter match
     Measure *measure = NULL;
@@ -1305,8 +1306,8 @@ void MEIOutput::WriteCustomScoreDef()
     if (measure && refScoreDef) {
         // Create a copy of the reference scoredef and adjust it to keep track of clef changes, key signature changes,
         // etc.
-        ScoreDef *scoreDef = vrv_cast<ScoreDef *>(refScoreDef->Clone());
-        ListOfObjects staffDefs = scoreDef->FindAllDescendantsByType(STAFFDEF);
+        ScoreDef *customScoreDef = vrv_cast<ScoreDef *>(refScoreDef->Clone());
+        ListOfObjects staffDefs = customScoreDef->FindAllDescendantsByType(STAFFDEF);
         for (Object *staffDef : staffDefs) {
             this->AdjustStaffDef(vrv_cast<StaffDef *>(staffDef), measure);
         }
@@ -1319,7 +1320,7 @@ void MEIOutput::WriteCustomScoreDef()
         }
         if (!drawLabels) {
             // If not, replace labels by abbreviation or delete them
-            ListOfObjects labels = scoreDef->FindAllDescendantsByType(LABEL);
+            ListOfObjects labels = customScoreDef->FindAllDescendantsByType(LABEL);
             for (Object *label : labels) {
                 if (!this->AdjustLabel(vrv_cast<Label *>(label))) {
                     label->GetParent()->DeleteChild(label);
@@ -1328,11 +1329,11 @@ void MEIOutput::WriteCustomScoreDef()
         }
 
         // Save the adjusted score def and delete it afterwards
-        scoreDef->SaveObject(this, this->GetBasic());
-        delete scoreDef;
+        customScoreDef->SaveObject(this, this->GetBasic());
+        delete customScoreDef;
     }
     else {
-        m_doc->GetCurrentScoreDef()->SaveObject(this, this->GetBasic());
+        scoreDef->SaveObject(this, this->GetBasic());
     }
 }
 
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index fd13a4b99da..33788e61036 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -888,23 +888,23 @@ bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
             }
         }
         if (head) {
-            m_doc->GetCurrentScoreDef()->AddChild(head);
+            score->GetScoreDef()->AddChild(head);
         }
         if (foot) {
-            m_doc->GetCurrentScoreDef()->AddChild(foot);
+            score->GetScoreDef()->AddChild(foot);
         }
     }
 
     std::vector<StaffGrp *> m_staffGrpStack;
     StaffGrp *staffGrp = new StaffGrp();
-    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
+    score->GetScoreDef()->AddChild(staffGrp);
     m_staffGrpStack.push_back(staffGrp);
 
     short int staffOffset = 0;
     m_octDis.push_back(0);
 
     pugi::xpath_node scoreMidiBpm = root.select_node("/score-partwise/part[1]/measure[1]/sound[@tempo][1]");
-    if (scoreMidiBpm) m_doc->GetCurrentScoreDef()->SetMidiBpm(scoreMidiBpm.node().attribute("tempo").as_double());
+    if (scoreMidiBpm) score->GetScoreDef()->SetMidiBpm(scoreMidiBpm.node().attribute("tempo").as_double());
 
     pugi::xpath_node_set partListChildren = root.select_nodes("/score-partwise/part-list/*");
     for (pugi::xpath_node_set::const_iterator it = partListChildren.begin(); it != partListChildren.end(); ++it) {
@@ -2626,7 +2626,7 @@ void MusicXmlInput::ReadMusicXmlNote(
     // find staff's staffDef
     // TODO Tablature: is this the correct way to find a staff's staffDef?
     AttNIntegerComparison cnc(STAFFDEF, staff->GetN());
-    StaffDef *staffDef = vrv_cast<StaffDef *>(m_doc->GetCurrentScoreDef()->FindDescendantByComparison(&cnc));
+    StaffDef *staffDef = vrv_cast<StaffDef *>(m_doc->GetFirstScoreDef()->FindDescendantByComparison(&cnc));
     bool isTablature = false;
     Tuning *tuning = NULL;
 
diff --git a/src/iopae.cpp b/src/iopae.cpp
index 0d508be5c12..56a2d0461f4 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -73,7 +73,7 @@ bool PAEOutput::Export(std::string &output)
     m_currentDots = -1;
     m_grace = false;
 
-    m_doc->GetCurrentScoreDef()->SaveObject(this, false);
+    m_doc->GetFirstScoreDef()->SaveObject(this, false);
 
     m_docScoreDef = false;
 
@@ -1019,20 +1019,20 @@ void PAEInput::parsePlainAndEasy(std::istream &infile)
         staffDef->AddChild(staffDefClef);
     }
     if (scoreDefKeySig) {
-        m_doc->GetCurrentScoreDef()->AddChild(scoreDefKeySig);
+        score->GetScoreDef()->AddChild(scoreDefKeySig);
     }
     if (scoreDefMeterSig) {
         // Make it an attribute for now
         scoreDefMeterSig->IsAttribute(true);
-        m_doc->GetCurrentScoreDef()->AddChild(scoreDefMeterSig);
+        score->GetScoreDef()->AddChild(scoreDefMeterSig);
     }
     if (scoreDefMensur) {
         // Make it an attribute for now
         scoreDefMensur->IsAttribute(true);
-        m_doc->GetCurrentScoreDef()->AddChild(scoreDefMensur);
+        score->GetScoreDef()->AddChild(scoreDefMensur);
     }
 
-    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
+    score->GetScoreDef()->AddChild(staffGrp);
 
     if (m_tie != NULL) {
         LogWarning("Open tie will not render because tstamp2 is missing");
@@ -2966,7 +2966,7 @@ bool PAEInput::Parse()
     staffDef->SetN(1);
     staffDef->SetLines(5);
     staffGrp->AddChild(staffDef);
-    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
+    score->GetScoreDef()->AddChild(staffGrp);
 
     if (m_isMensural) {
         staffDef->SetNotationtype(NOTATIONTYPE_mensural);
@@ -2977,17 +2977,17 @@ bool PAEInput::Parse()
         staffDef->AddChild(m_clef.Clone());
     }
     if (m_hasKeySig) {
-        m_doc->GetCurrentScoreDef()->AddChild(m_keySig.Clone());
+        score->GetScoreDef()->AddChild(m_keySig.Clone());
     }
     if (m_hasMeterSig) {
         // Make it an attribute for now
         m_meterSig.IsAttribute(true);
-        m_doc->GetCurrentScoreDef()->AddChild(m_meterSig.Clone());
+        score->GetScoreDef()->AddChild(m_meterSig.Clone());
     }
     if (m_hasMensur) {
         // Make it an attribute for now
         m_mensur.IsAttribute(true);
-        m_doc->GetCurrentScoreDef()->AddChild(m_mensur.Clone());
+        score->GetScoreDef()->AddChild(m_mensur.Clone());
     }
 
     // A stack to which layer element are added. At least a Layer, but then Beam, GraceGrp, Chord, etc.

From cbd55114b9e7fe56a0aa09e5f60dd4bde832d521 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 14 Sep 2023 21:42:16 +0200
Subject: [PATCH 03/18] Detect corresponding score for any node

---
 include/vrv/doc.h | 10 +++++++++-
 src/doc.cpp       | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index a41b88558da..0b652cce8ba 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -149,6 +149,14 @@ class Doc : public Object {
     const ScoreDef *GetFirstScoreDef() const;
     ///@}
 
+    /**
+     * Get the corresponding scoreDef for a node
+     */
+    ///@{
+    ScoreDef *GetCorrespScoreDef(const Object *object);
+    const ScoreDef *GetCorrespScoreDef(const Object *object) const;
+    ///@}
+
     /**
      * Return true if the MIDI generation is already done
      */
@@ -560,7 +568,7 @@ class Doc : public Object {
 
     /**
      * The list of all scores
-     * Used in Doc::GetScoreDefFor to quickly determine the corresponding score for an object
+     * Used in Doc::GetCorrespScoreDef to quickly determine the corresponding scoreDef for an object
      */
     std::list<Score *> m_scores;
 
diff --git a/src/doc.cpp b/src/doc.cpp
index 7be35f4dac1..dc41907a749 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -1480,6 +1480,22 @@ const ScoreDef *Doc::GetFirstScoreDef() const
     return score ? score->GetScoreDef() : NULL;
 }
 
+ScoreDef *Doc::GetCorrespScoreDef(const Object *object)
+{
+    return const_cast<ScoreDef *>(std::as_const(*this).GetCorrespScoreDef(object));
+}
+
+const ScoreDef *Doc::GetCorrespScoreDef(const Object *object) const
+{
+    const Score *correspScore = NULL;
+    for (Score *score : m_scores) {
+        if ((score == object) || Object::IsPreOrdered(score, object)) {
+            correspScore = score;
+        }
+    }
+    return correspScore ? correspScore->GetScoreDef() : NULL;
+}
+
 void Doc::CollectScores()
 {
     m_scores.clear();

From 05903088674304cd3dc8ba0144e851a96c145ab8 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Sat, 16 Sep 2023 23:23:53 +0200
Subject: [PATCH 04/18] Replace usage of GetCurrentScoreDef in layout

---
 include/vrv/doc.h              |  23 +++--
 include/vrv/floatingobject.h   |   2 +-
 src/adjustaccidxfunctor.cpp    |   2 +-
 src/adjustdotsfunctor.cpp      |   3 +-
 src/adjustgracexposfunctor.cpp |   3 +-
 src/adjustlayersfunctor.cpp    |   3 +-
 src/adjustxposfunctor.cpp      |   3 +-
 src/doc.cpp                    | 148 ++++++++++++++++++++-------------
 src/editortoolkit_neume.cpp    |   2 +-
 src/floatingobject.cpp         |   5 +-
 src/page.cpp                   |  13 +--
 src/preparedatafunctor.cpp     |   6 +-
 12 files changed, 129 insertions(+), 84 deletions(-)

diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index 0b652cce8ba..e4822a9c2e8 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -137,9 +137,9 @@ class Doc : public Object {
     int GetPageCount() const;
 
     /**
-     * Get all scores
+     * Get all visible scores
      */
-    std::list<Score *> GetScores() { return m_scores; }
+    std::list<Score *> GetVisibleScores() { return m_visibleScores; }
 
     /**
      * Get the first scoreDef
@@ -149,6 +149,15 @@ class Doc : public Object {
     const ScoreDef *GetFirstScoreDef() const;
     ///@}
 
+    /**
+     * Get the first or last visible scoreDef
+     * Lazily updates the visible scores, hence never const
+     */
+    ///@{
+    ScoreDef *GetFirstVisibleScoreDef();
+    ScoreDef *GetLastVisibleScoreDef();
+    ///@}
+
     /**
      * Get the corresponding scoreDef for a node
      */
@@ -241,7 +250,7 @@ class Doc : public Object {
      * Get the default distance from the staff for the object
      * The distance is given in x * MEI UNIT
      */
-    data_MEASUREMENTSIGNED GetStaffDistance(const ClassId classId, int staffIndex, data_STAFFREL staffPosition);
+    data_MEASUREMENTSIGNED GetStaffDistance(const Object *object, int staffIndex, data_STAFFREL staffPosition) const;
 
     /**
      * Prepare the timemap for MIDI and timemap file export.
@@ -494,9 +503,9 @@ class Doc : public Object {
     void PrepareMeasureIndices();
 
     /**
-     * Determine all scores
+     * Determine all visible scores
      */
-    void CollectScores();
+    void CollectVisibleScores();
 
 public:
     Page *m_selectionPreceding;
@@ -567,10 +576,10 @@ class Doc : public Object {
     Resources m_resources;
 
     /**
-     * The list of all scores
+     * The list of all visible scores
      * Used in Doc::GetCorrespScoreDef to quickly determine the corresponding scoreDef for an object
      */
-    std::list<Score *> m_scores;
+    std::list<Score *> m_visibleScores;
 
     /**
      * @name Holds a pointer to the current score/scoreDef.
diff --git a/include/vrv/floatingobject.h b/include/vrv/floatingobject.h
index aaa9d9edcf3..f6cd1f450a3 100644
--- a/include/vrv/floatingobject.h
+++ b/include/vrv/floatingobject.h
@@ -251,7 +251,7 @@ class FloatingPositioner : public BoundingBox {
     /**
      * Update the Y drawing relative position based on collision detection with the overlapping bounding box
      */
-    void CalcDrawingYRel(Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox);
+    void CalcDrawingYRel(const Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox);
 
     /**
      * Align extender elements across systems
diff --git a/src/adjustaccidxfunctor.cpp b/src/adjustaccidxfunctor.cpp
index ece6761c994..f911a2bf168 100644
--- a/src/adjustaccidxfunctor.cpp
+++ b/src/adjustaccidxfunctor.cpp
@@ -41,7 +41,7 @@ FunctorCode AdjustAccidXFunctor::VisitAlignmentReference(AlignmentReference *ali
     if (accids.empty()) return FUNCTOR_SIBLINGS;
 
     assert(m_doc);
-    StaffDef *staffDef = m_doc->GetCurrentScoreDef()->GetStaffDef(alignmentReference->GetN());
+    StaffDef *staffDef = m_doc->GetCorrespScoreDef(alignmentReference)->GetStaffDef(alignmentReference->GetN());
     int staffSize = (staffDef && staffDef->HasScale()) ? staffDef->GetScale() : 100;
 
     std::sort(accids.begin(), accids.end(), AccidSpaceSort());
diff --git a/src/adjustdotsfunctor.cpp b/src/adjustdotsfunctor.cpp
index 63dc27b7a40..1f930da9a88 100644
--- a/src/adjustdotsfunctor.cpp
+++ b/src/adjustdotsfunctor.cpp
@@ -11,6 +11,7 @@
 
 #include "doc.h"
 #include "elementpart.h"
+#include "score.h"
 #include "staff.h"
 
 //----------------------------------------------------------------------------
@@ -125,7 +126,7 @@ FunctorCode AdjustDotsFunctor::VisitMeasure(Measure *measure)
 
 FunctorCode AdjustDotsFunctor::VisitScore(Score *score)
 {
-    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
+    m_staffNs = score->GetScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/adjustgracexposfunctor.cpp b/src/adjustgracexposfunctor.cpp
index 6d9ec49c51f..85e4876cbb5 100644
--- a/src/adjustgracexposfunctor.cpp
+++ b/src/adjustgracexposfunctor.cpp
@@ -10,6 +10,7 @@
 //----------------------------------------------------------------------------
 
 #include "doc.h"
+#include "score.h"
 
 //----------------------------------------------------------------------------
 
@@ -230,7 +231,7 @@ FunctorCode AdjustGraceXPosFunctor::VisitMeasure(Measure *measure)
 
 FunctorCode AdjustGraceXPosFunctor::VisitScore(Score *score)
 {
-    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
+    m_staffNs = score->GetScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/adjustlayersfunctor.cpp b/src/adjustlayersfunctor.cpp
index 7b312d143a6..058120c970c 100644
--- a/src/adjustlayersfunctor.cpp
+++ b/src/adjustlayersfunctor.cpp
@@ -10,6 +10,7 @@
 //----------------------------------------------------------------------------
 
 #include "doc.h"
+#include "score.h"
 #include "staff.h"
 
 //----------------------------------------------------------------------------
@@ -148,7 +149,7 @@ FunctorCode AdjustLayersFunctor::VisitMeasure(Measure *measure)
 
 FunctorCode AdjustLayersFunctor::VisitScore(Score *score)
 {
-    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
+    m_staffNs = score->GetScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/adjustxposfunctor.cpp b/src/adjustxposfunctor.cpp
index 07b4117b196..5436c605497 100644
--- a/src/adjustxposfunctor.cpp
+++ b/src/adjustxposfunctor.cpp
@@ -12,6 +12,7 @@
 #include "doc.h"
 #include "multirest.h"
 #include "rest.h"
+#include "score.h"
 #include "staff.h"
 #include "system.h"
 
@@ -298,7 +299,7 @@ FunctorCode AdjustXPosFunctor::VisitMeasure(Measure *measure)
 
 FunctorCode AdjustXPosFunctor::VisitScore(Score *score)
 {
-    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
+    m_staffNs = score->GetScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/doc.cpp b/src/doc.cpp
index dc41907a749..fd4bb825174 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -191,7 +191,8 @@ bool Doc::GenerateDocumentScoreDef()
         return false;
     }
 
-    this->GetCurrentScoreDef()->Reset();
+    ScoreDef *scoreDef = this->GetFirstScoreDef();
+    scoreDef->Reset();
     StaffGrp *staffGrp = new StaffGrp();
     for (Object *object : staves) {
         Staff *staff = vrv_cast<Staff *>(object);
@@ -202,7 +203,7 @@ bool Doc::GenerateDocumentScoreDef()
         if (!measure->IsMeasuredMusic()) staffDef->SetNotationtype(NOTATIONTYPE_mensural);
         staffGrp->AddChild(staffDef);
     }
-    this->GetCurrentScoreDef()->AddChild(staffGrp);
+    scoreDef->AddChild(staffGrp);
 
     LogInfo("ScoreDef generated");
 
@@ -211,7 +212,8 @@ bool Doc::GenerateDocumentScoreDef()
 
 bool Doc::GenerateFooter()
 {
-    if (this->GetCurrentScoreDef()->FindDescendantByType(PGFOOT)) {
+    ScoreDef *scoreDef = this->GetLastVisibleScoreDef();
+    if (scoreDef->FindDescendantByType(PGFOOT)) {
         return false;
     }
 
@@ -221,21 +223,22 @@ bool Doc::GenerateFooter()
     pgFoot->IsGenerated(true);
     pgFoot->LoadFooter(this);
     pgFoot->SetType("autogenerated");
-    this->GetCurrentScoreDef()->AddChild(pgFoot);
+    scoreDef->AddChild(pgFoot);
 
     PgFoot *pgFoot2 = new PgFoot();
     pgFoot2->SetFunc(PGFUNC_all);
     pgFoot2->IsGenerated(true);
     pgFoot2->LoadFooter(this);
     pgFoot2->SetType("autogenerated");
-    this->GetCurrentScoreDef()->AddChild(pgFoot2);
+    scoreDef->AddChild(pgFoot2);
 
     return true;
 }
 
 bool Doc::GenerateHeader()
 {
-    if (this->GetCurrentScoreDef()->FindDescendantByType(PGHEAD)) return false;
+    ScoreDef *scoreDef = this->GetFirstVisibleScoreDef();
+    if (scoreDef->FindDescendantByType(PGHEAD)) return false;
 
     PgHead *pgHead = new PgHead();
     pgHead->SetFunc(PGFUNC_first);
@@ -243,14 +246,14 @@ bool Doc::GenerateHeader()
     pgHead->IsGenerated(true);
     pgHead->GenerateFromMEIHeader(m_header);
     pgHead->SetType("autogenerated");
-    this->GetCurrentScoreDef()->AddChild(pgHead);
+    scoreDef->AddChild(pgHead);
 
     PgHead *pgHead2 = new PgHead();
     pgHead2->SetFunc(PGFUNC_all);
     pgHead2->IsGenerated(true);
     pgHead2->AddPageNum(HORIZONTALALIGNMENT_center, VERTICALALIGNMENT_top);
     pgHead2->SetType("autogenerated");
-    this->GetCurrentScoreDef()->AddChild(pgHead2);
+    scoreDef->AddChild(pgHead2);
 
     return true;
 }
@@ -345,11 +348,12 @@ void Doc::CalculateTimemap()
     double tempo = MIDI_TEMPO;
 
     // Set tempo
-    if (this->GetCurrentScoreDef()->HasMidiBpm()) {
-        tempo = this->GetCurrentScoreDef()->GetMidiBpm();
+    ScoreDef *scoreDef = this->GetFirstVisibleScoreDef();
+    if (scoreDef->HasMidiBpm()) {
+        tempo = scoreDef->GetMidiBpm();
     }
-    else if (this->GetCurrentScoreDef()->HasMm()) {
-        tempo = Tempo::CalcTempo(this->GetCurrentScoreDef());
+    else if (scoreDef->HasMm()) {
+        tempo = Tempo::CalcTempo(scoreDef);
     }
 
     // We first calculate the maximum duration of each measure
@@ -372,7 +376,6 @@ void Doc::CalculateTimemap()
 
 void Doc::ExportMIDI(smf::MidiFile *midiFile)
 {
-
     if (!this->HasTimemap()) {
         // generate MIDI timemap before progressing
         CalculateTimemap();
@@ -384,11 +387,12 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
     double tempo = MIDI_TEMPO;
 
     // set MIDI tempo
-    if (this->GetCurrentScoreDef()->HasMidiBpm()) {
-        tempo = this->GetCurrentScoreDef()->GetMidiBpm();
+    ScoreDef *scoreDef = this->GetFirstVisibleScoreDef();
+    if (scoreDef->HasMidiBpm()) {
+        tempo = scoreDef->GetMidiBpm();
     }
-    else if (this->GetCurrentScoreDef()->HasMm()) {
-        tempo = Tempo::CalcTempo(this->GetCurrentScoreDef());
+    else if (scoreDef->HasMm()) {
+        tempo = Tempo::CalcTempo(scoreDef);
     }
     midiFile->addTempo(0, 0, tempo);
 
@@ -417,10 +421,8 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
     int midiTrack = 1;
     Filters filters;
     for (staves = layerTree.child.begin(); staves != layerTree.child.end(); ++staves) {
-
-        ScoreDef *currentScoreDef = this->GetCurrentScoreDef();
         int transSemi = 0;
-        if (StaffDef *staffDef = currentScoreDef->GetStaffDef(staves->first)) {
+        if (StaffDef *staffDef = scoreDef->GetStaffDef(staves->first)) {
             // get the transposition (semi-tone) value for the staff
             if (staffDef->HasTransSemi()) transSemi = staffDef->GetTransSemi();
             midiTrack = staffDef->GetN();
@@ -462,16 +464,16 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
             }
             // set MIDI key signature
             KeySig *keySig = vrv_cast<KeySig *>(staffDef->FindDescendantByType(KEYSIG));
-            if (!keySig && (currentScoreDef->HasKeySigInfo())) {
-                keySig = vrv_cast<KeySig *>(currentScoreDef->GetKeySig());
+            if (!keySig && (scoreDef->HasKeySigInfo())) {
+                keySig = vrv_cast<KeySig *>(scoreDef->GetKeySig());
             }
             if (keySig && keySig->HasSig()) {
                 midiFile->addKeySignature(midiTrack, 0, keySig->GetFifthsInt(), (keySig->GetMode() == MODE_minor));
             }
             // set MIDI time signature
             MeterSig *meterSig = vrv_cast<MeterSig *>(staffDef->FindDescendantByType(METERSIG));
-            if (!meterSig && (currentScoreDef->HasMeterSigInfo())) {
-                meterSig = vrv_cast<MeterSig *>(currentScoreDef->GetMeterSig());
+            if (!meterSig && (scoreDef->HasMeterSigInfo())) {
+                meterSig = vrv_cast<MeterSig *>(scoreDef->GetMeterSig());
             }
             if (meterSig && meterSig->HasCount() && meterSig->HasUnit()) {
                 midiFile->addTimeSignature(midiTrack, 0, meterSig->GetTotalCount(), meterSig->GetUnit());
@@ -482,7 +484,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
         GenerateMIDIFunctor generateScoreDefMIDI(midiFile);
         generateScoreDefMIDI.SetChannel(midiChannel);
         generateScoreDefMIDI.SetTrack(midiTrack);
-        currentScoreDef->Process(generateScoreDefMIDI);
+        scoreDef->Process(generateScoreDefMIDI);
 
         for (layers = staves->second.child.begin(); layers != staves->second.child.end(); ++layers) {
             filters.Clear();
@@ -574,9 +576,9 @@ void Doc::PrepareData()
 
     this->PrepareMeasureIndices();
 
-    /************ Collect all scores ************/
+    /************ Collect all visible scores ************/
 
-    this->CollectScores();
+    this->CollectVisibleScores();
 
     /************ Store default durations ************/
 
@@ -862,8 +864,10 @@ void Doc::PrepareData()
         }
     }
 
-    ScoreDefSetGrpSymFunctor scoreDefSetGrpSym;
-    this->GetCurrentScoreDef()->Process(scoreDefSetGrpSym);
+    for (Score *score : this->GetVisibleScores()) {
+        ScoreDefSetGrpSymFunctor scoreDefSetGrpSym;
+        score->GetScoreDef()->Process(scoreDefSetGrpSym);
+    }
 
     // LogElapsedTimeEnd ("Preparing drawing");
 
@@ -908,10 +912,9 @@ void Doc::ScoreDefOptimizeDoc()
 
 void Doc::ScoreDefSetGrpSymDoc()
 {
-    // Group symbols need to be resolved using scoreDef, since there might be @starid/@endid attributes that determine
+    // Group symbols need to be resolved using scoreDef, since there might be @startid/@endid attributes that determine
     // their positioning
     ScoreDefSetGrpSymFunctor scoreDefSetGrpSym;
-    // this->GetCurrentScoreDef()->Process(scoreDefSetGrpSym);
     this->Process(scoreDefSetGrpSym);
 }
 
@@ -940,7 +943,7 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
         return;
     }
 
-    std::list<Score *> scores = this->GetScores();
+    std::list<Score *> scores = this->GetVisibleScores();
     assert(!scores.empty());
 
     this->ScoreDefSetCurrentDoc();
@@ -1097,7 +1100,7 @@ void Doc::CastOffEncodingDoc()
     this->ScoreDefSetCurrentDoc(true);
 
     // Optimize the doc if one of the score requires optimization
-    for (Score *score : this->GetScores()) {
+    for (Score *score : this->GetVisibleScores()) {
         if (score->ScoreDefNeedsOptimization(m_options->m_condense.GetValue())) {
             this->ScoreDefOptimizeDoc();
             break;
@@ -1473,13 +1476,33 @@ ScoreDef *Doc::GetFirstScoreDef()
 
 const ScoreDef *Doc::GetFirstScoreDef() const
 {
-    // Use precalculated list of scores, if possible
-    const Score *score
-        = m_scores.empty() ? vrv_cast<const Score *>(this->FindDescendantByType(SCORE, 3)) : m_scores.front();
+    const Score *score = vrv_cast<const Score *>(this->FindDescendantByType(SCORE, 3));
 
     return score ? score->GetScoreDef() : NULL;
 }
 
+ScoreDef *Doc::GetFirstVisibleScoreDef()
+{
+    if (m_visibleScores.empty()) {
+        this->CollectVisibleScores();
+
+        assert(!m_visibleScores.empty());
+    }
+
+    return m_visibleScores.front()->GetScoreDef();
+}
+
+ScoreDef *Doc::GetLastVisibleScoreDef()
+{
+    if (m_visibleScores.empty()) {
+        this->CollectVisibleScores();
+
+        assert(!m_visibleScores.empty());
+    }
+
+    return m_visibleScores.back()->GetScoreDef();
+}
+
 ScoreDef *Doc::GetCorrespScoreDef(const Object *object)
 {
     return const_cast<ScoreDef *>(std::as_const(*this).GetCorrespScoreDef(object));
@@ -1487,23 +1510,28 @@ ScoreDef *Doc::GetCorrespScoreDef(const Object *object)
 
 const ScoreDef *Doc::GetCorrespScoreDef(const Object *object) const
 {
-    const Score *correspScore = NULL;
-    for (Score *score : m_scores) {
+    assert(!m_visibleScores.empty());
+
+    const Score *correspScore = m_visibleScores.front();
+    for (Score *score : m_visibleScores) {
         if ((score == object) || Object::IsPreOrdered(score, object)) {
             correspScore = score;
         }
     }
-    return correspScore ? correspScore->GetScoreDef() : NULL;
+    return correspScore->GetScoreDef();
 }
 
-void Doc::CollectScores()
+void Doc::CollectVisibleScores()
 {
-    m_scores.clear();
+    m_visibleScores.clear();
     ListOfObjects objects = this->FindAllDescendantsByType(SCORE, false, 3);
     for (Object *object : objects) {
         Score *score = vrv_cast<Score *>(object);
         assert(score);
-        m_scores.push_back(score);
+        // Visible scores have milestone end
+        if (score->GetMilestoneEnd()) {
+            m_visibleScores.push_back(score);
+        }
     }
 }
 
@@ -1879,32 +1907,34 @@ double Doc::GetTopMargin(const ClassId classId) const
     return m_options->m_defaultTopMargin.GetValue();
 }
 
-data_MEASUREMENTSIGNED Doc::GetStaffDistance(const ClassId classId, int staffIndex, data_STAFFREL staffPosition)
+data_MEASUREMENTSIGNED Doc::GetStaffDistance(const Object *object, int staffIndex, data_STAFFREL staffPosition) const
 {
+    const ScoreDef *scoreDef = this->GetCorrespScoreDef(object);
+
     data_MEASUREMENTSIGNED distance;
     if (staffPosition == STAFFREL_above || staffPosition == STAFFREL_below) {
-        if (classId == DIR) {
+        if (object->Is(DIR)) {
             // Inspect the scoreDef attribute
-            if (this->GetCurrentScoreDef()->HasDirDist()) {
-                distance = this->GetCurrentScoreDef()->GetDirDist();
+            if (scoreDef->HasDirDist()) {
+                distance = scoreDef->GetDirDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasDirDist()) {
                 distance = staffDef->GetDirDist();
             }
         }
-        else if (classId == DYNAM) {
+        else if (object->Is(DYNAM)) {
             distance.SetVu(m_options->m_dynamDist.GetDefault());
 
             // Inspect the scoreDef attribute
-            if (this->GetCurrentScoreDef()->HasDynamDist()) {
-                distance = this->GetCurrentScoreDef()->GetDynamDist();
+            if (scoreDef->HasDynamDist()) {
+                distance = scoreDef->GetDynamDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasDynamDist()) {
                 distance = staffDef->GetDynamDist();
             }
@@ -1914,16 +1944,16 @@ data_MEASUREMENTSIGNED Doc::GetStaffDistance(const ClassId classId, int staffInd
                 distance.SetVu(m_options->m_dynamDist.GetValue());
             }
         }
-        else if (classId == HARM) {
+        else if (object->Is(HARM)) {
             distance.SetVu(m_options->m_harmDist.GetDefault());
 
             // Inspect the scoreDef attribute
-            if (this->GetCurrentScoreDef()->HasHarmDist()) {
-                distance = this->GetCurrentScoreDef()->GetHarmDist();
+            if (scoreDef->HasHarmDist()) {
+                distance = scoreDef->GetHarmDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasHarmDist()) {
                 distance = staffDef->GetHarmDist();
             }
@@ -1933,14 +1963,14 @@ data_MEASUREMENTSIGNED Doc::GetStaffDistance(const ClassId classId, int staffInd
                 distance.SetVu(m_options->m_harmDist.GetValue());
             }
         }
-        else if (classId == TEMPO) {
+        else if (object->Is(TEMPO)) {
             // Inspect the scoreDef attribute
-            if (this->GetCurrentScoreDef()->HasTempoDist()) {
-                distance = this->GetCurrentScoreDef()->GetTempoDist();
+            if (scoreDef->HasTempoDist()) {
+                distance = scoreDef->GetTempoDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasTempoDist()) {
                 distance = staffDef->GetTempoDist();
             }
diff --git a/src/editortoolkit_neume.cpp b/src/editortoolkit_neume.cpp
index f32481b091b..704faabd95f 100644
--- a/src/editortoolkit_neume.cpp
+++ b/src/editortoolkit_neume.cpp
@@ -786,7 +786,7 @@ bool EditorToolkitNeume::Insert(std::string elementType, std::string staffId, in
             assert(parent);
             newStaff = new Staff(1);
             newStaff->m_drawingStaffDef
-                = vrv_cast<StaffDef *>(m_doc->GetCurrentScoreDef()->FindDescendantByType(STAFFDEF));
+                = vrv_cast<StaffDef *>(m_doc->GetCorrespScoreDef(parent)->FindDescendantByType(STAFFDEF));
             newStaff->m_drawingNotationType = NOTATIONTYPE_neume;
             newStaff->m_drawingLines = 4;
         }
diff --git a/src/floatingobject.cpp b/src/floatingobject.cpp
index c6e46b59f62..a2b126315f9 100644
--- a/src/floatingobject.cpp
+++ b/src/floatingobject.cpp
@@ -445,7 +445,7 @@ int FloatingPositioner::GetAdmissibleHorizOverlapMargin(const BoundingBox *bbox,
 }
 
 void FloatingPositioner::CalcDrawingYRel(
-    Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox)
+    const Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox)
 {
     assert(doc);
     assert(staffAlignment);
@@ -460,8 +460,7 @@ void FloatingPositioner::CalcDrawingYRel(
         int staffIndex = staffAlignment->GetStaff()->GetN();
 
         int minStaffDistance = 0.0;
-        data_MEASUREMENTSIGNED minStaffDistanceMeasurement
-            = doc->GetStaffDistance(m_object->GetClassId(), staffIndex, m_place);
+        data_MEASUREMENTSIGNED minStaffDistanceMeasurement = doc->GetStaffDistance(m_object, staffIndex, m_place);
 
         if (minStaffDistanceMeasurement.HasValue()) {
             if (minStaffDistanceMeasurement.GetType() == MEASUREMENTTYPE_px) {
diff --git a/src/page.cpp b/src/page.cpp
index c34d9ceff04..11129b04683 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -378,6 +378,9 @@ void Page::LayOutHorizontally()
     view.SetPage(this->GetIdx(), false);
     view.DrawCurrentPage(&bBoxDC, false);
 
+    // Get the scoreDef at the beginning of the page
+    ScoreDef *scoreDef = m_score->GetScoreDef();
+
     // Adjust the position of outside articulations
     AdjustArticFunctor adjustArtic(doc);
     this->Process(adjustArtic);
@@ -385,16 +388,16 @@ void Page::LayOutHorizontally()
     // Adjust the x position of the LayerElement where multiple layers collide
     // Look at each LayerElement and change the m_xShift if the bounding box is overlapping
     // For the first iteration align elements without taking dots into consideration
-    AdjustLayersFunctor adjustLayers(doc, doc->GetCurrentScoreDef()->GetStaffNs());
+    AdjustLayersFunctor adjustLayers(doc, scoreDef->GetStaffNs());
     this->Process(adjustLayers);
 
     // Adjust dots for the multiple layers. Try to align dots that can be grouped together when layers collide,
     // otherwise keep their relative positioning
-    AdjustDotsFunctor adjustDots(doc, doc->GetCurrentScoreDef()->GetStaffNs());
+    AdjustDotsFunctor adjustDots(doc, scoreDef->GetStaffNs());
     this->Process(adjustDots);
 
     // Adjust layers again, this time including dots positioning
-    AdjustLayersFunctor adjustLayersWithDots(doc, doc->GetCurrentScoreDef()->GetStaffNs());
+    AdjustLayersFunctor adjustLayersWithDots(doc, scoreDef->GetStaffNs());
     adjustLayersWithDots.IgnoreDots(false);
     this->Process(adjustLayersWithDots);
 
@@ -404,7 +407,7 @@ void Page::LayOutHorizontally()
 
     // Adjust the X shift of the Alignment looking at the bounding boxes
     // Look at each LayerElement and change the m_xShift if the bounding box is overlapping
-    AdjustXPosFunctor adjustXPos(doc, doc->GetCurrentScoreDef()->GetStaffNs());
+    AdjustXPosFunctor adjustXPos(doc, scoreDef->GetStaffNs());
     adjustXPos.SetExcluded({ TABDURSYM });
     this->Process(adjustXPos);
 
@@ -416,7 +419,7 @@ void Page::LayOutHorizontally()
 
     // Adjust the X shift of the Alignment looking at the bounding boxes
     // Look at each LayerElement and change the m_xShift if the bounding box is overlapping
-    AdjustGraceXPosFunctor adjustGraceXPos(doc, doc->GetCurrentScoreDef()->GetStaffNs());
+    AdjustGraceXPosFunctor adjustGraceXPos(doc, scoreDef->GetStaffNs());
     this->Process(adjustGraceXPos);
 
     // Adjust the spacing of clef changes since they are skipped in AdjustXPos
diff --git a/src/preparedatafunctor.cpp b/src/preparedatafunctor.cpp
index 7b5f19b594b..17e28e27a10 100644
--- a/src/preparedatafunctor.cpp
+++ b/src/preparedatafunctor.cpp
@@ -1360,10 +1360,10 @@ FunctorCode PrepareRptFunctor::VisitStaff(Staff *staff)
     }
 
     // This is happening only for the first staff element of the staff @n
-    if (StaffDef *staffDef = m_doc->GetCurrentScoreDef()->GetStaffDef(staff->GetN())) {
+    ScoreDef *scoreDef = m_doc->GetCorrespScoreDef(staff);
+    if (StaffDef *staffDef = scoreDef->GetStaffDef(staff->GetN())) {
         const bool hideNumber = (staffDef->GetMultiNumber() == BOOLEAN_false)
-            || ((staffDef->GetMultiNumber() != BOOLEAN_true)
-                && (m_doc->GetCurrentScoreDef()->GetMultiNumber() == BOOLEAN_false));
+            || ((staffDef->GetMultiNumber() != BOOLEAN_true) && (scoreDef->GetMultiNumber() == BOOLEAN_false));
         if (hideNumber) {
             // Set it just in case, but stopping the functor should do it for this staff @n
             m_multiNumber = BOOLEAN_false;

From 4860c01b81b17794cfce13c0404db3927c55caef Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 18 Sep 2023 22:05:53 +0200
Subject: [PATCH 05/18] Autogenerate header/footer for all visible scores

---
 include/vrv/doc.h | 15 +++------
 src/doc.cpp       | 84 +++++++++++++++++++++++------------------------
 2 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index e4822a9c2e8..28f2e6d46f8 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -90,12 +90,12 @@ class Doc : public Object {
     /**
      * Generate a document pgFoot if none is provided
      */
-    bool GenerateFooter();
+    void GenerateFooter();
 
     /**
      * Generate a document pgHead from the MEI header if none is provided
      */
-    bool GenerateHeader();
+    void GenerateHeader();
 
     /**
      * Generate measure numbers from measure attributes
@@ -136,11 +136,6 @@ class Doc : public Object {
      */
     int GetPageCount() const;
 
-    /**
-     * Get all visible scores
-     */
-    std::list<Score *> GetVisibleScores() { return m_visibleScores; }
-
     /**
      * Get the first scoreDef
      */
@@ -150,12 +145,12 @@ class Doc : public Object {
     ///@}
 
     /**
-     * Get the first or last visible scoreDef
-     * Lazily updates the visible scores, hence never const
+     * Get all visible scores / the first visible scoreDef
+     * Lazily updates the visible scores, hence not const
      */
     ///@{
+    std::list<Score *> GetVisibleScores();
     ScoreDef *GetFirstVisibleScoreDef();
-    ScoreDef *GetLastVisibleScoreDef();
     ///@}
 
     /**
diff --git a/src/doc.cpp b/src/doc.cpp
index fd4bb825174..d2997ecbe4d 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -210,52 +210,50 @@ bool Doc::GenerateDocumentScoreDef()
     return true;
 }
 
-bool Doc::GenerateFooter()
+void Doc::GenerateFooter()
 {
-    ScoreDef *scoreDef = this->GetLastVisibleScoreDef();
-    if (scoreDef->FindDescendantByType(PGFOOT)) {
-        return false;
-    }
-
-    PgFoot *pgFoot = new PgFoot();
-    pgFoot->SetFunc(PGFUNC_first);
-    // We mark it as generated for not having it written in the output
-    pgFoot->IsGenerated(true);
-    pgFoot->LoadFooter(this);
-    pgFoot->SetType("autogenerated");
-    scoreDef->AddChild(pgFoot);
+    for (Score *score : this->GetVisibleScores()) {
+        ScoreDef *scoreDef = score->GetScoreDef();
+        if (scoreDef->FindDescendantByType(PGFOOT)) continue;
 
-    PgFoot *pgFoot2 = new PgFoot();
-    pgFoot2->SetFunc(PGFUNC_all);
-    pgFoot2->IsGenerated(true);
-    pgFoot2->LoadFooter(this);
-    pgFoot2->SetType("autogenerated");
-    scoreDef->AddChild(pgFoot2);
+        PgFoot *pgFoot = new PgFoot();
+        pgFoot->SetFunc(PGFUNC_first);
+        // We mark it as generated for not having it written in the output
+        pgFoot->IsGenerated(true);
+        pgFoot->LoadFooter(this);
+        pgFoot->SetType("autogenerated");
+        scoreDef->AddChild(pgFoot);
 
-    return true;
+        PgFoot *pgFoot2 = new PgFoot();
+        pgFoot2->SetFunc(PGFUNC_all);
+        pgFoot2->IsGenerated(true);
+        pgFoot2->LoadFooter(this);
+        pgFoot2->SetType("autogenerated");
+        scoreDef->AddChild(pgFoot2);
+    }
 }
 
-bool Doc::GenerateHeader()
+void Doc::GenerateHeader()
 {
-    ScoreDef *scoreDef = this->GetFirstVisibleScoreDef();
-    if (scoreDef->FindDescendantByType(PGHEAD)) return false;
-
-    PgHead *pgHead = new PgHead();
-    pgHead->SetFunc(PGFUNC_first);
-    // We mark it as generated for not having it written in the output
-    pgHead->IsGenerated(true);
-    pgHead->GenerateFromMEIHeader(m_header);
-    pgHead->SetType("autogenerated");
-    scoreDef->AddChild(pgHead);
-
-    PgHead *pgHead2 = new PgHead();
-    pgHead2->SetFunc(PGFUNC_all);
-    pgHead2->IsGenerated(true);
-    pgHead2->AddPageNum(HORIZONTALALIGNMENT_center, VERTICALALIGNMENT_top);
-    pgHead2->SetType("autogenerated");
-    scoreDef->AddChild(pgHead2);
+    for (Score *score : this->GetVisibleScores()) {
+        ScoreDef *scoreDef = score->GetScoreDef();
+        if (scoreDef->FindDescendantByType(PGHEAD)) continue;
 
-    return true;
+        PgHead *pgHead = new PgHead();
+        pgHead->SetFunc(PGFUNC_first);
+        // We mark it as generated for not having it written in the output
+        pgHead->IsGenerated(true);
+        pgHead->GenerateFromMEIHeader(m_header);
+        pgHead->SetType("autogenerated");
+        scoreDef->AddChild(pgHead);
+
+        PgHead *pgHead2 = new PgHead();
+        pgHead2->SetFunc(PGFUNC_all);
+        pgHead2->IsGenerated(true);
+        pgHead2->AddPageNum(HORIZONTALALIGNMENT_center, VERTICALALIGNMENT_top);
+        pgHead2->SetType("autogenerated");
+        scoreDef->AddChild(pgHead2);
+    }
 }
 
 void Doc::PrepareMeasureIndices()
@@ -1481,7 +1479,7 @@ const ScoreDef *Doc::GetFirstScoreDef() const
     return score ? score->GetScoreDef() : NULL;
 }
 
-ScoreDef *Doc::GetFirstVisibleScoreDef()
+std::list<Score *> Doc::GetVisibleScores()
 {
     if (m_visibleScores.empty()) {
         this->CollectVisibleScores();
@@ -1489,10 +1487,10 @@ ScoreDef *Doc::GetFirstVisibleScoreDef()
         assert(!m_visibleScores.empty());
     }
 
-    return m_visibleScores.front()->GetScoreDef();
+    return m_visibleScores;
 }
 
-ScoreDef *Doc::GetLastVisibleScoreDef()
+ScoreDef *Doc::GetFirstVisibleScoreDef()
 {
     if (m_visibleScores.empty()) {
         this->CollectVisibleScores();
@@ -1500,7 +1498,7 @@ ScoreDef *Doc::GetLastVisibleScoreDef()
         assert(!m_visibleScores.empty());
     }
 
-    return m_visibleScores.back()->GetScoreDef();
+    return m_visibleScores.front()->GetScoreDef();
 }
 
 ScoreDef *Doc::GetCorrespScoreDef(const Object *object)

From c7cc7833afccc6bf5f8640ce447ea2306137a7ba Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 20 Sep 2023 14:17:52 +0200
Subject: [PATCH 06/18] Remove previous mechanism for current scoreDef

---
 include/vrv/doc.h           | 33 +++++-----------------------
 include/vrv/object.h        |  1 -
 include/vrv/page.h          |  5 -----
 include/vrv/score.h         |  6 -----
 src/adjustaccidxfunctor.cpp |  4 +++-
 src/doc.cpp                 | 44 ++++++++++---------------------------
 src/editortoolkit_neume.cpp |  5 +++--
 src/object.cpp              | 26 ----------------------
 src/page.cpp                |  2 --
 src/preparedatafunctor.cpp  |  2 +-
 src/score.cpp               | 10 ---------
 src/setscoredeffunctor.cpp  |  8 +++++--
 12 files changed, 30 insertions(+), 116 deletions(-)

diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index 28f2e6d46f8..710d73c3ef0 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -145,20 +145,20 @@ class Doc : public Object {
     ///@}
 
     /**
-     * Get all visible scores / the first visible scoreDef
+     * Get all visible scores / the first visible score
      * Lazily updates the visible scores, hence not const
      */
     ///@{
     std::list<Score *> GetVisibleScores();
-    ScoreDef *GetFirstVisibleScoreDef();
+    Score *GetFirstVisibleScore();
     ///@}
 
     /**
-     * Get the corresponding scoreDef for a node
+     * Get the corresponding score for a node
      */
     ///@{
-    ScoreDef *GetCorrespScoreDef(const Object *object);
-    const ScoreDef *GetCorrespScoreDef(const Object *object) const;
+    Score *GetCorrespondingScore(const Object *object);
+    const Score *GetCorrespondingScore(const Object *object) const;
     ///@}
 
     /**
@@ -438,19 +438,6 @@ class Doc : public Object {
     bool HasFacsimile() const { return m_facsimile != NULL; }
     ///@}
 
-    /**
-     * @name Setter and getter for the current Score/ScoreDef.
-     * If not set, then looks for the first Score in the Document and use that.
-     * The currentScoreDef is also changed by the Object::Process whenever as Score is reached.
-     * When processing backward, the ScoreDef is changed when reaching the corresponding PageMilestoneEnd
-     */
-    ///@{
-    Score *GetCurrentScore();
-    ScoreDef *GetCurrentScoreDef();
-    void SetCurrentScore(Score *score);
-    bool HasCurrentScore() const { return m_currentScore != NULL; }
-    ///@}
-
     /**
      * Return true if the document has been cast off already.
      */
@@ -572,18 +559,10 @@ class Doc : public Object {
 
     /**
      * The list of all visible scores
-     * Used in Doc::GetCorrespScoreDef to quickly determine the corresponding scoreDef for an object
+     * Used in Doc::GetCorrespondingScore to quickly determine the score for an object
      */
     std::list<Score *> m_visibleScores;
 
-    /**
-     * @name Holds a pointer to the current score/scoreDef.
-     * Set by Doc::GetCurrentScoreDef or explicitly through Doc::SetCurrentScoreDef
-     */
-    ///@{
-    Score *m_currentScore;
-    ///@}
-
     /**
      * A flag indicating if the document has been cast off or not.
      */
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 8ab619368d9..1cb3f41ff41 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -692,7 +692,6 @@ class Object : public BoundingBox {
      * Helper methods for functor processing
      */
     ///@{
-    void UpdateDocumentScore(bool direction);
     bool SkipChildren(bool visibleOnly) const;
     bool FiltersApply(const Filters *filters, Object *object) const;
     ///@}
diff --git a/include/vrv/page.h b/include/vrv/page.h
index 7bab10d7ec7..f1751100c99 100644
--- a/include/vrv/page.h
+++ b/include/vrv/page.h
@@ -48,11 +48,6 @@ class Page : public Object {
     bool IsSupportedChild(Object *object) override;
     ///@}
 
-    /**
-     * Return the number of system (children are System object only)
-     */
-    int GetSystemCount() const { return (int)GetChildren().size(); }
-
     /**
      * @name Get and set the pixel per unit factor.
      */
diff --git a/include/vrv/score.h b/include/vrv/score.h
index de496139af5..975909c70b9 100644
--- a/include/vrv/score.h
+++ b/include/vrv/score.h
@@ -56,12 +56,6 @@ class Score : public PageElement, public PageMilestoneInterface, public AttLabel
     const ScoreDef *GetScoreDef() const { return &m_scoreDef; }
     ///@}
 
-    /**
-     * Helper looking at the parent Doc and set its scoreDef as current one.
-     * Called from Object::Process
-     */
-    void SetAsCurrent();
-
     /**
      * Calculate the height of the pgHead/pgHead2 and pgFoot/pgFoot2 (if any)
      * Requires the Doc to have an empty Pages object because it adds temporary pages
diff --git a/src/adjustaccidxfunctor.cpp b/src/adjustaccidxfunctor.cpp
index f911a2bf168..7bc8b01512d 100644
--- a/src/adjustaccidxfunctor.cpp
+++ b/src/adjustaccidxfunctor.cpp
@@ -10,6 +10,7 @@
 //----------------------------------------------------------------------------
 
 #include "doc.h"
+#include "score.h"
 
 //----------------------------------------------------------------------------
 
@@ -41,7 +42,8 @@ FunctorCode AdjustAccidXFunctor::VisitAlignmentReference(AlignmentReference *ali
     if (accids.empty()) return FUNCTOR_SIBLINGS;
 
     assert(m_doc);
-    StaffDef *staffDef = m_doc->GetCorrespScoreDef(alignmentReference)->GetStaffDef(alignmentReference->GetN());
+    ScoreDef *scoreDef = m_doc->GetCorrespondingScore(alignmentReference)->GetScoreDef();
+    StaffDef *staffDef = scoreDef->GetStaffDef(alignmentReference->GetN());
     int staffSize = (staffDef && staffDef->HasScale()) ? staffDef->GetScale() : 100;
 
     std::sort(accids.begin(), accids.end(), AccidSpaceSort());
diff --git a/src/doc.cpp b/src/doc.cpp
index d2997ecbe4d..ee5d7da258b 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -125,7 +125,6 @@ void Doc::Reset()
     m_drawingPageMarginTop = 0;
 
     m_drawingPage = NULL;
-    m_currentScore = NULL;
     m_currentScoreDefDone = false;
     m_dataPreparationDone = false;
     m_timemapTempo = 0.0;
@@ -346,7 +345,7 @@ void Doc::CalculateTimemap()
     double tempo = MIDI_TEMPO;
 
     // Set tempo
-    ScoreDef *scoreDef = this->GetFirstVisibleScoreDef();
+    ScoreDef *scoreDef = this->GetFirstVisibleScore()->GetScoreDef();
     if (scoreDef->HasMidiBpm()) {
         tempo = scoreDef->GetMidiBpm();
     }
@@ -385,7 +384,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
     double tempo = MIDI_TEMPO;
 
     // set MIDI tempo
-    ScoreDef *scoreDef = this->GetFirstVisibleScoreDef();
+    ScoreDef *scoreDef = this->GetFirstVisibleScore()->GetScoreDef();
     if (scoreDef->HasMidiBpm()) {
         tempo = scoreDef->GetMidiBpm();
     }
@@ -1490,7 +1489,7 @@ std::list<Score *> Doc::GetVisibleScores()
     return m_visibleScores;
 }
 
-ScoreDef *Doc::GetFirstVisibleScoreDef()
+Score *Doc::GetFirstVisibleScore()
 {
     if (m_visibleScores.empty()) {
         this->CollectVisibleScores();
@@ -1498,25 +1497,25 @@ ScoreDef *Doc::GetFirstVisibleScoreDef()
         assert(!m_visibleScores.empty());
     }
 
-    return m_visibleScores.front()->GetScoreDef();
+    return m_visibleScores.front();
 }
 
-ScoreDef *Doc::GetCorrespScoreDef(const Object *object)
+Score *Doc::GetCorrespondingScore(const Object *object)
 {
-    return const_cast<ScoreDef *>(std::as_const(*this).GetCorrespScoreDef(object));
+    return const_cast<Score *>(std::as_const(*this).GetCorrespondingScore(object));
 }
 
-const ScoreDef *Doc::GetCorrespScoreDef(const Object *object) const
+const Score *Doc::GetCorrespondingScore(const Object *object) const
 {
     assert(!m_visibleScores.empty());
 
-    const Score *correspScore = m_visibleScores.front();
+    const Score *correspondingScore = m_visibleScores.front();
     for (Score *score : m_visibleScores) {
         if ((score == object) || Object::IsPreOrdered(score, object)) {
-            correspScore = score;
+            correspondingScore = score;
         }
     }
-    return correspScore->GetScoreDef();
+    return correspondingScore;
 }
 
 void Doc::CollectVisibleScores()
@@ -1907,7 +1906,7 @@ double Doc::GetTopMargin(const ClassId classId) const
 
 data_MEASUREMENTSIGNED Doc::GetStaffDistance(const Object *object, int staffIndex, data_STAFFREL staffPosition) const
 {
-    const ScoreDef *scoreDef = this->GetCorrespScoreDef(object);
+    const ScoreDef *scoreDef = this->GetCorrespondingScore(object)->GetScoreDef();
 
     data_MEASUREMENTSIGNED distance;
     if (staffPosition == STAFFREL_above || staffPosition == STAFFREL_below) {
@@ -2090,27 +2089,6 @@ int Doc::GetAdjustedDrawingPageWidth() const
     return (contentWidth + m_drawingPageMarginLeft + m_drawingPageMarginRight) / DEFINITION_FACTOR;
 }
 
-Score *Doc::GetCurrentScore()
-{
-    if (!m_currentScore) {
-        m_currentScore = vrv_cast<Score *>(this->FindDescendantByType(SCORE));
-        assert(m_currentScore);
-    }
-    return m_currentScore;
-}
-
-ScoreDef *Doc::GetCurrentScoreDef()
-{
-    if (!m_currentScore) this->GetCurrentScore();
-
-    return m_currentScore->GetScoreDef();
-}
-
-void Doc::SetCurrentScore(Score *score)
-{
-    m_currentScore = score;
-}
-
 //----------------------------------------------------------------------------
 // Doc functors methods
 //----------------------------------------------------------------------------
diff --git a/src/editortoolkit_neume.cpp b/src/editortoolkit_neume.cpp
index 704faabd95f..a572a89d6ac 100644
--- a/src/editortoolkit_neume.cpp
+++ b/src/editortoolkit_neume.cpp
@@ -29,6 +29,7 @@
 #include "neume.h"
 #include "page.h"
 #include "rend.h"
+#include "score.h"
 #include "staff.h"
 #include "staffdef.h"
 #include "surface.h"
@@ -785,8 +786,8 @@ bool EditorToolkitNeume::Insert(std::string elementType, std::string staffId, in
             parent = m_doc->GetDrawingPage()->FindDescendantByType(MEASURE);
             assert(parent);
             newStaff = new Staff(1);
-            newStaff->m_drawingStaffDef
-                = vrv_cast<StaffDef *>(m_doc->GetCorrespScoreDef(parent)->FindDescendantByType(STAFFDEF));
+            newStaff->m_drawingStaffDef = vrv_cast<StaffDef *>(
+                m_doc->GetCorrespondingScore(parent)->GetScoreDef()->FindDescendantByType(STAFFDEF));
             newStaff->m_drawingNotationType = NOTATIONTYPE_neume;
             newStaff->m_drawingLines = 4;
         }
diff --git a/src/object.cpp b/src/object.cpp
index 7b53a851893..e6bde61dd9c 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1018,9 +1018,6 @@ void Object::Process(Functor &functor, int deepness, bool skipFirst)
         return;
     }
 
-    // Update the current score stored in the document
-    this->UpdateDocumentScore(functor.GetDirection());
-
     if (!skipFirst) {
         FunctorCode code = this->Accept(functor);
         functor.SetCode(code);
@@ -1075,9 +1072,6 @@ void Object::Process(ConstFunctor &functor, int deepness, bool skipFirst) const
         return;
     }
 
-    // Update the current score stored in the document
-    const_cast<Object *>(this)->UpdateDocumentScore(functor.GetDirection());
-
     if (!skipFirst) {
         FunctorCode code = this->Accept(functor);
         functor.SetCode(code);
@@ -1146,26 +1140,6 @@ FunctorCode Object::AcceptEnd(ConstFunctor &functor) const
     return functor.VisitObjectEnd(this);
 }
 
-void Object::UpdateDocumentScore(bool direction)
-{
-    // When we are starting a new score, we need to update the current score in the document
-    if (direction == FORWARD && this->Is(SCORE)) {
-        Score *score = vrv_cast<Score *>(this);
-        assert(score);
-        score->SetAsCurrent();
-    }
-    // We need to do the same in backward direction through the PageMilestoneEnd::m_start
-    else if (direction == BACKWARD && this->Is(PAGE_MILESTONE_END)) {
-        PageMilestoneEnd *elementEnd = vrv_cast<PageMilestoneEnd *>(this);
-        assert(elementEnd);
-        if (elementEnd->GetStart() && elementEnd->GetStart()->Is(SCORE)) {
-            Score *score = vrv_cast<Score *>(elementEnd->GetStart());
-            assert(score);
-            score->SetAsCurrent();
-        }
-    }
-}
-
 bool Object::SkipChildren(bool visibleOnly) const
 {
     if (visibleOnly) {
diff --git a/src/page.cpp b/src/page.cpp
index 11129b04683..5e3bb7ff276 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -555,8 +555,6 @@ void Page::LayOutVertically()
         this->Process(adjustSlurs);
     }
 
-    doc->SetCurrentScore(this->m_score);
-
     if (this->GetHeader()) {
         this->GetHeader()->AdjustRunningElementYPos();
     }
diff --git a/src/preparedatafunctor.cpp b/src/preparedatafunctor.cpp
index 17e28e27a10..e83c58fa565 100644
--- a/src/preparedatafunctor.cpp
+++ b/src/preparedatafunctor.cpp
@@ -1360,7 +1360,7 @@ FunctorCode PrepareRptFunctor::VisitStaff(Staff *staff)
     }
 
     // This is happening only for the first staff element of the staff @n
-    ScoreDef *scoreDef = m_doc->GetCorrespScoreDef(staff);
+    ScoreDef *scoreDef = m_doc->GetCorrespondingScore(staff)->GetScoreDef();
     if (StaffDef *staffDef = scoreDef->GetStaffDef(staff->GetN())) {
         const bool hideNumber = (staffDef->GetMultiNumber() == BOOLEAN_false)
             || ((staffDef->GetMultiNumber() != BOOLEAN_true) && (scoreDef->GetMultiNumber() == BOOLEAN_false));
diff --git a/src/score.cpp b/src/score.cpp
index fb10abcd573..3e6886578c8 100644
--- a/src/score.cpp
+++ b/src/score.cpp
@@ -86,16 +86,6 @@ bool Score::IsSupportedChild(Object *child)
     return true;
 }
 
-void Score::SetAsCurrent()
-{
-    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
-    // The doc can be NULL when doing the castoff and the pages are no attached to the doc
-    // If such cases, it will not matter not to have the current scoreDef in the doc
-    if (doc) {
-        doc->SetCurrentScore(this);
-    }
-}
-
 void Score::CalcRunningElementHeight(Doc *doc)
 {
     assert(doc);
diff --git a/src/setscoredeffunctor.cpp b/src/setscoredeffunctor.cpp
index d78d59db534..3059cc78ee8 100644
--- a/src/setscoredeffunctor.cpp
+++ b/src/setscoredeffunctor.cpp
@@ -67,10 +67,14 @@ ScoreDefSetCurrentPageFunctor::ScoreDefSetCurrentPageFunctor(Doc *doc) : DocFunc
 FunctorCode ScoreDefSetCurrentPageFunctor::VisitPageEnd(Page *page)
 {
     if (!page->m_score) {
-        page->m_score = m_doc->GetCurrentScore();
+        const Object *firstSystem = page->GetFirst(SYSTEM);
+        const Object *reference = firstSystem ? firstSystem : page;
+        page->m_score = m_doc->GetCorrespondingScore(reference);
     }
     else {
-        page->m_scoreEnd = m_doc->GetCurrentScore();
+        const Object *lastSystem = page->GetLast(SYSTEM);
+        const Object *reference = lastSystem ? lastSystem : page;
+        page->m_scoreEnd = m_doc->GetCorrespondingScore(reference);
     }
 
     return FUNCTOR_CONTINUE;

From 18e2be584380150c2cbe6eb9dbc254f845018da6 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 20 Sep 2023 14:26:42 +0200
Subject: [PATCH 07/18] Run ScoreDefSetCurrentPage only once

---
 src/doc.cpp                |  5 -----
 src/setscoredeffunctor.cpp | 17 +++++++----------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/doc.cpp b/src/doc.cpp
index ee5d7da258b..b36a19f5b59 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -883,12 +883,7 @@ void Doc::ScoreDefSetCurrentDoc(bool force)
     }
 
     // First we need to set Page::m_score and Page::m_scoreEnd
-    // We do it by going BACKWARD, with a depth limit of 3 (we want to hit the Score elements)
     ScoreDefSetCurrentPageFunctor scoreDefSetCurrentPage(this);
-    scoreDefSetCurrentPage.SetDirection(BACKWARD);
-    this->Process(scoreDefSetCurrentPage, 3);
-    // Do it again FORWARD to set Page::m_scoreEnd - relies on Page::m_score not being NULL
-    scoreDefSetCurrentPage.SetDirection(FORWARD);
     this->Process(scoreDefSetCurrentPage, 3);
 
     ScoreDefSetCurrentFunctor scoreDefSetCurrent(this);
diff --git a/src/setscoredeffunctor.cpp b/src/setscoredeffunctor.cpp
index 3059cc78ee8..144bc4d3248 100644
--- a/src/setscoredeffunctor.cpp
+++ b/src/setscoredeffunctor.cpp
@@ -66,16 +66,13 @@ ScoreDefSetCurrentPageFunctor::ScoreDefSetCurrentPageFunctor(Doc *doc) : DocFunc
 
 FunctorCode ScoreDefSetCurrentPageFunctor::VisitPageEnd(Page *page)
 {
-    if (!page->m_score) {
-        const Object *firstSystem = page->GetFirst(SYSTEM);
-        const Object *reference = firstSystem ? firstSystem : page;
-        page->m_score = m_doc->GetCorrespondingScore(reference);
-    }
-    else {
-        const Object *lastSystem = page->GetLast(SYSTEM);
-        const Object *reference = lastSystem ? lastSystem : page;
-        page->m_scoreEnd = m_doc->GetCorrespondingScore(reference);
-    }
+    const Object *firstSystem = page->GetFirst(SYSTEM);
+    const Object *reference = firstSystem ? firstSystem : page;
+    page->m_score = m_doc->GetCorrespondingScore(reference);
+
+    const Object *lastSystem = page->GetLast(SYSTEM);
+    reference = lastSystem ? lastSystem : page;
+    page->m_scoreEnd = m_doc->GetCorrespondingScore(reference);
 
     return FUNCTOR_CONTINUE;
 }

From e100f6aeb68028fb3b4e2ff5caa6c76c52e816ac Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 20 Sep 2023 14:49:46 +0200
Subject: [PATCH 08/18] Resolve conflict

---
 src/iomusxml.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 33788e61036..5d810126917 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -3703,7 +3703,7 @@ void MusicXmlInput::ReadMusicXmlPrint(pugi::xml_node node, Section *section)
     }
 
     if (std::string(node.child("measure-numbering").text().as_string()) == "none") {
-        m_doc->GetCurrentScoreDef()->SetMnumVisible(BOOLEAN_false);
+        m_doc->GetFirstScoreDef()->SetMnumVisible(BOOLEAN_false);
     }
 }
 

From d39a097b008a088520538b87e6a8b07ec5f63ae1 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 28 Sep 2023 21:28:32 +0200
Subject: [PATCH 09/18] Revert "Replace handling of current scoreDef in Doc"

---
 include/vrv/doc.h              |  62 ++++----
 include/vrv/floatingobject.h   |   2 +-
 include/vrv/iomei.h            |   2 +-
 include/vrv/object.h           |   1 +
 include/vrv/page.h             |   5 +
 include/vrv/score.h            |   6 +
 src/adjustaccidxfunctor.cpp    |   4 +-
 src/adjustdotsfunctor.cpp      |   3 +-
 src/adjustgracexposfunctor.cpp |   3 +-
 src/adjustlayersfunctor.cpp    |   3 +-
 src/adjustxposfunctor.cpp      |   3 +-
 src/doc.cpp                    | 268 ++++++++++++++-------------------
 src/editortoolkit_neume.cpp    |   5 +-
 src/floatingobject.cpp         |   5 +-
 src/ioabc.cpp                  |   2 +-
 src/iodarms.cpp                |   2 +-
 src/iohumdrum.cpp              |  34 ++---
 src/iomei.cpp                  |  19 ++-
 src/iomusxml.cpp               |  12 +-
 src/iopae.cpp                  |  18 +--
 src/object.cpp                 |  26 ++++
 src/page.cpp                   |  15 +-
 src/preparedatafunctor.cpp     |   6 +-
 src/score.cpp                  |  10 ++
 src/setscoredeffunctor.cpp     |  13 +-
 25 files changed, 262 insertions(+), 267 deletions(-)

diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index 710d73c3ef0..d1cfdc7a7af 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -90,12 +90,12 @@ class Doc : public Object {
     /**
      * Generate a document pgFoot if none is provided
      */
-    void GenerateFooter();
+    bool GenerateFooter();
 
     /**
      * Generate a document pgHead from the MEI header if none is provided
      */
-    void GenerateHeader();
+    bool GenerateHeader();
 
     /**
      * Generate measure numbers from measure attributes
@@ -121,6 +121,11 @@ class Doc : public Object {
      */
     bool HasPage(int pageIdx) const;
 
+    /**
+     * Get all the Score in the visible Mdiv.
+     */
+    std::list<Score *> GetScores();
+
     /**
      * Get the Pages in the visible Mdiv.
      * Will find it only when having read a pages-based MEI file,
@@ -136,31 +141,6 @@ class Doc : public Object {
      */
     int GetPageCount() const;
 
-    /**
-     * Get the first scoreDef
-     */
-    ///@{
-    ScoreDef *GetFirstScoreDef();
-    const ScoreDef *GetFirstScoreDef() const;
-    ///@}
-
-    /**
-     * Get all visible scores / the first visible score
-     * Lazily updates the visible scores, hence not const
-     */
-    ///@{
-    std::list<Score *> GetVisibleScores();
-    Score *GetFirstVisibleScore();
-    ///@}
-
-    /**
-     * Get the corresponding score for a node
-     */
-    ///@{
-    Score *GetCorrespondingScore(const Object *object);
-    const Score *GetCorrespondingScore(const Object *object) const;
-    ///@}
-
     /**
      * Return true if the MIDI generation is already done
      */
@@ -245,7 +225,7 @@ class Doc : public Object {
      * Get the default distance from the staff for the object
      * The distance is given in x * MEI UNIT
      */
-    data_MEASUREMENTSIGNED GetStaffDistance(const Object *object, int staffIndex, data_STAFFREL staffPosition) const;
+    data_MEASUREMENTSIGNED GetStaffDistance(const ClassId classId, int staffIndex, data_STAFFREL staffPosition);
 
     /**
      * Prepare the timemap for MIDI and timemap file export.
@@ -438,6 +418,19 @@ class Doc : public Object {
     bool HasFacsimile() const { return m_facsimile != NULL; }
     ///@}
 
+    /**
+     * @name Setter and getter for the current Score/ScoreDef.
+     * If not set, then looks for the first Score in the Document and use that.
+     * The currentScoreDef is also changed by the Object::Process whenever as Score is reached.
+     * When processing backward, the ScoreDef is changed when reaching the corresponding PageMilestoneEnd
+     */
+    ///@{
+    Score *GetCurrentScore();
+    ScoreDef *GetCurrentScoreDef();
+    void SetCurrentScore(Score *score);
+    bool HasCurrentScore() const { return m_currentScore != NULL; }
+    ///@}
+
     /**
      * Return true if the document has been cast off already.
      */
@@ -484,11 +477,6 @@ class Doc : public Object {
      */
     void PrepareMeasureIndices();
 
-    /**
-     * Determine all visible scores
-     */
-    void CollectVisibleScores();
-
 public:
     Page *m_selectionPreceding;
     Page *m_selectionFollowing;
@@ -558,10 +546,12 @@ class Doc : public Object {
     Resources m_resources;
 
     /**
-     * The list of all visible scores
-     * Used in Doc::GetCorrespondingScore to quickly determine the score for an object
+     * @name Holds a pointer to the current score/scoreDef.
+     * Set by Doc::GetCurrentScoreDef or explicitly through Doc::SetCurrentScoreDef
      */
-    std::list<Score *> m_visibleScores;
+    ///@{
+    Score *m_currentScore;
+    ///@}
 
     /**
      * A flag indicating if the document has been cast off or not.
diff --git a/include/vrv/floatingobject.h b/include/vrv/floatingobject.h
index f6cd1f450a3..aaa9d9edcf3 100644
--- a/include/vrv/floatingobject.h
+++ b/include/vrv/floatingobject.h
@@ -251,7 +251,7 @@ class FloatingPositioner : public BoundingBox {
     /**
      * Update the Y drawing relative position based on collision detection with the overlapping bounding box
      */
-    void CalcDrawingYRel(const Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox);
+    void CalcDrawingYRel(Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox);
 
     /**
      * Align extender elements across systems
diff --git a/include/vrv/iomei.h b/include/vrv/iomei.h
index 6b0d7800119..e162f386646 100644
--- a/include/vrv/iomei.h
+++ b/include/vrv/iomei.h
@@ -306,7 +306,7 @@ class MEIOutput : public Output {
      * Scoredef manipulation
      */
     ///@{
-    void WriteCustomScoreDef(ScoreDef *scoreDef);
+    void WriteCustomScoreDef();
     void AdjustStaffDef(StaffDef *staffDef, Measure *measure);
     bool AdjustLabel(Label *label);
     ///@}
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 1cb3f41ff41..8ab619368d9 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -692,6 +692,7 @@ class Object : public BoundingBox {
      * Helper methods for functor processing
      */
     ///@{
+    void UpdateDocumentScore(bool direction);
     bool SkipChildren(bool visibleOnly) const;
     bool FiltersApply(const Filters *filters, Object *object) const;
     ///@}
diff --git a/include/vrv/page.h b/include/vrv/page.h
index f1751100c99..7bab10d7ec7 100644
--- a/include/vrv/page.h
+++ b/include/vrv/page.h
@@ -48,6 +48,11 @@ class Page : public Object {
     bool IsSupportedChild(Object *object) override;
     ///@}
 
+    /**
+     * Return the number of system (children are System object only)
+     */
+    int GetSystemCount() const { return (int)GetChildren().size(); }
+
     /**
      * @name Get and set the pixel per unit factor.
      */
diff --git a/include/vrv/score.h b/include/vrv/score.h
index 975909c70b9..de496139af5 100644
--- a/include/vrv/score.h
+++ b/include/vrv/score.h
@@ -56,6 +56,12 @@ class Score : public PageElement, public PageMilestoneInterface, public AttLabel
     const ScoreDef *GetScoreDef() const { return &m_scoreDef; }
     ///@}
 
+    /**
+     * Helper looking at the parent Doc and set its scoreDef as current one.
+     * Called from Object::Process
+     */
+    void SetAsCurrent();
+
     /**
      * Calculate the height of the pgHead/pgHead2 and pgFoot/pgFoot2 (if any)
      * Requires the Doc to have an empty Pages object because it adds temporary pages
diff --git a/src/adjustaccidxfunctor.cpp b/src/adjustaccidxfunctor.cpp
index 7bc8b01512d..ece6761c994 100644
--- a/src/adjustaccidxfunctor.cpp
+++ b/src/adjustaccidxfunctor.cpp
@@ -10,7 +10,6 @@
 //----------------------------------------------------------------------------
 
 #include "doc.h"
-#include "score.h"
 
 //----------------------------------------------------------------------------
 
@@ -42,8 +41,7 @@ FunctorCode AdjustAccidXFunctor::VisitAlignmentReference(AlignmentReference *ali
     if (accids.empty()) return FUNCTOR_SIBLINGS;
 
     assert(m_doc);
-    ScoreDef *scoreDef = m_doc->GetCorrespondingScore(alignmentReference)->GetScoreDef();
-    StaffDef *staffDef = scoreDef->GetStaffDef(alignmentReference->GetN());
+    StaffDef *staffDef = m_doc->GetCurrentScoreDef()->GetStaffDef(alignmentReference->GetN());
     int staffSize = (staffDef && staffDef->HasScale()) ? staffDef->GetScale() : 100;
 
     std::sort(accids.begin(), accids.end(), AccidSpaceSort());
diff --git a/src/adjustdotsfunctor.cpp b/src/adjustdotsfunctor.cpp
index 1f930da9a88..63dc27b7a40 100644
--- a/src/adjustdotsfunctor.cpp
+++ b/src/adjustdotsfunctor.cpp
@@ -11,7 +11,6 @@
 
 #include "doc.h"
 #include "elementpart.h"
-#include "score.h"
 #include "staff.h"
 
 //----------------------------------------------------------------------------
@@ -126,7 +125,7 @@ FunctorCode AdjustDotsFunctor::VisitMeasure(Measure *measure)
 
 FunctorCode AdjustDotsFunctor::VisitScore(Score *score)
 {
-    m_staffNs = score->GetScoreDef()->GetStaffNs();
+    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/adjustgracexposfunctor.cpp b/src/adjustgracexposfunctor.cpp
index 85e4876cbb5..6d9ec49c51f 100644
--- a/src/adjustgracexposfunctor.cpp
+++ b/src/adjustgracexposfunctor.cpp
@@ -10,7 +10,6 @@
 //----------------------------------------------------------------------------
 
 #include "doc.h"
-#include "score.h"
 
 //----------------------------------------------------------------------------
 
@@ -231,7 +230,7 @@ FunctorCode AdjustGraceXPosFunctor::VisitMeasure(Measure *measure)
 
 FunctorCode AdjustGraceXPosFunctor::VisitScore(Score *score)
 {
-    m_staffNs = score->GetScoreDef()->GetStaffNs();
+    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/adjustlayersfunctor.cpp b/src/adjustlayersfunctor.cpp
index 058120c970c..7b312d143a6 100644
--- a/src/adjustlayersfunctor.cpp
+++ b/src/adjustlayersfunctor.cpp
@@ -10,7 +10,6 @@
 //----------------------------------------------------------------------------
 
 #include "doc.h"
-#include "score.h"
 #include "staff.h"
 
 //----------------------------------------------------------------------------
@@ -149,7 +148,7 @@ FunctorCode AdjustLayersFunctor::VisitMeasure(Measure *measure)
 
 FunctorCode AdjustLayersFunctor::VisitScore(Score *score)
 {
-    m_staffNs = score->GetScoreDef()->GetStaffNs();
+    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/adjustxposfunctor.cpp b/src/adjustxposfunctor.cpp
index 5436c605497..07b4117b196 100644
--- a/src/adjustxposfunctor.cpp
+++ b/src/adjustxposfunctor.cpp
@@ -12,7 +12,6 @@
 #include "doc.h"
 #include "multirest.h"
 #include "rest.h"
-#include "score.h"
 #include "staff.h"
 #include "system.h"
 
@@ -299,7 +298,7 @@ FunctorCode AdjustXPosFunctor::VisitMeasure(Measure *measure)
 
 FunctorCode AdjustXPosFunctor::VisitScore(Score *score)
 {
-    m_staffNs = score->GetScoreDef()->GetStaffNs();
+    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/doc.cpp b/src/doc.cpp
index b36a19f5b59..3fd5b393d28 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -125,6 +125,7 @@ void Doc::Reset()
     m_drawingPageMarginTop = 0;
 
     m_drawingPage = NULL;
+    m_currentScore = NULL;
     m_currentScoreDefDone = false;
     m_dataPreparationDone = false;
     m_timemapTempo = 0.0;
@@ -190,8 +191,7 @@ bool Doc::GenerateDocumentScoreDef()
         return false;
     }
 
-    ScoreDef *scoreDef = this->GetFirstScoreDef();
-    scoreDef->Reset();
+    this->GetCurrentScoreDef()->Reset();
     StaffGrp *staffGrp = new StaffGrp();
     for (Object *object : staves) {
         Staff *staff = vrv_cast<Staff *>(object);
@@ -202,57 +202,57 @@ bool Doc::GenerateDocumentScoreDef()
         if (!measure->IsMeasuredMusic()) staffDef->SetNotationtype(NOTATIONTYPE_mensural);
         staffGrp->AddChild(staffDef);
     }
-    scoreDef->AddChild(staffGrp);
+    this->GetCurrentScoreDef()->AddChild(staffGrp);
 
     LogInfo("ScoreDef generated");
 
     return true;
 }
 
-void Doc::GenerateFooter()
+bool Doc::GenerateFooter()
 {
-    for (Score *score : this->GetVisibleScores()) {
-        ScoreDef *scoreDef = score->GetScoreDef();
-        if (scoreDef->FindDescendantByType(PGFOOT)) continue;
+    if (this->GetCurrentScoreDef()->FindDescendantByType(PGFOOT)) {
+        return false;
+    }
 
-        PgFoot *pgFoot = new PgFoot();
-        pgFoot->SetFunc(PGFUNC_first);
-        // We mark it as generated for not having it written in the output
-        pgFoot->IsGenerated(true);
-        pgFoot->LoadFooter(this);
-        pgFoot->SetType("autogenerated");
-        scoreDef->AddChild(pgFoot);
+    PgFoot *pgFoot = new PgFoot();
+    pgFoot->SetFunc(PGFUNC_first);
+    // We mark it as generated for not having it written in the output
+    pgFoot->IsGenerated(true);
+    pgFoot->LoadFooter(this);
+    pgFoot->SetType("autogenerated");
+    this->GetCurrentScoreDef()->AddChild(pgFoot);
 
-        PgFoot *pgFoot2 = new PgFoot();
-        pgFoot2->SetFunc(PGFUNC_all);
-        pgFoot2->IsGenerated(true);
-        pgFoot2->LoadFooter(this);
-        pgFoot2->SetType("autogenerated");
-        scoreDef->AddChild(pgFoot2);
-    }
+    PgFoot *pgFoot2 = new PgFoot();
+    pgFoot2->SetFunc(PGFUNC_all);
+    pgFoot2->IsGenerated(true);
+    pgFoot2->LoadFooter(this);
+    pgFoot2->SetType("autogenerated");
+    this->GetCurrentScoreDef()->AddChild(pgFoot2);
+
+    return true;
 }
 
-void Doc::GenerateHeader()
+bool Doc::GenerateHeader()
 {
-    for (Score *score : this->GetVisibleScores()) {
-        ScoreDef *scoreDef = score->GetScoreDef();
-        if (scoreDef->FindDescendantByType(PGHEAD)) continue;
+    if (this->GetCurrentScoreDef()->FindDescendantByType(PGHEAD)) return false;
 
-        PgHead *pgHead = new PgHead();
-        pgHead->SetFunc(PGFUNC_first);
-        // We mark it as generated for not having it written in the output
-        pgHead->IsGenerated(true);
-        pgHead->GenerateFromMEIHeader(m_header);
-        pgHead->SetType("autogenerated");
-        scoreDef->AddChild(pgHead);
+    PgHead *pgHead = new PgHead();
+    pgHead->SetFunc(PGFUNC_first);
+    // We mark it as generated for not having it written in the output
+    pgHead->IsGenerated(true);
+    pgHead->GenerateFromMEIHeader(m_header);
+    pgHead->SetType("autogenerated");
+    this->GetCurrentScoreDef()->AddChild(pgHead);
 
-        PgHead *pgHead2 = new PgHead();
-        pgHead2->SetFunc(PGFUNC_all);
-        pgHead2->IsGenerated(true);
-        pgHead2->AddPageNum(HORIZONTALALIGNMENT_center, VERTICALALIGNMENT_top);
-        pgHead2->SetType("autogenerated");
-        scoreDef->AddChild(pgHead2);
-    }
+    PgHead *pgHead2 = new PgHead();
+    pgHead2->SetFunc(PGFUNC_all);
+    pgHead2->IsGenerated(true);
+    pgHead2->AddPageNum(HORIZONTALALIGNMENT_center, VERTICALALIGNMENT_top);
+    pgHead2->SetType("autogenerated");
+    this->GetCurrentScoreDef()->AddChild(pgHead2);
+
+    return true;
 }
 
 void Doc::PrepareMeasureIndices()
@@ -345,12 +345,11 @@ void Doc::CalculateTimemap()
     double tempo = MIDI_TEMPO;
 
     // Set tempo
-    ScoreDef *scoreDef = this->GetFirstVisibleScore()->GetScoreDef();
-    if (scoreDef->HasMidiBpm()) {
-        tempo = scoreDef->GetMidiBpm();
+    if (this->GetCurrentScoreDef()->HasMidiBpm()) {
+        tempo = this->GetCurrentScoreDef()->GetMidiBpm();
     }
-    else if (scoreDef->HasMm()) {
-        tempo = Tempo::CalcTempo(scoreDef);
+    else if (this->GetCurrentScoreDef()->HasMm()) {
+        tempo = Tempo::CalcTempo(this->GetCurrentScoreDef());
     }
 
     // We first calculate the maximum duration of each measure
@@ -373,6 +372,7 @@ void Doc::CalculateTimemap()
 
 void Doc::ExportMIDI(smf::MidiFile *midiFile)
 {
+
     if (!this->HasTimemap()) {
         // generate MIDI timemap before progressing
         CalculateTimemap();
@@ -384,12 +384,11 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
     double tempo = MIDI_TEMPO;
 
     // set MIDI tempo
-    ScoreDef *scoreDef = this->GetFirstVisibleScore()->GetScoreDef();
-    if (scoreDef->HasMidiBpm()) {
-        tempo = scoreDef->GetMidiBpm();
+    if (this->GetCurrentScoreDef()->HasMidiBpm()) {
+        tempo = this->GetCurrentScoreDef()->GetMidiBpm();
     }
-    else if (scoreDef->HasMm()) {
-        tempo = Tempo::CalcTempo(scoreDef);
+    else if (this->GetCurrentScoreDef()->HasMm()) {
+        tempo = Tempo::CalcTempo(this->GetCurrentScoreDef());
     }
     midiFile->addTempo(0, 0, tempo);
 
@@ -418,8 +417,10 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
     int midiTrack = 1;
     Filters filters;
     for (staves = layerTree.child.begin(); staves != layerTree.child.end(); ++staves) {
+
+        ScoreDef *currentScoreDef = this->GetCurrentScoreDef();
         int transSemi = 0;
-        if (StaffDef *staffDef = scoreDef->GetStaffDef(staves->first)) {
+        if (StaffDef *staffDef = currentScoreDef->GetStaffDef(staves->first)) {
             // get the transposition (semi-tone) value for the staff
             if (staffDef->HasTransSemi()) transSemi = staffDef->GetTransSemi();
             midiTrack = staffDef->GetN();
@@ -461,16 +462,16 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
             }
             // set MIDI key signature
             KeySig *keySig = vrv_cast<KeySig *>(staffDef->FindDescendantByType(KEYSIG));
-            if (!keySig && (scoreDef->HasKeySigInfo())) {
-                keySig = vrv_cast<KeySig *>(scoreDef->GetKeySig());
+            if (!keySig && (currentScoreDef->HasKeySigInfo())) {
+                keySig = vrv_cast<KeySig *>(currentScoreDef->GetKeySig());
             }
             if (keySig && keySig->HasSig()) {
                 midiFile->addKeySignature(midiTrack, 0, keySig->GetFifthsInt(), (keySig->GetMode() == MODE_minor));
             }
             // set MIDI time signature
             MeterSig *meterSig = vrv_cast<MeterSig *>(staffDef->FindDescendantByType(METERSIG));
-            if (!meterSig && (scoreDef->HasMeterSigInfo())) {
-                meterSig = vrv_cast<MeterSig *>(scoreDef->GetMeterSig());
+            if (!meterSig && (currentScoreDef->HasMeterSigInfo())) {
+                meterSig = vrv_cast<MeterSig *>(currentScoreDef->GetMeterSig());
             }
             if (meterSig && meterSig->HasCount() && meterSig->HasUnit()) {
                 midiFile->addTimeSignature(midiTrack, 0, meterSig->GetTotalCount(), meterSig->GetUnit());
@@ -481,7 +482,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
         GenerateMIDIFunctor generateScoreDefMIDI(midiFile);
         generateScoreDefMIDI.SetChannel(midiChannel);
         generateScoreDefMIDI.SetTrack(midiTrack);
-        scoreDef->Process(generateScoreDefMIDI);
+        currentScoreDef->Process(generateScoreDefMIDI);
 
         for (layers = staves->second.child.begin(); layers != staves->second.child.end(); ++layers) {
             filters.Clear();
@@ -573,10 +574,6 @@ void Doc::PrepareData()
 
     this->PrepareMeasureIndices();
 
-    /************ Collect all visible scores ************/
-
-    this->CollectVisibleScores();
-
     /************ Store default durations ************/
 
     PrepareDurationFunctor prepareDuration;
@@ -861,10 +858,8 @@ void Doc::PrepareData()
         }
     }
 
-    for (Score *score : this->GetVisibleScores()) {
-        ScoreDefSetGrpSymFunctor scoreDefSetGrpSym;
-        score->GetScoreDef()->Process(scoreDefSetGrpSym);
-    }
+    ScoreDefSetGrpSymFunctor scoreDefSetGrpSym;
+    this->GetCurrentScoreDef()->Process(scoreDefSetGrpSym);
 
     // LogElapsedTimeEnd ("Preparing drawing");
 
@@ -883,7 +878,12 @@ void Doc::ScoreDefSetCurrentDoc(bool force)
     }
 
     // First we need to set Page::m_score and Page::m_scoreEnd
+    // We do it by going BACKWARD, with a depth limit of 3 (we want to hit the Score elements)
     ScoreDefSetCurrentPageFunctor scoreDefSetCurrentPage(this);
+    scoreDefSetCurrentPage.SetDirection(BACKWARD);
+    this->Process(scoreDefSetCurrentPage, 3);
+    // Do it again FORWARD to set Page::m_scoreEnd - relies on Page::m_score not being NULL
+    scoreDefSetCurrentPage.SetDirection(FORWARD);
     this->Process(scoreDefSetCurrentPage, 3);
 
     ScoreDefSetCurrentFunctor scoreDefSetCurrent(this);
@@ -904,9 +904,10 @@ void Doc::ScoreDefOptimizeDoc()
 
 void Doc::ScoreDefSetGrpSymDoc()
 {
-    // Group symbols need to be resolved using scoreDef, since there might be @startid/@endid attributes that determine
+    // Group symbols need to be resolved using scoreDef, since there might be @starid/@endid attributes that determine
     // their positioning
     ScoreDefSetGrpSymFunctor scoreDefSetGrpSym;
+    // this->GetCurrentScoreDef()->Process(scoreDefSetGrpSym);
     this->Process(scoreDefSetGrpSym);
 }
 
@@ -935,7 +936,7 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
         return;
     }
 
-    std::list<Score *> scores = this->GetVisibleScores();
+    std::list<Score *> scores = this->GetScores();
     assert(!scores.empty());
 
     this->ScoreDefSetCurrentDoc();
@@ -1092,7 +1093,7 @@ void Doc::CastOffEncodingDoc()
     this->ScoreDefSetCurrentDoc(true);
 
     // Optimize the doc if one of the score requires optimization
-    for (Score *score : this->GetVisibleScores()) {
+    for (Score *score : this->GetScores()) {
         if (score->ScoreDefNeedsOptimization(m_options->m_condense.GetValue())) {
             this->ScoreDefOptimizeDoc();
             break;
@@ -1445,6 +1446,18 @@ bool Doc::HasPage(int pageIdx) const
     return ((pageIdx >= 0) && (pageIdx < pages->GetChildCount()));
 }
 
+std::list<Score *> Doc::GetScores()
+{
+    std::list<Score *> scores;
+    ListOfObjects objects = this->FindAllDescendantsByType(SCORE, false, 3);
+    for (const auto object : objects) {
+        Score *score = vrv_cast<Score *>(object);
+        assert(score);
+        scores.push_back(score);
+    }
+    return scores;
+}
+
 Pages *Doc::GetPages()
 {
     return vrv_cast<Pages *>(this->FindDescendantByType(PAGES));
@@ -1461,72 +1474,6 @@ int Doc::GetPageCount() const
     return ((pages) ? pages->GetChildCount() : 0);
 }
 
-ScoreDef *Doc::GetFirstScoreDef()
-{
-    return const_cast<ScoreDef *>(std::as_const(*this).GetFirstScoreDef());
-}
-
-const ScoreDef *Doc::GetFirstScoreDef() const
-{
-    const Score *score = vrv_cast<const Score *>(this->FindDescendantByType(SCORE, 3));
-
-    return score ? score->GetScoreDef() : NULL;
-}
-
-std::list<Score *> Doc::GetVisibleScores()
-{
-    if (m_visibleScores.empty()) {
-        this->CollectVisibleScores();
-
-        assert(!m_visibleScores.empty());
-    }
-
-    return m_visibleScores;
-}
-
-Score *Doc::GetFirstVisibleScore()
-{
-    if (m_visibleScores.empty()) {
-        this->CollectVisibleScores();
-
-        assert(!m_visibleScores.empty());
-    }
-
-    return m_visibleScores.front();
-}
-
-Score *Doc::GetCorrespondingScore(const Object *object)
-{
-    return const_cast<Score *>(std::as_const(*this).GetCorrespondingScore(object));
-}
-
-const Score *Doc::GetCorrespondingScore(const Object *object) const
-{
-    assert(!m_visibleScores.empty());
-
-    const Score *correspondingScore = m_visibleScores.front();
-    for (Score *score : m_visibleScores) {
-        if ((score == object) || Object::IsPreOrdered(score, object)) {
-            correspondingScore = score;
-        }
-    }
-    return correspondingScore;
-}
-
-void Doc::CollectVisibleScores()
-{
-    m_visibleScores.clear();
-    ListOfObjects objects = this->FindAllDescendantsByType(SCORE, false, 3);
-    for (Object *object : objects) {
-        Score *score = vrv_cast<Score *>(object);
-        assert(score);
-        // Visible scores have milestone end
-        if (score->GetMilestoneEnd()) {
-            m_visibleScores.push_back(score);
-        }
-    }
-}
-
 int Doc::GetGlyphHeight(char32_t code, int staffSize, bool graceSize) const
 {
     int x, y, w, h;
@@ -1899,34 +1846,32 @@ double Doc::GetTopMargin(const ClassId classId) const
     return m_options->m_defaultTopMargin.GetValue();
 }
 
-data_MEASUREMENTSIGNED Doc::GetStaffDistance(const Object *object, int staffIndex, data_STAFFREL staffPosition) const
+data_MEASUREMENTSIGNED Doc::GetStaffDistance(const ClassId classId, int staffIndex, data_STAFFREL staffPosition)
 {
-    const ScoreDef *scoreDef = this->GetCorrespondingScore(object)->GetScoreDef();
-
     data_MEASUREMENTSIGNED distance;
     if (staffPosition == STAFFREL_above || staffPosition == STAFFREL_below) {
-        if (object->Is(DIR)) {
+        if (classId == DIR) {
             // Inspect the scoreDef attribute
-            if (scoreDef->HasDirDist()) {
-                distance = scoreDef->GetDirDist();
+            if (this->GetCurrentScoreDef()->HasDirDist()) {
+                distance = this->GetCurrentScoreDef()->GetDirDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasDirDist()) {
                 distance = staffDef->GetDirDist();
             }
         }
-        else if (object->Is(DYNAM)) {
+        else if (classId == DYNAM) {
             distance.SetVu(m_options->m_dynamDist.GetDefault());
 
             // Inspect the scoreDef attribute
-            if (scoreDef->HasDynamDist()) {
-                distance = scoreDef->GetDynamDist();
+            if (this->GetCurrentScoreDef()->HasDynamDist()) {
+                distance = this->GetCurrentScoreDef()->GetDynamDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasDynamDist()) {
                 distance = staffDef->GetDynamDist();
             }
@@ -1936,16 +1881,16 @@ data_MEASUREMENTSIGNED Doc::GetStaffDistance(const Object *object, int staffInde
                 distance.SetVu(m_options->m_dynamDist.GetValue());
             }
         }
-        else if (object->Is(HARM)) {
+        else if (classId == HARM) {
             distance.SetVu(m_options->m_harmDist.GetDefault());
 
             // Inspect the scoreDef attribute
-            if (scoreDef->HasHarmDist()) {
-                distance = scoreDef->GetHarmDist();
+            if (this->GetCurrentScoreDef()->HasHarmDist()) {
+                distance = this->GetCurrentScoreDef()->GetHarmDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasHarmDist()) {
                 distance = staffDef->GetHarmDist();
             }
@@ -1955,14 +1900,14 @@ data_MEASUREMENTSIGNED Doc::GetStaffDistance(const Object *object, int staffInde
                 distance.SetVu(m_options->m_harmDist.GetValue());
             }
         }
-        else if (object->Is(TEMPO)) {
+        else if (classId == TEMPO) {
             // Inspect the scoreDef attribute
-            if (scoreDef->HasTempoDist()) {
-                distance = scoreDef->GetTempoDist();
+            if (this->GetCurrentScoreDef()->HasTempoDist()) {
+                distance = this->GetCurrentScoreDef()->GetTempoDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasTempoDist()) {
                 distance = staffDef->GetTempoDist();
             }
@@ -2084,6 +2029,27 @@ int Doc::GetAdjustedDrawingPageWidth() const
     return (contentWidth + m_drawingPageMarginLeft + m_drawingPageMarginRight) / DEFINITION_FACTOR;
 }
 
+Score *Doc::GetCurrentScore()
+{
+    if (!m_currentScore) {
+        m_currentScore = vrv_cast<Score *>(this->FindDescendantByType(SCORE));
+        assert(m_currentScore);
+    }
+    return m_currentScore;
+}
+
+ScoreDef *Doc::GetCurrentScoreDef()
+{
+    if (!m_currentScore) this->GetCurrentScore();
+
+    return m_currentScore->GetScoreDef();
+}
+
+void Doc::SetCurrentScore(Score *score)
+{
+    m_currentScore = score;
+}
+
 //----------------------------------------------------------------------------
 // Doc functors methods
 //----------------------------------------------------------------------------
diff --git a/src/editortoolkit_neume.cpp b/src/editortoolkit_neume.cpp
index a572a89d6ac..f32481b091b 100644
--- a/src/editortoolkit_neume.cpp
+++ b/src/editortoolkit_neume.cpp
@@ -29,7 +29,6 @@
 #include "neume.h"
 #include "page.h"
 #include "rend.h"
-#include "score.h"
 #include "staff.h"
 #include "staffdef.h"
 #include "surface.h"
@@ -786,8 +785,8 @@ bool EditorToolkitNeume::Insert(std::string elementType, std::string staffId, in
             parent = m_doc->GetDrawingPage()->FindDescendantByType(MEASURE);
             assert(parent);
             newStaff = new Staff(1);
-            newStaff->m_drawingStaffDef = vrv_cast<StaffDef *>(
-                m_doc->GetCorrespondingScore(parent)->GetScoreDef()->FindDescendantByType(STAFFDEF));
+            newStaff->m_drawingStaffDef
+                = vrv_cast<StaffDef *>(m_doc->GetCurrentScoreDef()->FindDescendantByType(STAFFDEF));
             newStaff->m_drawingNotationType = NOTATIONTYPE_neume;
             newStaff->m_drawingLines = 4;
         }
diff --git a/src/floatingobject.cpp b/src/floatingobject.cpp
index a2b126315f9..c6e46b59f62 100644
--- a/src/floatingobject.cpp
+++ b/src/floatingobject.cpp
@@ -445,7 +445,7 @@ int FloatingPositioner::GetAdmissibleHorizOverlapMargin(const BoundingBox *bbox,
 }
 
 void FloatingPositioner::CalcDrawingYRel(
-    const Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox)
+    Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox)
 {
     assert(doc);
     assert(staffAlignment);
@@ -460,7 +460,8 @@ void FloatingPositioner::CalcDrawingYRel(
         int staffIndex = staffAlignment->GetStaff()->GetN();
 
         int minStaffDistance = 0.0;
-        data_MEASUREMENTSIGNED minStaffDistanceMeasurement = doc->GetStaffDistance(m_object, staffIndex, m_place);
+        data_MEASUREMENTSIGNED minStaffDistanceMeasurement
+            = doc->GetStaffDistance(m_object->GetClassId(), staffIndex, m_place);
 
         if (minStaffDistanceMeasurement.HasValue()) {
             if (minStaffDistanceMeasurement.GetType() == MEASUREMENTTYPE_px) {
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index a7473bdae60..5ce7bdae43d 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -224,7 +224,7 @@ int ABCInput::SetBarLine(const std::string &musicCode, int i)
 
 void ABCInput::CalcUnitNoteLength()
 {
-    MeterSig *meterSig = vrv_cast<MeterSig *>(m_doc->GetFirstScoreDef()->FindDescendantByType(METERSIG));
+    MeterSig *meterSig = vrv_cast<MeterSig *>(m_doc->GetCurrentScoreDef()->FindDescendantByType(METERSIG));
     if (!meterSig || !meterSig->HasUnit() || double(meterSig->GetTotalCount()) / double(meterSig->GetUnit()) >= 0.75) {
         m_unitDur = 8;
         m_durDefault = DURATION_8;
diff --git a/src/iodarms.cpp b/src/iodarms.cpp
index debf3f3181a..36082e95284 100644
--- a/src/iodarms.cpp
+++ b/src/iodarms.cpp
@@ -521,7 +521,7 @@ bool DarmsInput::Import(const std::string &data_str)
     StaffDef *staffDef = new StaffDef();
     staffDef->SetN(1);
     staffGrp->AddChild(staffDef);
-    m_doc->GetFirstScoreDef()->AddChild(staffGrp);
+    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
 
     m_doc->ConvertToPageBasedDoc();
 
diff --git a/src/iohumdrum.cpp b/src/iohumdrum.cpp
index 907caf7992c..801556e9b85 100644
--- a/src/iohumdrum.cpp
+++ b/src/iohumdrum.cpp
@@ -3411,7 +3411,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
     const std::vector<hum::HTp> &staffstarts = m_staffstarts;
 
     if (staffstarts.size() > 0) {
-        addMidiTempo(m_doc->GetFirstScoreDef(), staffstarts[0], top, bot);
+        addMidiTempo(m_doc->GetCurrentScoreDef(), staffstarts[0], top, bot);
     }
     hum::HumRegex hre;
     for (int i = 0; i < (int)staffstarts.size(); ++i) {
@@ -3445,7 +3445,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
         // If there is one staff, then no extra decoration.
         else if (staffstarts.size() == 1) {
             StaffGrp *sg = new StaffGrp();
-            m_doc->GetFirstScoreDef()->AddChild(sg);
+            m_doc->GetCurrentScoreDef()->AddChild(sg);
             sg->AddChild(m_staffdef[0]);
         }
         // do something if there is no staff in the score?
@@ -3454,7 +3454,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
         bool status = processStaffDecoration(decoration);
         if (!status) {
             StaffGrp *sg = new StaffGrp();
-            m_doc->GetFirstScoreDef()->AddChild(sg);
+            m_doc->GetCurrentScoreDef()->AddChild(sg);
             sg->SetBarThru(BOOLEAN_false);
             // setGroupSymbol(sg, staffGroupingSym_SYMBOL_bracket);
             for (int i = 0; i < (int)m_staffdef.size(); ++i) {
@@ -3481,7 +3481,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
 
 void HumdrumInput::promoteInstrumentNamesToGroup()
 {
-    ScoreDef *sdf = m_doc->GetFirstScoreDef();
+    ScoreDef *sdf = m_doc->GetCurrentScoreDef();
     int count = sdf->GetChildCount();
     for (int i = 0; i < count; ++i) {
         Object *obj = sdf->GetChild(i);
@@ -3555,7 +3555,7 @@ void HumdrumInput::promoteInstrumentsForStaffGroup(StaffGrp *group)
 
 void HumdrumInput::promoteInstrumentAbbreviationsToGroup()
 {
-    ScoreDef *sdf = m_doc->GetFirstScoreDef();
+    ScoreDef *sdf = m_doc->GetCurrentScoreDef();
     int count = sdf->GetChildCount();
 
     for (int i = 0; i < count; ++i) {
@@ -4007,14 +4007,14 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
         // There is no barline across the staves in this case.
         root = new StaffGrp();
         root->SetBarThru(BOOLEAN_false);
-        m_doc->GetFirstScoreDef()->AddChild(root);
+        m_doc->GetCurrentScoreDef()->AddChild(root);
     }
     else if (d[0] == '(') {
         // The outer group is not bracketed, but bar goes all of
         // the way through system.
         root = new StaffGrp();
         root->SetBarThru(BOOLEAN_true);
-        m_doc->GetFirstScoreDef()->AddChild(root);
+        m_doc->GetCurrentScoreDef()->AddChild(root);
     }
     else if (pairing.back() == 0) {
         skipfirst = true;
@@ -4030,7 +4030,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
         else if (d[0] == '[') {
             setGroupSymbol(root, staffGroupingSym_SYMBOL_bracket);
         }
-        m_doc->GetFirstScoreDef()->AddChild(root);
+        m_doc->GetCurrentScoreDef()->AddChild(root);
     }
 
     std::vector<int> spine; // kernstart index
@@ -4271,7 +4271,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
             root->AddChild(sg);
         }
         else {
-            m_doc->GetFirstScoreDef()->AddChild(sg);
+            m_doc->GetCurrentScoreDef()->AddChild(sg);
         }
         for (int i = 0; i < (int)m_staffdef.size(); ++i) {
             sg->AddChild(m_staffdef[i]);
@@ -4294,7 +4294,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
                 root->AddChild(sg);
             }
             else {
-                m_doc->GetFirstScoreDef()->AddChild(sg);
+                m_doc->GetCurrentScoreDef()->AddChild(sg);
             }
         }
 
@@ -4371,7 +4371,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
         }
         else {
             root_sg = new StaffGrp();
-            m_doc->GetFirstScoreDef()->AddChild(root_sg);
+            m_doc->GetCurrentScoreDef()->AddChild(root_sg);
             root_sg->SetBarThru(BOOLEAN_false);
         }
         for (int i = 0; i < (int)newgroups.size(); ++i) {
@@ -4857,7 +4857,7 @@ bool HumdrumInput::prepareFooter(
     // std::cout << "MEI CONTENT " << meicontent << std::endl;
 
     AttFormeworkComparison comparison(PGFOOT, PGFUNC_first);
-    Object *pgfoot = tempdoc.GetFirstScoreDef()->FindDescendantByComparison(&comparison);
+    Object *pgfoot = tempdoc.GetCurrentScoreDef()->FindDescendantByComparison(&comparison);
     if (pgfoot == NULL) {
         return false;
     }
@@ -4875,10 +4875,10 @@ bool HumdrumInput::prepareFooter(
         return false;
     }
 
-    m_doc->GetFirstScoreDef()->AddChild(pgfoot);
+    m_doc->GetCurrentScoreDef()->AddChild(pgfoot);
 
     AttFormeworkComparison comparison2(PGFOOT, PGFUNC_all);
-    Object *pgfoot2 = tempdoc.GetFirstScoreDef()->FindDescendantByComparison(&comparison2);
+    Object *pgfoot2 = tempdoc.GetCurrentScoreDef()->FindDescendantByComparison(&comparison2);
     if (pgfoot2 == NULL) {
         return true;
     }
@@ -4896,7 +4896,7 @@ bool HumdrumInput::prepareFooter(
         return true;
     }
 
-    m_doc->GetFirstScoreDef()->AddChild(pgfoot2);
+    m_doc->GetCurrentScoreDef()->AddChild(pgfoot2);
 
     return true;
 }
@@ -5032,7 +5032,7 @@ bool HumdrumInput::prepareHeader(
     // std::string meicontent = meioutput.GetOutput();
     // std::cout << "MEI CONTENT " << meicontent << std::endl;
 
-    Object *pghead = tempdoc.GetFirstScoreDef()->FindDescendantByType(ClassId::PGHEAD);
+    Object *pghead = tempdoc.GetCurrentScoreDef()->FindDescendantByType(ClassId::PGHEAD);
     if (pghead == NULL) {
         return false;
     }
@@ -5050,7 +5050,7 @@ bool HumdrumInput::prepareHeader(
         return false;
     }
 
-    m_doc->GetFirstScoreDef()->AddChild(pghead);
+    m_doc->GetCurrentScoreDef()->AddChild(pghead);
 
     return true;
 }
diff --git a/src/iomei.cpp b/src/iomei.cpp
index e11544cc1c2..9f3e2b6c52f 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -914,13 +914,12 @@ bool MEIOutput::WriteObjectInternal(Object *object, bool useCustomScoreDef)
     if (this->IsTreeObject(object)) m_nodeStack.push_back(m_currentNode);
 
     if (object->Is(SCORE)) {
-        ScoreDef *scoreDef = vrv_cast<Score *>(object)->GetScoreDef();
         if (useCustomScoreDef) {
-            this->WriteCustomScoreDef(scoreDef);
+            this->WriteCustomScoreDef();
         }
         else {
             // Save the main scoreDef
-            scoreDef->SaveObject(this, this->GetBasic());
+            m_doc->GetCurrentScoreDef()->SaveObject(this, this->GetBasic());
         }
     }
 
@@ -1279,7 +1278,7 @@ void MEIOutput::WriteStackedObjectsEnd()
         [this](Object *object) { this->WriteObjectInternalEnd(object); });
 }
 
-void MEIOutput::WriteCustomScoreDef(ScoreDef *scoreDef)
+void MEIOutput::WriteCustomScoreDef()
 {
     // Determine the first measure with respect to the first filter match
     Measure *measure = NULL;
@@ -1306,8 +1305,8 @@ void MEIOutput::WriteCustomScoreDef(ScoreDef *scoreDef)
     if (measure && refScoreDef) {
         // Create a copy of the reference scoredef and adjust it to keep track of clef changes, key signature changes,
         // etc.
-        ScoreDef *customScoreDef = vrv_cast<ScoreDef *>(refScoreDef->Clone());
-        ListOfObjects staffDefs = customScoreDef->FindAllDescendantsByType(STAFFDEF);
+        ScoreDef *scoreDef = vrv_cast<ScoreDef *>(refScoreDef->Clone());
+        ListOfObjects staffDefs = scoreDef->FindAllDescendantsByType(STAFFDEF);
         for (Object *staffDef : staffDefs) {
             this->AdjustStaffDef(vrv_cast<StaffDef *>(staffDef), measure);
         }
@@ -1320,7 +1319,7 @@ void MEIOutput::WriteCustomScoreDef(ScoreDef *scoreDef)
         }
         if (!drawLabels) {
             // If not, replace labels by abbreviation or delete them
-            ListOfObjects labels = customScoreDef->FindAllDescendantsByType(LABEL);
+            ListOfObjects labels = scoreDef->FindAllDescendantsByType(LABEL);
             for (Object *label : labels) {
                 if (!this->AdjustLabel(vrv_cast<Label *>(label))) {
                     label->GetParent()->DeleteChild(label);
@@ -1329,11 +1328,11 @@ void MEIOutput::WriteCustomScoreDef(ScoreDef *scoreDef)
         }
 
         // Save the adjusted score def and delete it afterwards
-        customScoreDef->SaveObject(this, this->GetBasic());
-        delete customScoreDef;
+        scoreDef->SaveObject(this, this->GetBasic());
+        delete scoreDef;
     }
     else {
-        scoreDef->SaveObject(this, this->GetBasic());
+        m_doc->GetCurrentScoreDef()->SaveObject(this, this->GetBasic());
     }
 }
 
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 5d810126917..fd13a4b99da 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -888,23 +888,23 @@ bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
             }
         }
         if (head) {
-            score->GetScoreDef()->AddChild(head);
+            m_doc->GetCurrentScoreDef()->AddChild(head);
         }
         if (foot) {
-            score->GetScoreDef()->AddChild(foot);
+            m_doc->GetCurrentScoreDef()->AddChild(foot);
         }
     }
 
     std::vector<StaffGrp *> m_staffGrpStack;
     StaffGrp *staffGrp = new StaffGrp();
-    score->GetScoreDef()->AddChild(staffGrp);
+    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
     m_staffGrpStack.push_back(staffGrp);
 
     short int staffOffset = 0;
     m_octDis.push_back(0);
 
     pugi::xpath_node scoreMidiBpm = root.select_node("/score-partwise/part[1]/measure[1]/sound[@tempo][1]");
-    if (scoreMidiBpm) score->GetScoreDef()->SetMidiBpm(scoreMidiBpm.node().attribute("tempo").as_double());
+    if (scoreMidiBpm) m_doc->GetCurrentScoreDef()->SetMidiBpm(scoreMidiBpm.node().attribute("tempo").as_double());
 
     pugi::xpath_node_set partListChildren = root.select_nodes("/score-partwise/part-list/*");
     for (pugi::xpath_node_set::const_iterator it = partListChildren.begin(); it != partListChildren.end(); ++it) {
@@ -2626,7 +2626,7 @@ void MusicXmlInput::ReadMusicXmlNote(
     // find staff's staffDef
     // TODO Tablature: is this the correct way to find a staff's staffDef?
     AttNIntegerComparison cnc(STAFFDEF, staff->GetN());
-    StaffDef *staffDef = vrv_cast<StaffDef *>(m_doc->GetFirstScoreDef()->FindDescendantByComparison(&cnc));
+    StaffDef *staffDef = vrv_cast<StaffDef *>(m_doc->GetCurrentScoreDef()->FindDescendantByComparison(&cnc));
     bool isTablature = false;
     Tuning *tuning = NULL;
 
@@ -3703,7 +3703,7 @@ void MusicXmlInput::ReadMusicXmlPrint(pugi::xml_node node, Section *section)
     }
 
     if (std::string(node.child("measure-numbering").text().as_string()) == "none") {
-        m_doc->GetFirstScoreDef()->SetMnumVisible(BOOLEAN_false);
+        m_doc->GetCurrentScoreDef()->SetMnumVisible(BOOLEAN_false);
     }
 }
 
diff --git a/src/iopae.cpp b/src/iopae.cpp
index 56a2d0461f4..0d508be5c12 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -73,7 +73,7 @@ bool PAEOutput::Export(std::string &output)
     m_currentDots = -1;
     m_grace = false;
 
-    m_doc->GetFirstScoreDef()->SaveObject(this, false);
+    m_doc->GetCurrentScoreDef()->SaveObject(this, false);
 
     m_docScoreDef = false;
 
@@ -1019,20 +1019,20 @@ void PAEInput::parsePlainAndEasy(std::istream &infile)
         staffDef->AddChild(staffDefClef);
     }
     if (scoreDefKeySig) {
-        score->GetScoreDef()->AddChild(scoreDefKeySig);
+        m_doc->GetCurrentScoreDef()->AddChild(scoreDefKeySig);
     }
     if (scoreDefMeterSig) {
         // Make it an attribute for now
         scoreDefMeterSig->IsAttribute(true);
-        score->GetScoreDef()->AddChild(scoreDefMeterSig);
+        m_doc->GetCurrentScoreDef()->AddChild(scoreDefMeterSig);
     }
     if (scoreDefMensur) {
         // Make it an attribute for now
         scoreDefMensur->IsAttribute(true);
-        score->GetScoreDef()->AddChild(scoreDefMensur);
+        m_doc->GetCurrentScoreDef()->AddChild(scoreDefMensur);
     }
 
-    score->GetScoreDef()->AddChild(staffGrp);
+    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
 
     if (m_tie != NULL) {
         LogWarning("Open tie will not render because tstamp2 is missing");
@@ -2966,7 +2966,7 @@ bool PAEInput::Parse()
     staffDef->SetN(1);
     staffDef->SetLines(5);
     staffGrp->AddChild(staffDef);
-    score->GetScoreDef()->AddChild(staffGrp);
+    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
 
     if (m_isMensural) {
         staffDef->SetNotationtype(NOTATIONTYPE_mensural);
@@ -2977,17 +2977,17 @@ bool PAEInput::Parse()
         staffDef->AddChild(m_clef.Clone());
     }
     if (m_hasKeySig) {
-        score->GetScoreDef()->AddChild(m_keySig.Clone());
+        m_doc->GetCurrentScoreDef()->AddChild(m_keySig.Clone());
     }
     if (m_hasMeterSig) {
         // Make it an attribute for now
         m_meterSig.IsAttribute(true);
-        score->GetScoreDef()->AddChild(m_meterSig.Clone());
+        m_doc->GetCurrentScoreDef()->AddChild(m_meterSig.Clone());
     }
     if (m_hasMensur) {
         // Make it an attribute for now
         m_mensur.IsAttribute(true);
-        score->GetScoreDef()->AddChild(m_mensur.Clone());
+        m_doc->GetCurrentScoreDef()->AddChild(m_mensur.Clone());
     }
 
     // A stack to which layer element are added. At least a Layer, but then Beam, GraceGrp, Chord, etc.
diff --git a/src/object.cpp b/src/object.cpp
index e6bde61dd9c..7b53a851893 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1018,6 +1018,9 @@ void Object::Process(Functor &functor, int deepness, bool skipFirst)
         return;
     }
 
+    // Update the current score stored in the document
+    this->UpdateDocumentScore(functor.GetDirection());
+
     if (!skipFirst) {
         FunctorCode code = this->Accept(functor);
         functor.SetCode(code);
@@ -1072,6 +1075,9 @@ void Object::Process(ConstFunctor &functor, int deepness, bool skipFirst) const
         return;
     }
 
+    // Update the current score stored in the document
+    const_cast<Object *>(this)->UpdateDocumentScore(functor.GetDirection());
+
     if (!skipFirst) {
         FunctorCode code = this->Accept(functor);
         functor.SetCode(code);
@@ -1140,6 +1146,26 @@ FunctorCode Object::AcceptEnd(ConstFunctor &functor) const
     return functor.VisitObjectEnd(this);
 }
 
+void Object::UpdateDocumentScore(bool direction)
+{
+    // When we are starting a new score, we need to update the current score in the document
+    if (direction == FORWARD && this->Is(SCORE)) {
+        Score *score = vrv_cast<Score *>(this);
+        assert(score);
+        score->SetAsCurrent();
+    }
+    // We need to do the same in backward direction through the PageMilestoneEnd::m_start
+    else if (direction == BACKWARD && this->Is(PAGE_MILESTONE_END)) {
+        PageMilestoneEnd *elementEnd = vrv_cast<PageMilestoneEnd *>(this);
+        assert(elementEnd);
+        if (elementEnd->GetStart() && elementEnd->GetStart()->Is(SCORE)) {
+            Score *score = vrv_cast<Score *>(elementEnd->GetStart());
+            assert(score);
+            score->SetAsCurrent();
+        }
+    }
+}
+
 bool Object::SkipChildren(bool visibleOnly) const
 {
     if (visibleOnly) {
diff --git a/src/page.cpp b/src/page.cpp
index 5e3bb7ff276..c34d9ceff04 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -378,9 +378,6 @@ void Page::LayOutHorizontally()
     view.SetPage(this->GetIdx(), false);
     view.DrawCurrentPage(&bBoxDC, false);
 
-    // Get the scoreDef at the beginning of the page
-    ScoreDef *scoreDef = m_score->GetScoreDef();
-
     // Adjust the position of outside articulations
     AdjustArticFunctor adjustArtic(doc);
     this->Process(adjustArtic);
@@ -388,16 +385,16 @@ void Page::LayOutHorizontally()
     // Adjust the x position of the LayerElement where multiple layers collide
     // Look at each LayerElement and change the m_xShift if the bounding box is overlapping
     // For the first iteration align elements without taking dots into consideration
-    AdjustLayersFunctor adjustLayers(doc, scoreDef->GetStaffNs());
+    AdjustLayersFunctor adjustLayers(doc, doc->GetCurrentScoreDef()->GetStaffNs());
     this->Process(adjustLayers);
 
     // Adjust dots for the multiple layers. Try to align dots that can be grouped together when layers collide,
     // otherwise keep their relative positioning
-    AdjustDotsFunctor adjustDots(doc, scoreDef->GetStaffNs());
+    AdjustDotsFunctor adjustDots(doc, doc->GetCurrentScoreDef()->GetStaffNs());
     this->Process(adjustDots);
 
     // Adjust layers again, this time including dots positioning
-    AdjustLayersFunctor adjustLayersWithDots(doc, scoreDef->GetStaffNs());
+    AdjustLayersFunctor adjustLayersWithDots(doc, doc->GetCurrentScoreDef()->GetStaffNs());
     adjustLayersWithDots.IgnoreDots(false);
     this->Process(adjustLayersWithDots);
 
@@ -407,7 +404,7 @@ void Page::LayOutHorizontally()
 
     // Adjust the X shift of the Alignment looking at the bounding boxes
     // Look at each LayerElement and change the m_xShift if the bounding box is overlapping
-    AdjustXPosFunctor adjustXPos(doc, scoreDef->GetStaffNs());
+    AdjustXPosFunctor adjustXPos(doc, doc->GetCurrentScoreDef()->GetStaffNs());
     adjustXPos.SetExcluded({ TABDURSYM });
     this->Process(adjustXPos);
 
@@ -419,7 +416,7 @@ void Page::LayOutHorizontally()
 
     // Adjust the X shift of the Alignment looking at the bounding boxes
     // Look at each LayerElement and change the m_xShift if the bounding box is overlapping
-    AdjustGraceXPosFunctor adjustGraceXPos(doc, scoreDef->GetStaffNs());
+    AdjustGraceXPosFunctor adjustGraceXPos(doc, doc->GetCurrentScoreDef()->GetStaffNs());
     this->Process(adjustGraceXPos);
 
     // Adjust the spacing of clef changes since they are skipped in AdjustXPos
@@ -555,6 +552,8 @@ void Page::LayOutVertically()
         this->Process(adjustSlurs);
     }
 
+    doc->SetCurrentScore(this->m_score);
+
     if (this->GetHeader()) {
         this->GetHeader()->AdjustRunningElementYPos();
     }
diff --git a/src/preparedatafunctor.cpp b/src/preparedatafunctor.cpp
index e83c58fa565..7b5f19b594b 100644
--- a/src/preparedatafunctor.cpp
+++ b/src/preparedatafunctor.cpp
@@ -1360,10 +1360,10 @@ FunctorCode PrepareRptFunctor::VisitStaff(Staff *staff)
     }
 
     // This is happening only for the first staff element of the staff @n
-    ScoreDef *scoreDef = m_doc->GetCorrespondingScore(staff)->GetScoreDef();
-    if (StaffDef *staffDef = scoreDef->GetStaffDef(staff->GetN())) {
+    if (StaffDef *staffDef = m_doc->GetCurrentScoreDef()->GetStaffDef(staff->GetN())) {
         const bool hideNumber = (staffDef->GetMultiNumber() == BOOLEAN_false)
-            || ((staffDef->GetMultiNumber() != BOOLEAN_true) && (scoreDef->GetMultiNumber() == BOOLEAN_false));
+            || ((staffDef->GetMultiNumber() != BOOLEAN_true)
+                && (m_doc->GetCurrentScoreDef()->GetMultiNumber() == BOOLEAN_false));
         if (hideNumber) {
             // Set it just in case, but stopping the functor should do it for this staff @n
             m_multiNumber = BOOLEAN_false;
diff --git a/src/score.cpp b/src/score.cpp
index 3e6886578c8..fb10abcd573 100644
--- a/src/score.cpp
+++ b/src/score.cpp
@@ -86,6 +86,16 @@ bool Score::IsSupportedChild(Object *child)
     return true;
 }
 
+void Score::SetAsCurrent()
+{
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
+    // The doc can be NULL when doing the castoff and the pages are no attached to the doc
+    // If such cases, it will not matter not to have the current scoreDef in the doc
+    if (doc) {
+        doc->SetCurrentScore(this);
+    }
+}
+
 void Score::CalcRunningElementHeight(Doc *doc)
 {
     assert(doc);
diff --git a/src/setscoredeffunctor.cpp b/src/setscoredeffunctor.cpp
index 144bc4d3248..d78d59db534 100644
--- a/src/setscoredeffunctor.cpp
+++ b/src/setscoredeffunctor.cpp
@@ -66,13 +66,12 @@ ScoreDefSetCurrentPageFunctor::ScoreDefSetCurrentPageFunctor(Doc *doc) : DocFunc
 
 FunctorCode ScoreDefSetCurrentPageFunctor::VisitPageEnd(Page *page)
 {
-    const Object *firstSystem = page->GetFirst(SYSTEM);
-    const Object *reference = firstSystem ? firstSystem : page;
-    page->m_score = m_doc->GetCorrespondingScore(reference);
-
-    const Object *lastSystem = page->GetLast(SYSTEM);
-    reference = lastSystem ? lastSystem : page;
-    page->m_scoreEnd = m_doc->GetCorrespondingScore(reference);
+    if (!page->m_score) {
+        page->m_score = m_doc->GetCurrentScore();
+    }
+    else {
+        page->m_scoreEnd = m_doc->GetCurrentScore();
+    }
 
     return FUNCTOR_CONTINUE;
 }

From 69b92ef10a786400f80816dfef21a566313cbc35 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 29 Sep 2023 15:51:02 +0200
Subject: [PATCH 10/18] Fix mensur and metersig not taken into account in MIDI
 output. Relates to #3520

---
 src/midifunctor.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/midifunctor.cpp b/src/midifunctor.cpp
index 788f70e7279..b0d5ad02b04 100644
--- a/src/midifunctor.cpp
+++ b/src/midifunctor.cpp
@@ -158,6 +158,12 @@ FunctorCode InitOnsetOffsetFunctor::VisitLayerElement(LayerElement *layerElement
         m_currentScoreTime += incrementScoreTime;
         m_currentRealTimeSeconds += incrementScoreTime * 60.0 / m_currentTempo;
     }
+    else if (layerElement->Is(MENSUR)) {
+        this->m_currentMensur = vrv_cast<Mensur *>(layerElement);
+    }
+    else if (layerElement->Is(METERSIG)) {
+        this->m_currentMeterSig = vrv_cast<MeterSig *>(layerElement);
+    }
 
     return FUNCTOR_CONTINUE;
 }

From 6fb5fdf60e1153fdf8ee3ef1d0dee8a192197ca8 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 30 Sep 2023 19:10:04 +0200
Subject: [PATCH 11/18] Fix position of mensural dots at the end of a system

Fixes #3524
---
 include/vrv/preparedatafunctor.h |  3 ++-
 src/preparedatafunctor.cpp       | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/vrv/preparedatafunctor.h b/include/vrv/preparedatafunctor.h
index 99803f51d6a..412ef9f3918 100644
--- a/include/vrv/preparedatafunctor.h
+++ b/include/vrv/preparedatafunctor.h
@@ -620,7 +620,7 @@ class PreparePointersByLayerFunctor : public Functor {
     /*
      * Abstract base implementation
      */
-    bool ImplementsEndInterface() const override { return false; }
+    bool ImplementsEndInterface() const override { return true; }
 
     /*
      * Functor interface
@@ -628,6 +628,7 @@ class PreparePointersByLayerFunctor : public Functor {
     ///@{
     FunctorCode VisitDot(Dot *dot) override;
     FunctorCode VisitLayerElement(LayerElement *layerElement) override;
+    FunctorCode VisitMeasureEnd(Measure *measure) override;
     ///@}
 
 protected:
diff --git a/src/preparedatafunctor.cpp b/src/preparedatafunctor.cpp
index 7b5f19b594b..74e18ae3f57 100644
--- a/src/preparedatafunctor.cpp
+++ b/src/preparedatafunctor.cpp
@@ -960,6 +960,16 @@ FunctorCode PreparePointersByLayerFunctor::VisitLayerElement(LayerElement *layer
     return FUNCTOR_CONTINUE;
 }
 
+FunctorCode PreparePointersByLayerFunctor::VisitMeasureEnd(Measure *measure)
+{
+    if (m_lastDot) {
+        m_lastDot->m_drawingNextElement = measure->GetRightBarLine();
+        m_lastDot = NULL;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 //----------------------------------------------------------------------------
 // PrepareLyricsFunctor
 //----------------------------------------------------------------------------

From 48819e0e5d9c02d0e4441492a8b1d833274ef10c Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 1 Oct 2023 11:34:47 +0200
Subject: [PATCH 12/18] Fix wrong attribute class registration for ending

Closes #3496
---
 src/ending.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ending.cpp b/src/ending.cpp
index b98534f944c..48745b32a28 100644
--- a/src/ending.cpp
+++ b/src/ending.cpp
@@ -40,7 +40,7 @@ Ending::Ending()
     this->RegisterAttClass(ATT_LABELLED);
     this->RegisterAttClass(ATT_LINEREND);
     this->RegisterAttClass(ATT_LINERENDBASE);
-    this->RegisterAttClass(ATT_NINTEGER);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
     this->Reset();
 }

From ec0b5ef6feec3827fa2ad670259d8f28ce20a9ee Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 1 Oct 2023 18:36:37 +0200
Subject: [PATCH 13/18] Fix symbol scaling in tablature

* Closes #3506
---
 src/view_element.cpp | 101 +++++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 48 deletions(-)

diff --git a/src/view_element.cpp b/src/view_element.cpp
index 46033f26f52..e35009ed723 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -1157,6 +1157,8 @@ void View::DrawMRest(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     MRest *mRest = vrv_cast<MRest *>(element);
     assert(mRest);
 
+    const int staffSize = staff->GetDrawingStaffNotationSize();
+
     dc->StartGraphic(element, "", element->GetID());
 
     mRest->CenterDrawingX();
@@ -1164,25 +1166,24 @@ void View::DrawMRest(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     const bool drawingCueSize = mRest->GetDrawingCueSize();
     int x = mRest->GetDrawingX();
     int y = (measure->m_measureAligner.GetMaxTime() >= (DUR_MAX * 2))
-        ? element->GetDrawingY() - m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)
+        ? element->GetDrawingY() - m_doc->GetDrawingDoubleUnit(staffSize)
         : element->GetDrawingY();
     char32_t rest
         = (measure->m_measureAligner.GetMaxTime() >= (DUR_MAX * 2)) ? SMUFL_E4E2_restDoubleWhole : SMUFL_E4E3_restWhole;
 
-    x -= m_doc->GetGlyphWidth(rest, staff->m_drawingStaffSize, drawingCueSize) / 2;
+    x -= m_doc->GetGlyphWidth(rest, staffSize, drawingCueSize) / 2;
 
-    this->DrawSmuflCode(dc, x, y, rest, staff->m_drawingStaffSize, drawingCueSize);
+    this->DrawSmuflCode(dc, x, y, rest, staffSize, drawingCueSize);
 
     // single legder line for whole rest glyphs
     if ((measure->m_measureAligner.GetMaxTime() < (DUR_MAX * 2))
         && (y > staff->GetDrawingY()
-            || y < staff->GetDrawingY()
-                    - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize))) {
-        const int width = m_doc->GetGlyphWidth(rest, staff->m_drawingStaffSize, drawingCueSize);
+            || y < staff->GetDrawingY() - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize))) {
+        const int width = m_doc->GetGlyphWidth(rest, staffSize, drawingCueSize);
         int ledgerLineThickness
-            = m_doc->GetOptions()->m_ledgerLineThickness.GetValue() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            = m_doc->GetOptions()->m_ledgerLineThickness.GetValue() * m_doc->GetDrawingUnit(staffSize);
         int ledgerLineExtension
-            = m_doc->GetOptions()->m_ledgerLineExtension.GetValue() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            = m_doc->GetOptions()->m_ledgerLineExtension.GetValue() * m_doc->GetDrawingUnit(staffSize);
         if (drawingCueSize) {
             ledgerLineThickness *= m_doc->GetOptions()->m_graceFactor.GetValue();
             ledgerLineExtension *= m_doc->GetOptions()->m_graceFactor.GetValue();
@@ -1209,6 +1210,8 @@ void View::DrawMRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
 
     mRpt->CenterDrawingX();
 
+    const int staffSize = staff->GetDrawingStaffNotationSize();
+
     dc->StartGraphic(element, "", element->GetID());
 
     this->DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E500_repeat1Bar, 0, false, staff);
@@ -1216,12 +1219,11 @@ void View::DrawMRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     // draw the measure count
     const int mRptNum = mRpt->HasNum() ? mRpt->GetNum() : mRpt->m_drawingMeasureCount;
     if ((mRptNum > 0) && (mRpt->GetNumVisible() != BOOLEAN_false)) {
-        dc->SetFont(m_doc->GetDrawingSmuflFont(staff->m_drawingStaffSize, false));
+        dc->SetFont(m_doc->GetDrawingSmuflFont(staffSize, false));
         // calculate the extend of the number
         TextExtend extend;
         const std::u32string figures = this->IntToTupletFigures(mRptNum);
         dc->GetSmuflTextExtent(figures, &extend);
-        const int staffSize = staff->m_drawingStaffSize;
         const int staffHeight = (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize);
         const int offset = std::max(m_doc->GetGlyphHeight(SMUFL_E500_repeat1Bar, staffSize, false) - staffHeight, 0);
         int yNum = staff->GetDrawingY() + m_doc->GetDrawingUnit(staffSize) + offset / 2;
@@ -1285,6 +1287,9 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     multiRest->CenterDrawingX();
 
+    const int staffNotationSize = staff->GetDrawingStaffNotationSize();
+    const int staffSize = staff->m_drawingStaffSize;
+
     dc->StartGraphic(element, "", element->GetID());
 
     int measureWidth = measure->GetInnerWidth();
@@ -1305,24 +1310,23 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
     const int num = multiRest->HasNum() ? std::min(multiRest->GetNum(), 999) : 1;
 
     const int multiRestThickness
-        = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * m_doc->GetOptions()->m_multiRestThickness.GetValue();
+        = m_doc->GetDrawingUnit(staffNotationSize) * m_doc->GetOptions()->m_multiRestThickness.GetValue();
     // Position centered in staff
-    int y2 = staff->GetDrawingY() - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - 1)
+    int y2 = staff->GetDrawingY() - m_doc->GetDrawingUnit(staffSize) * (staff->m_drawingLines - 1)
         - multiRestThickness / 2;
     if (multiRest->HasLoc()) {
-        y2 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - 1 - multiRest->GetLoc());
+        y2 -= m_doc->GetDrawingUnit(staffSize) * (staff->m_drawingLines - 1 - multiRest->GetLoc());
     }
     int y1 = y2 + multiRestThickness;
 
     if (multiRest->UseBlockStyle(m_doc)) {
         // This is 1/2 the length of the black rectangle
-        int width = measureWidth - 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+        int width = measureWidth - 2 * m_doc->GetDrawingDoubleUnit(staffNotationSize);
         if (multiRest->HasWidth() && multiRest->AttWidth::GetWidth().GetType() == MEASUREMENTTYPE_vu) {
-            const int fixedWidth
-                = multiRest->AttWidth::GetWidth().GetVu() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            const int fixedWidth = multiRest->AttWidth::GetWidth().GetVu() * m_doc->GetDrawingUnit(staffNotationSize);
             width = (width > fixedWidth) ? fixedWidth : width;
         }
-        if (width > m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) * 4) {
+        if (width > m_doc->GetDrawingStemWidth(staffNotationSize) * 4) {
             // xCentered is the central point, calculate x1 and x2
             const int x1 = xCentered - width / 2;
             const int x2 = xCentered + width / 2;
@@ -1334,58 +1338,57 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
             this->DrawFilledRectangle(dc, x1, y1, x2, y2);
 
             // Draw two lines at beginning and end
-            int border = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-            this->DrawFilledRectangle(
-                dc, x1, y1 + border, x1 + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) * 2, y2 - border);
+            int border = m_doc->GetDrawingUnit(staffNotationSize);
             this->DrawFilledRectangle(
-                dc, x2 - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) * 2, y1 + border, x2, y2 - border);
+                dc, x1, y1 + border, x1 + m_doc->GetDrawingStemWidth(staffNotationSize) * 2, y2 - border);
+            this->DrawFilledRectangle(dc, x2 - m_doc->GetDrawingStemWidth(staffSize) * 2, y1 + border, x2, y2 - border);
 
             dc->ReactivateGraphic();
         }
     }
     else {
         if (staff->m_drawingLines % 2 != 0) {
-            y2 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-            y1 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            y2 += m_doc->GetDrawingUnit(staffSize);
+            y1 += m_doc->GetDrawingUnit(staffSize);
         }
 
-        const int lgWidth = m_doc->GetGlyphWidth(SMUFL_E4E1_restLonga, staff->m_drawingStaffSize, false);
-        const int brWidth = m_doc->GetGlyphWidth(SMUFL_E4E2_restDoubleWhole, staff->m_drawingStaffSize, false);
-        const int sbWidth = m_doc->GetGlyphWidth(SMUFL_E4E3_restWhole, staff->m_drawingStaffSize, false);
+        const int lgWidth = m_doc->GetGlyphWidth(SMUFL_E4E1_restLonga, staffSize, false);
+        const int brWidth = m_doc->GetGlyphWidth(SMUFL_E4E2_restDoubleWhole, staffSize, false);
+        const int sbWidth = m_doc->GetGlyphWidth(SMUFL_E4E3_restWhole, staffSize, false);
 
-        int width = (num / 4) * (lgWidth + m_doc->GetDrawingUnit(staff->m_drawingStaffSize));
-        width += ((num % 4) / 2) * (brWidth + m_doc->GetDrawingUnit(staff->m_drawingStaffSize));
-        width = (num % 2) ? width + sbWidth : width - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+        int width = (num / 4) * (lgWidth + m_doc->GetDrawingUnit(staffSize));
+        width += ((num % 4) / 2) * (brWidth + m_doc->GetDrawingUnit(staffSize));
+        width = (num % 2) ? width + sbWidth : width - m_doc->GetDrawingUnit(staffSize);
 
         int x1 = xCentered - width / 2;
 
         int count = num;
         while ((count / 4)) {
-            this->DrawSmuflCode(dc, x1, y2, SMUFL_E4E1_restLonga, staff->m_drawingStaffSize, false);
-            x1 += lgWidth + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            this->DrawSmuflCode(dc, x1, y2, SMUFL_E4E1_restLonga, staffSize, false);
+            x1 += lgWidth + m_doc->GetDrawingUnit(staffSize);
             count -= 4;
         }
         while ((count / 2)) {
-            this->DrawSmuflCode(dc, x1, y2, SMUFL_E4E2_restDoubleWhole, staff->m_drawingStaffSize, false);
-            x1 += brWidth + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            this->DrawSmuflCode(dc, x1, y2, SMUFL_E4E2_restDoubleWhole, staffSize, false);
+            x1 += brWidth + m_doc->GetDrawingUnit(staffSize);
             count -= 2;
         }
-        if (count) this->DrawSmuflCode(dc, x1, y1, SMUFL_E4E3_restWhole, staff->m_drawingStaffSize, false);
+        if (count) this->DrawSmuflCode(dc, x1, y1, SMUFL_E4E3_restWhole, staffSize, false);
     }
 
     // Draw the number
     if (multiRest->GetNumVisible() != BOOLEAN_false) {
-        dc->SetFont(m_doc->GetDrawingSmuflFont(staff->m_drawingStaffSize, false));
+        dc->SetFont(m_doc->GetDrawingSmuflFont(staffNotationSize, false));
 
-        const int staffHeight = (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-        const int offset = 3 * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+        const int staffHeight = (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize);
+        const int offset = 3 * m_doc->GetDrawingUnit(staffNotationSize);
 
         const int y = (multiRest->GetNumPlace() == STAFFREL_basic_below)
             ? std::min(staff->GetDrawingY() - staffHeight, y2) - offset
             : std::max(staff->GetDrawingY(), y1) + offset;
 
         this->DrawSmuflString(
-            dc, xCentered, y, this->IntToTimeSigFigures(num), HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
+            dc, xCentered, y, this->IntToTimeSigFigures(num), HORIZONTALALIGNMENT_center, staffNotationSize);
         dc->ResetFont();
     }
 
@@ -1522,6 +1525,7 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     if (rest->m_crossStaff) staff = rest->m_crossStaff;
 
     const bool drawingCueSize = rest->GetDrawingCueSize();
+    const int staffSize = staff->GetDrawingStaffNotationSize();
     int drawingDur = rest->GetActualDur();
     if (drawingDur == DUR_NONE) {
         if (!dc->Is(BBOX_DEVICE_CONTEXT)) {
@@ -1534,21 +1538,21 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     const int x = element->GetDrawingX();
     const int y = element->GetDrawingY();
 
-    this->DrawSmuflCode(dc, x, y, drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
+    this->DrawSmuflCode(dc, x, y, drawingGlyph, staffSize, drawingCueSize);
 
     if ((drawingDur == DUR_1 || drawingDur == DUR_2 || drawingDur == DUR_BR)) {
-        const int width = m_doc->GetGlyphWidth(drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
+        const int width = m_doc->GetGlyphWidth(drawingGlyph, staffSize, drawingCueSize);
         int ledgerLineThickness
-            = m_doc->GetOptions()->m_ledgerLineThickness.GetValue() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            = m_doc->GetOptions()->m_ledgerLineThickness.GetValue() * m_doc->GetDrawingUnit(staffSize);
         int ledgerLineExtension
-            = m_doc->GetOptions()->m_ledgerLineExtension.GetValue() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            = m_doc->GetOptions()->m_ledgerLineExtension.GetValue() * m_doc->GetDrawingUnit(staffSize);
         if (drawingCueSize) {
             ledgerLineThickness *= m_doc->GetOptions()->m_graceFactor.GetValue();
             ledgerLineExtension *= m_doc->GetOptions()->m_graceFactor.GetValue();
         }
         const int topMargin = staff->GetDrawingY();
-        const int bottomMargin = staff->GetDrawingY()
-            - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+        const int bottomMargin
+            = staff->GetDrawingY() - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize);
 
         dc->StartCustomGraphic("ledgerLines");
         // single legder line for half and whole rests
@@ -1560,7 +1564,7 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
         }
         // double ledger line for breve rests
         else if (drawingDur == DUR_BR && (y >= topMargin || y <= bottomMargin)) {
-            const int height = m_doc->GetGlyphHeight(drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
+            const int height = m_doc->GetGlyphHeight(drawingGlyph, staffSize, drawingCueSize);
             dc->DeactivateGraphicX();
             if (y != topMargin) {
                 this->DrawHorizontalLine(
@@ -2007,12 +2011,13 @@ int View::DrawMeterSigFigures(DeviceContext *dc, int x, int y, MeterSig *meterSi
 
 void View::DrawMRptPart(DeviceContext *dc, int xCentered, char32_t rptGlyph, int num, bool line, Staff *staff)
 {
+    const int staffNotationSize = staff->GetDrawingStaffNotationSize();
     const int staffSize = staff->m_drawingStaffSize;
     const int y = staff->GetDrawingY();
-    const int xSymbol = xCentered - m_doc->GetGlyphWidth(rptGlyph, staffSize, false) / 2;
+    const int xSymbol = xCentered - m_doc->GetGlyphWidth(rptGlyph, staffNotationSize, false) / 2;
     const int ySymbol = y - (staff->m_drawingLines - 1) * m_doc->GetDrawingUnit(staffSize);
 
-    this->DrawSmuflCode(dc, xSymbol, ySymbol, rptGlyph, staffSize, false);
+    this->DrawSmuflCode(dc, xSymbol, ySymbol, rptGlyph, staffNotationSize, false);
 
     if (line) {
         const int yBottom = y - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize);
@@ -2021,7 +2026,7 @@ void View::DrawMRptPart(DeviceContext *dc, int xCentered, char32_t rptGlyph, int
     }
 
     if (num > 0) {
-        dc->SetFont(m_doc->GetDrawingSmuflFont(staffSize, false));
+        dc->SetFont(m_doc->GetDrawingSmuflFont(staffNotationSize, false));
         // calculate the width of the figures
         TextExtend extend;
         const std::u32string figures = this->IntToTimeSigFigures(num);

From d827621913d44004b6780721d427044ecdaa8866 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 1 Oct 2023 18:40:32 +0200
Subject: [PATCH 14/18] Additional fixes to rpt position

---
 src/view_element.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/view_element.cpp b/src/view_element.cpp
index e35009ed723..b579be46fea 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -2031,10 +2031,10 @@ void View::DrawMRptPart(DeviceContext *dc, int xCentered, char32_t rptGlyph, int
         TextExtend extend;
         const std::u32string figures = this->IntToTimeSigFigures(num);
         dc->GetSmuflTextExtent(figures, &extend);
-        const int symHeight = m_doc->GetGlyphHeight(rptGlyph, staffSize, false);
+        const int symHeight = m_doc->GetGlyphHeight(rptGlyph, staffNotationSize, false);
         const int yNum = (y > ySymbol + symHeight / 2)
-            ? staff->GetDrawingY() + m_doc->GetDrawingUnit(staffSize) + extend.m_height / 2
-            : ySymbol + 3 * m_doc->GetDrawingUnit(staffSize) + extend.m_height / 2;
+            ? staff->GetDrawingY() + m_doc->GetDrawingUnit(staffNotationSize) + extend.m_height / 2
+            : ySymbol + 3 * m_doc->GetDrawingUnit(staffNotationSize) + extend.m_height / 2;
         dc->DrawMusicText(figures, ToDeviceContextX(xCentered - extend.m_width / 2), ToDeviceContextY(yNum));
         dc->ResetFont();
     }

From 13a49aeea6fd2ada8450117d975f4f1f71313d7a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 1 Oct 2023 18:56:26 +0200
Subject: [PATCH 15/18] Fix order in tupletSpan conversion

Fixes #3500
---
 src/iomei.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/iomei.cpp b/src/iomei.cpp
index 9f3e2b6c52f..623ef94c156 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -8046,7 +8046,7 @@ bool MEIInput::ReadTupletSpanAsTuplet(Measure *measure, pugi::xml_node tupletSpa
     // LogDebug("%d %d %s!", startIdx, endIdx, start->GetID().c_str());
     for (int i = endIdx; i >= startIdx; --i) {
         LayerElement *element = dynamic_cast<LayerElement *>(parentLayer->DetachChild(i));
-        if (element) tuplet->AddChild(element);
+        if (element) tuplet->InsertChild(element, 0);
     }
     parentLayer->InsertChild(tuplet, startIdx);
 

From 449a5a31785e98d863b13bd16f69e8b52280f093 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 1 Oct 2023 18:58:47 +0200
Subject: [PATCH 16/18] Fix barline width in tablature repeat

---
 src/view_element.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view_element.cpp b/src/view_element.cpp
index b579be46fea..9072bfbdadf 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -2022,7 +2022,7 @@ void View::DrawMRptPart(DeviceContext *dc, int xCentered, char32_t rptGlyph, int
     if (line) {
         const int yBottom = y - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize);
         const int offset = (y == ySymbol) ? m_doc->GetDrawingDoubleUnit(staffSize) : 0;
-        this->DrawVerticalLine(dc, y + offset, yBottom - offset, xCentered, m_doc->GetDrawingBarLineWidth(staffSize));
+        this->DrawVerticalLine(dc, y + offset, yBottom - offset, xCentered, m_doc->GetDrawingBarLineWidth(staffNotationSize));
     }
 
     if (num > 0) {

From c2049bda8c8f6f277082d8fb6737ff698771b78c Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 2 Oct 2023 08:06:11 +0200
Subject: [PATCH 17/18] Fix formatting

---
 src/view_element.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/view_element.cpp b/src/view_element.cpp
index 9072bfbdadf..5cad710a7e9 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -2022,7 +2022,8 @@ void View::DrawMRptPart(DeviceContext *dc, int xCentered, char32_t rptGlyph, int
     if (line) {
         const int yBottom = y - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize);
         const int offset = (y == ySymbol) ? m_doc->GetDrawingDoubleUnit(staffSize) : 0;
-        this->DrawVerticalLine(dc, y + offset, yBottom - offset, xCentered, m_doc->GetDrawingBarLineWidth(staffNotationSize));
+        this->DrawVerticalLine(
+            dc, y + offset, yBottom - offset, xCentered, m_doc->GetDrawingBarLineWidth(staffNotationSize));
     }
 
     if (num > 0) {

From 27dc692d7723c98ede9fc72ecaac6e9f471a6522 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 2 Oct 2023 10:58:40 +0200
Subject: [PATCH 18/18] Fix spacing with dots preventing justification

---
 src/view_element.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/view_element.cpp b/src/view_element.cpp
index 5cad710a7e9..56a19e03251 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -828,15 +828,21 @@ void View::DrawDot(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
             if (dot->m_drawingPreviousElement && !dot->m_drawingNextElement) {
                 x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 7 / 2;
                 y = dot->m_drawingPreviousElement->GetDrawingY();
+                this->DrawDotsPart(dc, x, y, 1, staff);
             }
             if (dot->m_drawingPreviousElement && dot->m_drawingNextElement) {
+                // Do not take into account the spacing since it is place in-between
+                dc->DeactivateGraphicX();
                 x += ((dot->m_drawingNextElement->GetDrawingX() - dot->m_drawingPreviousElement->GetDrawingX()) / 2);
                 x += dot->m_drawingPreviousElement->GetDrawingRadius(m_doc);
                 y = dot->m_drawingPreviousElement->GetDrawingY();
+                this->DrawDotsPart(dc, x, y, 1, staff);
+                dc->ReactivateGraphic();
             }
         }
-
-        this->DrawDotsPart(dc, x, y, 1, staff);
+        else {
+            this->DrawDotsPart(dc, x, y, 1, staff);
+        }
     }
 
     dc->EndGraphic(element, this);