v0.9.72-alpha1-step-4

jacques-menu · Dec 18, 2024 · 4d32ba2 · 4d32ba2
1 parent 8a29c4c
commit 4d32ba2
Show file tree

Hide file tree

Showing 124 changed files with 840 additions and 17,606 deletions.
diff --git a/MusicFormatsVersionNumber.txt b/MusicFormatsVersionNumber.txt
@@ -1 +1 @@
-v0.9.72-alpha1-step-3
+v0.9.72-alpha1-step-4
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
@@ -199,7 +199,7 @@ message (STATUS "-----> MF_CLI_SAMPLES_DIR: ${MF_CLI_SAMPLES_DIR}")
 # message (STATUS "-----> MF_CLI_SERVICES_DIR: ${MF_CLI_SERVICES_DIR}")
 
 
-set (MF_SRC_FOLDERS ${MF_SRC_FOLDERS} mflibrary components languages oah wae manpage services)
+set (MF_SRC_FOLDERS ${MF_SRC_FOLDERS} mfutilities components languages oah wae manpage services)
 
 set (MF_SRC_FOLDERS ${MF_SRC_FOLDERS} interpreters/stringmatcherinterpreter interpreters/mfslinterpreter interpreters/ischemeinterpreter)
 

diff --git a/include/MusicFormatsVersionDate.h b/include/MusicFormatsVersionDate.h
@@ -1 +1 @@
-#define MUSICFORMATS_VERSION_DATE "December 17, 2024"
+#define MUSICFORMATS_VERSION_DATE "December 18, 2024"
diff --git a/include/MusicFormatsVersionNumber.h b/include/MusicFormatsVersionNumber.h
@@ -1 +1 @@
-#define MUSICFORMATS_VERSION_NUMBER "v0.9.72-alpha1-step-2"
+#define MUSICFORMATS_VERSION_NUMBER "v0.9.72-alpha1-step-3"
diff --git a/include/mflibrary/mfAssert.h → include/mfutilities/mfAssert.h b/include/mflibrary/mfAssert.h → include/mfutilities/mfAssert.h
diff --git a/include/mflibrary/mfBool.h → include/mfutilities/mfBool.h b/include/mflibrary/mfBool.h → include/mfutilities/mfBool.h
diff --git a/include/mflibrary/mfConstants.h → include/mfutilities/mfConstants.h b/include/mflibrary/mfConstants.h → include/mfutilities/mfConstants.h
@@ -87,7 +87,7 @@ EXP extern std::string mfMeasureNumberAsString (std::string measureNumber);
 
 constexpr int K_WHOLE_NOTES_NUMERATOR_UNKNOWN_ = 0;
 
-EXP extern const msrWholeNotes K_WHOLE_NOTES_UNKNOWN____;
+EXP extern const msrWholeNotes K_WHOLE_NOTES_UNKNOWN_;
 
 EXP extern const std::string
   kWholeNotePrefix,
@@ -122,13 +122,6 @@ EXP extern std::string mfStanzaNumberAsString (std::string stanzaNumber);
 
 constexpr int K_MF_NAMES_LIST_MAX_LENGTH = 50;
 
-// OAH layout settings
-//______________________________________________________________________________
-constexpr int K_OAH_ELEMENTS_INDENTER_OFFSET = 3;
-  // indent a bit more for readability
-
-constexpr int K_OAH_FIELD_WIDTH = 40;
-
 
 }
 

