Merge pull request rism-digital#3926 from brdvd/feat/generate-transpo…

…sition-keysig Generate auxiliary KeySig during transposition
rettinghaus · Jan 31, 2025 · 25a12df · 25a12df
2 parents da06d58 + fcffeb3
commit 25a12df
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 16 deletions.
diff --git a/include/vrv/transposefunctor.h b/include/vrv/transposefunctor.h
@@ -49,10 +49,18 @@ class TransposeFunctor : public DocFunctor {
     FunctorCode VisitNote(Note *note) override;
     FunctorCode VisitRest(Rest *rest) override;
     FunctorCode VisitScore(Score *score) override;
+    FunctorCode VisitStaffDef(StaffDef *staffDef) override;
     ///@}
 
 protected:
-    //
+    /*
+     * Retrieve corresponding elements
+     */
+    ///@{
+    const KeySig *GetKeySigForStaffDef(const StaffDef *staffDef) const;
+    int GetStaffNForKeySig(const KeySig *keySig) const;
+    ///@}
+
 private:
     //
 public:

diff --git a/src/transposefunctor.cpp b/src/transposefunctor.cpp
@@ -52,15 +52,7 @@ FunctorCode TransposeFunctor::VisitHarm(Harm *harm)
 FunctorCode TransposeFunctor::VisitKeySig(KeySig *keySig)
 {
     // Store current KeySig
-    int staffN = -1;
-    const StaffDef *staffDef = vrv_cast<StaffDef *>(keySig->GetFirstAncestor(STAFFDEF));
-    if (staffDef) {
-        staffN = staffDef->GetN();
-    }
-    else {
-        const Staff *staff = keySig->GetAncestorStaff(ANCESTOR_ONLY, false);
-        if (staff) staffN = staff->GetN();
-    }
+    const int staffN = this->GetStaffNForKeySig(keySig);
     m_keySigForStaffN[staffN] = keySig;
 
     // Transpose
@@ -234,6 +226,41 @@ FunctorCode TransposeFunctor::VisitScore(Score *score)
     return FUNCTOR_CONTINUE;
 }
 
+FunctorCode TransposeFunctor::VisitStaffDef(StaffDef *staffDef)
+{
+    if (!this->GetKeySigForStaffDef(staffDef)) {
+        KeySig *keySig = new KeySig();
+        staffDef->AddChild(keySig);
+        LogWarning("Adding auxiliary KeySig for transposition");
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
+const KeySig *TransposeFunctor::GetKeySigForStaffDef(const StaffDef *staffDef) const
+{
+    const KeySig *keySig = vrv_cast<const KeySig *>(staffDef->FindDescendantByType(KEYSIG));
+    if (!keySig) {
+        const ScoreDef *scoreDef = vrv_cast<const ScoreDef *>(staffDef->GetFirstAncestor(SCOREDEF));
+        keySig = vrv_cast<const KeySig *>(scoreDef->FindDescendantByType(KEYSIG, 1));
+    }
+    return keySig;
+}
+
+int TransposeFunctor::GetStaffNForKeySig(const KeySig *keySig) const
+{
+    int staffN = -1;
+    const StaffDef *staffDef = vrv_cast<const StaffDef *>(keySig->GetFirstAncestor(STAFFDEF));
+    if (staffDef) {
+        staffN = staffDef->GetN();
+    }
+    else {
+        const Staff *staff = keySig->GetAncestorStaff(ANCESTOR_ONLY, false);
+        if (staff) staffN = staff->GetN();
+    }
+    return staffN;
+}
+
 //----------------------------------------------------------------------------
 // TransposeSelectedMdivFunctor
 //----------------------------------------------------------------------------
@@ -362,12 +389,11 @@ FunctorCode TransposeToSoundingPitchFunctor::VisitStaff(Staff *staff)
 
 FunctorCode TransposeToSoundingPitchFunctor::VisitStaffDef(StaffDef *staffDef)
 {
-    // Retrieve the key signature
-    const KeySig *keySig = vrv_cast<const KeySig *>(staffDef->FindDescendantByType(KEYSIG));
-    if (!keySig) {
-        const ScoreDef *scoreDef = vrv_cast<const ScoreDef *>(staffDef->GetFirstAncestor(SCOREDEF));
-        keySig = vrv_cast<const KeySig *>(scoreDef->FindDescendantByType(KEYSIG));
-    }
+    // Call base method (creates KeySig if missing)
+    TransposeFunctor::VisitStaffDef(staffDef);
+
+    const KeySig *keySig = this->GetKeySigForStaffDef(staffDef);
+
     // Determine and store the transposition interval (based on keySig)
     if (keySig && staffDef->HasTransSemi() && staffDef->HasN()) {
         const int fifths = keySig->GetFifthsInt();