diff --git a/Sourcecode/private/mx/impl/MxVersionDefines.h b/Sourcecode/private/mx/impl/MxVersionDefines.h index 132ad6071..914f79628 100644 --- a/Sourcecode/private/mx/impl/MxVersionDefines.h +++ b/Sourcecode/private/mx/impl/MxVersionDefines.h @@ -1,4 +1,4 @@ #define MX_VERSION_MAJOR 1 #define MX_VERSION_MINOR 0 -#define MX_VERSION_PATCH 0 -#define MX_VERSION_BUILD 37 +#define MX_VERSION_PATCH 1 +#define MX_VERSION_BUILD 38 diff --git a/Sourcecode/private/mxtest/xml/FakeXml.h b/Sourcecode/private/mxtest/xml/FakeXml.h deleted file mode 100755 index 3619eb83a..000000000 --- a/Sourcecode/private/mxtest/xml/FakeXml.h +++ /dev/null @@ -1,28 +0,0 @@ -// MusicXML Class Library -// Copyright (c) by Matthew James Briggs -// Distributed under the MIT License - -#pragma once - -#include "mxtest/control/CompileControl.h" -#ifdef MX_COMPILE_XML_TESTS - - -namespace mxtest -{ - const char* const fakeXml = R"(((( - - - abcdefg - - - - Bones - Bishop - - -))))"; - -} - -#endif diff --git a/Sourcecode/private/mxtest/xml/XAttributeIteratorTest.cpp b/Sourcecode/private/mxtest/xml/XAttributeIteratorTest.cpp deleted file mode 100755 index 1a62a55ed..000000000 --- a/Sourcecode/private/mxtest/xml/XAttributeIteratorTest.cpp +++ /dev/null @@ -1,301 +0,0 @@ -// MusicXML Class Library -// Copyright (c) by Matthew James Briggs -// Distributed under the MIT License - -#include "mxtest/control/CompileControl.h" -#ifdef MX_COMPILE_XML_TESTS - -#include "cpul/cpulTestHarness.h" -#include "mxtest/xml/FakeXml.h" -#include "ezxml/XFactory.h" -#include "ezxml/XDoc.h" -#include "ezxml/XAttribute.h" -#include "ezxml/XAttributeIterator.h" -#include "ezxml/XElementIterator.h" - -#include - -using namespace std; -using namespace ezxml; - -namespace -{ - inline ::ezxml::XDocCPtr doc() - { - auto xdoc = XFactory::makeXDoc(); - std::istringstream is( mxtest::fakeXml ); - xdoc->loadStream( is ); - return xdoc; - } - - inline XElementPtr somethingWithAttributes( const ::ezxml::XDocCPtr& xdoc ) - { - auto root = xdoc->getRoot(); - auto firstIter = root->begin(); - ++firstIter; - ++firstIter; - auto nextIter = firstIter->begin(); - return nextIter->clone(); - } -} - - -TEST( basicIteration, XAttributeIterator ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - auto iter = node->attributesBegin(); - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-a", iter->getName() ); - CHECK_EQUAL( "A", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-b", iter->getName() ); - CHECK_EQUAL( "B", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-c", iter->getName() ); - CHECK_EQUAL( "C", iter->getValue() ); - ++iter; - CHECK( iter == node->attributesEnd() ); - -} -T_END - - -TEST( suffixIncrement, XAttributeIterator ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - auto iter = node->attributesBegin(); - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-a", ( iter++ )->getName() ); - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-b", ( iter++ )->getName() ); - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-c", ( iter++ )->getName() ); - CHECK( iter == node->attributesEnd() ); -} -T_END - - -TEST( suffixDecrement, XAttributeIterator ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - XAttributeIterator iter = node->attributesEnd(); - CHECK( iter == node->attributesEnd() ); - iter--; - CHECK( iter != node->attributesEnd() ); - CHECK( iter != node->attributesBegin() ); - CHECK_EQUAL( "attr-c", ( iter-- )->getName() ); - CHECK( iter != node->attributesEnd() ); - CHECK( iter != node->attributesBegin() ); - CHECK_EQUAL( "attr-b", ( iter-- )->getName() ); - CHECK( iter != node->attributesEnd() ); - CHECK( iter == node->attributesBegin() ); - CHECK_EQUAL( "attr-a", ( iter-- )->getName() ); - - // iter is now "before" root->begin() - // which behaves like an "end" iter, should throw - CHECK_RAISES( iter->getName() ); -} -T_END - - -TEST( prefixIncrement, XAttributeIterator ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - XAttributeIterator iter = node->attributesBegin(); - CHECK_EQUAL( "attr-a", iter->getName() ); - CHECK_EQUAL( "attr-b", ( ++iter )->getName() ); - CHECK_EQUAL( "attr-c", ( ++iter )->getName() ); - ++iter; - CHECK( iter == node->attributesEnd() ) -} -T_END - - -TEST( prefixDecrement, XAttributeIterator ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - XAttributeIterator iter = node->attributesEnd(); - CHECK( iter == node->attributesEnd() ); - CHECK( iter != node->attributesBegin() ); - CHECK_EQUAL( "attr-c", ( --iter )->getName() ); - CHECK( iter != node->attributesEnd() ); - CHECK( iter != node->attributesBegin() ); - CHECK_EQUAL( "attr-b", ( --iter )->getName() ); - CHECK( iter != node->attributesEnd() ); - CHECK( iter != node->attributesBegin() ); - CHECK_EQUAL( "attr-a", ( --iter )->getName() ); - CHECK( iter != node->attributesEnd() ); - CHECK( iter == node->attributesBegin() ); - --iter; - - // iter is now "before" root->begin() - // which behaves like an "end" iter, should throw - CHECK_RAISES( iter->getName() ); -} -T_END - - -TEST( stlAlgorithm, XAttributeIterator ) -{ - // First demonstrate the impossible lambda syntax - std::vector ints{ 5, 7, 99, 1, -1, 36, 17, 9 }; - - auto it = std::find_if( - ints.begin(), - ints.end(), - [] ( const int& i ) { return i < 0; } ); - - CHECK_EQUAL( -1, *it ); - - // Now try it with the custom iterator - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - - auto iter = std::find_if( - node->attributesBegin(), - node->attributesEnd(), - [] ( const XAttribute& n ) { return n.getName() == "attr-b"; } ); - - CHECK_EQUAL( "attr-b", iter->getName() ) -} -T_END - - -TEST( operatorStar, XAttributeIterator ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - XAttributeIterator iter = node->attributesBegin(); - auto& attribute = *iter; - CHECK_EQUAL( "attr-a", attribute.getName() ); - attribute.setName( "attr-XYZ" ); - CHECK_EQUAL( "attr-XYZ", attribute.getName() ); - - // obtain the node again to make sure it changed in the xdoc - auto reobtainednode = somethingWithAttributes( xdoc ); - auto reobtainedIter = reobtainednode->attributesBegin(); - CHECK_EQUAL( "attr-XYZ", reobtainedIter->getName() ); -} -T_END - - -TEST( copyConstructor, XAttributeIterator ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - XAttributeIterator iter = node->attributesBegin(); - XAttributeIterator copy{ iter }; - - CHECK_EQUAL( "attr-a", iter->getName() ) - CHECK_EQUAL( "attr-a", copy->getName() ) - - copy->setName( "XYZ" ); - - CHECK_EQUAL( "XYZ", iter->getName() ) - CHECK_EQUAL( "XYZ", copy->getName() ) -} -T_END - - -TEST( moveConstructor, XAttributeIterator ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - XAttributeIterator movedIter{ node->attributesBegin() }; // maybe it calls move ctor... - - CHECK_EQUAL( "attr-a", movedIter->getName() ) - movedIter->setName( "XYZ" ); - CHECK_EQUAL( "XYZ", movedIter->getName() ) - - // obtain the node again to make sure it changed in the xdoc - auto reobtainednode = somethingWithAttributes( xdoc ); - auto reobtainedIter = reobtainednode->attributesBegin(); - CHECK_EQUAL( "XYZ", reobtainedIter->getName() ); -} -T_END - - -TEST( assignmentOperator, XAttributeIterator ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - XAttributeIterator iter = node->attributesBegin(); - XAttributeIterator assigned; - assigned = iter; - - CHECK_EQUAL( "attr-a", iter->getName() ) - CHECK_EQUAL( "attr-a", assigned->getName() ) - - assigned->setName( "XYZ" ); - - CHECK_EQUAL( "XYZ", iter->getName() ) - CHECK_EQUAL( "XYZ", assigned->getName() ) -} -T_END - - -TEST( moveAssignment, XAttributeIterator ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - XAttributeIterator movedIter; - movedIter = node->attributesBegin(); // maybe it calls move assignment... - - CHECK_EQUAL( "attr-a", movedIter->getName() ) - movedIter->setName( "XYZ" ); - CHECK_EQUAL( "XYZ", movedIter->getName() ) - - // obtain the node again to make sure it changed in the xdoc - auto reobtainednode = somethingWithAttributes( xdoc ); - auto reobtainedIter = reobtainednode->attributesBegin(); - CHECK_EQUAL( "XYZ", reobtainedIter->getName() ); -} -T_END - - -TEST( nullThrows, XAttributeIterator ) -{ - XAttributeIterator nullIter; - CHECK_RAISES( nullIter->getName() ) - CHECK_RAISES( (*nullIter).getName() ) - -} -T_END - - -TEST( doesNotCrash, XAttributeIterator ) -{ - XAttributeIterator nullIter; - XAttributeIterator anotherIter; - CHECK_NOT_RAISES( anotherIter = nullIter ); - CHECK_NOT_RAISES( anotherIter = XAttributeIterator{} ); -} -T_END - - -namespace -{ - XElementPtr nodeWithDocOutOfScope() - { - auto xdoc = doc(); - auto node = xdoc->getRoot(); - return node; - } -} - - -TEST( avoidsUndefinedBehavior, XAttributeIterator ) -{ - auto root = nodeWithDocOutOfScope(); - CHECK_RAISES( auto iter = root->attributesBegin() ); -} -T_END - -#endif diff --git a/Sourcecode/private/mxtest/xml/XAttributeTest.cpp b/Sourcecode/private/mxtest/xml/XAttributeTest.cpp deleted file mode 100755 index 0b0916700..000000000 --- a/Sourcecode/private/mxtest/xml/XAttributeTest.cpp +++ /dev/null @@ -1,145 +0,0 @@ -// MusicXML Class Library -// Copyright (c) by Matthew James Briggs -// Distributed under the MIT License - -#include "mxtest/control/CompileControl.h" -#ifdef MX_COMPILE_XML_TESTS - -#include "cpul/cpulTestHarness.h" -#include "ezxml/XFactory.h" -#include "ezxml/XDoc.h" -#include "ezxml/XAttribute.h" -#include "ezxml/XAttributeIterator.h" -#include "ezxml/XElementIterator.h" -#include "mxtest/xml/FakeXml.h" - -using namespace std; -using namespace ezxml; - -namespace -{ - inline ::ezxml::XDocCPtr doc() - { - auto xdoc = XFactory::makeXDoc(); - std::istringstream is( mxtest::fakeXml ); - xdoc->loadStream( is ); - return xdoc; - } - - - inline XElementPtr somethingWithAttributes( const ::ezxml::XDocCPtr& xdoc ) - { - auto root = xdoc->getRoot(); - auto firstIter = root->begin(); - ++firstIter; - ++firstIter; - auto nextIter = firstIter->begin(); - return nextIter->clone(); - } -} - - -TEST( getNameValue, XAttribute ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - auto iter = node->attributesBegin(); - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-a", iter->getName() ); - CHECK_EQUAL( "A", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-b", iter->getName() ); - CHECK_EQUAL( "B", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-c", iter->getName() ); - CHECK_EQUAL( "C", iter->getValue() ); - ++iter; - CHECK( iter == node->attributesEnd() ); -} -T_END - - -TEST( setName, XAttribute ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - auto iter = node->attributesBegin(); - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-a", iter->getName() ); - CHECK_EQUAL( "A", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - - iter->setName( "hello-attr" ); - - CHECK_EQUAL( "hello-attr", iter->getName() ); - CHECK_EQUAL( "B", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-c", iter->getName() ); - CHECK_EQUAL( "C", iter->getValue() ); - ++iter; - CHECK( iter == node->attributesEnd() ); - - node = somethingWithAttributes( xdoc ); - iter = node->attributesBegin(); - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-a", iter->getName() ); - CHECK_EQUAL( "A", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "hello-attr", iter->getName() ); - CHECK_EQUAL( "B", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-c", iter->getName() ); - CHECK_EQUAL( "C", iter->getValue() ); - ++iter; - CHECK( iter == node->attributesEnd() ); -} -T_END - - -TEST( setValue, XAttribute ) -{ - auto xdoc = doc(); - auto node = somethingWithAttributes( xdoc ); - auto iter = node->attributesBegin(); - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-a", iter->getName() ); - CHECK_EQUAL( "A", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - - iter->setValue( "hello-attr" ); - - CHECK_EQUAL( "attr-b", iter->getName() ); - CHECK_EQUAL( "hello-attr", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-c", iter->getName() ); - CHECK_EQUAL( "C", iter->getValue() ); - ++iter; - CHECK( iter == node->attributesEnd() ); - - node = somethingWithAttributes( xdoc ); - iter = node->attributesBegin(); - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-a", iter->getName() ); - CHECK_EQUAL( "A", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-b", iter->getName() ); - CHECK_EQUAL( "hello-attr", iter->getValue() ); - ++iter; - CHECK( iter != node->attributesEnd() ); - CHECK_EQUAL( "attr-c", iter->getName() ); - CHECK_EQUAL( "C", iter->getValue() ); - ++iter; - CHECK( iter == node->attributesEnd() ); -} -T_END - -#endif diff --git a/Sourcecode/private/mxtest/xml/XDocTest.cpp b/Sourcecode/private/mxtest/xml/XDocTest.cpp deleted file mode 100755 index 9d8e25f5b..000000000 --- a/Sourcecode/private/mxtest/xml/XDocTest.cpp +++ /dev/null @@ -1,995 +0,0 @@ -// MusicXML Class Library -// Copyright (c) by Matthew James Briggs -// Distributed under the MIT License - -#include "mxtest/control/CompileControl.h" -#ifdef MX_COMPILE_XML_TESTS - -#include "cpul/cpulTestHarness.h" -#include "ezxml/XFactory.h" -#include "ezxml/XDoc.h" - -#include - -using namespace std; -using namespace ezxml; - -void streamDoc( const XDocCPtr& xdoc ) -{ - xdoc->saveStream( std::cout ); - std::cout << std::endl; -} - - -TEST( defaultXmlVersion, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - auto xmlVersion = xdoc->getXmlVersion(); - CHECK( xmlVersion == XmlVersion::onePointZero ); -} -T_END - - -TEST( defaultEncoding, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - auto encoding = xdoc->getEncoding(); - CHECK( encoding == DEFAULT_ENCODING ); -} -T_END - - -TEST( defaultGetHasStandaloneAttribute, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - auto hasStandaloneAttribute = xdoc->getHasStandaloneAttribute(); - CHECK( !hasStandaloneAttribute ); -} -T_END - - -TEST( defaultgetIsStandalone, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - auto isStandalone = xdoc->getIsStandalone(); - CHECK( !isStandalone ); -} -T_END - - -TEST( defaultGetHasDoctypeDeclaration, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - auto hasDoctypeDeclaration = xdoc->getHasDoctypeDeclaration(); - CHECK( !hasDoctypeDeclaration ); -} -T_END - - -TEST( defaultgetDoctypeValue, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - std::string expected = ""; - std::string actual = xdoc->getDoctypeValue(); - CHECK_EQUAL( expected, actual ) -} -T_END - - -TEST( defaultContents, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - - std::stringstream expected; - expected << R"()" << std::endl; - expected << "" << std::endl; - std::stringstream actual; - xdoc->saveStream( actual ); - - CHECK_EQUAL( expected.str(), actual.str() ); - -} -T_END - - -TEST( xmlVersionOnePointOne, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - - std::stringstream documentContents; - documentContents << R"()" << std::endl; - documentContents << R"()" << std::endl; - xdoc->loadStream( documentContents ); - std::stringstream actual; - xdoc->saveStream( actual ); - - std::stringstream expectedContents; - expectedContents << R"()" << std::endl; - expectedContents << R"()" << std::endl; - - CHECK_EQUAL( expectedContents.str(), actual.str() ); - - auto actualXmlVersion = xdoc->getXmlVersion(); - auto expectedXmlVersion = XmlVersion::onePointOne; - CHECK( expectedXmlVersion == actualXmlVersion ); -} -T_END - - -TEST( simpleParse1, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - - std::stringstream input; - input << R"()" << std::endl; - input << R"()" << std::endl; - input << R"()" << std::endl; - - xdoc->loadStream( input ); - - auto expectedEncoding = Encoding::utfEight; - auto actualEncoding = xdoc->getEncoding(); - CHECK( expectedEncoding == actualEncoding ); - - auto expectedXmlVersion = XmlVersion::onePointZero; - auto actualXmlVersion = xdoc->getXmlVersion(); - CHECK( expectedXmlVersion == actualXmlVersion ); - - auto expectedHasStandalone = false; - auto actualHasStandalone = xdoc->getHasStandaloneAttribute(); - CHECK( expectedHasStandalone == actualHasStandalone ); - - auto expectedIsStandalone = false; - auto actualIsStandalone = xdoc->getIsStandalone(); - CHECK( expectedIsStandalone == actualIsStandalone ); - - auto expectedHasDoctype = true; - auto actualHasDoctype = xdoc->getHasDoctypeDeclaration(); - CHECK( expectedHasDoctype == actualHasDoctype ); - - auto expectedDoctype = std::string{ R"()" }; - - auto rootNode = xdoc->getRoot(); - CHECK( rootNode != nullptr ); - CHECK_EQUAL( "some-tag", rootNode->getName() ); -} -T_END - - -TEST( simpleParse_StandaloneNo, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - - std::stringstream input; - input << R"()" << std::endl; - input << R"()" << std::endl; - - xdoc->loadStream( input ); - - auto expectedEncoding = Encoding::utfEight; - auto actualEncoding = xdoc->getEncoding(); - CHECK( expectedEncoding == actualEncoding ); - - auto expectedXmlVersion = XmlVersion::onePointZero; - auto actualXmlVersion = xdoc->getXmlVersion(); - CHECK( expectedXmlVersion == actualXmlVersion ); - - auto expectedHasStandalone = true; - auto actualHasStandalone = xdoc->getHasStandaloneAttribute(); - CHECK( expectedHasStandalone == actualHasStandalone ); - - auto expectedIsStandalone = false; - auto actualIsStandalone = xdoc->getIsStandalone(); - CHECK( expectedIsStandalone == actualIsStandalone ); - - auto expectedHasDoctype = false; - auto actualHasDoctype = xdoc->getHasDoctypeDeclaration(); - CHECK( expectedHasDoctype == actualHasDoctype ); - - auto expectedDoctype = std::string{ R"()" }; - - auto rootNode = xdoc->getRoot(); - CHECK( rootNode != nullptr ) - CHECK_EQUAL( "some-tag", rootNode->getName() ); -} -T_END - - -TEST( simpleParse_StandaloneYes, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - - std::stringstream input; - input << R"()" << std::endl; - input << R"()" << std::endl; - input << R"()" << std::endl; - - xdoc->loadStream( input ); - - auto expectedEncoding = Encoding::utfEight; - auto actualEncoding = xdoc->getEncoding(); - CHECK( expectedEncoding == actualEncoding ); - - auto expectedXmlVersion = XmlVersion::onePointZero; - auto actualXmlVersion = xdoc->getXmlVersion(); - CHECK( expectedXmlVersion == actualXmlVersion ); - - auto expectedHasStandalone = true; - auto actualHasStandalone = xdoc->getHasStandaloneAttribute(); - CHECK( expectedHasStandalone == actualHasStandalone ); - - auto expectedIsStandalone = true; - auto actualIsStandalone = xdoc->getIsStandalone(); - CHECK( expectedIsStandalone == actualIsStandalone ); - - auto expectedHasDoctype = true; - auto actualHasDoctype = xdoc->getHasDoctypeDeclaration(); - CHECK( expectedHasDoctype == actualHasDoctype ); - - auto expectedDoctype = std::string{ R"()" }; - - auto rootNode = xdoc->getRoot(); - CHECK( rootNode != nullptr ); - CHECK_EQUAL( "some-tag", rootNode->getName() ); -} -T_END - - -TEST( simpleParse_EmptyDocParseException, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - - std::stringstream input; - CHECK_RAISES( xdoc->loadStream( input ) ) -} -T_END - - -TEST( simpleParse_RootOnly, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - - std::stringstream input; - input << ""; - - xdoc->loadStream( input ); - - auto expectedEncoding = DEFAULT_ENCODING; - auto actualEncoding = xdoc->getEncoding(); - CHECK( expectedEncoding == actualEncoding ); - - auto expectedXmlVersion = DEFAULT_XML_VERSION; - auto actualXmlVersion = xdoc->getXmlVersion(); - CHECK( expectedXmlVersion == actualXmlVersion ); - - auto expectedHasStandalone = false; - auto actualHasStandalone = xdoc->getHasStandaloneAttribute(); - CHECK( expectedHasStandalone == actualHasStandalone ); - - auto expectedIsStandalone = false; - auto actualIsStandalone = xdoc->getIsStandalone(); - CHECK( expectedIsStandalone == actualIsStandalone ); - - auto expectedHasDoctype = false; - auto actualHasDoctype = xdoc->getHasDoctypeDeclaration(); - CHECK( expectedHasDoctype == actualHasDoctype ); - - auto expectedDoctype = std::string{ R"()" }; - - auto rootNode = xdoc->getRoot(); - CHECK( rootNode != nullptr ); - CHECK_EQUAL( "score-partwise", rootNode->getName() ); - -} -T_END - - -TEST( simpleParse_RootAndDoctypeOnly, XDoc ) -{ - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - - std::stringstream input; - input << R"()" << std::endl; - input << ""; - - xdoc->loadStream( input ); - - auto expectedEncoding = DEFAULT_ENCODING; - auto actualEncoding = xdoc->getEncoding(); - CHECK( expectedEncoding == actualEncoding ); - - auto expectedXmlVersion = DEFAULT_XML_VERSION; - auto actualXmlVersion = xdoc->getXmlVersion(); - CHECK( expectedXmlVersion == actualXmlVersion ); - - auto expectedHasStandalone = false; - auto actualHasStandalone = xdoc->getHasStandaloneAttribute(); - CHECK( expectedHasStandalone == actualHasStandalone ); - - auto expectedIsStandalone = false; - auto actualIsStandalone = xdoc->getIsStandalone(); - CHECK( expectedIsStandalone == actualIsStandalone ); - - auto expectedHasDoctype = true; - auto actualHasDoctype = xdoc->getHasDoctypeDeclaration(); - CHECK( expectedHasDoctype == actualHasDoctype ); - - auto expectedDoctype = std::string{ R"()" }; - - auto rootNode = xdoc->getRoot(); - CHECK( rootNode != nullptr ); - CHECK_EQUAL( "score-partwise", rootNode->getName() ); -} - T_END; - - namespace - { - const char * const XML10_UTF8 = R"()"; -// const char * const XML10_UTF16 = R"()"; - const char * const XML11_UTF8 = R"()"; -// const char * const XML11_UTF16 = R"()"; - const char * const XML10_UTF8_STANDALONE_YES = R"()"; -// const char * const XML10_UTF16_STANDALONE_YES = R"()"; -// const char * const XML11_UTF8_STANDALONE_YES = R"()"; -// const char * const XML11_UTF16_STANDALONE_YES = R"()"; - const char * const XML10_UTF8_STANDALONE_NO = R"()"; -// const char * const XML10_UTF16_STANDALONE_NO = R"()"; -// const char * const XML11_UTF8_STANDALONE_NO = R"()"; -// const char * const XML11_UTF16_STANDALONE_NO = R"()"; - const char * const DOCTYPE_EMPTY_WSPACE = R"()"; - const char * const DOCTYPE_EMPTY_NSPACE = R"()"; - const char * const DOCTYPE_VALUE = R"()"; - const char * const ROOT = R"()"; - } - - - struct ThreeLineDocString - { - const char* const line1; - const char* const line2; - const char* const line3; - ThreeLineDocString( const char* const inLine1, const char* const inLine2, const char* const inLine3 ) : line1( inLine1 ), line2( inLine2 ), line3( inLine3 ) {} - std::string toString() const { std::stringstream ss; ss << line1 << std::endl << line2 << std::endl << line3 << std::endl; return ss.str(); } - }; - - - struct TwoLineDocString - { - const char* const line1; - const char* const line2; - TwoLineDocString( const char* const inLine1, const char* const inLine2 ) : line1( inLine1 ), line2( inLine2 ) {} - std::string toString() const { std::stringstream ss; ss << line1 << std::endl << line2 << std::endl; return ss.str(); } - }; - - inline std::string quickDoc( - const char* const line1, - const char* const line2, - const char* const line3 ) - { - std::stringstream ss; - ss << line1 << std::endl << line2 << std::endl << line3 << std::endl; - return ss.str(); - } - - TEST( Xml10_Xml11, XDoc ) - { - ThreeLineDocString xmlString{ XML10_UTF8, DOCTYPE_EMPTY_WSPACE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setXmlVersion( XmlVersion::onePointOne ); - - CHECK( XmlVersion::onePointOne == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML11_UTF8, DOCTYPE_EMPTY_WSPACE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; - - - TEST( Xml11_Xml10, XDoc ) - { - ThreeLineDocString xmlString{ XML11_UTF8, DOCTYPE_EMPTY_WSPACE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointOne == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setXmlVersion( XmlVersion::onePointZero ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML10_UTF8, DOCTYPE_EMPTY_WSPACE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; - - - TEST( NoDoctype_Doctype, XDoc ) - { - TwoLineDocString xmlString{ XML10_UTF8, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( ! xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setHasDoctypeDeclaration( true ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML10_UTF8, DOCTYPE_EMPTY_NSPACE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; - - - TEST( Doctype_NoDoctype, XDoc ) - { - ThreeLineDocString xmlString{ XML10_UTF8, DOCTYPE_EMPTY_WSPACE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setHasDoctypeDeclaration( false ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( ! xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - TwoLineDocString expected{ XML10_UTF8, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; - - - TEST( NoDoctype_DoctypeWithValue, XDoc ) - { - TwoLineDocString xmlString{ XML10_UTF8, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( ! xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setHasDoctypeDeclaration( true ); - xdoc->setDoctypeValue( "SomeDoctypeValue" ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML10_UTF8, DOCTYPE_VALUE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; - - - TEST( DoctypeWithValue_NoDoctype, XDoc ) - { - ThreeLineDocString xmlString{ XML10_UTF8, DOCTYPE_VALUE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setHasDoctypeDeclaration( false ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( ! xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - TwoLineDocString expected{ XML10_UTF8, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; - - - TEST( HasStandalone_NoStandalone, XDoc ) - { - ThreeLineDocString xmlString{ XML10_UTF8_STANDALONE_YES, DOCTYPE_VALUE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setHasStandaloneAttribute( false ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML10_UTF8, DOCTYPE_VALUE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; - - - TEST( NoStandalone_HasStandalone, XDoc ) - { - ThreeLineDocString xmlString{ XML10_UTF8, DOCTYPE_VALUE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setHasStandaloneAttribute( true ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML10_UTF8_STANDALONE_NO, DOCTYPE_VALUE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; - - - TEST( NoStandalone_setIsStandaloneFalse, XDoc ) - { - ThreeLineDocString xmlString{ XML10_UTF8, DOCTYPE_VALUE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setIsStandalone( false ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML10_UTF8_STANDALONE_NO, DOCTYPE_VALUE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; - - - TEST( NoStandalone_setIsStandaloneTrue, XDoc ) - { - ThreeLineDocString xmlString{ XML10_UTF8, DOCTYPE_VALUE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setIsStandalone( true ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML10_UTF8_STANDALONE_YES, DOCTYPE_VALUE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; - -// TODO - support UTF-16 properly -#if 1==0 - TEST( utf16_utf8, XDoc ) - { - ThreeLineDocString xmlString{ XML10_UTF16, DOCTYPE_VALUE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfSixteen == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setEncoding( Encoding::utfEight ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML10_UTF8, DOCTYPE_VALUE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; -#endif - -// TODO - support UTF-16 properly -#if 1==0 - TEST( xml11_utf16, XDoc ) - { - ThreeLineDocString xmlString{ XML11_UTF16, DOCTYPE_VALUE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointOne == xdoc->getXmlVersion() ); - CHECK( Encoding::utfSixteen == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setEncoding( Encoding::utfEight ); - xdoc->setIsStandalone( true ); - xdoc->setDoctypeValue( "" ); - - CHECK( XmlVersion::onePointOne == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML11_UTF8_STANDALONE_YES, DOCTYPE_EMPTY_NSPACE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; -#endif - -// TODO - support UTF-16 properly -#if 1==0 - TEST( xml10_utf16_standalone_yes, XDoc ) - { - TwoLineDocString xmlString{ XML10_UTF16_STANDALONE_YES, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfSixteen == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( xdoc->getIsStandalone() ); - CHECK( ! xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setXmlVersion( XmlVersion::onePointOne ); - xdoc->setIsStandalone( false ); - xdoc->setDoctypeValue( "" ); - - CHECK( XmlVersion::onePointOne == xdoc->getXmlVersion() ); - CHECK( Encoding::utfSixteen == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - ThreeLineDocString expected{ XML11_UTF16_STANDALONE_NO, DOCTYPE_EMPTY_NSPACE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; -#endif - -// TODO - support UTF-16 properly -#if 1==0 - TEST( xml11_utf8_standalone_yes, XDoc ) - { - ThreeLineDocString xmlString{ XML11_UTF8_STANDALONE_YES, DOCTYPE_VALUE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointOne == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setXmlVersion( XmlVersion::onePointOne ); - xdoc->setEncoding( Encoding::utfSixteen ); - xdoc->setHasStandaloneAttribute( false ); - xdoc->setHasDoctypeDeclaration( false ); - - CHECK( XmlVersion::onePointOne == xdoc->getXmlVersion() ); - CHECK( Encoding::utfSixteen == xdoc->getEncoding() ); - CHECK( ! xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( ! xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - TwoLineDocString expected{ XML11_UTF16, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; -#endif - -// TODO - support UTF-16 properly -#if 1==0 - TEST( xml11_utf16_standalone_yes, XDoc ) - { - ThreeLineDocString xmlString{ XML11_UTF16_STANDALONE_YES, DOCTYPE_VALUE, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointOne == xdoc->getXmlVersion() ); - CHECK( Encoding::utfSixteen == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setXmlVersion( XmlVersion::onePointZero ); - xdoc->setEncoding( Encoding::utfSixteen ); - xdoc->setHasStandaloneAttribute( false ); - xdoc->setHasDoctypeDeclaration( false ); - xdoc->setHasStandaloneAttribute( false ); - xdoc->setIsStandalone( false ); - - CHECK( XmlVersion::onePointZero == xdoc->getXmlVersion() ); - CHECK( Encoding::utfSixteen == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( ! xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - TwoLineDocString expected{ XML10_UTF16_STANDALONE_NO, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; -#endif - -// TODO - support UTF-16 properly -#if 1==0 - TEST( xml11_utf16_standalone_no, XDoc ) - { - TwoLineDocString xmlString{ XML11_UTF16_STANDALONE_NO, ROOT }; - std::istringstream is( xmlString.toString() ); - auto xdoc = XFactory::makeXDoc(); - xdoc->setDoWriteByteOrderMark( false ); - xdoc->loadStream( is ); - - CHECK( XmlVersion::onePointOne == xdoc->getXmlVersion() ); - CHECK( Encoding::utfSixteen == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( ! xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "", xdoc->getDoctypeValue() ); - - std::stringstream reserialized; - xdoc->saveStream( reserialized ); - CHECK_EQUAL( xmlString.toString(), reserialized.str() ); - - xdoc->setXmlVersion( XmlVersion::onePointOne ); - xdoc->setEncoding( Encoding::utfEight ); - xdoc->setHasStandaloneAttribute( true ); - xdoc->setHasDoctypeDeclaration( true ); - xdoc->setDoctypeValue( "SomeDoctypeValue" ); - xdoc->setHasStandaloneAttribute( true ); - xdoc->setIsStandalone( false ); - - CHECK( XmlVersion::onePointOne == xdoc->getXmlVersion() ); - CHECK( Encoding::utfEight == xdoc->getEncoding() ); - CHECK( xdoc->getHasStandaloneAttribute() ); - CHECK( ! xdoc->getIsStandalone() ); - CHECK( xdoc->getHasDoctypeDeclaration() ); - CHECK_EQUAL( "SomeDoctypeValue", xdoc->getDoctypeValue() ); - ThreeLineDocString expected{ XML11_UTF8_STANDALONE_NO, DOCTYPE_VALUE, ROOT }; - std::stringstream actual; - xdoc->saveStream( actual ); - CHECK_EQUAL( expected.toString(), actual.str() ); - } - T_END; -#endif - -#endif diff --git a/Sourcecode/private/mxtest/xml/XElementIteratorTest.cpp b/Sourcecode/private/mxtest/xml/XElementIteratorTest.cpp deleted file mode 100755 index fd7b1a677..000000000 --- a/Sourcecode/private/mxtest/xml/XElementIteratorTest.cpp +++ /dev/null @@ -1,279 +0,0 @@ -// MusicXML Class Library -// Copyright (c) by Matthew James Briggs -// Distributed under the MIT License - -#include "mxtest/control/CompileControl.h" -#ifdef MX_COMPILE_XML_TESTS - -#include "cpul/cpulTestHarness.h" -#include "ezxml/XFactory.h" -#include "ezxml/XDoc.h" -#include "ezxml/XElement.h" -#include "ezxml/XElementIterator.h" -#include "mxtest/xml/FakeXml.h" - - - -#include - -using namespace std; -using namespace ezxml; - -namespace -{ - inline ::ezxml::XDocCPtr doc() - { - auto xdoc = XFactory::makeXDoc(); - std::istringstream is( mxtest::fakeXml ); - xdoc->loadStream( is ); - return xdoc; - } -} - - -TEST( beginEndForLoop, XElementIterator ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - int i = 0; - for( auto it = root->begin(); it != root->end(); ++it, ++i ) - { - switch( i ) - { - case 0: - CHECK_EQUAL( "abc", it->getName() ); - break; - case 1: - CHECK_EQUAL( "empty-element", it->getName() ); - break; - case 2: - CHECK_EQUAL( "nested-stuff", it->getName() ); - break; - default: - CHECK_FAIL( "should not reach here" ); - break; - } - } -} -T_END - - -TEST( suffixIncrement, XElementIterator ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - XElementIterator iter = root->begin(); - CHECK( iter != root->end() ); - CHECK_EQUAL( "abc", ( iter++ )->getName() ); - CHECK( iter != root->end() ); - CHECK_EQUAL( "empty-element", ( iter++ )->getName() ); - CHECK( iter != root->end() ); - CHECK_EQUAL( "nested-stuff", ( iter++ )->getName() ); - CHECK( iter == root->end() ); -} -T_END - - -TEST( suffixDecrement, XElementIterator ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - XElementIterator iter = root->end(); - CHECK( iter == root->end() ); - iter--; - CHECK( iter != root->end() ); - CHECK( iter != root->begin() ); - CHECK_EQUAL( "nested-stuff", ( iter-- )->getName() ); - CHECK( iter != root->end() ); - CHECK( iter != root->begin() ); - CHECK_EQUAL( "empty-element", ( iter-- )->getName() ); - CHECK( iter != root->end() ); - CHECK( iter == root->begin() ); - CHECK_EQUAL( "abc", ( iter-- )->getName() ); - - // iter is now "before" root->begin() - // which behaves like an "end" iter, should throw - CHECK_RAISES( iter->getName() ); -} -T_END - - -TEST( prefixIncrement, XElementIterator ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - XElementIterator iter = root->begin(); - CHECK_EQUAL( "abc", iter->getName() ); - CHECK_EQUAL( "empty-element", ( ++iter )->getName() ); - CHECK_EQUAL( "nested-stuff", ( ++iter )->getName() ); - ++iter; - CHECK( iter == root->end() ) -} -T_END - - -TEST( prefixDecrement, XElementIterator ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - XElementIterator iter = root->end(); - CHECK( iter == root->end() ); - CHECK( iter != root->begin() ); - CHECK_EQUAL( "nested-stuff", ( --iter )->getName() ); - CHECK( iter != root->end() ); - CHECK( iter != root->begin() ); - CHECK_EQUAL( "empty-element", ( --iter )->getName() ); - CHECK( iter != root->end() ); - CHECK( iter != root->begin() ); - CHECK_EQUAL( "abc", ( --iter )->getName() ); - CHECK( iter != root->end() ); - CHECK( iter == root->begin() ); - --iter; - - // iter is now "before" root->begin() - // which behaves like an "end" iter, should throw - CHECK_RAISES( iter->getName() ); -} -T_END - - -TEST( stlAlgorithm, XElementIterator ) -{ - // First demonstrate the impossible lambda syntax - std::vector ints{ 5, 7, 99, 1, -1, 36, 17, 9 }; - - auto it = std::find_if( - ints.begin(), - ints.end(), - [] ( const int& i ) { return i < 0; } ); - - CHECK_EQUAL( -1, (*it) ); - - // Now try it with the custom iterator - auto xdoc = doc(); - auto root = xdoc->getRoot(); - - auto iter = std::find_if( - root->begin(), - root->end(), - [] ( const XElement& n ) { return n.getName() == "nested-stuff"; } ); - - CHECK_EQUAL( "nested-stuff", iter->getName() ) -} -T_END - - -TEST( operatorStar, XElementIterator ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - XElementIterator iter = root->begin(); - auto& node = *iter; - CHECK_EQUAL( "abc", node.getName() ) - node.setName( "def" ); - CHECK_EQUAL( "def", node.getName() ) - - // obtain the node again to make sure it changed in the xdoc - auto reobtainedRoot = xdoc->getRoot(); - auto reobtainedIter = reobtainedRoot->begin(); - CHECK_EQUAL( "def", reobtainedIter->getName() ); -} -T_END - - -TEST( copyConstructor, XElementIterator ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - XElementIterator iter = root->begin(); - XElementIterator copy{ iter }; - - CHECK_EQUAL( "abc", iter->getName() ) - CHECK_EQUAL( "abc", copy->getName() ) - - copy->setName( "def" ); - - CHECK_EQUAL( "def", iter->getName() ) - CHECK_EQUAL( "def", copy->getName() ) -} -T_END - - -TEST( moveConstructor, XElementIterator ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - XElementIterator moved{ root->begin() }; // maybe it calls move ctor... - - auto& node = *moved; - CHECK_EQUAL( "abc", node.getName() ) - node.setName( "def" ); - CHECK_EQUAL( "def", node.getName() ) - - // obtain the node again to make sure it changed in the xdoc - auto reobtainedRoot = xdoc->getRoot(); - auto reobtainedIter = reobtainedRoot->begin(); - CHECK_EQUAL( "def", reobtainedIter->getName() ); -} -T_END - - -TEST( assignmentOperator, XElementIterator ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - XElementIterator iter = root->begin(); - XElementIterator assigned; - assigned = iter; - - CHECK_EQUAL( "abc", iter->getName() ) - CHECK_EQUAL( "abc", assigned->getName() ) - - assigned->setName( "def" ); - - CHECK_EQUAL( "def", iter->getName() ) - CHECK_EQUAL( "def", assigned->getName() ) -} -T_END - - -TEST( moveAssignment, XElementIterator ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - XElementIterator moved; - moved = root->begin(); // maybe it calls move assignment... - - auto& node = *moved; - CHECK_EQUAL( "abc", node.getName() ) - node.setName( "def" ); - CHECK_EQUAL( "def", node.getName() ) - - // obtain the node again to make sure it changed in the xdoc - auto reobtainedRoot = xdoc->getRoot(); - auto reobtainedIter = reobtainedRoot->begin(); - CHECK_EQUAL( "def", reobtainedIter->getName() ); -} -T_END - - -TEST( nullThrows, XElementIterator ) -{ - XElementIterator nullIter; - CHECK_RAISES( nullIter->getName() ) - CHECK_RAISES( (*nullIter).getName() ) - -} -T_END - - -TEST( doesNotCrash, XElementIterator ) -{ - XElementIterator nullIter; - XElementIterator anotherIter; - CHECK_NOT_RAISES( anotherIter = nullIter ); - CHECK_NOT_RAISES( anotherIter = XElementIterator{} ); -} -T_END - -#endif diff --git a/Sourcecode/private/mxtest/xml/XElementTest.cpp b/Sourcecode/private/mxtest/xml/XElementTest.cpp deleted file mode 100755 index df31d7e54..000000000 --- a/Sourcecode/private/mxtest/xml/XElementTest.cpp +++ /dev/null @@ -1,361 +0,0 @@ -// MusicXML Class Library -// Copyright (c) by Matthew James Briggs -// Distributed under the MIT License - -#include "mxtest/control/CompileControl.h" -#ifdef MX_COMPILE_XML_TESTS - -#include "cpul/cpulTestHarness.h" -#include "ezxml/XFactory.h" -#include "ezxml/XDoc.h" -#include "ezxml/XElement.h" -#include "ezxml/XElementIterator.h" -#include "ezxml/XAttributeIterator.h" -#include "mxtest/xml/FakeXml.h" - -using namespace std; -using namespace ezxml; - - - -namespace -{ - inline ::ezxml::XDocCPtr doc() - { - auto xdoc = XFactory::makeXDoc(); - std::istringstream is( mxtest::fakeXml ); - xdoc->loadStream( is ); - return xdoc; - } -} - - -TEST( useIteratorBasic, XElement ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - int i = 0; - auto endIter = root->end(); - for( auto it = root->begin(); it != endIter; ++it, ++i ) - { - switch( i ) - { - case 0: - CHECK_EQUAL( "abc", it->getName() ); - break; - case 1: - CHECK_EQUAL( "empty-element", it->getName() ); - break; - case 2: - CHECK_EQUAL( "nested-stuff", it->getName() ); - break; - default: - CHECK_FAIL( "should not reach here" ); - break; - } - } -} -T_END - - -TEST( getTypeElement, XElement ) -{ - auto xdoc = doc(); - auto node = xdoc->getRoot(); - CHECK( !node->getIsNull() ); - CHECK_EQUAL( "root-node", node->getName() ); - CHECK_EQUAL( "", node->getValue() ); - CHECK( XElementType::element == node->getType() ); -} -T_END - - -TEST( getTypeText, XElement ) -{ - auto xdoc = doc(); - auto node = xdoc->getRoot(); - auto iter = node->begin(); - CHECK( !iter.getIsPayloadNull() ); - CHECK( !iter->getIsNull() ); - CHECK_EQUAL( "abc", iter->getName() ); - auto weird = iter->begin(); - CHECK( weird == iter->end() ); - CHECK_EQUAL( "abcdefg", iter->getValue() ); - CHECK( XElementType::text == iter->getType() ); -} -T_END - - -TEST( getTypeEmpty, XElement ) -{ - auto xdoc = doc(); - auto node = xdoc->getRoot(); - auto iter = node->begin(); - ++iter; - CHECK( !iter.getIsPayloadNull() ); - CHECK( !iter->getIsNull() ); - CHECK_EQUAL( "empty-element", iter->getName() ); - CHECK( XElementType::empty == iter->getType() ); -} -T_END - - -TEST( getValueEmptyElementEmptyString, XElement ) -{ - auto xdoc = doc(); - auto node = xdoc->getRoot(); - auto iter = node->begin(); - ++iter; - CHECK( !iter.getIsPayloadNull() ); - CHECK( !iter->getIsNull() ); - CHECK_EQUAL( "", iter->getValue() ); - CHECK( XElementType::empty == iter->getType() ); -} -T_END - - -TEST( getValueEmptyElementTypeEmptyString, XElement ) -{ - auto xdoc = doc(); - auto node = xdoc->getRoot(); - auto iter = node->begin(); - ++iter; - ++iter; - CHECK( !iter.getIsPayloadNull() ); - CHECK( !iter->getIsNull() ); - CHECK_EQUAL( "", iter->getValue() ); - CHECK( XElementType::element == iter->getType() ); -} -T_END - - -TEST( getValue, XElement ) -{ - auto xdoc = doc(); - auto node = xdoc->getRoot(); - auto iter = node->begin(); - CHECK( !iter.getIsPayloadNull() ); - CHECK( !iter->getIsNull() ); - CHECK_EQUAL( "abcdefg", iter->getValue() ); - CHECK( XElementType::text == iter->getType() ); -} -T_END - - -TEST( setName, XElement ) -{ - auto xdoc = doc(); - auto node1 = xdoc->getRoot(); - auto iter1 = node1->begin(); - CHECK_EQUAL( "abc", iter1->getName() ); - - // function under test - iter1->setName( "blah" ); - CHECK_EQUAL( "blah", iter1->getName() ); - - auto node2 = xdoc->getRoot(); - auto iter2 = node1->begin(); - CHECK_EQUAL( "blah", iter1->getName() ); -} -T_END - - -TEST( setValueChangeExisting, XElement ) -{ - auto xdoc = doc(); - auto node1 = xdoc->getRoot(); - auto iter1 = node1->begin(); - CHECK_EQUAL( "abcdefg", iter1->getValue() ); - - // function under test - iter1->setValue( "blah" ); - CHECK_EQUAL( "blah", iter1->getValue() ); - - auto node2 = xdoc->getRoot(); - auto iter2 = node1->begin(); - CHECK_EQUAL( "blah", iter1->getValue() ); -} -T_END - - -TEST( setValueAddToEmpty, XElement ) -{ - auto xdoc = doc(); - auto node1 = xdoc->getRoot(); - auto iter1 = node1->begin(); - ++iter1; - CHECK_EQUAL( "", iter1->getValue() ); - CHECK( XElementType::empty == iter1->getType() ); - - // function under test - iter1->setValue( "blah" ); - CHECK_EQUAL( "blah", iter1->getValue() ); - CHECK( XElementType::text == iter1->getType() ); - - auto node2 = xdoc->getRoot(); - auto iter2 = node1->begin(); - ++iter2; - CHECK_EQUAL( "blah", iter1->getValue() ); - CHECK( XElementType::text == iter1->getType() ); -} -T_END - - -TEST( getDoc, XElement ) -{ - auto xdoc = doc(); - auto node = xdoc->getRoot(); - auto gotdoc = node->getDoc(); - CHECK_EQUAL( reinterpret_cast( xdoc.get() ), reinterpret_cast( gotdoc.get() ) ) -} -T_END - - -TEST( getParent, XElement ) -{ - auto xdoc = doc(); - auto node = xdoc->getRoot(); - auto iter = node->begin(); - auto parent = iter->getParent(); - CHECK_EQUAL( "root-node", node->getName() ); - CHECK_EQUAL( "root-node", parent->getName() ) -} -T_END - - -TEST( attributesBeginEnd, XElement ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - CHECK( root->attributesBegin() == root->attributesEnd() ); - auto elIter = root->begin(); - ++elIter; - CHECK( elIter->attributesBegin() != elIter->attributesEnd() ); -} -T_END - - -TEST( prependAttributeFromEmpty, XElement ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - CHECK( root->attributesBegin() == root->attributesEnd() ); - root->prependAttribute( "prepended" )->setValue( "val-A" ); - CHECK( root->attributesBegin() != root->attributesEnd() ); - auto atIter = root->attributesBegin(); - CHECK_EQUAL( "prepended", atIter->getName() ); - CHECK_EQUAL( "val-A", atIter->getValue() ); - - // start over make sure its there - auto root2 = xdoc->getRoot(); - auto atIter2 = root2->attributesBegin(); - CHECK_EQUAL( "prepended", atIter2->getName() ); - CHECK_EQUAL( "val-A", atIter2->getValue() ); -} -T_END - - -TEST( appendAttributeFromEmpty, XElement ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - CHECK( root->attributesBegin() == root->attributesEnd() ); - root->appendAttribute( "appended" )->setValue( "val-B" ); - CHECK( root->attributesBegin() != root->attributesEnd() ); - auto atIter = root->attributesBegin(); - CHECK_EQUAL( "appended", atIter->getName() ); - CHECK_EQUAL( "val-B", atIter->getValue() ); - - // start over make sure its there - auto root2 = xdoc->getRoot(); - auto atIter2 = root2->attributesBegin(); - CHECK_EQUAL( "appended", atIter2->getName() ); - CHECK_EQUAL( "val-B", atIter2->getValue() ); -} -T_END - - -TEST( prependAttributeWithExisting, XElement ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - auto elIter = root->begin(); - ++elIter; - ++elIter; - auto& node = *elIter; - auto atIter = node.attributesBegin(); - CHECK_EQUAL( "color", atIter->getName() ); - CHECK_EQUAL( "blue", atIter->getValue() ); - node.prependAttribute( "pre" )->setValue( "pended" ); - atIter = node.attributesBegin(); - CHECK_EQUAL( "pre", atIter->getName() ); - CHECK_EQUAL( "pended", atIter->getValue() ); - ++atIter; - CHECK_EQUAL( "color", atIter->getName() ); - CHECK_EQUAL( "blue", atIter->getValue() ); -} -T_END - - -TEST( appendAttributeWithExisting, XElement ) -{ - auto xdoc = doc(); - auto root = xdoc->getRoot(); - auto elIter = root->begin(); - ++elIter; - ++elIter; - auto& node = *elIter; - auto atIter = node.attributesBegin(); - CHECK_EQUAL( "color", atIter->getName() ); - CHECK_EQUAL( "blue", atIter->getValue() ); - node.appendAttribute( "ap" )->setValue( "pended" ); - atIter = node.attributesBegin(); - CHECK_EQUAL( "color", atIter->getName() ); - CHECK_EQUAL( "blue", atIter->getValue() ); - ++atIter; - CHECK_EQUAL( "ap", atIter->getName() ); - CHECK_EQUAL( "pended", atIter->getValue() ); -} -T_END - - -TEST( insertSiblingAfter, XElement ) -{ - auto xdoc = XFactory::makeXDoc(); - auto root = xdoc->getRoot(); - root->appendChild( "one" ); - root->appendChild( "three" ); - root->appendChild( "four" ); - root->begin()->insertSiblingAfter( "two" ); - auto it = root->begin(); - CHECK_EQUAL( "one", it->getName() ); - ++it; - CHECK_EQUAL( "two", it->getName() ); - ++it; - CHECK_EQUAL( "three", it->getName() ); - ++it; - CHECK_EQUAL( "four", it->getName() ); -} -T_END - - -TEST( removeChild, XElement ) -{ - auto xdoc = XFactory::makeXDoc(); - auto root = xdoc->getRoot(); - root->appendChild( "one" ); - root->appendChild( "two" ); - root->appendChild( "three" ); - root->appendChild( "four" ); - root->removeChild( "two" ); - auto it = root->begin(); - CHECK_EQUAL( "one", it->getName() ); - ++it; - CHECK_EQUAL( "three", it->getName() ); - ++it; - CHECK_EQUAL( "four", it->getName() ); -} -T_END - - -#endif diff --git a/Xcode/Mx.xcodeproj/project.pbxproj b/Xcode/Mx.xcodeproj/project.pbxproj index de0a67bf4..e157926b2 100755 --- a/Xcode/Mx.xcodeproj/project.pbxproj +++ b/Xcode/Mx.xcodeproj/project.pbxproj @@ -3287,7 +3287,6 @@ 29A8FFFD1EF0499300AD2478 /* TouchingPitch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8E1DB1EF0476100AD2478 /* TouchingPitch.cpp */; }; 29A8FFFE1EF0499300AD2478 /* TraditionalKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8E1DD1EF0476200AD2478 /* TraditionalKey.cpp */; }; 29A8FFFF1EF0499300AD2478 /* Transpose.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8E1DF1EF0476200AD2478 /* Transpose.cpp */; }; - 29B962851E79FF410072071D /* MxiOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 29B962831E79FF410072071D /* MxiOS.h */; }; 29E7633B205E2DEE00B754D5 /* LyricType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E76339205E2DEE00B754D5 /* LyricType.cpp */; }; 29E7633C205E2DEE00B754D5 /* LyricType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E76339205E2DEE00B754D5 /* LyricType.cpp */; }; 29E7633D205E2DEE00B754D5 /* LyricType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E76339205E2DEE00B754D5 /* LyricType.cpp */; }; @@ -3306,51 +3305,135 @@ 29EAD74A1F0EF8CE00BDE782 /* MiscData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29EAD7461F0EF8CE00BDE782 /* MiscData.cpp */; }; 29EAD74B1F0EF8CE00BDE782 /* MiscData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29EAD7461F0EF8CE00BDE782 /* MiscData.cpp */; }; 29EAD74C1F0EF8CE00BDE782 /* MiscData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29EAD7461F0EF8CE00BDE782 /* MiscData.cpp */; }; - 9CD23C022340658C00EB6F13 /* XAttributeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B8D2340658C00EB6F13 /* XAttributeIterator.cpp */; }; - 9CD23C032340658C00EB6F13 /* XAttributeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B8D2340658C00EB6F13 /* XAttributeIterator.cpp */; }; - 9CD23C042340658C00EB6F13 /* XAttributeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B8D2340658C00EB6F13 /* XAttributeIterator.cpp */; }; - 9CD23C052340658C00EB6F13 /* XAttributeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B8D2340658C00EB6F13 /* XAttributeIterator.cpp */; }; - 9CD23C062340658C00EB6F13 /* XAttributeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B8D2340658C00EB6F13 /* XAttributeIterator.cpp */; }; - 9CD23C0C2340658C00EB6F13 /* XElementIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B8F2340658C00EB6F13 /* XElementIterator.cpp */; }; - 9CD23C0D2340658C00EB6F13 /* XElementIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B8F2340658C00EB6F13 /* XElementIterator.cpp */; }; - 9CD23C0E2340658C00EB6F13 /* XElementIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B8F2340658C00EB6F13 /* XElementIterator.cpp */; }; - 9CD23C0F2340658C00EB6F13 /* XElementIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B8F2340658C00EB6F13 /* XElementIterator.cpp */; }; - 9CD23C102340658C00EB6F13 /* XElementIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B8F2340658C00EB6F13 /* XElementIterator.cpp */; }; - 9CD23C112340658C00EB6F13 /* PugiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B902340658C00EB6F13 /* PugiElement.cpp */; }; - 9CD23C122340658C00EB6F13 /* PugiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B902340658C00EB6F13 /* PugiElement.cpp */; }; - 9CD23C132340658C00EB6F13 /* PugiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B902340658C00EB6F13 /* PugiElement.cpp */; }; - 9CD23C142340658C00EB6F13 /* PugiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B902340658C00EB6F13 /* PugiElement.cpp */; }; - 9CD23C152340658C00EB6F13 /* PugiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B902340658C00EB6F13 /* PugiElement.cpp */; }; - 9CD23C252340658C00EB6F13 /* PugiAttributeIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B942340658C00EB6F13 /* PugiAttributeIterImpl.cpp */; }; - 9CD23C262340658C00EB6F13 /* PugiAttributeIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B942340658C00EB6F13 /* PugiAttributeIterImpl.cpp */; }; - 9CD23C272340658C00EB6F13 /* PugiAttributeIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B942340658C00EB6F13 /* PugiAttributeIterImpl.cpp */; }; - 9CD23C282340658C00EB6F13 /* PugiAttributeIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B942340658C00EB6F13 /* PugiAttributeIterImpl.cpp */; }; - 9CD23C292340658C00EB6F13 /* PugiAttributeIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B942340658C00EB6F13 /* PugiAttributeIterImpl.cpp */; }; - 9CD23C2F2340658C00EB6F13 /* PugiAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B972340658C00EB6F13 /* PugiAttribute.cpp */; }; - 9CD23C302340658C00EB6F13 /* PugiAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B972340658C00EB6F13 /* PugiAttribute.cpp */; }; - 9CD23C312340658C00EB6F13 /* PugiAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B972340658C00EB6F13 /* PugiAttribute.cpp */; }; - 9CD23C322340658C00EB6F13 /* PugiAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B972340658C00EB6F13 /* PugiAttribute.cpp */; }; - 9CD23C332340658C00EB6F13 /* PugiAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B972340658C00EB6F13 /* PugiAttribute.cpp */; }; - 9CD23C342340658C00EB6F13 /* PugiElementIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B982340658C00EB6F13 /* PugiElementIterImpl.cpp */; }; - 9CD23C352340658C00EB6F13 /* PugiElementIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B982340658C00EB6F13 /* PugiElementIterImpl.cpp */; }; - 9CD23C362340658C00EB6F13 /* PugiElementIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B982340658C00EB6F13 /* PugiElementIterImpl.cpp */; }; - 9CD23C372340658C00EB6F13 /* PugiElementIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B982340658C00EB6F13 /* PugiElementIterImpl.cpp */; }; - 9CD23C382340658C00EB6F13 /* PugiElementIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B982340658C00EB6F13 /* PugiElementIterImpl.cpp */; }; - 9CD23C3A2340658C00EB6F13 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B992340658C00EB6F13 /* pugixml.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; - 9CD23C3B2340658C00EB6F13 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B992340658C00EB6F13 /* pugixml.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; - 9CD23C3C2340658C00EB6F13 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B992340658C00EB6F13 /* pugixml.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; - 9CD23C3D2340658C00EB6F13 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B992340658C00EB6F13 /* pugixml.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; - 9CD23C4D2340658C00EB6F13 /* XFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B9D2340658C00EB6F13 /* XFactory.cpp */; }; - 9CD23C4E2340658C00EB6F13 /* XFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B9D2340658C00EB6F13 /* XFactory.cpp */; }; - 9CD23C4F2340658C00EB6F13 /* XFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B9D2340658C00EB6F13 /* XFactory.cpp */; }; - 9CD23C502340658C00EB6F13 /* XFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B9D2340658C00EB6F13 /* XFactory.cpp */; }; - 9CD23C512340658C00EB6F13 /* XFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B9D2340658C00EB6F13 /* XFactory.cpp */; }; - 9CD23C5C2340658C00EB6F13 /* PugiDoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23BA02340658C00EB6F13 /* PugiDoc.cpp */; }; - 9CD23C5D2340658C00EB6F13 /* PugiDoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23BA02340658C00EB6F13 /* PugiDoc.cpp */; }; - 9CD23C5E2340658C00EB6F13 /* PugiDoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23BA02340658C00EB6F13 /* PugiDoc.cpp */; }; - 9CD23C5F2340658C00EB6F13 /* PugiDoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23BA02340658C00EB6F13 /* PugiDoc.cpp */; }; - 9CD23C602340658C00EB6F13 /* PugiDoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23BA02340658C00EB6F13 /* PugiDoc.cpp */; }; - 9CD23C7723406A1300EB6F13 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD23B992340658C00EB6F13 /* pugixml.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; + 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 */; }; + 9CD50C28238A323100ED7DD8 /* BarlineData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3852225C0DB600814240 /* BarlineData.h */; }; + 9CD50C29238A323100ED7DD8 /* ChordData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384A225C0DB500814240 /* ChordData.h */; }; + 9CD50C2A238A323100ED7DD8 /* ClefData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC383D225C0DB300814240 /* ClefData.h */; }; + 9CD50C2B238A323100ED7DD8 /* ColorData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3861225C0DB700814240 /* ColorData.h */; }; + 9CD50C2C238A323100ED7DD8 /* CurveData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3859225C0DB600814240 /* CurveData.h */; }; + 9CD50C2D238A323100ED7DD8 /* DirectionData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384B225C0DB500814240 /* DirectionData.h */; }; + 9CD50C2E238A323100ED7DD8 /* DocumentManager.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3840225C0DB400814240 /* DocumentManager.h */; }; + 9CD50C2F238A323100ED7DD8 /* DurationData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385B225C0DB700814240 /* DurationData.h */; }; + 9CD50C30238A323100ED7DD8 /* EncodingData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3862225C0DB700814240 /* EncodingData.h */; }; + 9CD50C31238A323100ED7DD8 /* FontData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384D225C0DB500814240 /* FontData.h */; }; + 9CD50C32238A323100ED7DD8 /* KeyData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3843225C0DB400814240 /* KeyData.h */; }; + 9CD50C33238A323100ED7DD8 /* LayoutData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385C225C0DB700814240 /* LayoutData.h */; }; + 9CD50C34238A323100ED7DD8 /* LineData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3854225C0DB600814240 /* LineData.h */; }; + 9CD50C35238A323100ED7DD8 /* LyricData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3860225C0DB700814240 /* LyricData.h */; }; + 9CD50C36238A323100ED7DD8 /* MarkData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385D225C0DB700814240 /* MarkData.h */; }; + 9CD50C37238A323100ED7DD8 /* MeasureData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385F225C0DB700814240 /* MeasureData.h */; }; + 9CD50C38238A323100ED7DD8 /* MeasureLocation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385E225C0DB700814240 /* MeasureLocation.h */; }; + 9CD50C39238A323100ED7DD8 /* MiscData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3857225C0DB600814240 /* MiscData.h */; }; + 9CD50C3A238A323100ED7DD8 /* NoteAttachmentData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3866225C0DB800814240 /* NoteAttachmentData.h */; }; + 9CD50C3B238A323100ED7DD8 /* NoteData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385A225C0DB600814240 /* NoteData.h */; }; + 9CD50C3C238A323100ED7DD8 /* OttavaData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3851225C0DB500814240 /* OttavaData.h */; }; + 9CD50C3D238A323100ED7DD8 /* PageTextData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3844225C0DB400814240 /* PageTextData.h */; }; + 9CD50C3E238A323100ED7DD8 /* PartData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3858225C0DB600814240 /* PartData.h */; }; + 9CD50C3F238A323100ED7DD8 /* PartGroupData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3845225C0DB400814240 /* PartGroupData.h */; }; + 9CD50C40238A323100ED7DD8 /* PitchData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC383F225C0DB400814240 /* PitchData.h */; }; + 9CD50C41238A323100ED7DD8 /* PositionData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3850225C0DB500814240 /* PositionData.h */; }; + 9CD50C42238A323100ED7DD8 /* PrintData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3846225C0DB400814240 /* PrintData.h */; }; + 9CD50C43238A323100ED7DD8 /* ScoreData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3847225C0DB400814240 /* ScoreData.h */; }; + 9CD50C44238A323100ED7DD8 /* SoundID.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3849225C0DB500814240 /* SoundID.h */; }; + 9CD50C45238A323100ED7DD8 /* SpannerData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3848225C0DB400814240 /* SpannerData.h */; }; + 9CD50C46238A323100ED7DD8 /* StaffData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3864225C0DB800814240 /* StaffData.h */; }; + 9CD50C47238A323100ED7DD8 /* SystemData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384C225C0DB500814240 /* SystemData.h */; }; + 9CD50C48238A323100ED7DD8 /* TempoData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384E225C0DB500814240 /* TempoData.h */; }; + 9CD50C49238A323100ED7DD8 /* TimeSignatureData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3842225C0DB400814240 /* TimeSignatureData.h */; }; + 9CD50C4A238A323100ED7DD8 /* TupletData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3853225C0DB600814240 /* TupletData.h */; }; + 9CD50C4B238A323100ED7DD8 /* Version.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384F225C0DB500814240 /* Version.h */; }; + 9CD50C4C238A323100ED7DD8 /* VoiceData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3865225C0DB800814240 /* VoiceData.h */; }; + 9CD50C4D238A323100ED7DD8 /* WedgeData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC383E225C0DB300814240 /* WedgeData.h */; }; + 9CD50C4E238A323100ED7DD8 /* WordsData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3855225C0DB600814240 /* WordsData.h */; }; + 9CD50C4F238A329F00ED7DD8 /* ApiCommon.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3863225C0DB800814240 /* ApiCommon.h */; }; + 9CD50C50238A329F00ED7DD8 /* ApiEquality.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3856225C0DB600814240 /* ApiEquality.h */; }; + 9CD50C51238A329F00ED7DD8 /* AppearanceData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3841225C0DB400814240 /* AppearanceData.h */; }; + 9CD50C52238A32A000ED7DD8 /* BarlineData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3852225C0DB600814240 /* BarlineData.h */; }; + 9CD50C53238A32A000ED7DD8 /* ChordData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384A225C0DB500814240 /* ChordData.h */; }; + 9CD50C54238A32A000ED7DD8 /* ClefData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC383D225C0DB300814240 /* ClefData.h */; }; + 9CD50C55238A32A000ED7DD8 /* ColorData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3861225C0DB700814240 /* ColorData.h */; }; + 9CD50C56238A32A000ED7DD8 /* CurveData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3859225C0DB600814240 /* CurveData.h */; }; + 9CD50C57238A32A000ED7DD8 /* DirectionData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384B225C0DB500814240 /* DirectionData.h */; }; + 9CD50C58238A32A000ED7DD8 /* DocumentManager.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3840225C0DB400814240 /* DocumentManager.h */; }; + 9CD50C59238A32A000ED7DD8 /* DurationData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385B225C0DB700814240 /* DurationData.h */; }; + 9CD50C5A238A32A000ED7DD8 /* EncodingData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3862225C0DB700814240 /* EncodingData.h */; }; + 9CD50C5B238A32A000ED7DD8 /* FontData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384D225C0DB500814240 /* FontData.h */; }; + 9CD50C5C238A32A000ED7DD8 /* KeyData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3843225C0DB400814240 /* KeyData.h */; }; + 9CD50C5D238A32A000ED7DD8 /* LayoutData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385C225C0DB700814240 /* LayoutData.h */; }; + 9CD50C5E238A32A000ED7DD8 /* LineData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3854225C0DB600814240 /* LineData.h */; }; + 9CD50C5F238A32A000ED7DD8 /* LyricData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3860225C0DB700814240 /* LyricData.h */; }; + 9CD50C60238A32A000ED7DD8 /* MarkData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385D225C0DB700814240 /* MarkData.h */; }; + 9CD50C61238A32A000ED7DD8 /* MeasureData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385F225C0DB700814240 /* MeasureData.h */; }; + 9CD50C62238A32A000ED7DD8 /* MeasureLocation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385E225C0DB700814240 /* MeasureLocation.h */; }; + 9CD50C63238A32A000ED7DD8 /* MiscData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3857225C0DB600814240 /* MiscData.h */; }; + 9CD50C64238A32A000ED7DD8 /* NoteAttachmentData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3866225C0DB800814240 /* NoteAttachmentData.h */; }; + 9CD50C65238A32A000ED7DD8 /* NoteData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC385A225C0DB600814240 /* NoteData.h */; }; + 9CD50C66238A32A100ED7DD8 /* OttavaData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3851225C0DB500814240 /* OttavaData.h */; }; + 9CD50C67238A32A100ED7DD8 /* PageTextData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3844225C0DB400814240 /* PageTextData.h */; }; + 9CD50C68238A32A100ED7DD8 /* PartData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3858225C0DB600814240 /* PartData.h */; }; + 9CD50C69238A32A100ED7DD8 /* PartGroupData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3845225C0DB400814240 /* PartGroupData.h */; }; + 9CD50C6A238A32A100ED7DD8 /* PitchData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC383F225C0DB400814240 /* PitchData.h */; }; + 9CD50C6B238A32A100ED7DD8 /* PositionData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3850225C0DB500814240 /* PositionData.h */; }; + 9CD50C6C238A32A100ED7DD8 /* PrintData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3846225C0DB400814240 /* PrintData.h */; }; + 9CD50C6D238A32A100ED7DD8 /* ScoreData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3847225C0DB400814240 /* ScoreData.h */; }; + 9CD50C6E238A32A100ED7DD8 /* SoundID.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3849225C0DB500814240 /* SoundID.h */; }; + 9CD50C6F238A32A100ED7DD8 /* SpannerData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3848225C0DB400814240 /* SpannerData.h */; }; + 9CD50C70238A32A100ED7DD8 /* StaffData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3864225C0DB800814240 /* StaffData.h */; }; + 9CD50C71238A32A100ED7DD8 /* SystemData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384C225C0DB500814240 /* SystemData.h */; }; + 9CD50C72238A32A100ED7DD8 /* TempoData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384E225C0DB500814240 /* TempoData.h */; }; + 9CD50C73238A32A100ED7DD8 /* TimeSignatureData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3842225C0DB400814240 /* TimeSignatureData.h */; }; + 9CD50C74238A32A100ED7DD8 /* TupletData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3853225C0DB600814240 /* TupletData.h */; }; + 9CD50C75238A32A100ED7DD8 /* Version.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC384F225C0DB500814240 /* Version.h */; }; + 9CD50C76238A32A100ED7DD8 /* VoiceData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3865225C0DB800814240 /* VoiceData.h */; }; + 9CD50C77238A32A100ED7DD8 /* WedgeData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC383E225C0DB300814240 /* WedgeData.h */; }; + 9CD50C78238A32A100ED7DD8 /* WordsData.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29DC3855225C0DB600814240 /* WordsData.h */; }; + 9CD50CA0238A3D2700ED7DD8 /* XAttributeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C7F238A3CFA00ED7DD8 /* XAttributeIterator.cpp */; }; + 9CD50CA1238A3D2700ED7DD8 /* XElementIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C81238A3CFA00ED7DD8 /* XElementIterator.cpp */; }; + 9CD50CA2238A3D2700ED7DD8 /* PugiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C82238A3CFA00ED7DD8 /* PugiElement.cpp */; }; + 9CD50CA3238A3D2700ED7DD8 /* PugiAttributeIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C86238A3CFA00ED7DD8 /* PugiAttributeIterImpl.cpp */; }; + 9CD50CA4238A3D2700ED7DD8 /* PugiAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C89238A3CFA00ED7DD8 /* PugiAttribute.cpp */; }; + 9CD50CA5238A3D2700ED7DD8 /* PugiElementIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8A238A3CFA00ED7DD8 /* PugiElementIterImpl.cpp */; }; + 9CD50CA6238A3D2700ED7DD8 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8B238A3CFA00ED7DD8 /* pugixml.cpp */; }; + 9CD50CA7238A3D2700ED7DD8 /* XFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8F238A3CFA00ED7DD8 /* XFactory.cpp */; }; + 9CD50CA8238A3D2700ED7DD8 /* PugiDoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C92238A3CFA00ED7DD8 /* PugiDoc.cpp */; }; + 9CD50CA9238A3D2800ED7DD8 /* XAttributeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C7F238A3CFA00ED7DD8 /* XAttributeIterator.cpp */; }; + 9CD50CAA238A3D2800ED7DD8 /* XElementIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C81238A3CFA00ED7DD8 /* XElementIterator.cpp */; }; + 9CD50CAB238A3D2800ED7DD8 /* PugiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C82238A3CFA00ED7DD8 /* PugiElement.cpp */; }; + 9CD50CAC238A3D2800ED7DD8 /* PugiAttributeIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C86238A3CFA00ED7DD8 /* PugiAttributeIterImpl.cpp */; }; + 9CD50CAD238A3D2800ED7DD8 /* PugiAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C89238A3CFA00ED7DD8 /* PugiAttribute.cpp */; }; + 9CD50CAE238A3D2800ED7DD8 /* PugiElementIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8A238A3CFA00ED7DD8 /* PugiElementIterImpl.cpp */; }; + 9CD50CAF238A3D2800ED7DD8 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8B238A3CFA00ED7DD8 /* pugixml.cpp */; }; + 9CD50CB0238A3D2800ED7DD8 /* XFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8F238A3CFA00ED7DD8 /* XFactory.cpp */; }; + 9CD50CB1238A3D2800ED7DD8 /* PugiDoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C92238A3CFA00ED7DD8 /* PugiDoc.cpp */; }; + 9CD50CB2238A3D2800ED7DD8 /* XAttributeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C7F238A3CFA00ED7DD8 /* XAttributeIterator.cpp */; }; + 9CD50CB3238A3D2800ED7DD8 /* XElementIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C81238A3CFA00ED7DD8 /* XElementIterator.cpp */; }; + 9CD50CB4238A3D2800ED7DD8 /* PugiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C82238A3CFA00ED7DD8 /* PugiElement.cpp */; }; + 9CD50CB5238A3D2800ED7DD8 /* PugiAttributeIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C86238A3CFA00ED7DD8 /* PugiAttributeIterImpl.cpp */; }; + 9CD50CB6238A3D2800ED7DD8 /* PugiAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C89238A3CFA00ED7DD8 /* PugiAttribute.cpp */; }; + 9CD50CB7238A3D2800ED7DD8 /* PugiElementIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8A238A3CFA00ED7DD8 /* PugiElementIterImpl.cpp */; }; + 9CD50CB8238A3D2800ED7DD8 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8B238A3CFA00ED7DD8 /* pugixml.cpp */; }; + 9CD50CB9238A3D2800ED7DD8 /* XFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8F238A3CFA00ED7DD8 /* XFactory.cpp */; }; + 9CD50CBA238A3D2800ED7DD8 /* PugiDoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C92238A3CFA00ED7DD8 /* PugiDoc.cpp */; }; + 9CD50CBB238A3D2800ED7DD8 /* XAttributeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C7F238A3CFA00ED7DD8 /* XAttributeIterator.cpp */; }; + 9CD50CBC238A3D2800ED7DD8 /* XElementIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C81238A3CFA00ED7DD8 /* XElementIterator.cpp */; }; + 9CD50CBD238A3D2800ED7DD8 /* PugiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C82238A3CFA00ED7DD8 /* PugiElement.cpp */; }; + 9CD50CBE238A3D2800ED7DD8 /* PugiAttributeIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C86238A3CFA00ED7DD8 /* PugiAttributeIterImpl.cpp */; }; + 9CD50CBF238A3D2800ED7DD8 /* PugiAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C89238A3CFA00ED7DD8 /* PugiAttribute.cpp */; }; + 9CD50CC0238A3D2800ED7DD8 /* PugiElementIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8A238A3CFA00ED7DD8 /* PugiElementIterImpl.cpp */; }; + 9CD50CC1238A3D2800ED7DD8 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8B238A3CFA00ED7DD8 /* pugixml.cpp */; }; + 9CD50CC2238A3D2800ED7DD8 /* XFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8F238A3CFA00ED7DD8 /* XFactory.cpp */; }; + 9CD50CC3238A3D2800ED7DD8 /* PugiDoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C92238A3CFA00ED7DD8 /* PugiDoc.cpp */; }; + 9CD50CC4238A3D2900ED7DD8 /* XAttributeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C7F238A3CFA00ED7DD8 /* XAttributeIterator.cpp */; }; + 9CD50CC5238A3D2900ED7DD8 /* XElementIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C81238A3CFA00ED7DD8 /* XElementIterator.cpp */; }; + 9CD50CC6238A3D2900ED7DD8 /* PugiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C82238A3CFA00ED7DD8 /* PugiElement.cpp */; }; + 9CD50CC7238A3D2900ED7DD8 /* PugiAttributeIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C86238A3CFA00ED7DD8 /* PugiAttributeIterImpl.cpp */; }; + 9CD50CC8238A3D2900ED7DD8 /* PugiAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C89238A3CFA00ED7DD8 /* PugiAttribute.cpp */; }; + 9CD50CC9238A3D2900ED7DD8 /* PugiElementIterImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD50C8A238A3CFA00ED7DD8 /* PugiElementIterImpl.cpp */; }; + 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 */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -3358,8 +3441,50 @@ isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = mx/api; - dstSubfolderSpec = 7; + dstSubfolderSpec = 6; files = ( + 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 */, + 9CD50C2B238A323100ED7DD8 /* ColorData.h in CopyFiles */, + 9CD50C2C238A323100ED7DD8 /* CurveData.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 */, + 9CD50C32238A323100ED7DD8 /* KeyData.h in CopyFiles */, + 9CD50C33238A323100ED7DD8 /* LayoutData.h in CopyFiles */, + 9CD50C34238A323100ED7DD8 /* LineData.h in CopyFiles */, + 9CD50C35238A323100ED7DD8 /* LyricData.h in CopyFiles */, + 9CD50C36238A323100ED7DD8 /* MarkData.h in CopyFiles */, + 9CD50C37238A323100ED7DD8 /* MeasureData.h in CopyFiles */, + 9CD50C38238A323100ED7DD8 /* MeasureLocation.h in CopyFiles */, + 9CD50C39238A323100ED7DD8 /* MiscData.h in CopyFiles */, + 9CD50C3A238A323100ED7DD8 /* NoteAttachmentData.h in CopyFiles */, + 9CD50C3B238A323100ED7DD8 /* NoteData.h in CopyFiles */, + 9CD50C3C238A323100ED7DD8 /* OttavaData.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 */, + 9CD50C43238A323100ED7DD8 /* ScoreData.h in CopyFiles */, + 9CD50C44238A323100ED7DD8 /* SoundID.h in CopyFiles */, + 9CD50C45238A323100ED7DD8 /* SpannerData.h in CopyFiles */, + 9CD50C46238A323100ED7DD8 /* StaffData.h in CopyFiles */, + 9CD50C47238A323100ED7DD8 /* SystemData.h in CopyFiles */, + 9CD50C48238A323100ED7DD8 /* TempoData.h in CopyFiles */, + 9CD50C49238A323100ED7DD8 /* TimeSignatureData.h in CopyFiles */, + 9CD50C4A238A323100ED7DD8 /* TupletData.h in CopyFiles */, + 9CD50C4B238A323100ED7DD8 /* Version.h in CopyFiles */, + 9CD50C4C238A323100ED7DD8 /* VoiceData.h in CopyFiles */, + 9CD50C4D238A323100ED7DD8 /* WedgeData.h in CopyFiles */, + 9CD50C4E238A323100ED7DD8 /* WordsData.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3369,6 +3494,48 @@ dstPath = mx/api; dstSubfolderSpec = 7; files = ( + 9CD50C4F238A329F00ED7DD8 /* ApiCommon.h in CopyFiles */, + 9CD50C50238A329F00ED7DD8 /* ApiEquality.h in CopyFiles */, + 9CD50C51238A329F00ED7DD8 /* AppearanceData.h in CopyFiles */, + 9CD50C52238A32A000ED7DD8 /* BarlineData.h in CopyFiles */, + 9CD50C53238A32A000ED7DD8 /* ChordData.h in CopyFiles */, + 9CD50C54238A32A000ED7DD8 /* ClefData.h in CopyFiles */, + 9CD50C55238A32A000ED7DD8 /* ColorData.h in CopyFiles */, + 9CD50C56238A32A000ED7DD8 /* CurveData.h in CopyFiles */, + 9CD50C57238A32A000ED7DD8 /* DirectionData.h in CopyFiles */, + 9CD50C58238A32A000ED7DD8 /* DocumentManager.h in CopyFiles */, + 9CD50C59238A32A000ED7DD8 /* DurationData.h in CopyFiles */, + 9CD50C5A238A32A000ED7DD8 /* EncodingData.h in CopyFiles */, + 9CD50C5B238A32A000ED7DD8 /* FontData.h in CopyFiles */, + 9CD50C5C238A32A000ED7DD8 /* KeyData.h in CopyFiles */, + 9CD50C5D238A32A000ED7DD8 /* LayoutData.h in CopyFiles */, + 9CD50C5E238A32A000ED7DD8 /* LineData.h in CopyFiles */, + 9CD50C5F238A32A000ED7DD8 /* LyricData.h in CopyFiles */, + 9CD50C60238A32A000ED7DD8 /* MarkData.h in CopyFiles */, + 9CD50C61238A32A000ED7DD8 /* MeasureData.h in CopyFiles */, + 9CD50C62238A32A000ED7DD8 /* MeasureLocation.h in CopyFiles */, + 9CD50C63238A32A000ED7DD8 /* MiscData.h in CopyFiles */, + 9CD50C64238A32A000ED7DD8 /* NoteAttachmentData.h in CopyFiles */, + 9CD50C65238A32A000ED7DD8 /* NoteData.h in CopyFiles */, + 9CD50C66238A32A100ED7DD8 /* OttavaData.h in CopyFiles */, + 9CD50C67238A32A100ED7DD8 /* PageTextData.h in CopyFiles */, + 9CD50C68238A32A100ED7DD8 /* PartData.h in CopyFiles */, + 9CD50C69238A32A100ED7DD8 /* PartGroupData.h in CopyFiles */, + 9CD50C6A238A32A100ED7DD8 /* PitchData.h in CopyFiles */, + 9CD50C6B238A32A100ED7DD8 /* PositionData.h in CopyFiles */, + 9CD50C6C238A32A100ED7DD8 /* PrintData.h in CopyFiles */, + 9CD50C6D238A32A100ED7DD8 /* ScoreData.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 */, + 9CD50C74238A32A100ED7DD8 /* TupletData.h in CopyFiles */, + 9CD50C75238A32A100ED7DD8 /* Version.h in CopyFiles */, + 9CD50C76238A32A100ED7DD8 /* VoiceData.h in CopyFiles */, + 9CD50C77238A32A100ED7DD8 /* WedgeData.h in CopyFiles */, + 9CD50C78238A32A100ED7DD8 /* WordsData.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4751,57 +4918,37 @@ 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 = ""; }; 29EAD7461F0EF8CE00BDE782 /* MiscData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MiscData.cpp; sourceTree = ""; }; - 9CD23B662340658C00EB6F13 /* .keep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .keep; sourceTree = ""; }; - 9CD23B672340658C00EB6F13 /* .keep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .keep; sourceTree = ""; }; - 9CD23B692340658C00EB6F13 /* freezing-small.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "freezing-small.xml"; sourceTree = ""; }; - 9CD23B6A2340658C00EB6F13 /* simple.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = simple.xml; sourceTree = ""; }; - 9CD23B6B2340658C00EB6F13 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = ""; }; - 9CD23B6D2340658C00EB6F13 /* ezxml.sublime-workspace */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "ezxml.sublime-workspace"; sourceTree = ""; }; - 9CD23B6E2340658C00EB6F13 /* ezxml.sublime-project */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "ezxml.sublime-project"; sourceTree = ""; }; - 9CD23B6F2340658C00EB6F13 /* ezxml.sublime-workspace.example copy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "ezxml.sublime-workspace.example copy"; sourceTree = ""; }; - 9CD23B702340658C00EB6F13 /* readme.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = readme.md; sourceTree = ""; }; - 9CD23B712340658C00EB6F13 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; - 9CD23B722340658C00EB6F13 /* .gitattributes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitattributes; sourceTree = ""; }; - 9CD23B732340658C00EB6F13 /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = ""; }; - 9CD23B762340658C00EB6F13 /* equal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = equal.h; sourceTree = ""; }; - 9CD23B772340658C00EB6F13 /* Path.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Path.h; sourceTree = ""; }; - 9CD23B782340658C00EB6F13 /* TestProcessingInstructions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestProcessingInstructions.cpp; sourceTree = ""; }; - 9CD23B792340658C00EB6F13 /* TestXDoc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestXDoc.cpp; sourceTree = ""; }; - 9CD23B7A2340658C00EB6F13 /* Catch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Catch.h; sourceTree = ""; }; - 9CD23B7B2340658C00EB6F13 /* Files.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Files.h; sourceTree = ""; }; - 9CD23B7C2340658C00EB6F13 /* TestFreezing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestFreezing.cpp; sourceTree = ""; }; - 9CD23B7D2340658C00EB6F13 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; - 9CD23B802340658C00EB6F13 /* XDocSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XDocSpec.h; sourceTree = ""; }; - 9CD23B812340658C00EB6F13 /* XFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XFactory.h; sourceTree = ""; }; - 9CD23B822340658C00EB6F13 /* ezxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ezxml.h; sourceTree = ""; }; - 9CD23B832340658C00EB6F13 /* XElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XElement.h; sourceTree = ""; }; - 9CD23B842340658C00EB6F13 /* XAttributeIterImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XAttributeIterImpl.h; sourceTree = ""; }; - 9CD23B852340658C00EB6F13 /* XElementIterImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XElementIterImpl.h; sourceTree = ""; }; - 9CD23B862340658C00EB6F13 /* XAttributeIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XAttributeIterator.h; sourceTree = ""; }; - 9CD23B872340658C00EB6F13 /* XElementIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XElementIterator.h; sourceTree = ""; }; - 9CD23B882340658C00EB6F13 /* XDoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XDoc.h; sourceTree = ""; }; - 9CD23B892340658C00EB6F13 /* XAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XAttribute.h; sourceTree = ""; }; - 9CD23B8A2340658C00EB6F13 /* XForwardDeclare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XForwardDeclare.h; sourceTree = ""; }; - 9CD23B8D2340658C00EB6F13 /* XAttributeIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XAttributeIterator.cpp; sourceTree = ""; }; - 9CD23B8E2340658C00EB6F13 /* pugiconfig.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pugiconfig.hpp; sourceTree = ""; }; - 9CD23B8F2340658C00EB6F13 /* XElementIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XElementIterator.cpp; sourceTree = ""; }; - 9CD23B902340658C00EB6F13 /* PugiElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PugiElement.cpp; sourceTree = ""; }; - 9CD23B912340658C00EB6F13 /* PugiDoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PugiDoc.h; sourceTree = ""; }; - 9CD23B922340658C00EB6F13 /* Parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Parse.h; sourceTree = ""; }; - 9CD23B932340658C00EB6F13 /* PugiAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PugiAttribute.h; sourceTree = ""; }; - 9CD23B942340658C00EB6F13 /* PugiAttributeIterImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PugiAttributeIterImpl.cpp; sourceTree = ""; }; - 9CD23B952340658C00EB6F13 /* pugilicense.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pugilicense.txt; sourceTree = ""; }; - 9CD23B962340658C00EB6F13 /* pugixml.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pugixml.hpp; sourceTree = ""; }; - 9CD23B972340658C00EB6F13 /* PugiAttribute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PugiAttribute.cpp; sourceTree = ""; }; - 9CD23B982340658C00EB6F13 /* PugiElementIterImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PugiElementIterImpl.cpp; sourceTree = ""; }; - 9CD23B992340658C00EB6F13 /* pugixml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pugixml.cpp; sourceTree = ""; }; - 9CD23B9A2340658C00EB6F13 /* XThrow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XThrow.h; sourceTree = ""; }; - 9CD23B9B2340658C00EB6F13 /* PugiElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PugiElement.h; sourceTree = ""; }; - 9CD23B9C2340658C00EB6F13 /* PugiElementIterImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PugiElementIterImpl.h; sourceTree = ""; }; - 9CD23B9D2340658C00EB6F13 /* XFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XFactory.cpp; sourceTree = ""; }; - 9CD23B9E2340658C00EB6F13 /* Throw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Throw.h; sourceTree = ""; }; - 9CD23B9F2340658C00EB6F13 /* PugiAttributeIterImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PugiAttributeIterImpl.h; sourceTree = ""; }; - 9CD23BA02340658C00EB6F13 /* PugiDoc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PugiDoc.cpp; 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 = ""; }; + 9CD50C82238A3CFA00ED7DD8 /* PugiElement.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PugiElement.cpp; sourceTree = ""; }; + 9CD50C83238A3CFA00ED7DD8 /* PugiDoc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PugiDoc.h; sourceTree = ""; }; + 9CD50C84238A3CFA00ED7DD8 /* Parse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Parse.h; sourceTree = ""; }; + 9CD50C85238A3CFA00ED7DD8 /* PugiAttribute.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PugiAttribute.h; sourceTree = ""; }; + 9CD50C86238A3CFA00ED7DD8 /* PugiAttributeIterImpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PugiAttributeIterImpl.cpp; sourceTree = ""; }; + 9CD50C87238A3CFA00ED7DD8 /* pugilicense.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = pugilicense.txt; sourceTree = ""; }; + 9CD50C88238A3CFA00ED7DD8 /* pugixml.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = pugixml.hpp; sourceTree = ""; }; + 9CD50C89238A3CFA00ED7DD8 /* PugiAttribute.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PugiAttribute.cpp; sourceTree = ""; }; + 9CD50C8A238A3CFA00ED7DD8 /* PugiElementIterImpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PugiElementIterImpl.cpp; sourceTree = ""; }; + 9CD50C8B238A3CFA00ED7DD8 /* pugixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = pugixml.cpp; sourceTree = ""; }; + 9CD50C8C238A3CFA00ED7DD8 /* XThrow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XThrow.h; sourceTree = ""; }; + 9CD50C8D238A3CFA00ED7DD8 /* PugiElement.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PugiElement.h; sourceTree = ""; }; + 9CD50C8E238A3CFA00ED7DD8 /* PugiElementIterImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PugiElementIterImpl.h; sourceTree = ""; }; + 9CD50C8F238A3CFA00ED7DD8 /* XFactory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = XFactory.cpp; sourceTree = ""; }; + 9CD50C90238A3CFA00ED7DD8 /* Throw.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Throw.h; sourceTree = ""; }; + 9CD50C91238A3CFA00ED7DD8 /* PugiAttributeIterImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PugiAttributeIterImpl.h; sourceTree = ""; }; + 9CD50C92238A3CFA00ED7DD8 /* PugiDoc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PugiDoc.cpp; sourceTree = ""; }; + 9CD50C95238A3D0A00ED7DD8 /* XDocSpec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XDocSpec.h; sourceTree = ""; }; + 9CD50C96238A3D0A00ED7DD8 /* XFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XFactory.h; sourceTree = ""; }; + 9CD50C97238A3D0A00ED7DD8 /* ezxml.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ezxml.h; sourceTree = ""; }; + 9CD50C98238A3D0A00ED7DD8 /* XElement.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XElement.h; sourceTree = ""; }; + 9CD50C99238A3D0A00ED7DD8 /* XAttributeIterImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XAttributeIterImpl.h; sourceTree = ""; }; + 9CD50C9A238A3D0A00ED7DD8 /* XElementIterImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XElementIterImpl.h; sourceTree = ""; }; + 9CD50C9B238A3D0A00ED7DD8 /* XAttributeIterator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XAttributeIterator.h; sourceTree = ""; }; + 9CD50C9C238A3D0A00ED7DD8 /* XElementIterator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XElementIterator.h; sourceTree = ""; }; + 9CD50C9D238A3D0A00ED7DD8 /* XDoc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XDoc.h; sourceTree = ""; }; + 9CD50C9E238A3D0A00ED7DD8 /* XAttribute.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XAttribute.h; sourceTree = ""; }; + 9CD50C9F238A3D0A00ED7DD8 /* XForwardDeclare.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XForwardDeclare.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -4876,7 +5023,7 @@ 29A8DD571EF0475D00AD2478 /* mx */ = { isa = PBXGroup; children = ( - 9CD23B622340653B00EB6F13 /* extern */, + 9CD50C7D238A3CB700ED7DD8 /* ezxml */, 29DC383C225C0D4000814240 /* api-include */, 29A8DD581EF0475D00AD2478 /* api */, 29A8DD881EF0475D00AD2478 /* core */, @@ -6316,170 +6463,70 @@ path = ../../include/mx/api; sourceTree = ""; }; - 9CD23B622340653B00EB6F13 /* extern */ = { + 9CD50C7D238A3CB700ED7DD8 /* ezxml */ = { isa = PBXGroup; children = ( - 9CD23B632340658C00EB6F13 /* ezxml */, - ); - name = extern; - path = ../Sourcecode/private/mx/extern; - sourceTree = SOURCE_ROOT; - }; - 9CD23B632340658C00EB6F13 /* ezxml */ = { - isa = PBXGroup; - children = ( - 9CD23B642340658C00EB6F13 /* testdata */, - 9CD23B6B2340658C00EB6F13 /* CMakeLists.txt */, - 9CD23B6C2340658C00EB6F13 /* other */, - 9CD23B702340658C00EB6F13 /* readme.md */, - 9CD23B712340658C00EB6F13 /* .gitignore */, - 9CD23B722340658C00EB6F13 /* .gitattributes */, - 9CD23B732340658C00EB6F13 /* license.txt */, - 9CD23B742340658C00EB6F13 /* src */, + 9CD50C93238A3D0A00ED7DD8 /* include */, + 9CD50C7E238A3CFA00ED7DD8 /* private */, ); name = ezxml; - path = ../../extern/ezxml; - sourceTree = ""; - }; - 9CD23B642340658C00EB6F13 /* testdata */ = { - isa = PBXGroup; - children = ( - 9CD23B652340658C00EB6F13 /* out */, - 9CD23B672340658C00EB6F13 /* .keep */, - 9CD23B682340658C00EB6F13 /* xml */, - ); - path = testdata; - sourceTree = ""; - }; - 9CD23B652340658C00EB6F13 /* out */ = { - isa = PBXGroup; - children = ( - 9CD23B662340658C00EB6F13 /* .keep */, - ); - path = out; - sourceTree = ""; - }; - 9CD23B682340658C00EB6F13 /* xml */ = { - isa = PBXGroup; - children = ( - 9CD23B692340658C00EB6F13 /* freezing-small.xml */, - 9CD23B6A2340658C00EB6F13 /* simple.xml */, - ); - path = xml; - sourceTree = ""; - }; - 9CD23B6C2340658C00EB6F13 /* other */ = { - isa = PBXGroup; - children = ( - 9CD23B6D2340658C00EB6F13 /* ezxml.sublime-workspace */, - 9CD23B6E2340658C00EB6F13 /* ezxml.sublime-project */, - 9CD23B6F2340658C00EB6F13 /* ezxml.sublime-workspace.example copy */, - ); - path = other; - sourceTree = ""; - }; - 9CD23B742340658C00EB6F13 /* src */ = { - isa = PBXGroup; - children = ( - 9CD23B752340658C00EB6F13 /* test */, - 9CD23B7E2340658C00EB6F13 /* include */, - 9CD23B8B2340658C00EB6F13 /* private */, - 9CD23BA12340658C00EB6F13 /* extern */, - ); - path = src; sourceTree = ""; }; - 9CD23B752340658C00EB6F13 /* test */ = { + 9CD50C7E238A3CFA00ED7DD8 /* private */ = { isa = PBXGroup; children = ( - 9CD23B762340658C00EB6F13 /* equal.h */, - 9CD23B772340658C00EB6F13 /* Path.h */, - 9CD23B782340658C00EB6F13 /* TestProcessingInstructions.cpp */, - 9CD23B792340658C00EB6F13 /* TestXDoc.cpp */, - 9CD23B7A2340658C00EB6F13 /* Catch.h */, - 9CD23B7B2340658C00EB6F13 /* Files.h */, - 9CD23B7C2340658C00EB6F13 /* TestFreezing.cpp */, - 9CD23B7D2340658C00EB6F13 /* main.cpp */, + 9CD50C7F238A3CFA00ED7DD8 /* XAttributeIterator.cpp */, + 9CD50C80238A3CFA00ED7DD8 /* pugiconfig.hpp */, + 9CD50C81238A3CFA00ED7DD8 /* XElementIterator.cpp */, + 9CD50C82238A3CFA00ED7DD8 /* PugiElement.cpp */, + 9CD50C83238A3CFA00ED7DD8 /* PugiDoc.h */, + 9CD50C84238A3CFA00ED7DD8 /* Parse.h */, + 9CD50C85238A3CFA00ED7DD8 /* PugiAttribute.h */, + 9CD50C86238A3CFA00ED7DD8 /* PugiAttributeIterImpl.cpp */, + 9CD50C87238A3CFA00ED7DD8 /* pugilicense.txt */, + 9CD50C88238A3CFA00ED7DD8 /* pugixml.hpp */, + 9CD50C89238A3CFA00ED7DD8 /* PugiAttribute.cpp */, + 9CD50C8A238A3CFA00ED7DD8 /* PugiElementIterImpl.cpp */, + 9CD50C8B238A3CFA00ED7DD8 /* pugixml.cpp */, + 9CD50C8C238A3CFA00ED7DD8 /* XThrow.h */, + 9CD50C8D238A3CFA00ED7DD8 /* PugiElement.h */, + 9CD50C8E238A3CFA00ED7DD8 /* PugiElementIterImpl.h */, + 9CD50C8F238A3CFA00ED7DD8 /* XFactory.cpp */, + 9CD50C90238A3CFA00ED7DD8 /* Throw.h */, + 9CD50C91238A3CFA00ED7DD8 /* PugiAttributeIterImpl.h */, + 9CD50C92238A3CFA00ED7DD8 /* PugiDoc.cpp */, ); - path = test; + name = private; + path = ../extern/ezxml/src/private/private; sourceTree = ""; }; - 9CD23B7E2340658C00EB6F13 /* include */ = { + 9CD50C93238A3D0A00ED7DD8 /* include */ = { isa = PBXGroup; children = ( - 9CD23B7F2340658C00EB6F13 /* ezxml */, + 9CD50C94238A3D0A00ED7DD8 /* ezxml */, ); - path = include; + name = include; + path = ../extern/ezxml/src/include; sourceTree = ""; }; - 9CD23B7F2340658C00EB6F13 /* ezxml */ = { + 9CD50C94238A3D0A00ED7DD8 /* ezxml */ = { isa = PBXGroup; children = ( - 9CD23B802340658C00EB6F13 /* XDocSpec.h */, - 9CD23B812340658C00EB6F13 /* XFactory.h */, - 9CD23B822340658C00EB6F13 /* ezxml.h */, - 9CD23B832340658C00EB6F13 /* XElement.h */, - 9CD23B842340658C00EB6F13 /* XAttributeIterImpl.h */, - 9CD23B852340658C00EB6F13 /* XElementIterImpl.h */, - 9CD23B862340658C00EB6F13 /* XAttributeIterator.h */, - 9CD23B872340658C00EB6F13 /* XElementIterator.h */, - 9CD23B882340658C00EB6F13 /* XDoc.h */, - 9CD23B892340658C00EB6F13 /* XAttribute.h */, - 9CD23B8A2340658C00EB6F13 /* XForwardDeclare.h */, + 9CD50C95238A3D0A00ED7DD8 /* XDocSpec.h */, + 9CD50C96238A3D0A00ED7DD8 /* XFactory.h */, + 9CD50C97238A3D0A00ED7DD8 /* ezxml.h */, + 9CD50C98238A3D0A00ED7DD8 /* XElement.h */, + 9CD50C99238A3D0A00ED7DD8 /* XAttributeIterImpl.h */, + 9CD50C9A238A3D0A00ED7DD8 /* XElementIterImpl.h */, + 9CD50C9B238A3D0A00ED7DD8 /* XAttributeIterator.h */, + 9CD50C9C238A3D0A00ED7DD8 /* XElementIterator.h */, + 9CD50C9D238A3D0A00ED7DD8 /* XDoc.h */, + 9CD50C9E238A3D0A00ED7DD8 /* XAttribute.h */, + 9CD50C9F238A3D0A00ED7DD8 /* XForwardDeclare.h */, ); path = ezxml; sourceTree = ""; }; - 9CD23B8B2340658C00EB6F13 /* private */ = { - isa = PBXGroup; - children = ( - 9CD23B8C2340658C00EB6F13 /* private */, - ); - path = private; - sourceTree = ""; - }; - 9CD23B8C2340658C00EB6F13 /* private */ = { - isa = PBXGroup; - children = ( - 9CD23B8D2340658C00EB6F13 /* XAttributeIterator.cpp */, - 9CD23B8E2340658C00EB6F13 /* pugiconfig.hpp */, - 9CD23B8F2340658C00EB6F13 /* XElementIterator.cpp */, - 9CD23B902340658C00EB6F13 /* PugiElement.cpp */, - 9CD23B912340658C00EB6F13 /* PugiDoc.h */, - 9CD23B922340658C00EB6F13 /* Parse.h */, - 9CD23B932340658C00EB6F13 /* PugiAttribute.h */, - 9CD23B942340658C00EB6F13 /* PugiAttributeIterImpl.cpp */, - 9CD23B952340658C00EB6F13 /* pugilicense.txt */, - 9CD23B962340658C00EB6F13 /* pugixml.hpp */, - 9CD23B972340658C00EB6F13 /* PugiAttribute.cpp */, - 9CD23B982340658C00EB6F13 /* PugiElementIterImpl.cpp */, - 9CD23B992340658C00EB6F13 /* pugixml.cpp */, - 9CD23B9A2340658C00EB6F13 /* XThrow.h */, - 9CD23B9B2340658C00EB6F13 /* PugiElement.h */, - 9CD23B9C2340658C00EB6F13 /* PugiElementIterImpl.h */, - 9CD23B9D2340658C00EB6F13 /* XFactory.cpp */, - 9CD23B9E2340658C00EB6F13 /* Throw.h */, - 9CD23B9F2340658C00EB6F13 /* PugiAttributeIterImpl.h */, - 9CD23BA02340658C00EB6F13 /* PugiDoc.cpp */, - ); - path = private; - sourceTree = ""; - }; - 9CD23BA12340658C00EB6F13 /* extern */ = { - isa = PBXGroup; - children = ( - 9CD23BA22340658C00EB6F13 /* rapidjson */, - ); - path = extern; - sourceTree = ""; - }; - 9CD23BA22340658C00EB6F13 /* rapidjson */ = { - isa = PBXGroup; - children = ( - ); - path = rapidjson; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -6510,7 +6557,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 29B962851E79FF410072071D /* MxiOS.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6618,7 +6664,7 @@ 299F7FDE1CA8D2200084CAE5 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1100; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "Matthew James Briggs"; TargetAttributes = { 293FFED11DD25C74001477E8 = { @@ -6644,11 +6690,11 @@ }; buildConfigurationList = 299F7FE11CA8D2200084CAE5 /* Build configuration list for PBXProject "Mx" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = en; + developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, - Base, ); mainGroup = 299F7FDD1CA8D2200084CAE5; productRefGroup = 299F7FE71CA8D2200084CAE5 /* Products */; @@ -6698,9 +6744,9 @@ 29A8FB0C1EF0476D00AD2478 /* WorkNumber.cpp in Sources */, 29A8EFD61EF0476700AD2478 /* MidiDeviceAttributes.cpp in Sources */, 29A8EAA41EF0476500AD2478 /* Fingernails.cpp in Sources */, + 9CD50CAF238A3D2800ED7DD8 /* pugixml.cpp in Sources */, 29A8ED6A1EF0476600AD2478 /* InterchangeableAttributes.cpp in Sources */, 29A8E9001EF0476400AD2478 /* Dynamics.cpp in Sources */, - 9CD23C3A2340658C00EB6F13 /* pugixml.cpp in Sources */, 29A8EC201EF0476500AD2478 /* GroupTime.cpp in Sources */, 29A8FA761EF0476D00AD2478 /* VirtualLibrary.cpp in Sources */, 29A8EA4A1EF0476500AD2478 /* FermataAttributes.cpp in Sources */, @@ -6777,7 +6823,7 @@ 29A8F08A1EF0476700AD2478 /* MusicDataChoice.cpp in Sources */, 29A8F7FB1EF0476B00AD2478 /* Syllabic.cpp in Sources */, 29A8F8B91EF0476C00AD2478 /* Time.cpp in Sources */, - 9CD23C352340658C00EB6F13 /* PugiElementIterImpl.cpp in Sources */, + 9CD50CAA238A3D2800ED7DD8 /* XElementIterator.cpp in Sources */, 29A8E3A61EF0476300AD2478 /* WordsData.cpp in Sources */, 29A8ED741EF0476600AD2478 /* Inversion.cpp in Sources */, 29A8EAB81EF0476500AD2478 /* FirstFretAttributes.cpp in Sources */, @@ -6786,14 +6832,15 @@ 29A8E84C1EF0476400AD2478 /* DirectionType.cpp in Sources */, 29A8FCD31EF0476E00AD2478 /* StaffFunctions.cpp in Sources */, 29A8FBDE1EF0476E00AD2478 /* DirectionWriter.cpp in Sources */, + 9CD50CAB238A3D2800ED7DD8 /* PugiElement.cpp in Sources */, 29A8F18E1EF0476800AD2478 /* Octave.cpp in Sources */, 29A8EFC21EF0476700AD2478 /* MidiChannel.cpp in Sources */, 29A800651EF0876500AD2478 /* SoundID.cpp in Sources */, 29A8F6251EF0476A00AD2478 /* Slide.cpp in Sources */, 29A8E8741EF0476400AD2478 /* DisplayStep.cpp in Sources */, 29A8F67F1EF0476A00AD2478 /* SoundAttributes.cpp in Sources */, - 9CD23C122340658C00EB6F13 /* PugiElement.cpp in Sources */, 29A8E7701EF0476400AD2478 /* CueNoteGroup.cpp in Sources */, + 9CD50CB0238A3D2800ED7DD8 /* XFactory.cpp in Sources */, 29A8F2741EF0476800AD2478 /* OtherPlayAttributes.cpp in Sources */, 29A8EE821EF0476600AD2478 /* LinkAttributes.cpp in Sources */, 29A8EDBA1EF0476600AD2478 /* Key.cpp in Sources */, @@ -6847,11 +6894,11 @@ 29A8E9AA1EF0476400AD2478 /* Encoding.cpp in Sources */, 29A8E6081EF0476300AD2478 /* BeatUnitPer.cpp in Sources */, 29A8E77A1EF0476400AD2478 /* Damp.cpp in Sources */, + 9CD50CAC238A3D2800ED7DD8 /* PugiAttributeIterImpl.cpp in Sources */, 29A8F4BD1EF0476900AD2478 /* Release.cpp in Sources */, 29A8F7291EF0476B00AD2478 /* Staves.cpp in Sources */, 29A8F3281EF0476800AD2478 /* PartName.cpp in Sources */, 29A8F6BB1EF0476A00AD2478 /* Staff.cpp in Sources */, - 9CD23C5D2340658C00EB6F13 /* PugiDoc.cpp in Sources */, 29A8F0BC1EF0476700AD2478 /* NonArpeggiate.cpp in Sources */, 29A8EBB21EF0476500AD2478 /* GroupAbbreviationDisplayAttributes.cpp in Sources */, 29A8F5671EF0476A00AD2478 /* Scordatura.cpp in Sources */, @@ -6861,7 +6908,6 @@ 29A8F9D11EF0476C00AD2478 /* TupletDot.cpp in Sources */, 29A8E8921EF0476400AD2478 /* DisplayTextAttributes.cpp in Sources */, 29A8FAF81EF0476D00AD2478 /* WordsAttributes.cpp in Sources */, - 9CD23C262340658C00EB6F13 /* PugiAttributeIterImpl.cpp in Sources */, 29A8ECDE1EF0476600AD2478 /* HoleClosedAttributes.cpp in Sources */, 29A8E6C61EF0476400AD2478 /* CircularArrow.cpp in Sources */, 29A8F98B1EF0476C00AD2478 /* TripleTongue.cpp in Sources */, @@ -6907,12 +6953,12 @@ 29A8F53F1EF0476A00AD2478 /* RootStepAttributes.cpp in Sources */, 29A8F6611EF0476A00AD2478 /* Solo.cpp in Sources */, 29A8F5211EF0476900AD2478 /* RootAlter.cpp in Sources */, - 9CD23C4E2340658C00EB6F13 /* XFactory.cpp in Sources */, 29A8E57C1EF0476300AD2478 /* BassAlterAttributes.cpp in Sources */, 29A8E5F41EF0476300AD2478 /* BeatUnitDot.cpp in Sources */, 29A8EC701EF0476500AD2478 /* HarmonicTypeChoice.cpp in Sources */, 29A8F8871EF0476B00AD2478 /* ThumbPosition.cpp in Sources */, 29A8FB021EF0476D00AD2478 /* Work.cpp in Sources */, + 9CD50CA9238A3D2800ED7DD8 /* XAttributeIterator.cpp in Sources */, 29A8EDD81EF0476600AD2478 /* KeyAttributes.cpp in Sources */, 29A8F6C51EF0476A00AD2478 /* StaffDetails.cpp in Sources */, 29A8E50E1EF0476300AD2478 /* AttributesIterface.cpp in Sources */, @@ -6937,6 +6983,7 @@ 29A8E9821EF0476400AD2478 /* EmptyPlacementAttributes.cpp in Sources */, 29A8ECD41EF0476600AD2478 /* HoleClosed.cpp in Sources */, 29A8E4141EF0476300AD2478 /* AccidentalAttributes.cpp in Sources */, + 9CD50CB1238A3D2800ED7DD8 /* PugiDoc.cpp in Sources */, 29A8E7E81EF0476400AD2478 /* DegreeValue.cpp in Sources */, 29A8E5EA1EF0476300AD2478 /* BeatUnit.cpp in Sources */, 29A8FC381EF0476E00AD2478 /* MeasureWriter.cpp in Sources */, @@ -6999,7 +7046,6 @@ 29A8F2EC1EF0476800AD2478 /* PartAbbreviationDisplayAttributes.cpp in Sources */, 29A8E6301EF0476300AD2478 /* BendAttributes.cpp in Sources */, 29A8F2CE1EF0476800AD2478 /* PartAbbreviation.cpp in Sources */, - 9CD23C032340658C00EB6F13 /* XAttributeIterator.cpp in Sources */, 29A8FBF21EF0476E00AD2478 /* DynamicsWriter.cpp in Sources */, 29A8FCF11EF0476E00AD2478 /* TupletReader.cpp in Sources */, 29A8F3DC1EF0476900AD2478 /* PerMinuteOrBeatUnitChoice.cpp in Sources */, @@ -7008,6 +7054,7 @@ 29EAD7491F0EF8CE00BDE782 /* MiscData.cpp in Sources */, 29A8ED881EF0476600AD2478 /* InvertedMordent.cpp in Sources */, 29A8E86A1EF0476400AD2478 /* DisplayOctave.cpp in Sources */, + 9CD50CAD238A3D2800ED7DD8 /* PugiAttribute.cpp in Sources */, 29A8E91E1EF0476400AD2478 /* EditorialVoiceDirectionGroup.cpp in Sources */, 29A8F3AA1EF0476900AD2478 /* Percussion.cpp in Sources */, 29A8EED21EF0476600AD2478 /* MeasureAttributes.cpp in Sources */, @@ -7054,7 +7101,6 @@ 29A8EB4E1EF0476500AD2478 /* Glass.cpp in Sources */, 29A8FA261EF0476C00AD2478 /* TurnAttributes.cpp in Sources */, 29A8FA9E1EF0476D00AD2478 /* WavyLine.cpp in Sources */, - 9CD23C302340658C00EB6F13 /* PugiAttribute.cpp in Sources */, 29A8EDA61EF0476600AD2478 /* InvertedTurnAttributes.cpp in Sources */, 29A8F10C1EF0476700AD2478 /* Notations.cpp in Sources */, 29A8E8241EF0476400AD2478 /* DetachedLegato.cpp in Sources */, @@ -7176,6 +7222,7 @@ 29A8EF721EF0476700AD2478 /* MetronomeDot.cpp in Sources */, 29A8F3B41EF0476900AD2478 /* PercussionAttributes.cpp in Sources */, 29A8E7661EF0476400AD2478 /* Cue.cpp in Sources */, + 9CD50CAE238A3D2800ED7DD8 /* PugiElementIterImpl.cpp in Sources */, 29A8E4E61EF0476300AD2478 /* ArrowStyle.cpp in Sources */, 29A8F8231EF0476B00AD2478 /* SystemLayout.cpp in Sources */, 29A8F31E1EF0476800AD2478 /* PartList.cpp in Sources */, @@ -7202,7 +7249,6 @@ 29A8F5351EF0476900AD2478 /* RootStep.cpp in Sources */, 29A8F7971EF0476B00AD2478 /* String.cpp in Sources */, 29A8E4B41EF0476300AD2478 /* ArpeggiateAttributes.cpp in Sources */, - 9CD23C0D2340658C00EB6F13 /* XElementIterator.cpp in Sources */, 29A8EF4A1EF0476700AD2478 /* Metronome.cpp in Sources */, 29A8F5F31EF0476A00AD2478 /* Sign.cpp in Sources */, 29A8F5E91EF0476A00AD2478 /* Shake.cpp in Sources */, @@ -7373,6 +7419,7 @@ 29A8FB0B1EF0476D00AD2478 /* WorkNumber.cpp in Sources */, 29A8EFD51EF0476700AD2478 /* MidiDeviceAttributes.cpp in Sources */, 29A8EAA31EF0476500AD2478 /* Fingernails.cpp in Sources */, + 9CD50CA6238A3D2700ED7DD8 /* pugixml.cpp in Sources */, 29A8ED691EF0476600AD2478 /* InterchangeableAttributes.cpp in Sources */, 29A8E8FF1EF0476400AD2478 /* Dynamics.cpp in Sources */, 29A8EC1F1EF0476500AD2478 /* GroupTime.cpp in Sources */, @@ -7451,7 +7498,7 @@ 29A8F0891EF0476700AD2478 /* MusicDataChoice.cpp in Sources */, 29A8F7FA1EF0476B00AD2478 /* Syllabic.cpp in Sources */, 29A8F8B81EF0476C00AD2478 /* Time.cpp in Sources */, - 9CD23C342340658C00EB6F13 /* PugiElementIterImpl.cpp in Sources */, + 9CD50CA1238A3D2700ED7DD8 /* XElementIterator.cpp in Sources */, 29A8E3A51EF0476300AD2478 /* WordsData.cpp in Sources */, 29A8ED731EF0476600AD2478 /* Inversion.cpp in Sources */, 29A8EAB71EF0476500AD2478 /* FirstFretAttributes.cpp in Sources */, @@ -7460,14 +7507,15 @@ 29A8E84B1EF0476400AD2478 /* DirectionType.cpp in Sources */, 29A8FCD21EF0476E00AD2478 /* StaffFunctions.cpp in Sources */, 29A8FBDD1EF0476E00AD2478 /* DirectionWriter.cpp in Sources */, + 9CD50CA2238A3D2700ED7DD8 /* PugiElement.cpp in Sources */, 29A8F18D1EF0476800AD2478 /* Octave.cpp in Sources */, 29A8EFC11EF0476700AD2478 /* MidiChannel.cpp in Sources */, 29A800641EF0876500AD2478 /* SoundID.cpp in Sources */, 29A8F6241EF0476A00AD2478 /* Slide.cpp in Sources */, 29A8E8731EF0476400AD2478 /* DisplayStep.cpp in Sources */, 29A8F67E1EF0476A00AD2478 /* SoundAttributes.cpp in Sources */, - 9CD23C112340658C00EB6F13 /* PugiElement.cpp in Sources */, 29A8E76F1EF0476400AD2478 /* CueNoteGroup.cpp in Sources */, + 9CD50CA7238A3D2700ED7DD8 /* XFactory.cpp in Sources */, 29A8F2731EF0476800AD2478 /* OtherPlayAttributes.cpp in Sources */, 29A8EE811EF0476600AD2478 /* LinkAttributes.cpp in Sources */, 29A8EDB91EF0476600AD2478 /* Key.cpp in Sources */, @@ -7486,7 +7534,6 @@ 29A8E6B11EF0476400AD2478 /* Chord.cpp in Sources */, 29A8E9771EF0476400AD2478 /* EmptyLineAttributes.cpp in Sources */, 29A8F1C91EF0476800AD2478 /* OpenString.cpp in Sources */, - 9CD23C7723406A1300EB6F13 /* pugixml.cpp in Sources */, 29A8EF2B1EF0476700AD2478 /* MeasureStyleChoice.cpp in Sources */, 29A8FB5B1EF0476D00AD2478 /* Integers.cpp in Sources */, 29A8F4801EF0476900AD2478 /* PullOff.cpp in Sources */, @@ -7522,11 +7569,11 @@ 29A8E9A91EF0476400AD2478 /* Encoding.cpp in Sources */, 29A8E6071EF0476300AD2478 /* BeatUnitPer.cpp in Sources */, 29A8E7791EF0476400AD2478 /* Damp.cpp in Sources */, + 9CD50CA3238A3D2700ED7DD8 /* PugiAttributeIterImpl.cpp in Sources */, 29A8F4BC1EF0476900AD2478 /* Release.cpp in Sources */, 29A8F7281EF0476B00AD2478 /* Staves.cpp in Sources */, 29A8F3271EF0476800AD2478 /* PartName.cpp in Sources */, 29A8F6BA1EF0476A00AD2478 /* Staff.cpp in Sources */, - 9CD23C5C2340658C00EB6F13 /* PugiDoc.cpp in Sources */, 29A8F0BB1EF0476700AD2478 /* NonArpeggiate.cpp in Sources */, 29A8EBB11EF0476500AD2478 /* GroupAbbreviationDisplayAttributes.cpp in Sources */, 29A8F5661EF0476A00AD2478 /* Scordatura.cpp in Sources */, @@ -7536,7 +7583,6 @@ 29A8F9D01EF0476C00AD2478 /* TupletDot.cpp in Sources */, 29A8E8911EF0476400AD2478 /* DisplayTextAttributes.cpp in Sources */, 29A8FAF71EF0476D00AD2478 /* WordsAttributes.cpp in Sources */, - 9CD23C252340658C00EB6F13 /* PugiAttributeIterImpl.cpp in Sources */, 29A8ECDD1EF0476600AD2478 /* HoleClosedAttributes.cpp in Sources */, 29A8E6C51EF0476400AD2478 /* CircularArrow.cpp in Sources */, 29A8F98A1EF0476C00AD2478 /* TripleTongue.cpp in Sources */, @@ -7582,12 +7628,12 @@ 29A8F53E1EF0476A00AD2478 /* RootStepAttributes.cpp in Sources */, 29A8F6601EF0476A00AD2478 /* Solo.cpp in Sources */, 29A8F5201EF0476900AD2478 /* RootAlter.cpp in Sources */, - 9CD23C4D2340658C00EB6F13 /* XFactory.cpp in Sources */, 29A8E57B1EF0476300AD2478 /* BassAlterAttributes.cpp in Sources */, 29A8E5F31EF0476300AD2478 /* BeatUnitDot.cpp in Sources */, 29A8EC6F1EF0476500AD2478 /* HarmonicTypeChoice.cpp in Sources */, 29A8F8861EF0476B00AD2478 /* ThumbPosition.cpp in Sources */, 29A8FB011EF0476D00AD2478 /* Work.cpp in Sources */, + 9CD50CA0238A3D2700ED7DD8 /* XAttributeIterator.cpp in Sources */, 29A8EDD71EF0476600AD2478 /* KeyAttributes.cpp in Sources */, 29A8F6C41EF0476A00AD2478 /* StaffDetails.cpp in Sources */, 29A8E50D1EF0476300AD2478 /* AttributesIterface.cpp in Sources */, @@ -7612,6 +7658,7 @@ 29A8E9811EF0476400AD2478 /* EmptyPlacementAttributes.cpp in Sources */, 29A8ECD31EF0476600AD2478 /* HoleClosed.cpp in Sources */, 29A8E4131EF0476300AD2478 /* AccidentalAttributes.cpp in Sources */, + 9CD50CA8238A3D2700ED7DD8 /* PugiDoc.cpp in Sources */, 29A8E7E71EF0476400AD2478 /* DegreeValue.cpp in Sources */, 29A8E5E91EF0476300AD2478 /* BeatUnit.cpp in Sources */, 29A8FC371EF0476E00AD2478 /* MeasureWriter.cpp in Sources */, @@ -7674,7 +7721,6 @@ 29A8F2EB1EF0476800AD2478 /* PartAbbreviationDisplayAttributes.cpp in Sources */, 29A8E62F1EF0476300AD2478 /* BendAttributes.cpp in Sources */, 29A8F2CD1EF0476800AD2478 /* PartAbbreviation.cpp in Sources */, - 9CD23C022340658C00EB6F13 /* XAttributeIterator.cpp in Sources */, 29A8FBF11EF0476E00AD2478 /* DynamicsWriter.cpp in Sources */, 29A8FCF01EF0476E00AD2478 /* TupletReader.cpp in Sources */, 29A8F3DB1EF0476900AD2478 /* PerMinuteOrBeatUnitChoice.cpp in Sources */, @@ -7683,6 +7729,7 @@ 29EAD7481F0EF8CE00BDE782 /* MiscData.cpp in Sources */, 29A8ED871EF0476600AD2478 /* InvertedMordent.cpp in Sources */, 29A8E8691EF0476400AD2478 /* DisplayOctave.cpp in Sources */, + 9CD50CA4238A3D2700ED7DD8 /* PugiAttribute.cpp in Sources */, 29A8E91D1EF0476400AD2478 /* EditorialVoiceDirectionGroup.cpp in Sources */, 29A8F3A91EF0476900AD2478 /* Percussion.cpp in Sources */, 29A8EED11EF0476600AD2478 /* MeasureAttributes.cpp in Sources */, @@ -7729,7 +7776,6 @@ 29A8EB4D1EF0476500AD2478 /* Glass.cpp in Sources */, 29A8FA251EF0476C00AD2478 /* TurnAttributes.cpp in Sources */, 29A8FA9D1EF0476D00AD2478 /* WavyLine.cpp in Sources */, - 9CD23C2F2340658C00EB6F13 /* PugiAttribute.cpp in Sources */, 29A8EDA51EF0476600AD2478 /* InvertedTurnAttributes.cpp in Sources */, 29A8F10B1EF0476700AD2478 /* Notations.cpp in Sources */, 29A8E8231EF0476400AD2478 /* DetachedLegato.cpp in Sources */, @@ -7851,6 +7897,7 @@ 29A8EF711EF0476700AD2478 /* MetronomeDot.cpp in Sources */, 29A8F3B31EF0476900AD2478 /* PercussionAttributes.cpp in Sources */, 29A8E7651EF0476400AD2478 /* Cue.cpp in Sources */, + 9CD50CA5238A3D2700ED7DD8 /* PugiElementIterImpl.cpp in Sources */, 29A8E4E51EF0476300AD2478 /* ArrowStyle.cpp in Sources */, 29A8F8221EF0476B00AD2478 /* SystemLayout.cpp in Sources */, 29A8F31D1EF0476800AD2478 /* PartList.cpp in Sources */, @@ -7877,7 +7924,6 @@ 29A8F5341EF0476900AD2478 /* RootStep.cpp in Sources */, 29A8F7961EF0476B00AD2478 /* String.cpp in Sources */, 29A8E4B31EF0476300AD2478 /* ArpeggiateAttributes.cpp in Sources */, - 9CD23C0C2340658C00EB6F13 /* XElementIterator.cpp in Sources */, 29A8EF491EF0476700AD2478 /* Metronome.cpp in Sources */, 29A8F5F21EF0476A00AD2478 /* Sign.cpp in Sources */, 29A8F5E81EF0476A00AD2478 /* Shake.cpp in Sources */, @@ -8048,9 +8094,9 @@ 29A8FDE51EF0499200AD2478 /* AccordionHigh.cpp in Sources */, 29A8FDE61EF0499200AD2478 /* AccordionLow.cpp in Sources */, 29A8FDE71EF0499200AD2478 /* AccordionMiddle.cpp in Sources */, + 9CD50CCA238A3D2900ED7DD8 /* pugixml.cpp in Sources */, 29A8FDE81EF0499200AD2478 /* AccordionRegistration.cpp in Sources */, 29A8FDE91EF0499200AD2478 /* AccordionRegistrationAttributes.cpp in Sources */, - 9CD23C3D2340658C00EB6F13 /* pugixml.cpp in Sources */, 29A8FDEA1EF0499200AD2478 /* ActualNotes.cpp in Sources */, 29A8FDEB1EF0499200AD2478 /* Alter.cpp in Sources */, 29A8FDEC1EF0499200AD2478 /* Appearance.cpp in Sources */, @@ -8127,7 +8173,7 @@ 29A8FE321EF0499200AD2478 /* CreditWordsGroup.cpp in Sources */, 29A8FE331EF0499200AD2478 /* Cue.cpp in Sources */, 29A8FE341EF0499200AD2478 /* CueNoteGroup.cpp in Sources */, - 9CD23C382340658C00EB6F13 /* PugiElementIterImpl.cpp in Sources */, + 9CD50CC5238A3D2900ED7DD8 /* XElementIterator.cpp in Sources */, 29A8FE351EF0499200AD2478 /* Damp.cpp in Sources */, 29A8FE361EF0499200AD2478 /* DampAll.cpp in Sources */, 29A8FE371EF0499200AD2478 /* Dashes.cpp in Sources */, @@ -8136,14 +8182,15 @@ 29A8FE3A1EF0499200AD2478 /* Degree.cpp in Sources */, 29A8FE3B1EF0499200AD2478 /* DegreeAlter.cpp in Sources */, 29A8FE3C1EF0499200AD2478 /* DegreeAlterAttributes.cpp in Sources */, + 9CD50CC6238A3D2900ED7DD8 /* PugiElement.cpp in Sources */, 29A8FE3D1EF0499200AD2478 /* DegreeAttributes.cpp in Sources */, 29A8FE3E1EF0499200AD2478 /* DegreeType.cpp in Sources */, 29A8FE3F1EF0499200AD2478 /* DegreeTypeAttributes.cpp in Sources */, 29A800681EF0876500AD2478 /* SoundID.cpp in Sources */, 29A8FE401EF0499200AD2478 /* DegreeValue.cpp in Sources */, 29A8FE411EF0499200AD2478 /* DegreeValueAttributes.cpp in Sources */, - 9CD23C152340658C00EB6F13 /* PugiElement.cpp in Sources */, 29A8FE421EF0499200AD2478 /* DelayedInvertedTurn.cpp in Sources */, + 9CD50CCB238A3D2900ED7DD8 /* XFactory.cpp in Sources */, 29A8FE431EF0499200AD2478 /* DelayedInvertedTurnAttributes.cpp in Sources */, 29A8FE441EF0499200AD2478 /* DelayedTurn.cpp in Sources */, 29A8FE451EF0499200AD2478 /* DelayedTurnAttributes.cpp in Sources */, @@ -8197,11 +8244,11 @@ 29A8FE741EF0499200AD2478 /* EndParagraph.cpp in Sources */, 29A02E8E1FE0FA5000B74FDE /* EncodingData.cpp in Sources */, 29A8FE751EF0499200AD2478 /* Ensemble.cpp in Sources */, + 9CD50CC7238A3D2900ED7DD8 /* PugiAttributeIterImpl.cpp in Sources */, 29A8FE761EF0499200AD2478 /* Extend.cpp in Sources */, 29A8FE771EF0499200AD2478 /* ExtendAttributes.cpp in Sources */, 29A8FE781EF0499200AD2478 /* Eyeglasses.cpp in Sources */, 29A8FE791EF0499200AD2478 /* Falloff.cpp in Sources */, - 9CD23C602340658C00EB6F13 /* PugiDoc.cpp in Sources */, 29A8FE7A1EF0499200AD2478 /* Feature.cpp in Sources */, 29A8FE7B1EF0499200AD2478 /* FeatureAttributes.cpp in Sources */, 29A8FE7C1EF0499200AD2478 /* Fermata.cpp in Sources */, @@ -8211,7 +8258,6 @@ 29A8FE801EF0499200AD2478 /* FiguredBass.cpp in Sources */, 29A8FE811EF0499200AD2478 /* FiguredBassAttributes.cpp in Sources */, 29A8FE821EF0499200AD2478 /* FigureNumber.cpp in Sources */, - 9CD23C292340658C00EB6F13 /* PugiAttributeIterImpl.cpp in Sources */, 29A8FE831EF0499200AD2478 /* FigureNumberAttributes.cpp in Sources */, 29A8FE841EF0499200AD2478 /* Fingering.cpp in Sources */, 29A8FE851EF0499200AD2478 /* FingeringAttributes.cpp in Sources */, @@ -8257,12 +8303,12 @@ 29A8FEAD1EF0499200AD2478 /* HammerOn.cpp in Sources */, 29A8FEAE1EF0499200AD2478 /* HammerOnAttributes.cpp in Sources */, 29A8FEAF1EF0499200AD2478 /* Handbell.cpp in Sources */, - 9CD23C512340658C00EB6F13 /* XFactory.cpp in Sources */, 29A8FEB01EF0499200AD2478 /* HandbellAttributes.cpp in Sources */, 29A8FEB11EF0499200AD2478 /* Harmonic.cpp in Sources */, 29A8FEB21EF0499200AD2478 /* HarmonicAttributes.cpp in Sources */, 29A8FEB31EF0499200AD2478 /* HarmonicInfoChoice.cpp in Sources */, 29A8FEB41EF0499200AD2478 /* HarmonicTypeChoice.cpp in Sources */, + 9CD50CC4238A3D2900ED7DD8 /* XAttributeIterator.cpp in Sources */, 29A8FEB51EF0499200AD2478 /* Harmony.cpp in Sources */, 29A8FEB61EF0499200AD2478 /* HarmonyAttributes.cpp in Sources */, 29A8FEB71EF0499200AD2478 /* HarmonyChordGroup.cpp in Sources */, @@ -8287,6 +8333,7 @@ 29A8FECA1EF0499200AD2478 /* Instruments.cpp in Sources */, 29A8FECB1EF0499200AD2478 /* InstrumentSound.cpp in Sources */, 29A8FECC1EF0499200AD2478 /* Interchangeable.cpp in Sources */, + 9CD50CCC238A3D2900ED7DD8 /* PugiDoc.cpp in Sources */, 29A8FECD1EF0499200AD2478 /* InterchangeableAttributes.cpp in Sources */, 29A8FECE1EF0499200AD2478 /* Inversion.cpp in Sources */, 29A8FECF1EF0499200AD2478 /* InversionAttributes.cpp in Sources */, @@ -8349,7 +8396,6 @@ 29A8FF081EF0499200AD2478 /* MidiBank.cpp in Sources */, 29A8FF091EF0499200AD2478 /* MidiChannel.cpp in Sources */, 29A8FF0A1EF0499200AD2478 /* MidiDevice.cpp in Sources */, - 9CD23C062340658C00EB6F13 /* XAttributeIterator.cpp in Sources */, 29A8FF0B1EF0499200AD2478 /* MidiDeviceAttributes.cpp in Sources */, 29A8FF0C1EF0499200AD2478 /* MidiDeviceInstrumentGroup.cpp in Sources */, 29A8FF0D1EF0499200AD2478 /* MidiInstrument.cpp in Sources */, @@ -8358,6 +8404,7 @@ 29A8FF101EF0499200AD2478 /* MidiProgram.cpp in Sources */, 29A8FF111EF0499200AD2478 /* MidiUnpitched.cpp in Sources */, 29A8FF121EF0499200AD2478 /* Millimeters.cpp in Sources */, + 9CD50CC8238A3D2900ED7DD8 /* PugiAttribute.cpp in Sources */, 29A8FF131EF0499200AD2478 /* Miscellaneous.cpp in Sources */, 29A8FF141EF0499200AD2478 /* MiscellaneousField.cpp in Sources */, 29EAD74C1F0EF8CE00BDE782 /* MiscData.cpp in Sources */, @@ -8404,7 +8451,6 @@ 29A8FF3C1EF0499200AD2478 /* OffsetAttributes.cpp in Sources */, 29A8FF3D1EF0499200AD2478 /* OpenString.cpp in Sources */, 29A8FF3E1EF0499200AD2478 /* Opus.cpp in Sources */, - 9CD23C332340658C00EB6F13 /* PugiAttribute.cpp in Sources */, 29A8FF3F1EF0499200AD2478 /* OpusAttributes.cpp in Sources */, 29A8FF401EF0499200AD2478 /* Ornaments.cpp in Sources */, 29A8FF411EF0499200AD2478 /* OrnamentsChoice.cpp in Sources */, @@ -8527,6 +8573,7 @@ 29A8FFB61EF0499300AD2478 /* SoundAttributes.cpp in Sources */, 29A8FFB71EF0499300AD2478 /* SoundingPitch.cpp in Sources */, 29A8FFB81EF0499300AD2478 /* Source.cpp in Sources */, + 9CD50CC9238A3D2900ED7DD8 /* PugiElementIterImpl.cpp in Sources */, 29A8FFB91EF0499300AD2478 /* Spiccato.cpp in Sources */, 29A8FFBA1EF0499300AD2478 /* Staccatissimo.cpp in Sources */, 29A8FFBB1EF0499300AD2478 /* Staccato.cpp in Sources */, @@ -8553,7 +8600,6 @@ 29A8FFD01EF0499300AD2478 /* Stopped.cpp in Sources */, 29A8FFD11EF0499300AD2478 /* Stress.cpp in Sources */, 29A8FFD21EF0499300AD2478 /* String.cpp in Sources */, - 9CD23C102340658C00EB6F13 /* XElementIterator.cpp in Sources */, 29A8FFD31EF0499300AD2478 /* StringAttributes.cpp in Sources */, 29A8FFD41EF0499300AD2478 /* StringMute.cpp in Sources */, 29A8FFD51EF0499300AD2478 /* StringMuteAttributes.cpp in Sources */, @@ -8723,9 +8769,9 @@ 29A8FB0E1EF0476D00AD2478 /* WorkNumber.cpp in Sources */, 29A8EFD81EF0476700AD2478 /* MidiDeviceAttributes.cpp in Sources */, 29A8EAA61EF0476500AD2478 /* Fingernails.cpp in Sources */, + 9CD50CC1238A3D2800ED7DD8 /* pugixml.cpp in Sources */, 29A8ED6C1EF0476600AD2478 /* InterchangeableAttributes.cpp in Sources */, 29A8E9021EF0476400AD2478 /* Dynamics.cpp in Sources */, - 9CD23C3C2340658C00EB6F13 /* pugixml.cpp in Sources */, 29A8EC221EF0476500AD2478 /* GroupTime.cpp in Sources */, 29A8FA781EF0476D00AD2478 /* VirtualLibrary.cpp in Sources */, 29A8EA4C1EF0476500AD2478 /* FermataAttributes.cpp in Sources */, @@ -8802,7 +8848,7 @@ 29A8F08C1EF0476700AD2478 /* MusicDataChoice.cpp in Sources */, 29A8F7FD1EF0476B00AD2478 /* Syllabic.cpp in Sources */, 29A8F8BB1EF0476C00AD2478 /* Time.cpp in Sources */, - 9CD23C372340658C00EB6F13 /* PugiElementIterImpl.cpp in Sources */, + 9CD50CBC238A3D2800ED7DD8 /* XElementIterator.cpp in Sources */, 29A8E3A81EF0476300AD2478 /* WordsData.cpp in Sources */, 29A8ED761EF0476600AD2478 /* Inversion.cpp in Sources */, 29A8EABA1EF0476500AD2478 /* FirstFretAttributes.cpp in Sources */, @@ -8811,14 +8857,15 @@ 29A8E84E1EF0476400AD2478 /* DirectionType.cpp in Sources */, 29A8FCD51EF0476E00AD2478 /* StaffFunctions.cpp in Sources */, 29A8FBE01EF0476E00AD2478 /* DirectionWriter.cpp in Sources */, + 9CD50CBD238A3D2800ED7DD8 /* PugiElement.cpp in Sources */, 29A8F1901EF0476800AD2478 /* Octave.cpp in Sources */, 29A8EFC41EF0476700AD2478 /* MidiChannel.cpp in Sources */, 29A800671EF0876500AD2478 /* SoundID.cpp in Sources */, 29A8F6271EF0476A00AD2478 /* Slide.cpp in Sources */, 29A8E8761EF0476400AD2478 /* DisplayStep.cpp in Sources */, 29A8F6811EF0476A00AD2478 /* SoundAttributes.cpp in Sources */, - 9CD23C142340658C00EB6F13 /* PugiElement.cpp in Sources */, 29A8E7721EF0476400AD2478 /* CueNoteGroup.cpp in Sources */, + 9CD50CC2238A3D2800ED7DD8 /* XFactory.cpp in Sources */, 29A8F2761EF0476800AD2478 /* OtherPlayAttributes.cpp in Sources */, 29A8EE841EF0476600AD2478 /* LinkAttributes.cpp in Sources */, 29A8EDBC1EF0476600AD2478 /* Key.cpp in Sources */, @@ -8872,11 +8919,11 @@ 29A8E9AC1EF0476400AD2478 /* Encoding.cpp in Sources */, 29A8E60A1EF0476300AD2478 /* BeatUnitPer.cpp in Sources */, 29A8E77C1EF0476400AD2478 /* Damp.cpp in Sources */, + 9CD50CBE238A3D2800ED7DD8 /* PugiAttributeIterImpl.cpp in Sources */, 29A8F4BF1EF0476900AD2478 /* Release.cpp in Sources */, 29A8F72B1EF0476B00AD2478 /* Staves.cpp in Sources */, 29A8F32A1EF0476800AD2478 /* PartName.cpp in Sources */, 29A8F6BD1EF0476A00AD2478 /* Staff.cpp in Sources */, - 9CD23C5F2340658C00EB6F13 /* PugiDoc.cpp in Sources */, 29A8F0BE1EF0476700AD2478 /* NonArpeggiate.cpp in Sources */, 29A8EBB41EF0476500AD2478 /* GroupAbbreviationDisplayAttributes.cpp in Sources */, 29A8F5691EF0476A00AD2478 /* Scordatura.cpp in Sources */, @@ -8886,7 +8933,6 @@ 29A8F9D31EF0476C00AD2478 /* TupletDot.cpp in Sources */, 29A8E8941EF0476400AD2478 /* DisplayTextAttributes.cpp in Sources */, 29A8FAFA1EF0476D00AD2478 /* WordsAttributes.cpp in Sources */, - 9CD23C282340658C00EB6F13 /* PugiAttributeIterImpl.cpp in Sources */, 29A8ECE01EF0476600AD2478 /* HoleClosedAttributes.cpp in Sources */, 29A8E6C81EF0476400AD2478 /* CircularArrow.cpp in Sources */, 29A8F98D1EF0476C00AD2478 /* TripleTongue.cpp in Sources */, @@ -8932,12 +8978,12 @@ 29A8F5411EF0476A00AD2478 /* RootStepAttributes.cpp in Sources */, 29A8F6631EF0476A00AD2478 /* Solo.cpp in Sources */, 29A8F5231EF0476900AD2478 /* RootAlter.cpp in Sources */, - 9CD23C502340658C00EB6F13 /* XFactory.cpp in Sources */, 29A8E57E1EF0476300AD2478 /* BassAlterAttributes.cpp in Sources */, 29A8E5F61EF0476300AD2478 /* BeatUnitDot.cpp in Sources */, 29A8EC721EF0476500AD2478 /* HarmonicTypeChoice.cpp in Sources */, 29A8F8891EF0476B00AD2478 /* ThumbPosition.cpp in Sources */, 29A8FB041EF0476D00AD2478 /* Work.cpp in Sources */, + 9CD50CBB238A3D2800ED7DD8 /* XAttributeIterator.cpp in Sources */, 29A8EDDA1EF0476600AD2478 /* KeyAttributes.cpp in Sources */, 29A8F6C71EF0476A00AD2478 /* StaffDetails.cpp in Sources */, 29A8E5101EF0476300AD2478 /* AttributesIterface.cpp in Sources */, @@ -8962,6 +9008,7 @@ 29A8E9841EF0476400AD2478 /* EmptyPlacementAttributes.cpp in Sources */, 29A8ECD61EF0476600AD2478 /* HoleClosed.cpp in Sources */, 29A8E4161EF0476300AD2478 /* AccidentalAttributes.cpp in Sources */, + 9CD50CC3238A3D2800ED7DD8 /* PugiDoc.cpp in Sources */, 29A8E7EA1EF0476400AD2478 /* DegreeValue.cpp in Sources */, 29A8E5EC1EF0476300AD2478 /* BeatUnit.cpp in Sources */, 29A8FC3A1EF0476E00AD2478 /* MeasureWriter.cpp in Sources */, @@ -9024,7 +9071,6 @@ 29A8F2EE1EF0476800AD2478 /* PartAbbreviationDisplayAttributes.cpp in Sources */, 29A8E6321EF0476300AD2478 /* BendAttributes.cpp in Sources */, 29A8F2D01EF0476800AD2478 /* PartAbbreviation.cpp in Sources */, - 9CD23C052340658C00EB6F13 /* XAttributeIterator.cpp in Sources */, 29A8FBF41EF0476E00AD2478 /* DynamicsWriter.cpp in Sources */, 29A8FCF31EF0476E00AD2478 /* TupletReader.cpp in Sources */, 29A8F3DE1EF0476900AD2478 /* PerMinuteOrBeatUnitChoice.cpp in Sources */, @@ -9033,6 +9079,7 @@ 29EAD74B1F0EF8CE00BDE782 /* MiscData.cpp in Sources */, 29A8ED8A1EF0476600AD2478 /* InvertedMordent.cpp in Sources */, 29A8E86C1EF0476400AD2478 /* DisplayOctave.cpp in Sources */, + 9CD50CBF238A3D2800ED7DD8 /* PugiAttribute.cpp in Sources */, 29A8E9201EF0476400AD2478 /* EditorialVoiceDirectionGroup.cpp in Sources */, 29A8F3AC1EF0476900AD2478 /* Percussion.cpp in Sources */, 29A8EED41EF0476600AD2478 /* MeasureAttributes.cpp in Sources */, @@ -9079,7 +9126,6 @@ 29A8EB501EF0476500AD2478 /* Glass.cpp in Sources */, 29A8FA281EF0476C00AD2478 /* TurnAttributes.cpp in Sources */, 29A8FAA01EF0476D00AD2478 /* WavyLine.cpp in Sources */, - 9CD23C322340658C00EB6F13 /* PugiAttribute.cpp in Sources */, 29A8EDA81EF0476600AD2478 /* InvertedTurnAttributes.cpp in Sources */, 29A8F10E1EF0476700AD2478 /* Notations.cpp in Sources */, 29A8E8261EF0476400AD2478 /* DetachedLegato.cpp in Sources */, @@ -9201,6 +9247,7 @@ 29A8EF741EF0476700AD2478 /* MetronomeDot.cpp in Sources */, 29A8F3B61EF0476900AD2478 /* PercussionAttributes.cpp in Sources */, 29A8E7681EF0476400AD2478 /* Cue.cpp in Sources */, + 9CD50CC0238A3D2800ED7DD8 /* PugiElementIterImpl.cpp in Sources */, 29A8E4E81EF0476300AD2478 /* ArrowStyle.cpp in Sources */, 29A8F8251EF0476B00AD2478 /* SystemLayout.cpp in Sources */, 29A8F3201EF0476800AD2478 /* PartList.cpp in Sources */, @@ -9227,7 +9274,6 @@ 29A8F5371EF0476900AD2478 /* RootStep.cpp in Sources */, 29A8F7991EF0476B00AD2478 /* String.cpp in Sources */, 29A8E4B61EF0476300AD2478 /* ArpeggiateAttributes.cpp in Sources */, - 9CD23C0F2340658C00EB6F13 /* XElementIterator.cpp in Sources */, 29A8EF4C1EF0476700AD2478 /* Metronome.cpp in Sources */, 29A8F5F51EF0476A00AD2478 /* Sign.cpp in Sources */, 29A8F5EB1EF0476A00AD2478 /* Shake.cpp in Sources */, @@ -9398,9 +9444,9 @@ 29A8FB0D1EF0476D00AD2478 /* WorkNumber.cpp in Sources */, 29A8EFD71EF0476700AD2478 /* MidiDeviceAttributes.cpp in Sources */, 29A8EAA51EF0476500AD2478 /* Fingernails.cpp in Sources */, + 9CD50CB8238A3D2800ED7DD8 /* pugixml.cpp in Sources */, 29A8ED6B1EF0476600AD2478 /* InterchangeableAttributes.cpp in Sources */, 29A8E9011EF0476400AD2478 /* Dynamics.cpp in Sources */, - 9CD23C3B2340658C00EB6F13 /* pugixml.cpp in Sources */, 29A8EC211EF0476500AD2478 /* GroupTime.cpp in Sources */, 29A8FA771EF0476D00AD2478 /* VirtualLibrary.cpp in Sources */, 29A8EA4B1EF0476500AD2478 /* FermataAttributes.cpp in Sources */, @@ -9477,7 +9523,7 @@ 29A8F08B1EF0476700AD2478 /* MusicDataChoice.cpp in Sources */, 29A8F7FC1EF0476B00AD2478 /* Syllabic.cpp in Sources */, 29A8F8BA1EF0476C00AD2478 /* Time.cpp in Sources */, - 9CD23C362340658C00EB6F13 /* PugiElementIterImpl.cpp in Sources */, + 9CD50CB3238A3D2800ED7DD8 /* XElementIterator.cpp in Sources */, 29A8E3A71EF0476300AD2478 /* WordsData.cpp in Sources */, 29A8ED751EF0476600AD2478 /* Inversion.cpp in Sources */, 29A8EAB91EF0476500AD2478 /* FirstFretAttributes.cpp in Sources */, @@ -9486,14 +9532,15 @@ 29A8E84D1EF0476400AD2478 /* DirectionType.cpp in Sources */, 29A8FCD41EF0476E00AD2478 /* StaffFunctions.cpp in Sources */, 29A8FBDF1EF0476E00AD2478 /* DirectionWriter.cpp in Sources */, + 9CD50CB4238A3D2800ED7DD8 /* PugiElement.cpp in Sources */, 29A8F18F1EF0476800AD2478 /* Octave.cpp in Sources */, 29A8EFC31EF0476700AD2478 /* MidiChannel.cpp in Sources */, 29A800661EF0876500AD2478 /* SoundID.cpp in Sources */, 29A8F6261EF0476A00AD2478 /* Slide.cpp in Sources */, 29A8E8751EF0476400AD2478 /* DisplayStep.cpp in Sources */, 29A8F6801EF0476A00AD2478 /* SoundAttributes.cpp in Sources */, - 9CD23C132340658C00EB6F13 /* PugiElement.cpp in Sources */, 29A8E7711EF0476400AD2478 /* CueNoteGroup.cpp in Sources */, + 9CD50CB9238A3D2800ED7DD8 /* XFactory.cpp in Sources */, 29A8F2751EF0476800AD2478 /* OtherPlayAttributes.cpp in Sources */, 29A8EE831EF0476600AD2478 /* LinkAttributes.cpp in Sources */, 29A8EDBB1EF0476600AD2478 /* Key.cpp in Sources */, @@ -9547,11 +9594,11 @@ 29A8E9AB1EF0476400AD2478 /* Encoding.cpp in Sources */, 29A8E6091EF0476300AD2478 /* BeatUnitPer.cpp in Sources */, 29A8E77B1EF0476400AD2478 /* Damp.cpp in Sources */, + 9CD50CB5238A3D2800ED7DD8 /* PugiAttributeIterImpl.cpp in Sources */, 29A8F4BE1EF0476900AD2478 /* Release.cpp in Sources */, 29A8F72A1EF0476B00AD2478 /* Staves.cpp in Sources */, 29A8F3291EF0476800AD2478 /* PartName.cpp in Sources */, 29A8F6BC1EF0476A00AD2478 /* Staff.cpp in Sources */, - 9CD23C5E2340658C00EB6F13 /* PugiDoc.cpp in Sources */, 29A8F0BD1EF0476700AD2478 /* NonArpeggiate.cpp in Sources */, 29A8EBB31EF0476500AD2478 /* GroupAbbreviationDisplayAttributes.cpp in Sources */, 29A8F5681EF0476A00AD2478 /* Scordatura.cpp in Sources */, @@ -9561,7 +9608,6 @@ 29A8F9D21EF0476C00AD2478 /* TupletDot.cpp in Sources */, 29A8E8931EF0476400AD2478 /* DisplayTextAttributes.cpp in Sources */, 29A8FAF91EF0476D00AD2478 /* WordsAttributes.cpp in Sources */, - 9CD23C272340658C00EB6F13 /* PugiAttributeIterImpl.cpp in Sources */, 29A8ECDF1EF0476600AD2478 /* HoleClosedAttributes.cpp in Sources */, 29A8E6C71EF0476400AD2478 /* CircularArrow.cpp in Sources */, 29A8F98C1EF0476C00AD2478 /* TripleTongue.cpp in Sources */, @@ -9607,12 +9653,12 @@ 29A8F5401EF0476A00AD2478 /* RootStepAttributes.cpp in Sources */, 29A8F6621EF0476A00AD2478 /* Solo.cpp in Sources */, 29A8F5221EF0476900AD2478 /* RootAlter.cpp in Sources */, - 9CD23C4F2340658C00EB6F13 /* XFactory.cpp in Sources */, 29A8E57D1EF0476300AD2478 /* BassAlterAttributes.cpp in Sources */, 29A8E5F51EF0476300AD2478 /* BeatUnitDot.cpp in Sources */, 29A8EC711EF0476500AD2478 /* HarmonicTypeChoice.cpp in Sources */, 29A8F8881EF0476B00AD2478 /* ThumbPosition.cpp in Sources */, 29A8FB031EF0476D00AD2478 /* Work.cpp in Sources */, + 9CD50CB2238A3D2800ED7DD8 /* XAttributeIterator.cpp in Sources */, 29A8EDD91EF0476600AD2478 /* KeyAttributes.cpp in Sources */, 29A8F6C61EF0476A00AD2478 /* StaffDetails.cpp in Sources */, 29A8E50F1EF0476300AD2478 /* AttributesIterface.cpp in Sources */, @@ -9637,6 +9683,7 @@ 29A8E9831EF0476400AD2478 /* EmptyPlacementAttributes.cpp in Sources */, 29A8ECD51EF0476600AD2478 /* HoleClosed.cpp in Sources */, 29A8E4151EF0476300AD2478 /* AccidentalAttributes.cpp in Sources */, + 9CD50CBA238A3D2800ED7DD8 /* PugiDoc.cpp in Sources */, 29A8E7E91EF0476400AD2478 /* DegreeValue.cpp in Sources */, 29A8E5EB1EF0476300AD2478 /* BeatUnit.cpp in Sources */, 29A8FC391EF0476E00AD2478 /* MeasureWriter.cpp in Sources */, @@ -9699,7 +9746,6 @@ 29A8F2ED1EF0476800AD2478 /* PartAbbreviationDisplayAttributes.cpp in Sources */, 29A8E6311EF0476300AD2478 /* BendAttributes.cpp in Sources */, 29A8F2CF1EF0476800AD2478 /* PartAbbreviation.cpp in Sources */, - 9CD23C042340658C00EB6F13 /* XAttributeIterator.cpp in Sources */, 29A8FBF31EF0476E00AD2478 /* DynamicsWriter.cpp in Sources */, 29A8FCF21EF0476E00AD2478 /* TupletReader.cpp in Sources */, 29A8F3DD1EF0476900AD2478 /* PerMinuteOrBeatUnitChoice.cpp in Sources */, @@ -9708,6 +9754,7 @@ 29EAD74A1F0EF8CE00BDE782 /* MiscData.cpp in Sources */, 29A8ED891EF0476600AD2478 /* InvertedMordent.cpp in Sources */, 29A8E86B1EF0476400AD2478 /* DisplayOctave.cpp in Sources */, + 9CD50CB6238A3D2800ED7DD8 /* PugiAttribute.cpp in Sources */, 29A8E91F1EF0476400AD2478 /* EditorialVoiceDirectionGroup.cpp in Sources */, 29A8F3AB1EF0476900AD2478 /* Percussion.cpp in Sources */, 29A8EED31EF0476600AD2478 /* MeasureAttributes.cpp in Sources */, @@ -9754,7 +9801,6 @@ 29A8EB4F1EF0476500AD2478 /* Glass.cpp in Sources */, 29A8FA271EF0476C00AD2478 /* TurnAttributes.cpp in Sources */, 29A8FA9F1EF0476D00AD2478 /* WavyLine.cpp in Sources */, - 9CD23C312340658C00EB6F13 /* PugiAttribute.cpp in Sources */, 29A8EDA71EF0476600AD2478 /* InvertedTurnAttributes.cpp in Sources */, 29A8F10D1EF0476700AD2478 /* Notations.cpp in Sources */, 29A8E8251EF0476400AD2478 /* DetachedLegato.cpp in Sources */, @@ -9876,6 +9922,7 @@ 29A8EF731EF0476700AD2478 /* MetronomeDot.cpp in Sources */, 29A8F3B51EF0476900AD2478 /* PercussionAttributes.cpp in Sources */, 29A8E7671EF0476400AD2478 /* Cue.cpp in Sources */, + 9CD50CB7238A3D2800ED7DD8 /* PugiElementIterImpl.cpp in Sources */, 29A8E4E71EF0476300AD2478 /* ArrowStyle.cpp in Sources */, 29A8F8241EF0476B00AD2478 /* SystemLayout.cpp in Sources */, 29A8F31F1EF0476800AD2478 /* PartList.cpp in Sources */, @@ -9902,7 +9949,6 @@ 29A8F5361EF0476900AD2478 /* RootStep.cpp in Sources */, 29A8F7981EF0476B00AD2478 /* String.cpp in Sources */, 29A8E4B51EF0476300AD2478 /* ArpeggiateAttributes.cpp in Sources */, - 9CD23C0E2340658C00EB6F13 /* XElementIterator.cpp in Sources */, 29A8EF4B1EF0476700AD2478 /* Metronome.cpp in Sources */, 29A8F5F41EF0476A00AD2478 /* Sign.cpp in Sources */, 29A8F5EA1EF0476A00AD2478 /* Shake.cpp in Sources */, @@ -10097,7 +10143,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -10179,7 +10224,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -10253,6 +10297,8 @@ 299F7FEB1CA8D2200084CAE5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; + CLANG_WARN_INT_CONVERSION = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; @@ -10271,6 +10317,8 @@ 299F7FEC1CA8D2200084CAE5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; + CLANG_WARN_INT_CONVERSION = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; @@ -10293,6 +10341,7 @@ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; @@ -10325,6 +10374,7 @@ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; @@ -10356,6 +10406,7 @@ CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -10369,7 +10420,7 @@ HEADER_SEARCH_PATHS = /usr/local/include; INFOPLIST_FILE = MxiOS/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = YES; @@ -10380,6 +10431,7 @@ "SDKROOT[arch=i386]" = "$(CORRESPONDING_SIMULATOR_SDK_NAME)"; "SDKROOT[arch=x86_64]" = "$(CORRESPONDING_SIMULATOR_SDK_NAME)"; SKIP_INSTALL = NO; + SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; VERSIONING_SYSTEM = "apple-generic"; @@ -10393,6 +10445,7 @@ CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -10407,7 +10460,7 @@ HEADER_SEARCH_PATHS = /usr/local/include; INFOPLIST_FILE = MxiOS/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = NO; @@ -10418,6 +10471,7 @@ "SDKROOT[arch=i386]" = "$(CORRESPONDING_SIMULATOR_SDK_NAME)"; "SDKROOT[arch=x86_64]" = "$(CORRESPONDING_SIMULATOR_SDK_NAME)"; SKIP_INSTALL = NO; + SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; diff --git a/Xcode/MxTest.xcodeproj/project.pbxproj b/Xcode/MxTest.xcodeproj/project.pbxproj index 252e871a5..4c3a4b9fe 100755 --- a/Xcode/MxTest.xcodeproj/project.pbxproj +++ b/Xcode/MxTest.xcodeproj/project.pbxproj @@ -7,11 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 29DC3ACE225C0FC200814240 /* XAttributeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29DC3872225C0FC100814240 /* XAttributeTest.cpp */; }; - 29DC3ACF225C0FC200814240 /* XDocTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29DC3873225C0FC100814240 /* XDocTest.cpp */; }; - 29DC3AD0225C0FC200814240 /* XElementTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29DC3874225C0FC100814240 /* XElementTest.cpp */; }; - 29DC3AD1225C0FC200814240 /* XElementIteratorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29DC3875225C0FC100814240 /* XElementIteratorTest.cpp */; }; - 29DC3AD2225C0FC200814240 /* XAttributeIteratorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29DC3876225C0FC100814240 /* XAttributeIteratorTest.cpp */; }; 29DC3AD3225C0FC200814240 /* PositionFunctionsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29DC3878225C0FC100814240 /* PositionFunctionsTest.cpp */; }; 29DC3AD4225C0FC200814240 /* PrintFunctionsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29DC3879225C0FC100814240 /* PrintFunctionsTest.cpp */; }; 29DC3AD5225C0FC200814240 /* DirectionReaderTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29DC387A225C0FC100814240 /* DirectionReaderTest.cpp */; }; @@ -490,12 +485,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 29DC3871225C0FC100814240 /* FakeXml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FakeXml.h; sourceTree = ""; }; - 29DC3872225C0FC100814240 /* XAttributeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XAttributeTest.cpp; sourceTree = ""; }; - 29DC3873225C0FC100814240 /* XDocTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XDocTest.cpp; sourceTree = ""; }; - 29DC3874225C0FC100814240 /* XElementTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XElementTest.cpp; sourceTree = ""; }; - 29DC3875225C0FC100814240 /* XElementIteratorTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XElementIteratorTest.cpp; sourceTree = ""; }; - 29DC3876225C0FC100814240 /* XAttributeIteratorTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XAttributeIteratorTest.cpp; sourceTree = ""; }; 29DC3878225C0FC100814240 /* PositionFunctionsTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PositionFunctionsTest.cpp; sourceTree = ""; }; 29DC3879225C0FC100814240 /* PrintFunctionsTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrintFunctionsTest.cpp; sourceTree = ""; }; 29DC387A225C0FC100814240 /* DirectionReaderTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectionReaderTest.cpp; sourceTree = ""; }; @@ -1104,7 +1093,7 @@ 29DC3CAB225C11C000814240 /* cpulTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpulTestResult.cpp; sourceTree = ""; }; 29DC3CAC225C11C000814240 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; 29DC3CAD225C11C000814240 /* cpulFailure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpulFailure.h; sourceTree = ""; }; - 9CD23B612340651300EB6F13 /* MxTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MxTest; sourceTree = BUILT_PRODUCTS_DIR; }; + 9CD50B87238A178B00ED7DD8 /* MxTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MxTest; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1124,7 +1113,7 @@ children = ( 29DC3867225C0EF200814240 /* mxtest */, 29DC3C9B225C10ED00814240 /* Frameworks */, - 9CD23B612340651300EB6F13 /* MxTest */, + 9CD50B87238A178B00ED7DD8 /* MxTest */, ); sourceTree = ""; }; @@ -1139,25 +1128,11 @@ 29DC3877225C0FC100814240 /* impl */, 29DC3882225C0FC100814240 /* import */, 29DC38C0225C0FC100814240 /* utility */, - 29DC3870225C0FC100814240 /* xml */, ); name = mxtest; path = ../Sourcecode/private/mxtest; sourceTree = ""; }; - 29DC3870225C0FC100814240 /* xml */ = { - isa = PBXGroup; - children = ( - 29DC3871225C0FC100814240 /* FakeXml.h */, - 29DC3872225C0FC100814240 /* XAttributeTest.cpp */, - 29DC3873225C0FC100814240 /* XDocTest.cpp */, - 29DC3874225C0FC100814240 /* XElementTest.cpp */, - 29DC3875225C0FC100814240 /* XElementIteratorTest.cpp */, - 29DC3876225C0FC100814240 /* XAttributeIteratorTest.cpp */, - ); - path = xml; - sourceTree = ""; - }; 29DC3877225C0FC100814240 /* impl */ = { isa = PBXGroup; children = ( @@ -1847,7 +1822,7 @@ ); name = MxTest; productName = MxTest; - productReference = 9CD23B612340651300EB6F13 /* MxTest */; + productReference = 9CD50B87238A178B00ED7DD8 /* MxTest */; productType = "com.apple.product-type.tool"; }; /* End PBXNativeTarget section */ @@ -1856,16 +1831,16 @@ 299F7FEE1CA8D2620084CAE5 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1100; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "Matthew James Briggs"; }; buildConfigurationList = 299F7FF11CA8D2620084CAE5 /* Build configuration list for PBXProject "MxTest" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = en; + developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, - Base, ); mainGroup = 299F7FED1CA8D2620084CAE5; productRefGroup = 299F7FED1CA8D2620084CAE5; @@ -1991,7 +1966,6 @@ 29DC3C88225C0FC300814240 /* StaccatissimoTest.cpp in Sources */, 29DC3B6F225C0FC200814240 /* PropertiesTest.cpp in Sources */, 29DC3B40225C0FC200814240 /* TimeTest.cpp in Sources */, - 29DC3AD2225C0FC200814240 /* XAttributeIteratorTest.cpp in Sources */, 29DC3BF8225C0FC300814240 /* LyricFontTest.cpp in Sources */, 29DC3B61225C0FC200814240 /* ScalingTest.cpp in Sources */, 29DC3B6C225C0FC200814240 /* HarpPedalsTest.cpp in Sources */, @@ -2165,7 +2139,6 @@ 29DC3C08225C0FC300814240 /* MetronomeRelationTest.cpp in Sources */, 29DC3B4D225C0FC200814240 /* StickTypeTest.cpp in Sources */, 29DC3AE9225C0FC200814240 /* FreezingTest.cpp in Sources */, - 29DC3AD0225C0FC200814240 /* XElementTest.cpp in Sources */, 29DC3B45225C0FC200814240 /* WedgeTest.cpp in Sources */, 29DC3C5A225C0FC300814240 /* SchleiferTest.cpp in Sources */, 29DC3B58225C0FC200814240 /* LeftDividerTest.cpp in Sources */, @@ -2264,7 +2237,6 @@ 29DC3B5F225C0FC200814240 /* ScorePartwiseTest.cpp in Sources */, 29DC3C8D225C0FC300814240 /* AccordTest.cpp in Sources */, 29DC3ADC225C0FC200814240 /* NoteWriterTest.cpp in Sources */, - 29DC3AD1225C0FC200814240 /* XElementIteratorTest.cpp in Sources */, 29DC3B19225C0FC200814240 /* KindTest.cpp in Sources */, 29DC3BFB225C0FC300814240 /* FrameFretsTest.cpp in Sources */, 29DC3BDB225C0FC300814240 /* DivisionsTest.cpp in Sources */, @@ -2272,7 +2244,6 @@ 29DC3BFC225C0FC300814240 /* TextTest.cpp in Sources */, 29DC3B09225C0FC200814240 /* StepTest.cpp in Sources */, 29DC3B54225C0FC200814240 /* SoloTest.cpp in Sources */, - 29DC3ACE225C0FC200814240 /* XAttributeTest.cpp in Sources */, 29DC3C22225C0FC300814240 /* RootTest.cpp in Sources */, 29DC3B47225C0FC200814240 /* PrintTest.cpp in Sources */, 29DC3B93225C0FC300814240 /* EditorialGroupTest.cpp in Sources */, @@ -2326,7 +2297,6 @@ 29DC3B68225C0FC200814240 /* DownBowTest.cpp in Sources */, 29DC3B07225C0FC200814240 /* YesNoNumberTest.cpp in Sources */, 29DC3BEA225C0FC300814240 /* PercussionTest.cpp in Sources */, - 29DC3ACF225C0FC200814240 /* XDocTest.cpp in Sources */, 29DC3B9E225C0FC300814240 /* ScoreHeaderGroupTest.cpp in Sources */, 29DC3B8C225C0FC300814240 /* OtherOrnamentTest.cpp in Sources */, 29DC3B4E225C0FC200814240 /* EndingTest.cpp in Sources */, @@ -2359,7 +2329,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -2402,10 +2371,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$PROJECT_DIR/../Sourcecode/include $PROJECT_DIR/../Sourcecode/private $PROJECT_DIR/../Sourcecode/private/extern/ezxml/src/include"; + USER_HEADER_SEARCH_PATHS = "$PROJECT_DIR/../Sourcecode/include $PROJECT_DIR/../Sourcecode/private $PROJECT_DIR/../Sourcecode/private/extern/ezxml/src/include $PROJECT_DIR/../Sourcecode/private/extern/ezxml/src/private"; }; name = Debug; }; @@ -2413,7 +2382,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -2455,16 +2423,15 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.8; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$PROJECT_DIR/../Sourcecode/include $PROJECT_DIR/../Sourcecode/private $PROJECT_DIR/../Sourcecode/private/extern/ezxml/src/include"; + USER_HEADER_SEARCH_PATHS = "$PROJECT_DIR/../Sourcecode/include $PROJECT_DIR/../Sourcecode/private $PROJECT_DIR/../Sourcecode/private/extern/ezxml/src/include $PROJECT_DIR/../Sourcecode/private/extern/ezxml/src/private"; }; name = Release; }; 299F80001CA8D2620084CAE5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "DEBUG=1", @@ -2477,7 +2444,6 @@ 299F80011CA8D2620084CAE5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)";