diff --git a/include/mflibrary/mfEnumAll.h → include/mfutilities/mfEnumAll.h b/include/mflibrary/mfEnumAll.h → include/mfutilities/mfEnumAll.h
diff --git a/include/mflibrary/mfExceptions.h → include/mfutilities/mfExceptions.h b/include/mflibrary/mfExceptions.h → include/mfutilities/mfExceptions.h
diff --git a/include/mflibrary/mfIndentedTextOutput.h → include/mfutilities/mfIndentedTextOutput.h b/include/mflibrary/mfIndentedTextOutput.h → include/mfutilities/mfIndentedTextOutput.h
diff --git a/include/mflibrary/mfInitialization.h → include/mfutilities/mfInitialization.h b/include/mflibrary/mfInitialization.h → include/mfutilities/mfInitialization.h
diff --git a/include/mflibrary/mfInputLinesRange.h → include/mfutilities/mfInputLinesRange.h b/include/mflibrary/mfInputLinesRange.h → include/mfutilities/mfInputLinesRange.h
diff --git a/include/mflibrary/mfLibraryComponent.h → include/mfutilities/mfLibraryComponent.h b/include/mflibrary/mfLibraryComponent.h → include/mfutilities/mfLibraryComponent.h
diff --git a/include/mflibrary/mfList.h → include/mfutilities/mfList.h b/include/mflibrary/mfList.h → include/mfutilities/mfList.h
diff --git a/include/mflibrary/mfMultiGenerationOah.h → include/mfutilities/mfMultiGenerationOah.h b/include/mflibrary/mfMultiGenerationOah.h → include/mfutilities/mfMultiGenerationOah.h
diff --git a/include/mflibrary/mfMusicformatsErrors.h → include/mfutilities/mfMusicformatsErrors.h b/include/mflibrary/mfMusicformatsErrors.h → include/mfutilities/mfMusicformatsErrors.h
diff --git a/include/mflibrary/mfOnOff.h → include/mfutilities/mfOnOff.h b/include/mflibrary/mfOnOff.h → include/mfutilities/mfOnOff.h
diff --git a/include/mflibrary/mfOutputFileOah.h → include/mfutilities/mfOutputFileOah.h b/include/mflibrary/mfOutputFileOah.h → include/mfutilities/mfOutputFileOah.h
diff --git a/include/mflibrary/mfPair.h → include/mfutilities/mfPair.h b/include/mflibrary/mfPair.h → include/mfutilities/mfPair.h
diff --git a/include/mflibrary/mfPasses.h → include/mfutilities/mfPasses.h b/include/mflibrary/mfPasses.h → include/mfutilities/mfPasses.h
diff --git a/include/mflibrary/mfPreprocessorSettings.h → include/mfutilities/mfPreprocessorSettings.h b/include/mflibrary/mfPreprocessorSettings.h → include/mfutilities/mfPreprocessorSettings.h
diff --git a/include/mflibrary/mfRational.h → include/mfutilities/mfRational.h b/include/mflibrary/mfRational.h → include/mfutilities/mfRational.h
diff --git a/include/mflibrary/mfScoreNotations.h → include/mfutilities/mfScoreNotations.h b/include/mflibrary/mfScoreNotations.h → include/mfutilities/mfScoreNotations.h
@@ -27,7 +27,7 @@ enum class msrScoreNotationKind {
 };
 
 std::string msrScoreNotationKindAsString (
-  msrScoreNotationKind lilypondScoreNotationKind);
+  msrScoreNotationKind scoreNotationKind);
 
 std::ostream& operator << (std::ostream& os, const msrScoreNotationKind& elt);
 

