rehearsal segno and coda support

webern · Jan 18, 2023 · 570c373 · 570c373
1 parent 816b0c5
commit 570c373
Show file tree

Hide file tree

Showing 8 changed files with 234 additions and 16 deletions.
diff --git a/Sourcecode/include/mx/api/CodaData.h b/Sourcecode/include/mx/api/CodaData.h
@@ -0,0 +1,37 @@
+// MusicXML Class Library
+// Copyright (c) by Matthew James Briggs
+// Distributed under the MIT License
+
+#pragma once
+
+#include "mx/api/ApiCommon.h"
+#include "mx/api/ColorData.h"
+#include "mx/api/PositionData.h"
+
+namespace mx
+{
+    namespace api
+    {
+        class CodaData
+        {
+        public:
+            PositionData positionData;
+            bool isColorSpecified;
+            ColorData colorData;
+
+            CodaData()
+            : positionData{}
+            , isColorSpecified{ false }
+            , colorData{}
+            {
+            }
+        };
+
+        MXAPI_EQUALS_BEGIN( CodaData )
+        MXAPI_EQUALS_MEMBER( positionData )
+        MXAPI_EQUALS_MEMBER( isColorSpecified )
+        MXAPI_EQUALS_MEMBER( colorData )
+        MXAPI_EQUALS_END;
+        MXAPI_NOT_EQUALS_AND_VECTORS( CodaData );
+    }
+}
diff --git a/Sourcecode/include/mx/api/DirectionData.h b/Sourcecode/include/mx/api/DirectionData.h
@@ -5,12 +5,15 @@
 #pragma once
 
 #include "mx/api/ApiCommon.h"
-#include "mx/api/WedgeData.h"
+#include "mx/api/ChordData.h"
+#include "mx/api/CodaData.h"
 #include "mx/api/MarkData.h"
-#include "mx/api/TempoData.h"
 #include "mx/api/OttavaData.h"
+#include "mx/api/RehearsalData.h"
+#include "mx/api/SegnoData.h"
+#include "mx/api/TempoData.h"
+#include "mx/api/WedgeData.h"
 #include "mx/api/WordsData.h"
-#include "mx/api/ChordData.h"
 
 namespace mx
 {
@@ -62,6 +65,9 @@ namespace mx
             std::vector<SpannerStop> bracketStops;
             std::vector<WordsData> words;
             std::vector<ChordData> chords;
+            std::vector<SegnoData> segnos;
+            std::vector<CodaData> codas;
+            std::vector<RehearsalData> rehearsals;
 
             DirectionData()
             : tickTimePosition{ 0 }
@@ -77,6 +83,7 @@ namespace mx
             , bracketStops{}
             , words{}
             , chords{}
+            , segnos{}
             {
 
             }
@@ -93,7 +100,9 @@ namespace mx
             directionData.tempos.size() == 0 &&
             directionData.ottavaStarts.size() == 0 &&
             directionData.ottavaStops.size() == 0 &&
-            directionData.words.size() == 0;
+            directionData.words.size() == 0 &&
+            directionData.segnos.size() == 0 &&
+            directionData.codas.size() == 0;
         }
 
         MXAPI_EQUALS_BEGIN( DirectionData )
@@ -111,6 +120,8 @@ namespace mx
         MXAPI_EQUALS_MEMBER( bracketStops )
         MXAPI_EQUALS_MEMBER( words )
         MXAPI_EQUALS_MEMBER( chords )
+        MXAPI_EQUALS_MEMBER( segnos )
+        MXAPI_EQUALS_MEMBER( codas )
         MXAPI_EQUALS_END;
         MXAPI_NOT_EQUALS_AND_VECTORS( DirectionData );
 	}

