Merge pull request #3564 from DDMAL/develop

Integrate lates changes from DDMAL
rism-digital · Dec 28, 2023 · dab41c5 · dab41c5
2 parents 30563af + 11e013d
commit dab41c5
Show file tree

Hide file tree

Showing 14 changed files with 677 additions and 669 deletions.
diff --git a/include/vrv/doc.h b/include/vrv/doc.h
@@ -114,6 +114,10 @@ class Doc : public Object {
     ///@{
     DocType GetType() const { return m_type; }
     void SetType(DocType type);
+    bool IsFacs() const { return (m_type == Facs); }
+    bool IsRaw() const { return (m_type == Raw); }
+    bool IsRendering() const { return (m_type == Rendering); }
+    bool IsTranscription() const { return (m_type == Transcription); }
     ///@}
 
     /**

diff --git a/include/vrv/editortoolkit_neume.h b/include/vrv/editortoolkit_neume.h
@@ -31,8 +31,8 @@ namespace vrv {
 class EditorToolkitNeume : public EditorToolkit {
 public:
     EditorToolkitNeume(Doc *doc, View *view) : EditorToolkit(doc, view) {}
-    bool ParseEditorAction(const std::string &json_editorAction);
-    virtual std::string EditInfo() { return m_infoObject.json(); };
+    bool ParseEditorAction(const std::string &json_editorAction) override;
+    std::string EditInfo() override;
 
     /**
      * Experimental editor functions.
@@ -44,6 +44,7 @@ class EditorToolkitNeume : public EditorToolkit {
     bool Insert(std::string elementType, std::string staffId, int ulx, int uly, int lrx, int lry,
         std::vector<std::pair<std::string, std::string>> attributes);
     bool InsertToSyllable(std::string elementId);
+    bool MatchHeight(std::string elementId);
     bool Merge(std::vector<std::string> elementIds);
     bool MoveOutsideSyllable(std::string elementId);
     bool Set(std::string elementId, std::string attrType, std::string attrValue);
@@ -54,6 +55,7 @@ class EditorToolkitNeume : public EditorToolkit {
     bool Remove(std::string elementId);
     bool Resize(std::string elementId, int ulx, int uly, int lrx, int lry, float resize = NAN);
     bool Group(std::string groupType, std::vector<std::string> elementIds);
+    void UnlinkSyllable(Syllable *syllable);
     bool Ungroup(std::string groupType, std::vector<std::string> elementIds);
     bool ChangeGroup(std::string elementId, std::string contour);
     bool ToggleLigature(std::vector<std::string> elementIds);
@@ -72,6 +74,7 @@ class EditorToolkitNeume : public EditorToolkit {
     bool ParseInsertAction(jsonxx::Object param, std::string *elementType, std::string *staffId, int *ulx, int *uly,
         int *lrx, int *lry, std::vector<std::pair<std::string, std::string>> *attributes);
     bool ParseInsertToSyllableAction(jsonxx::Object param, std::string *elementId);
+    bool ParseMatchHeightAction(jsonxx::Object param, std::string *elementId);
     bool ParseMergeAction(jsonxx::Object param, std::vector<std::string> *elementIds);
     bool ParseMoveOutsideSyllableAction(jsonxx::Object param, std::string *elementId);
     bool ParseSetAction(jsonxx::Object param, std::string *elementId, std::string *attrType, std::string *attrValue);
@@ -98,9 +101,6 @@ class EditorToolkitNeume : public EditorToolkit {
     bool AdjustPitchFromPosition(Object *obj, Clef *clef = NULL);
     bool AdjustClefLineFromPosition(Clef *clef, Staff *staff = NULL);
     ///@}
-
-private:
-    jsonxx::Object m_infoObject;
 };
 
 //--------------------------------------------------------------------------------

diff --git a/src/doc.cpp b/src/doc.cpp
@@ -869,7 +869,7 @@ void Doc::PrepareData()
     }
 
     /************ Resolve @facs ************/
-    if (this->GetType() == Facs) {
+    if (this->IsFacs()) {
         // Associate zones with elements
         PrepareFacsimileFunctor prepareFacsimile(this->GetFacsimile());
         this->Process(prepareFacsimile);
@@ -1281,10 +1281,10 @@ void Doc::ConvertToCastOffMensuralDoc(bool castOff)
     if (!m_isMensuralMusicOnly) return;
 
     // Do not convert transcription files
-    if (this->GetType() == Transcription) return;
+    if (this->IsTranscription()) return;
 
     // Do not convert facs files
-    if (this->GetType() == Facs) return;
+    if (this->IsFacs()) return;
 
     // We are converting to measure music in a definite way
     if (this->GetOptions()->m_mensuralToMeasure.GetValue()) {
@@ -2088,7 +2088,7 @@ int Doc::GetAdjustedDrawingPageHeight() const
 {
     assert(m_drawingPage);
 
-    if ((this->GetType() == Transcription) || (this->GetType() == Facs)) {
+    if (this->IsTranscription() || this->IsFacs()) {
         return m_drawingPage->m_pageHeight / DEFINITION_FACTOR;
     }
 
@@ -2100,7 +2100,7 @@ int Doc::GetAdjustedDrawingPageWidth() const
 {
     assert(m_drawingPage);
 
-    if ((this->GetType() == Transcription) || (this->GetType() == Facs)) {
+    if (this->IsTranscription() || this->IsFacs()) {
         return m_drawingPage->m_pageWidth / DEFINITION_FACTOR;
     }