diff --git a/include/mflibrary/mfServices.h → include/mfutilities/mfServices.h b/include/mflibrary/mfServices.h → include/mfutilities/mfServices.h
diff --git a/include/mflibrary/mfStack.h → include/mfutilities/mfStack.h b/include/mflibrary/mfStack.h → include/mfutilities/mfStack.h
diff --git a/include/mflibrary/mfStringsHandling.h → include/mfutilities/mfStringsHandling.h b/include/mflibrary/mfStringsHandling.h → include/mfutilities/mfStringsHandling.h
diff --git a/include/mflibrary/mfSystemInterface.h → include/mfutilities/mfSystemInterface.h b/include/mflibrary/mfSystemInterface.h → include/mfutilities/mfSystemInterface.h
diff --git a/include/mflibrary/mfTest.h → include/mfutilities/mfTest.h b/include/mflibrary/mfTest.h → include/mfutilities/mfTest.h
diff --git a/include/mflibrary/mfTiming.h → include/mfutilities/mfTiming.h b/include/mflibrary/mfTiming.h → include/mfutilities/mfTiming.h
diff --git a/include/mflibrary/mfTraceOah.h → include/mfutilities/mfTraceOah.h b/include/mflibrary/mfTraceOah.h → include/mfutilities/mfTraceOah.h
diff --git a/include/mflibrary/mfWrapperTypes.h → include/mfutilities/mfWrapperTypes.h b/include/mflibrary/mfWrapperTypes.h → include/mfutilities/mfWrapperTypes.h
@@ -448,7 +448,7 @@ typedef mfValueWithNeutralValue
 //______________________________________________________________________________
 // whole notes durations
 typedef mfValueWithNeutralValue
-  <msrWholeNotes, kWholeNotePrefix, K_WHOLE_NOTES_UNKNOWN____, kWholeNoteNeutralValueString>
+  <msrWholeNotes, kWholeNotePrefix, K_WHOLE_NOTES_UNKNOWN_, kWholeNoteNeutralValueString>
     mfWohleNotes;
 
 //______________________________________________________________________________

diff --git a/src/mflibrary/mfTest.h → include/oah/oahConstants.h b/src/mflibrary/mfTest.h → include/oah/oahConstants.h
@@ -9,29 +9,30 @@
   https://github.com/jacques-menu/musicformats
 */
 
-#ifndef ___mfTest___
-#define ___mfTest___
+#ifndef ___oahConstants___
+#define ___oahConstants___
 
-#include <iostream>
+#include <string>
 
 #include "exports.h"
 
+#include "msrMoments.h"
+#include "msrNotesDurations.h"
+
 
 namespace MusicFormats
 {
 
 //______________________________________________________________________________
-/*
-  this function is meant for developpers/maintainers
-  who need to do a quick test of mfMusicFormats' behaviour for their purposes
+// OAH layout settings
 
-  such code is not supposed to be long-term living
-*/
+constexpr int K_OAH_ELEMENTS_INDENTER_OFFSET = 3;
+  // indent a bit more for readability
 
-EXP void mfTest (std::ostream& os);
+constexpr int K_OAH_FIELD_WIDTH = 40;
 
 
 }
 
 
-#endif // ___mfTest___
+#endif // ___oahConstants___
diff --git a/include/passes/mxsr2msr/mxsr2msrOah.h b/include/passes/mxsr2msr/mxsr2msrOah.h
@@ -317,7 +317,8 @@ class EXP mxsr2msrOahGroup : public oahGroup
                           getBoldWordsAtom () const
                               { return fBoldWordsAtom; }
 
-    const std::set <std::string>&    getItalicWordsSet () const
+    const std::set <std::string>&
+                          getItalicWordsSet () const
                               { return fItalicWordsSet; }
     S_oahStringSetElementAtom
                           getItalicWordsAtom () const
@@ -402,7 +403,7 @@ class EXP mxsr2msrOahGroup : public oahGroup
                           getWordsToDecrescAtom () const
                               { return fWordsToDecrescAtom; }
 
-// ties
+    // ties
     // --------------------------------------
 
     Bool                  getIgnoreTies () const
@@ -487,14 +488,20 @@ class EXP mxsr2msrOahGroup : public oahGroup
     Bool                  getTraceForward () const
                               { return fTraceForward; }
 
-    // specific trace JMI move to traceOah
+    // display
     // --------------------------------------
 
     void                  setDisplayMxsr ()
                               { fDisplayMxsr = true; }
     Bool                  getDisplayMxsr () const
                               { return fDisplayMxsr; }
 