diff --git a/Sourcecode/include/mx/api/RehearsalData.h b/Sourcecode/include/mx/api/RehearsalData.h
@@ -0,0 +1,46 @@
+// MusicXML Class Library
+// Copyright (c) by Matthew James Briggs
+// Distributed under the MIT License
+
+#pragma once
+
+#include "mx/api/ApiCommon.h"
+#include "mx/api/ColorData.h"
+#include "mx/api/PositionData.h"
+
+namespace mx
+{
+    namespace api
+    {
+        class RehearsalData
+        {
+        public:
+            std::string text;
+            PositionData positionData;
+            bool isColorSpecified;
+            ColorData colorData;
+            FontData fontData;
+
+            // Additional data about enclosing shape is available
+            // but not supported at this time.
+
+            RehearsalData()
+            : text{}
+            , positionData{}
+            , isColorSpecified{ false }
+            , colorData{}
+            , fontData{}
+            {
+            }
+        };
+
+        MXAPI_EQUALS_BEGIN( RehearsalData )
+        MXAPI_EQUALS_MEMBER( text )
+        MXAPI_EQUALS_MEMBER( positionData )
+        MXAPI_EQUALS_MEMBER( isColorSpecified )
+        MXAPI_EQUALS_MEMBER( colorData )
+        MXAPI_EQUALS_MEMBER( fontData )
+        MXAPI_EQUALS_END;
+        MXAPI_NOT_EQUALS_AND_VECTORS( RehearsalData );
+    }
+}
diff --git a/Sourcecode/include/mx/api/SegnoData.h b/Sourcecode/include/mx/api/SegnoData.h
@@ -0,0 +1,37 @@
+// MusicXML Class Library
+// Copyright (c) by Matthew James Briggs
+// Distributed under the MIT License
+
+#pragma once
+
+#include "mx/api/ApiCommon.h"
+#include "mx/api/ColorData.h"
+#include "mx/api/PositionData.h"
+
+namespace mx
+{
+    namespace api
+    {
+        class SegnoData
+        {
+        public:
+            PositionData positionData;
+            bool isColorSpecified;
+            ColorData colorData;
+
+            SegnoData()
+            : positionData{}
+            , isColorSpecified{ false }
+            , colorData{}
+            {
+            }
+        };
+
+        MXAPI_EQUALS_BEGIN( SegnoData )
+        MXAPI_EQUALS_MEMBER( positionData )
+        MXAPI_EQUALS_MEMBER( isColorSpecified )
+        MXAPI_EQUALS_MEMBER( colorData )
+        MXAPI_EQUALS_END;
+        MXAPI_NOT_EQUALS_AND_VECTORS( SegnoData );
+    }
+}
diff --git a/Sourcecode/private/cpul/catch.h b/Sourcecode/private/cpul/catch.h
@@ -8642,7 +8642,11 @@ namespace Catch {
 
 #ifdef CATCH_PLATFORM_MAC
 
-    #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #if defined(__i386__) || defined(__x86_64__)
+         #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+     #elif defined(__aarch64__)
+         #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+     #endif
 
 #elif defined(CATCH_PLATFORM_IPHONE)
 

diff --git a/Sourcecode/private/mx/impl/DirectionReader.cpp b/Sourcecode/private/mx/impl/DirectionReader.cpp
@@ -318,13 +318,34 @@ namespace mx
 
         void DirectionReader::parseRehearsal( const core::DirectionType& directionType)
         {
+            const auto& rehearsalSet = directionType.getRehearsalSet();
+
+            for( const auto& rehearsalPtr : rehearsalSet )
+            {
+                api::RehearsalData outRehearsal;
+                const auto& attr = *rehearsalPtr->getAttributes();
+                outRehearsal.text = rehearsalPtr->getValue().getValue();
+                outRehearsal.positionData = getPositionData( attr );
+                outRehearsal.colorData = getColor( attr );
+                myOutDirectionData.rehearsals.emplace_back( std::move( outRehearsal ) );
+            }
+
             MX_UNUSED( directionType );
         }
 
 
         void DirectionReader::parseSegno( const core::DirectionType& directionType)
         {
-            MX_UNUSED( directionType );
+            const auto& segnoSet = directionType.getSegnoSet();
+
+            for( const auto& segnoPtr : segnoSet )
+            {
+                api::SegnoData outSegno;
+                const auto& attr = *segnoPtr->getAttributes();
+                outSegno.positionData = getPositionData( attr );
+                outSegno.colorData = getColor( attr );
+                myOutDirectionData.segnos.emplace_back( std::move( outSegno ) );
+            }
         }
 
 
@@ -347,7 +368,16 @@ namespace mx
 
         void DirectionReader::parseCoda( const core::DirectionType& directionType)
         {
-            MX_UNUSED( directionType );
+            const auto& codaSet = directionType.getCodaSet();
+
+            for( const auto& codaPtr : codaSet )
+            {
+                api::CodaData outCoda;
+                const auto& attr = *codaPtr->getAttributes();
+                outCoda.positionData = getPositionData( attr );
+                outCoda.colorData = getColor( attr );
+                myOutDirectionData.codas.emplace_back( std::move( outCoda ) );
+            }
         }
 
 

diff --git a/Sourcecode/private/mx/impl/DirectionWriter.cpp b/Sourcecode/private/mx/impl/DirectionWriter.cpp
@@ -332,6 +332,33 @@ namespace mx
                     addDirectionType( outDirType, directionPtr );
                 }
             }
+
+            if( myDirectionData.segnos.size() > 0 ) {
+
+                for( const auto& rehearsal : myDirectionData.segnos ) {
+                    auto outDirType = core::makeDirectionType();
+                    outDirType->setChoice( core::DirectionType::Choice::segno );
+                    this->addDirectionType( outDirType, directionPtr );
+                }
+            }
+
+            if( myDirectionData.codas.size() > 0 ) {
+
+                for( const auto& rehearsal : myDirectionData.codas ) {
+                    auto outDirType = core::makeDirectionType();
+                    outDirType->setChoice( core::DirectionType::Choice::coda );
+                    this->addDirectionType( outDirType, directionPtr );
+                }
+            }
+
+            if( myDirectionData.rehearsals.size() > 0 ) {
+
+                for( const auto& rehearsal : myDirectionData.rehearsals ) {
+                    auto outDirType = core::makeDirectionType();
+                    outDirType->setChoice( core::DirectionType::Choice::rehearsal );
+                    this->addDirectionType( outDirType, directionPtr );
+                }
+            }
 
             if( myIsFirstDirectionTypeAdded )
             {