Merge commit 'a3a767abd3bb254e3029498173c3854108af2aad' into develop-…

…facsimile-neume-line

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## [unreleased]
+* Support for `fTrem@unitdur` (@eNote-GmbH)
 
 ## [4.1.0] - 2023-12-15
 * Support for staves ordered by `scoreDef`

include/vrv/doc.h

@@ -162,6 +162,9 @@ class Doc : public Object {
     ///@{
     Score *GetCorrespondingScore(const Object *object);
     const Score *GetCorrespondingScore(const Object *object) const;
+    // Generic version that does not necessarily rely on precalculated visible scores
+    Score *GetCorrespondingScore(const Object *object, const std::list<Score *> &scores);
+    const Score *GetCorrespondingScore(const Object *object, const std::list<Score *> &scores) const;
     ///@}
 
     /**

include/vrv/setscoredeffunctor.h

@@ -88,6 +88,7 @@ class ScoreDefSetCurrentPageFunctor : public DocFunctor {
      */
     ///@{
     FunctorCode VisitPageEnd(Page *page) override;
+    FunctorCode VisitScore(Score *score) override;
     ///@}
 
 protected:
@@ -97,7 +98,8 @@ class ScoreDefSetCurrentPageFunctor : public DocFunctor {
 public:
     //
 private:
-    //
+    // The list of all scores
+    std::list<Score *> m_scores;
 };
 
 //----------------------------------------------------------------------------

src/doc.cpp

@@ -1294,9 +1294,6 @@ void Doc::ConvertToCastOffMensuralDoc(bool castOff)
         m_isMensuralMusicOnly = false;
     }
 
-    // Calling Doc::PrepareData is expected to collect visible scores
-    assert(m_dataPreparationDone);
-
     // Make sure the document is not cast-off
     this->UnCastOffDoc();
 
@@ -1555,10 +1552,20 @@ Score *Doc::GetCorrespondingScore(const Object *object)
 
 const Score *Doc::GetCorrespondingScore(const Object *object) const
 {
-    assert(!m_visibleScores.empty());
+    return this->GetCorrespondingScore(object, m_visibleScores);
+}
+
+Score *Doc::GetCorrespondingScore(const Object *object, const std::list<Score *> &scores)
+{
+    return const_cast<Score *>(std::as_const(*this).GetCorrespondingScore(object, scores));
+}
 
-    const Score *correspondingScore = m_visibleScores.front();
-    for (Score *score : m_visibleScores) {
+const Score *Doc::GetCorrespondingScore(const Object *object, const std::list<Score *> &scores) const
+{
+    assert(!scores.empty());
+
+    const Score *correspondingScore = scores.front();
+    for (Score *score : scores) {
         if ((score == object) || Object::IsPreOrdered(score, object)) {
             correspondingScore = score;
         }

src/iohumdrum.cpp

@@ -31612,7 +31612,6 @@ void HumdrumInput::finalizeDocument(Doc *doc)
     if (m_mens) {
         doc->SetMensuralMusicOnly(true);
         doc->m_notationType = NOTATIONTYPE_mensural;
-        doc->PrepareData();
         doc->ConvertToCastOffMensuralDoc(true);
     }
 }

src/setscoredeffunctor.cpp

@@ -68,11 +68,18 @@ FunctorCode ScoreDefSetCurrentPageFunctor::VisitPageEnd(Page *page)
 {
     const Object *firstSystem = page->GetFirst(SYSTEM);
     const Object *reference = firstSystem ? firstSystem : page;
-    page->m_score = m_doc->GetCorrespondingScore(reference);
+    page->m_score = m_doc->GetCorrespondingScore(reference, m_scores);
 
     const Object *lastSystem = page->GetLast(SYSTEM);
     reference = lastSystem ? lastSystem : page;
-    page->m_scoreEnd = m_doc->GetCorrespondingScore(reference);
+    page->m_scoreEnd = m_doc->GetCorrespondingScore(reference, m_scores);
+
+    return FUNCTOR_CONTINUE;
+}
+
+FunctorCode ScoreDefSetCurrentPageFunctor::VisitScore(Score *score)
+{
+    m_scores.push_back(score);
 
     return FUNCTOR_CONTINUE;
 }

src/verticalaligner.cpp

@@ -48,7 +48,6 @@ void SystemAligner::Reset()
     m_spacingTypes.clear();
     m_system = NULL;
 
-    ArrayOfObjects &children = this->GetChildrenForModification();
     m_bottomAlignment = new StaffAlignment();
     m_bottomAlignment->SetStaff(NULL, NULL, this->GetAboveSpacingType(NULL));
     m_bottomAlignment->SetParentSystem(this->GetSystem());

src/view_beam.cpp

@@ -150,8 +150,8 @@ void View::DrawFTremSegment(DeviceContext *dc, Staff *staff, FTrem *fTrem)
         secondElement->m_x += (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
     }
 
-    // Number of bars to draw
-    const int allBars = fTrem->GetBeams();
+    // Number of beams to draw
+    const int allBars = fTrem->HasBeams() ? fTrem->GetBeams() : fTrem->GetUnitdur() - DURATION_4;
     int floatingBars = fTrem->HasBeamsFloat() ? fTrem->GetBeamsFloat() : 0;
     int fullBars = allBars - floatingBars;