From 570c37393a7b2ef72bd4021adaf161e19439ca3e Mon Sep 17 00:00:00 2001 From: Gene <47258285+SemitoneGene@users.noreply.github.com> Date: Wed, 18 Jan 2023 13:56:41 -0800 Subject: [PATCH] rehearsal segno and coda support --- Sourcecode/include/mx/api/CodaData.h | 37 +++++++++++++++ Sourcecode/include/mx/api/DirectionData.h | 19 ++++++-- Sourcecode/include/mx/api/RehearsalData.h | 46 +++++++++++++++++++ Sourcecode/include/mx/api/SegnoData.h | 37 +++++++++++++++ Sourcecode/private/cpul/catch.h | 6 ++- .../private/mx/impl/DirectionReader.cpp | 34 +++++++++++++- .../private/mx/impl/DirectionWriter.cpp | 27 +++++++++++ Xcode/Mx.xcodeproj/project.pbxproj | 44 ++++++++++++++---- 8 files changed, 234 insertions(+), 16 deletions(-) create mode 100644 Sourcecode/include/mx/api/CodaData.h create mode 100644 Sourcecode/include/mx/api/RehearsalData.h create mode 100644 Sourcecode/include/mx/api/SegnoData.h diff --git a/Sourcecode/include/mx/api/CodaData.h b/Sourcecode/include/mx/api/CodaData.h new file mode 100644 index 000000000..48af431e7 --- /dev/null +++ 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 index a74bd71a2..2a660267b 100644 --- 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 bracketStops; std::vector words; std::vector chords; + std::vector segnos; + std::vector codas; + std::vector 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 new file mode 100644 index 000000000..4d21bc563 --- /dev/null +++ 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 new file mode 100644 index 000000000..592b01fd4 --- /dev/null +++ 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 index 58ea18f50..f9789228c 100644 --- 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 index 9341e9792..41ba238ea 100644 --- 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 index ad9867ea3..f9951c4b8 100644 --- 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 ) { diff --git a/Xcode/Mx.xcodeproj/project.pbxproj b/Xcode/Mx.xcodeproj/project.pbxproj index dae3041cb..ce299a7c7 100755 --- a/Xcode/Mx.xcodeproj/project.pbxproj +++ b/Xcode/Mx.xcodeproj/project.pbxproj @@ -3398,6 +3398,14 @@ 29EAD73D1F0EA96B00BDE782 /* ProcessingInstruction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29EAD7391F0EA96B00BDE782 /* ProcessingInstruction.cpp */; }; 29EAD73E1F0EA96B00BDE782 /* ProcessingInstruction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29EAD7391F0EA96B00BDE782 /* ProcessingInstruction.cpp */; }; 29EAD73F1F0EA96B00BDE782 /* ProcessingInstruction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29EAD7391F0EA96B00BDE782 /* ProcessingInstruction.cpp */; }; + 3DC0222E2974B19F00A69637 /* SegnoData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DC022282974A13600A69637 /* SegnoData.h */; }; + 3DC0222F2974B2D200A69637 /* SegnoData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DC022282974A13600A69637 /* SegnoData.h */; }; + 3DC022452975110C00A69637 /* CodaData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DC02242297510DE00A69637 /* CodaData.h */; }; + 3DC022462975114300A69637 /* CodaData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DC02242297510DE00A69637 /* CodaData.h */; }; + 3DC022482975D1C700A69637 /* RehearsalData.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DC022472975D1C700A69637 /* RehearsalData.h */; }; + 3DC022492975D1C700A69637 /* RehearsalData.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DC022472975D1C700A69637 /* RehearsalData.h */; }; + 3DC0224A2975D86B00A69637 /* RehearsalData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DC022472975D1C700A69637 /* RehearsalData.h */; }; + 3DC0224B2975D89E00A69637 /* RehearsalData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DC022472975D1C700A69637 /* RehearsalData.h */; }; 9CD50C25238A323100ED7DD8 /* ApiCommon.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3863225C0DB800814240 /* ApiCommon.h */; }; 9CD50C26238A323100ED7DD8 /* ApiEquality.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3856225C0DB600814240 /* ApiEquality.h */; }; 9CD50C27238A323100ED7DD8 /* AppearanceData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3841225C0DB400814240 /* AppearanceData.h */; }; @@ -3527,6 +3535,8 @@ 9CD50CCA238A3D2900ED7DD8 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8B238A3CFA00ED7DD8 /* pugixml.cpp */; }; 9CD50CCB238A3D2900ED7DD8 /* XFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8F238A3CFA00ED7DD8 /* XFactory.cpp */; }; 9CD50CCC238A3D2900ED7DD8 /* PugiDoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C92238A3CFA00ED7DD8 /* PugiDoc.cpp */; }; + F28C5CDE2912E2530057288B /* TransposeData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 297B99C1252A263B0089E958 /* TransposeData.h */; }; + F28C5CDF2912E5AD0057288B /* TransposeData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 297B99C1252A263B0089E958 /* TransposeData.h */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -3536,32 +3546,28 @@ dstPath = mx/api; dstSubfolderSpec = 6; files = ( - 29703A0F24954A1600D0E3B3 /* DefaultsData.h in CopyFiles */, - 29703A1024954A1600D0E3B3 /* KeyComponent.h in CopyFiles */, - 29703A1124954A1600D0E3B3 /* LeftRight.h in CopyFiles */, - 29703A1224954A1600D0E3B3 /* MarginsData.h in CopyFiles */, - 29703A1324954A1600D0E3B3 /* PageData.h in CopyFiles */, - 29703A1424954A1600D0E3B3 /* PageLayoutData.h in CopyFiles */, - 29703A1524954A1600D0E3B3 /* PageMarginsData.h in CopyFiles */, - 29703A1624954A1600D0E3B3 /* SizeData.h in CopyFiles */, - 29703A1724954A1600D0E3B3 /* SystemLayoutData.h in CopyFiles */, 9CD50C25238A323100ED7DD8 /* ApiCommon.h in CopyFiles */, 9CD50C26238A323100ED7DD8 /* ApiEquality.h in CopyFiles */, 9CD50C27238A323100ED7DD8 /* AppearanceData.h in CopyFiles */, 9CD50C28238A323100ED7DD8 /* BarlineData.h in CopyFiles */, 9CD50C29238A323100ED7DD8 /* ChordData.h in CopyFiles */, 9CD50C2A238A323100ED7DD8 /* ClefData.h in CopyFiles */, + 3DC022452975110C00A69637 /* CodaData.h in CopyFiles */, 9CD50C2B238A323100ED7DD8 /* ColorData.h in CopyFiles */, 9CD50C2C238A323100ED7DD8 /* CurveData.h in CopyFiles */, + 29703A0F24954A1600D0E3B3 /* DefaultsData.h in CopyFiles */, 9CD50C2D238A323100ED7DD8 /* DirectionData.h in CopyFiles */, 9CD50C2E238A323100ED7DD8 /* DocumentManager.h in CopyFiles */, 9CD50C2F238A323100ED7DD8 /* DurationData.h in CopyFiles */, 9CD50C30238A323100ED7DD8 /* EncodingData.h in CopyFiles */, 9CD50C31238A323100ED7DD8 /* FontData.h in CopyFiles */, + 29703A1024954A1600D0E3B3 /* KeyComponent.h in CopyFiles */, 9CD50C32238A323100ED7DD8 /* KeyData.h in CopyFiles */, 9CD50C33238A323100ED7DD8 /* LayoutData.h in CopyFiles */, + 29703A1124954A1600D0E3B3 /* LeftRight.h in CopyFiles */, 9CD50C34238A323100ED7DD8 /* LineData.h in CopyFiles */, 9CD50C35238A323100ED7DD8 /* LyricData.h in CopyFiles */, + 29703A1224954A1600D0E3B3 /* MarginsData.h in CopyFiles */, 9CD50C36238A323100ED7DD8 /* MarkData.h in CopyFiles */, 9CD50C37238A323100ED7DD8 /* MeasureData.h in CopyFiles */, 9CD50C38238A323100ED7DD8 /* MeasureLocation.h in CopyFiles */, @@ -3569,19 +3575,27 @@ 9CD50C3A238A323100ED7DD8 /* NoteAttachmentData.h in CopyFiles */, 9CD50C3B238A323100ED7DD8 /* NoteData.h in CopyFiles */, 9CD50C3C238A323100ED7DD8 /* OttavaData.h in CopyFiles */, + 29703A1324954A1600D0E3B3 /* PageData.h in CopyFiles */, + 29703A1424954A1600D0E3B3 /* PageLayoutData.h in CopyFiles */, + 29703A1524954A1600D0E3B3 /* PageMarginsData.h in CopyFiles */, 9CD50C3D238A323100ED7DD8 /* PageTextData.h in CopyFiles */, 9CD50C3E238A323100ED7DD8 /* PartData.h in CopyFiles */, 9CD50C3F238A323100ED7DD8 /* PartGroupData.h in CopyFiles */, 9CD50C40238A323100ED7DD8 /* PitchData.h in CopyFiles */, 9CD50C41238A323100ED7DD8 /* PositionData.h in CopyFiles */, 9CD50C42238A323100ED7DD8 /* PrintData.h in CopyFiles */, + 3DC0224B2975D89E00A69637 /* RehearsalData.h in CopyFiles */, 9CD50C43238A323100ED7DD8 /* ScoreData.h in CopyFiles */, + 3DC0222E2974B19F00A69637 /* SegnoData.h in CopyFiles */, + 29703A1624954A1600D0E3B3 /* SizeData.h in CopyFiles */, 9CD50C44238A323100ED7DD8 /* SoundID.h in CopyFiles */, 9CD50C45238A323100ED7DD8 /* SpannerData.h in CopyFiles */, 9CD50C46238A323100ED7DD8 /* StaffData.h in CopyFiles */, 9CD50C47238A323100ED7DD8 /* SystemData.h in CopyFiles */, + 29703A1724954A1600D0E3B3 /* SystemLayoutData.h in CopyFiles */, 9CD50C48238A323100ED7DD8 /* TempoData.h in CopyFiles */, 9CD50C49238A323100ED7DD8 /* TimeSignatureData.h in CopyFiles */, + F28C5CDF2912E5AD0057288B /* TransposeData.h in CopyFiles */, 9CD50C4A238A323100ED7DD8 /* TupletData.h in CopyFiles */, 9CD50C4B238A323100ED7DD8 /* Version.h in CopyFiles */, 9CD50C4C238A323100ED7DD8 /* VoiceData.h in CopyFiles */, @@ -3611,6 +3625,7 @@ 9CD50C52238A32A000ED7DD8 /* BarlineData.h in CopyFiles */, 9CD50C53238A32A000ED7DD8 /* ChordData.h in CopyFiles */, 9CD50C54238A32A000ED7DD8 /* ClefData.h in CopyFiles */, + 3DC022462975114300A69637 /* CodaData.h in CopyFiles */, 9CD50C55238A32A000ED7DD8 /* ColorData.h in CopyFiles */, 9CD50C56238A32A000ED7DD8 /* CurveData.h in CopyFiles */, 9CD50C57238A32A000ED7DD8 /* DirectionData.h in CopyFiles */, @@ -3635,13 +3650,16 @@ 9CD50C6A238A32A100ED7DD8 /* PitchData.h in CopyFiles */, 9CD50C6B238A32A100ED7DD8 /* PositionData.h in CopyFiles */, 9CD50C6C238A32A100ED7DD8 /* PrintData.h in CopyFiles */, + 3DC0224A2975D86B00A69637 /* RehearsalData.h in CopyFiles */, 9CD50C6D238A32A100ED7DD8 /* ScoreData.h in CopyFiles */, + 3DC0222F2974B2D200A69637 /* SegnoData.h in CopyFiles */, 9CD50C6E238A32A100ED7DD8 /* SoundID.h in CopyFiles */, 9CD50C6F238A32A100ED7DD8 /* SpannerData.h in CopyFiles */, 9CD50C70238A32A100ED7DD8 /* StaffData.h in CopyFiles */, 9CD50C71238A32A100ED7DD8 /* SystemData.h in CopyFiles */, 9CD50C72238A32A100ED7DD8 /* TempoData.h in CopyFiles */, 9CD50C73238A32A100ED7DD8 /* TimeSignatureData.h in CopyFiles */, + F28C5CDE2912E2530057288B /* TransposeData.h in CopyFiles */, 9CD50C74238A32A100ED7DD8 /* TupletData.h in CopyFiles */, 9CD50C75238A32A100ED7DD8 /* Version.h in CopyFiles */, 9CD50C76238A32A100ED7DD8 /* VoiceData.h in CopyFiles */, @@ -5050,6 +5068,9 @@ 29EAD7391F0EA96B00BDE782 /* ProcessingInstruction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessingInstruction.cpp; sourceTree = ""; }; 29EAD73A1F0EA96B00BDE782 /* ProcessingInstruction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessingInstruction.h; sourceTree = ""; }; 29F9465C245E72A6007E2308 /* AttributesIterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AttributesIterface.h; sourceTree = ""; }; + 3DC022282974A13600A69637 /* SegnoData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegnoData.h; sourceTree = ""; }; + 3DC02242297510DE00A69637 /* CodaData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodaData.h; sourceTree = ""; }; + 3DC022472975D1C700A69637 /* RehearsalData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RehearsalData.h; sourceTree = ""; }; 9CD50C7F238A3CFA00ED7DD8 /* XAttributeIterator.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = XAttributeIterator.cpp; sourceTree = ""; }; 9CD50C80238A3CFA00ED7DD8 /* pugiconfig.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = pugiconfig.hpp; sourceTree = ""; }; 9CD50C81238A3CFA00ED7DD8 /* XElementIterator.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = XElementIterator.cpp; sourceTree = ""; }; @@ -6565,6 +6586,7 @@ 29DC3852225C0DB600814240 /* BarlineData.h */, 29DC384A225C0DB500814240 /* ChordData.h */, 29DC383D225C0DB300814240 /* ClefData.h */, + 3DC02242297510DE00A69637 /* CodaData.h */, 29DC3861225C0DB700814240 /* ColorData.h */, 29DC3859225C0DB600814240 /* CurveData.h */, 29843AD9248DE951006A8E34 /* DefaultsData.h */, @@ -6596,7 +6618,9 @@ 29DC383F225C0DB400814240 /* PitchData.h */, 29DC3850225C0DB500814240 /* PositionData.h */, 29DC3846225C0DB400814240 /* PrintData.h */, + 3DC022472975D1C700A69637 /* RehearsalData.h */, 29DC3847225C0DB400814240 /* ScoreData.h */, + 3DC022282974A13600A69637 /* SegnoData.h */, 29843AD6248D47E9006A8E34 /* SizeData.h */, 29DC3849225C0DB500814240 /* SoundID.h */, 29DC3848225C0DB400814240 /* SpannerData.h */, @@ -6754,6 +6778,7 @@ 2999A8F624CD0AEC004637BA /* XlinkTitle.h in Headers */, 2999A8FB24CD0AEC004637BA /* XmlLang.h in Headers */, 2999A90024CD0AEC004637BA /* XsID.h in Headers */, + 3DC022492975D1C700A69637 /* RehearsalData.h in Headers */, 2999A8CE24CD0AEC004637BA /* CommaSeparatedText.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -6778,6 +6803,7 @@ 2999A8F524CD0AEC004637BA /* XlinkTitle.h in Headers */, 2999A8FA24CD0AEC004637BA /* XmlLang.h in Headers */, 2999A8FF24CD0AEC004637BA /* XsID.h in Headers */, + 3DC022482975D1C700A69637 /* RehearsalData.h in Headers */, 2999A8CD24CD0AEC004637BA /* CommaSeparatedText.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0;