+    S_oahBooleanAtom      getDisplayMxsrAtom () const
+                            { return fDisplayMxsrAtom; }
+
+    // specific trace JMI move to traceOah
+    // --------------------------------------
+
     void                  setTraceMxsr ()
                               { fTraceMxsr = true; }
     Bool                  getTraceMxsr () const
@@ -558,6 +565,8 @@ class EXP mxsr2msrOahGroup : public oahGroup
     // private services
     // ------------------------------------------------------
 
+    void                  initializeMxsr2msrDisplayOptions ();
+
 #ifdef MF_TRACE_IS_ENABLED
     void                  initializeMxsr2msrTraceOptions ();
 #endif // MF_TRACE_IS_ENABLED
@@ -612,7 +621,7 @@ class EXP mxsr2msrOahGroup : public oahGroup
     // private fields
     // ------------------------------------------------------
 
-    // use MXSR events (temporary from v0.9.72)
+    // use MXSR events
     // --------------------------------------
 
     Bool                  fUseMxsrEvents;
@@ -860,6 +869,11 @@ class EXP mxsr2msrOahGroup : public oahGroup
 
     Bool                  fCubase;
 
+    // display MXSR
+    // --------------------------------------
+
+    Bool                  fDisplayMxsr;
+    S_oahBooleanAtom      fDisplayMxsrAtom;
 
 #ifdef MF_TRACE_IS_ENABLED
     // specific trace
@@ -877,8 +891,6 @@ class EXP mxsr2msrOahGroup : public oahGroup
     // specific trace JMI move to traceOah JMI ??? v0.9.70
     // --------------------------------------
 
-    Bool                  fDisplayMxsr;
-
     Bool                  fTraceMxsr;
 
     // visitors

diff --git a/include/passes/mxsr2msr/mxsr2msrSkeletonBuilder.h b/include/passes/mxsr2msr/mxsr2msrSkeletonBuilder.h
@@ -508,6 +508,20 @@ class EXP mxsr2msrSkeletonBuilder :
     void                      handleBOFPartGroupsNestingBOFAndScorePartsAllocation (
                                 int inputLineNumber);
 
+    void                      sortfStartedPartGroupsListsVector (
+                                int inputLineNumber);
+
+    void                      sortStoppedPartGroupsListsVector (
+                                int inputLineNumber);
+
+    void                      handlePartGroupsStartAtIdentity (
+                                int inputLineNumber,
+                                int identity);
+
+    void                      handleThePartGroupsStoppedAtIdentity (
+                                int inputLineNumber,
+                                int identity);
+
     // parts handling
     // ------------------------------------------------------
 

