Scoring up implementation as functor

include/vrv/options.h

@@ -841,6 +841,7 @@ class Options {
 
     OptionBool m_ligatureAsBracket;
     OptionBool m_mensuralToMeasure;
+    OptionBool m_mensuralScoreUp;
 
     /**
      * Additional options for passing method JSON options to the command-line

include/vrv/scoringupfunctor.h

@@ -32,7 +32,7 @@ class ScoringUpFunctor : public Functor {
     /*
      * Abstract base implementation
      */
-    bool ImplementsEndInterface() const override { return false; }
+    bool ImplementsEndInterface() const override { return true; }
 
     /*
      * Methods
@@ -41,7 +41,7 @@ class ScoringUpFunctor : public Functor {
      * @name: Divide the notes of a voice into sequences to be processed individualy
      */
     ///@{
-    void workInMensur(const ArrayOfElementDurPairs &m_dursInVoiceSameMensur, data_DURATION noteLevel);
+    void WorkInMensur(const ArrayOfElementDurPairs &m_dursInVoiceSameMensur, data_DURATION noteLevel);
     std::vector<ArrayOfElementDurPairs> SubdivideIntoBoundedSequences(
         const ArrayOfElementDurPairs &dursInVoiceSameMensur, data_DURATION boundUnit);
     void ProcessBoundedSequences(const std::vector<ArrayOfElementDurPairs> &listOfSequences, data_DURATION boundUnit);
@@ -84,7 +84,7 @@ class ScoringUpFunctor : public Functor {
      * Functor interface
      */
     ///@{
-    FunctorCode VisitLayer(Layer *layer) override;
+    FunctorCode VisitLayerEnd(Layer *layer) override;
     FunctorCode VisitLayerElement(LayerElement *layerElement) override;
     ///@}
     ///

src/iomei.cpp

@@ -4068,7 +4068,6 @@ bool MEIInput::ReadDoc(pugi::xml_node root)
         if (success) {
             m_doc->ConvertToPageBasedDoc();
             m_doc->ConvertMarkupDoc(!m_doc->GetOptions()->m_preserveAnalyticalMarkup.GetValue());
-            m_doc->ScoringUpDoc();
         }
 
         if (success && !m_hasScoreDef) {

src/options.cpp

@@ -1827,6 +1827,11 @@ Options::Options()
     m_mensuralToMeasure.Init(false);
     this->Register(&m_mensuralToMeasure, "mensuralToMeasure", &m_mensural);
 
+    m_mensuralScoreUp.SetInfo(
+        "Mensural scoring up", "Score up the mensural voices by providing a dur.quality to the notes");
+    m_mensuralScoreUp.Init(false);
+    this->Register(&m_mensuralScoreUp, "mensuralScoreUp", &m_mensural);
+
     /********* Method JSON options to the command-line *********/
 
     m_jsonCmdLineOptions.SetLabel("Method JSON options for the command-line", "7-methodJson");

src/scoringupfunctor.cpp

@@ -45,34 +45,29 @@ ScoringUpFunctor::ScoringUpFunctor() : Functor()
     std::list<std::pair<Note *, Dot *>> m_listOfPerfNotesDotsPairs = {};
 }
 
-FunctorCode ScoringUpFunctor::VisitLayer(Layer *layer)
+FunctorCode ScoringUpFunctor::VisitLayerEnd(Layer *layer)
 {
     m_currentScoreTime = 0.0;
-    m_currentMensur = layer->GetCurrentMensur();
-    /*data_MODUSMAIOR modusmaior = m_currentMensur->GetModusmaior();
-    data_MODUSMINOR modusminor = m_currentMensur->GetModusminor();
-    data_TEMPUS tempus = m_currentMensur->GetTempus();
-    data_PROLATIO prolatio = m_currentMensur->GetProlatio();*/
     // Doesn't get it from the staffDef, right?//
     if (!m_dursInVoiceSameMensur.empty()) {
         if (m_prolatio == 3) {
-            workInMensur(m_dursInVoiceSameMensur, DURATION_semibrevis);
+            WorkInMensur(m_dursInVoiceSameMensur, DURATION_semibrevis);
         }
         if (m_tempus == 3) {
-            workInMensur(m_dursInVoiceSameMensur, DURATION_brevis);
+            WorkInMensur(m_dursInVoiceSameMensur, DURATION_brevis);
         }
         if (m_modusMinor == 3) {
-            workInMensur(m_dursInVoiceSameMensur, DURATION_longa);
+            WorkInMensur(m_dursInVoiceSameMensur, DURATION_longa);
         }
         if (m_modusMaior == 3) {
-            workInMensur(m_dursInVoiceSameMensur, DURATION_maxima);
+            WorkInMensur(m_dursInVoiceSameMensur, DURATION_maxima);
         }
         m_dursInVoiceSameMensur = {}; // restart for next voice (layer)
     }
     return FUNCTOR_CONTINUE;
 }
 
-void ScoringUpFunctor::workInMensur(const ArrayOfElementDurPairs &m_dursInVoiceSameMensur, data_DURATION noteLevel)
+void ScoringUpFunctor::WorkInMensur(const ArrayOfElementDurPairs &m_dursInVoiceSameMensur, data_DURATION noteLevel)
 {
     m_listOfSequences = this->SubdivideIntoBoundedSequences(m_dursInVoiceSameMensur, noteLevel);
     this->ProcessBoundedSequences(m_listOfSequences, noteLevel);

src/toolkit.cpp

@@ -816,6 +816,9 @@ bool Toolkit::LoadData(const std::string &data, bool resetLogBuffer)
 
     // Convert pseudo-measures into distinct segments based on barLine elements
     if (m_doc.IsMensuralMusicOnly()) {
+        if (m_options->m_mensuralScoreUp.GetValue()) {
+            m_doc.ScoringUpDoc();
+        }
         m_doc.ConvertToCastOffMensuralDoc(true);
     }