Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
58dd9d7
release v0.3.0
webern Nov 20, 2017
ac01ee3
develop backmerge master
webern Nov 20, 2017
7c879b5
frz fix placement of directions in chords
webern Nov 24, 2017
0db2e8f
frz round trip musicxml version
webern Nov 25, 2017
454de95
frz fix tuplet issues
webern Nov 27, 2017
dc40ce4
frz branch progress
webern Mar 18, 2018
181b924
gene noteheads and lyrics
webern Mar 18, 2018
53c61de
fix errant comments in cmake build
webern Apr 22, 2018
c8d62b2
better error message and project update
webern May 29, 2018
df9035a
gitignore
webern Jun 25, 2018
1376ec9
Merge branch 'develop' of https://github.com/Webern/MusicXML-Class-Li…
webern Jun 25, 2018
fe5ebfb
merge mxapi into develop
webern Jun 25, 2018
1174443
probably ok
webern Jun 25, 2018
9c18d8a
sublime
webern Apr 7, 2019
d0e94e4
Merge branch 'master' into develop
webern Apr 7, 2019
8f792e7
Merge branch 'master' into develop
webern Apr 7, 2019
952715e
merge mxapi branch (#20)
Apr 7, 2019
bf248af
Merge branch 'develop' of https://github.com/Webern/MusicXML-Class-Li…
webern Apr 7, 2019
7d0ced7
work on test options (#27)
Apr 8, 2019
4d8123c
readme and examples #22 #26 (#28)
Apr 8, 2019
18660e2
use include directory as public api #21 (#29)
Apr 8, 2019
64f99b6
readme work for 1.0 #25 #26 #30 (#31)
Apr 8, 2019
23bf12a
xcode
webern Apr 8, 2019
9c540ff
Merge branch 'master' into develop
webern Apr 9, 2019
69856d6
merge with ezxml library (#38)
webern Sep 29, 2019
a3db8e9
Merge branch 'master' into develop
Nov 24, 2019
7fb62a7
fix xcode project for komp (#39)
webern Nov 24, 2019
a5884ce
Merge branch 'master' into develop
Nov 24, 2019
b68c5df
further explain tick time position #43 (#47)
webern Feb 2, 2020
73aa012
support microtonal notes with cents #42 (#48)
webern Feb 2, 2020
2187360
note msvc compiler is tested in the readme #41 (#49)
webern Feb 2, 2020
2b557dd
Merge branch 'master' into develop
webern Feb 3, 2020
b6ef06f
Merge branch 'master' into develop
webern Feb 20, 2020
0271965
fix new system logic #52 (#56)
webern Feb 20, 2020
892e672
remove mx::utility (#51)
webern Feb 20, 2020
5dd8a36
Merge branch 'master' into develop
webern Mar 1, 2020
f55d2a8
fix #62 windows msvc bad address bug (#61)
webern Mar 8, 2020
cce2dd4
Merge branch 'master' into develop
webern Mar 8, 2020
5690c85
fix rust gitignore
webern Mar 9, 2020
e2e767b
Merge branch 'master' into develop
webern Mar 9, 2020
7df36b9
use the catch2 test framework instead of cpplite #46 (#59)
webern Mar 9, 2020
1d447e1
Merge branch 'master' into develop
webern Mar 9, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/saveactions_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ option(
OFF
)

#set(CMAKE_BINARY_DIR "./Build")
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})

Expand Down Expand Up @@ -90,14 +89,13 @@ file(WRITE ${PRIVATE_DIR}/mxtest/file/PathRoot.h

# MxTest
if(MX_BUILD_TESTS)
message("tests will be compiled")
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} tests will be compiled")
if(MX_BUILD_CORE_TESTS)
message("core tests will be compiled")
# add_compile_definitions(MX_COMPILE_CORE_TESTS)
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} core tests will be compiled")
add_definitions(-DMX_COMPILE_CORE_TESTS)
else()
message("core tests will not be compiled")
endif()
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} core tests will NOT be compiled")
endif()
find_package( Threads )
add_executable(MxTest ${SRC_MX_TEST_API} ${SRC_MX_TEST_CONTROL} ${SRC_MX_TEST_CORE} ${SRC_MX_TEST_FILE} ${SRC_MX_TEST_IMPL} ${SRC_MX_TEST_IMPORT} ${SRC_MX_TEST_UTILITY} ${SRC_MX_TEST_XML} ${SRC_CPUL})
target_include_directories(MxTest PRIVATE ${PRIVATE_DIR})
Expand All @@ -106,12 +104,12 @@ if(MX_BUILD_TESTS)
target_link_libraries(MxTest ${CMAKE_THREAD_LIBS_INIT})
set_property(TARGET MxTest PROPERTY CXX_STANDARD 14)
else()
message("tests will not be compiled")
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} tests will NOT be compiled")
endif()

# MxExamples
if(MX_BUILD_EXAMPLES)
message("examples will be compiled")
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} examples will be compiled")
find_package( Threads )
add_executable(MxRead ${PRIVATE_DIR}/mx/examples/Read.cpp)
add_executable(MxWrite ${PRIVATE_DIR}/mx/examples/Write.cpp)
Expand All @@ -123,5 +121,5 @@ if(MX_BUILD_EXAMPLES)
set_property(TARGET MxWrite PROPERTY CXX_STANDARD 14)
set_property(TARGET MxHide PROPERTY CXX_STANDARD 14)
else()
message("examples will not be compiled")
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} examples will NOT be compiled")
endif()
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,6 @@ The `mx::core` namespace contains the MusicXML representation objects such as el

The `::ezxml::` namespace contains generic XML DOM functionality. Under the hood [pugixml](http://pugixml.org/) is being used. See the XML DOM section for more information.

The `mx::utility` namespace contains the beginnings of an api for simplifying the interactions with MusicXML. This namespace and its interfaces will change completely and should be avoided for now.

##### Partwise vs. Timewise
There are two types of MusicXML documents, 'partwise' and 'timewise'. A partwise document consists of a set of parts which contain measures. A timewise document consists of a set of measures which contain parts. Partwise is used more often by MusicXML applications while Timewise documents seem to be rare or even nonresistant. Nonetheless *MusicXML Class Library* implements both Timewise and Partwise. The class `mx::core::Document` can hold *either* a Partwise *or* a Timewise score. Note that is actually holds both, but only one or the other is 'active'. You can check the inner document type with the getChoice function. You can convert between Partwise and Timewise with the convertContents function.

Expand Down
Loading