diff --git a/include/representations/msr/msrNotesDurations.h b/include/representations/msr/msrNotesDurations.h
@@ -214,9 +214,6 @@ EXP msrWholeNotes msrNotesDurationKindAsWholeNotes (
 
 EXP msrNotesDurationKind wholeNotesAsNotesDurationKind (msrWholeNotes wholeNotes);
 
-//______________________________________________________________________________
-EXP extern const msrWholeNotes K_WHOLE_NOTES_UNKNOWN_;
-
 //______________________________________________________________________________
 std::string wholeNotesAndDotsNumberPitchAndOctaveAsString ( // JMI v0.9.67
   int                  inputLineNumber,

diff --git a/include/representations/msr/msrOah.h b/include/representations/msr/msrOah.h
@@ -422,12 +422,12 @@ class EXP msrOahGroup : public oahGroup
     // private services
     // ------------------------------------------------------
 
+    void                  initializeMsrDisplayOptions ();
+
 #ifdef MF_TRACE_IS_ENABLED
     void                  initializeMsrTraceOah ();
 #endif // MF_TRACE_IS_ENABLED
 
-    void                  initializeMsrDisplayOptions ();
-
     void                  initializeMsrLanguagesOptions ();
 
     void                  initializeMsrHeaderOptions ();

diff --git a/src/MusicFormatsVersionNumber.h b/src/MusicFormatsVersionNumber.h
@@ -1 +1 @@
-#define MUSICFORMATS_VERSION_NUMBER "v0.9.72-alpha1-step-3"
+#define MUSICFORMATS_VERSION_NUMBER "v0.9.72-alpha1-step-4"
diff --git a/src/converters/msdl2braille/msdl2brailleManPageOah.cpp b/src/converters/msdl2braille/msdl2brailleManPageOah.cpp
@@ -14,9 +14,9 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "msdl2brailleManPageOah.h"

diff --git a/src/converters/msdl2guido/msdl2guidoManPageOah.cpp b/src/converters/msdl2guido/msdl2guidoManPageOah.cpp
@@ -14,9 +14,9 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "msdl2guidoManPageOah.h"

diff --git a/src/converters/msdl2lilypond/msdl2lilypondManPageOah.cpp b/src/converters/msdl2lilypond/msdl2lilypondManPageOah.cpp
@@ -14,9 +14,9 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "msdl2lilypondManPageOah.h"

diff --git a/src/converters/msdl2musicxml/msdl2musicxmlManPageOah.cpp b/src/converters/msdl2musicxml/msdl2musicxmlManPageOah.cpp
@@ -14,9 +14,9 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "msdl2musicxmlManPageOah.h"

diff --git a/src/converters/msr2braille/msr2brailleManPageOah.cpp b/src/converters/msr2braille/msr2brailleManPageOah.cpp
@@ -14,11 +14,11 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
 #include "oahOah.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "msr2brailleManPageOah.h"

diff --git a/src/converters/msr2guido/msr2guidoManPageOah.cpp b/src/converters/msr2guido/msr2guidoManPageOah.cpp
@@ -14,9 +14,9 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "msr2guidoManPageOah.h"

diff --git a/src/converters/msr2lilypond/msr2lilypondManPageOah.cpp b/src/converters/msr2lilypond/msr2lilypondManPageOah.cpp
@@ -14,9 +14,9 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "msr2lilypondManPageOah.h"

diff --git a/src/converters/msr2musicxml/msr2musicxmlManPageOah.cpp b/src/converters/msr2musicxml/msr2musicxmlManPageOah.cpp
@@ -14,9 +14,9 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "msr2musicxmlManPageOah.h"

diff --git a/src/converters/musicxml2braille/musicxml2brailleManPageOah.cpp b/src/converters/musicxml2braille/musicxml2brailleManPageOah.cpp
@@ -14,9 +14,9 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "musicxml2brailleManPageOah.h"

diff --git a/src/converters/musicxml2guido/musicxml2guidoManPageOah.cpp b/src/converters/musicxml2guido/musicxml2guidoManPageOah.cpp
@@ -14,9 +14,9 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "musicxml2guidoManPageOah.h"

diff --git a/src/converters/musicxml2lilypond/musicxml2lilypondManPageOah.cpp b/src/converters/musicxml2lilypond/musicxml2lilypondManPageOah.cpp
@@ -14,11 +14,11 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
 #include "oahOah.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "musicxml2lilypondManPageOah.h"

diff --git a/src/converters/musicxml2musicxml/musicxml2musicxmlManPageOah.cpp b/src/converters/musicxml2musicxml/musicxml2musicxmlManPageOah.cpp
@@ -14,9 +14,9 @@
 
 #include <regex>
 
-#include "mfConstants.h"
 #include "mfPreprocessorSettings.h"
 
+#include "oahConstants.h"
 #include "oahEarlyOptions.h"
 
 #include "musicxml2musicxmlManPageOah.h"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define MUSICFORMATS_VERSION_DATE "December 17, 2024"
		#define MUSICFORMATS_VERSION_DATE "December 18, 2024"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define MUSICFORMATS_VERSION_NUMBER "v0.9.72-alpha1-step-2"
		#define MUSICFORMATS_VERSION_NUMBER "v0.9.72-alpha1-step-3"