Merge branch 'develop'

# Conflicts:
#	CHANGELOG.md
#	Verovio.podspec
#	bindings/java/pom.xml
#	codemeta.json
#	emscripten/npm/package.json

.github/workflows/clang-format-check.yml

@@ -7,10 +7,11 @@ jobs:
     strategy:
       matrix:
         path:
-          - check: "src"
-            exclude: "(hum|midi|json|pugi)"
           - check: "include"
-            exclude: "(hum|midi|json|pugi|utf8|win32|zip)"
+            exclude: "(hum|crc|midi|json|pugi|utf8|win32|zip)"
+          - check: "src"
+            exclude: "(hum|crc|midi|json|pugi)"
+          - check: "tools"
     steps:
       - uses: actions/checkout@v2
       - name: Run clang-format style check for C/C++ programs.

.gitignore

@@ -5,7 +5,6 @@ Verovio.xcodeproj/project.xcworkspace/xcshareddata
 Verovio.xcodeproj/project.xcworkspace/xcuserdata
 Verovio.xcodeproj/xcuserdata/
 bin/
-build/
 
 # Qt Creator
 tools/CMakeLists.txt.user
@@ -43,6 +42,8 @@ bindings/python/_verovio*.so
 bindings/python/__pycache__/*
 bindings/python/CMakeCache.txt
 bindings/python/CMakeFiles/
+build
+dist
 verovio.egg-info
 
 # java build

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [unreleased]
+* Support for `section@restart`
+* Support for rendering multiple `mdiv/score`
+* Support for delayed turns using `@startid`
+* Improved ties between chords (@eNote-GmBH)
+* Improved handling of whole notes with multiple layers (@eNote-GmBH)
+* Improved support for `engravingDefaults` (@eNote-GmBH)
+* Improved logging for Android (@alpha0010)
+* Improved spacing for notes on ledger lines (@eNote-GmBH)
+* Improved placement of beam in order to avoid overlaps (@eNote-GmBH)
+* Function getElementsAtTime includes `chord` elements
+* Function resetXmlIdSeed for resetting the `@xml:id` random generator with a specific value
+* Function getDescriptiveFeatures for basic feature extraction (experimental work)
+* Option --staccato-center to center staccato on notehead and not the stem (new default)
+* Option --xml-id-checksum to have `@xml:id` generated based on the checksum of the input data
+
 ## [3.5.0] - 2021-07-22
 * Support for `lv` (@eNote-GmbH)
 * Support for additive meters (@eNote-GmbH)

appveyor.yml

@@ -4,16 +4,16 @@ branches:
   only:
     - develop
 
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 configuration: Release
 
 platform: x64
 
 before_build:
-  - cmd: >-
-    cd tools
-    cmake -DCMAKE_GENERATOR_PLATFORM=x64 ../cmake
+  - cmd: |
+      cd tools
+      cmake -DCMAKE_GENERATOR_PLATFORM=x64 ../cmake
 
 build:
   project: tools/Verovio.sln

bindings/java/build.sh

@@ -22,6 +22,7 @@ FILES="$SRCFILES \
  ../../src/midi/MidiMessage.cpp \
  ../../src/hum/humlib.cpp \
  ../../src/json/jsonxx.cc \
+ ../../src/crc/crc.cpp \
  ../../libmei/attconverter.cpp \
  ../../libmei/atts_analytical.cpp \
  ../../libmei/atts_cmn.cpp \
@@ -40,7 +41,7 @@ FILES="$SRCFILES \
  ../../libmei/atts_shared.cpp \
  ../../libmei/atts_visual.cpp"
 
-CXXOPTS="-g -fpic -std=c++17 -I../../include -I../../include/vrv -I../../include/json -I../../include/hum -I../../include/midi -I../../include/pugi -I../../include/utf8 -I../../include/zip -I../../libmei -I/opt/local/include/ "
+CXXOPTS="-g -fpic -std=c++17 -I../../include -I../../include/vrv -I../../include/json -I../../include/hum -I../../include/crc -I../../include/midi -I../../include/pugi -I../../include/utf8 -I../../include/zip -I../../libmei -I/opt/local/include/ "
 
 PATHS=""
 unamestr=$(uname)

bindings/python/.pypi-version

@@ -1,3 +1,3 @@
 # dummy file used by setup.py for counting revisions when publishing to test.pypi
 # counting can be reset by making a change to this file
-3.5.0
+3.6.0

cmake/CMakeLists.txt

@@ -14,6 +14,7 @@ option(VRV_DYNAMIC_CAST         "Enable <dynamic_cast>"                        O
 option(NO_DARMS_SUPPORT         "Disable DARMS support"                        ON)
 option(NO_PAE_SUPPORT           "Disable Plaine & Easie support"               OFF)
 option(NO_ABC_SUPPORT           "Disable ABC support"                          OFF)
+option(NO_MUSICXML_SUPPORT      "Disable MusicXML support"                     OFF)
 option(NO_MXL_SUPPORT           "Disable compressed MusicXML support"          OFF)
 option(NO_HUMDRUM_SUPPORT       "Disable Humdrum support"                      OFF)
 option(MUSICXML_DEFAULT_HUMDRUM "Enable MusicXML to Humdrum by default"        OFF)
@@ -25,6 +26,7 @@ endif()
 
 include_directories(
     ../include
+    ../include/crc
     ../include/midi
     ../include/hum
     ../include/json
@@ -115,6 +117,10 @@ if(NO_PAE_SUPPORT)
     add_definitions(-DNO_PAE_SUPPORT)
 endif()
 
+if(NO_MUSICXML_SUPPORT)
+    add_definitions(-DNO_MUSICXML_SUPPORT)
+endif()
+
 if(NO_MXL_SUPPORT)
     add_definitions(-DNO_MXL_SUPPORT)
 endif()
@@ -130,6 +136,7 @@ endif()
 
 file(GLOB verovio_SRC "../src/*.cpp")
 file(GLOB midi_SRC "../src/midi/*.cpp")
+file(GLOB crc_SRC "../src/crc/*.cpp")
 
 # Add header files to custom target, otherwise they are not shown in some IDEs (e.g. QtCreator)
 file(GLOB_RECURSE LibFiles "../include/*.h")
@@ -138,6 +145,7 @@ add_custom_target(headers SOURCES ${LibFiles})
 set(all_SRC
     ${verovio_SRC}
     ${hum_SRC}
+    ${crc_SRC}
     ${midi_SRC}
     ../src/json/jsonxx.cc
     ../src/pugi/pugixml.cpp

data/Bravura.xml

@@ -43,6 +43,14 @@
 	<g c="E08B" x="0.0" y="-359.0" w="418.0" h="720.0" h-a-x="417" />
 	<g c="E08C" x="-1.0" y="-250.0" w="500.0" h="500.0" />
 	<g c="E08D" x="-1.0" y="-133.0" w="256.0" h="256.0" h-a-x="254" />
+	<g c="E08E" x="0.0" y="-190.0" w="378.0" h="379.0" h-a-x="378" />
+	<g c="E08F" x="0.0" y="-125.0" w="448.0" h="249.0" h-a-x="448" />
+	<g c="E090" x="0.0" y="-35.0" w="448.0" h="75.0" h-a-x="448" />
+	<g c="E091" x="0.0" y="-198.0" w="395.0" h="396.0" h-a-x="396" />
+	<g c="E092" x="0.0" y="-251.0" w="110.0" h="500.0" h-a-x="110" />
+	<g c="E093" x="0.0" y="-251.0" w="110.0" h="500.0" h-a-x="110" />
+	<g c="E094" x="0.0" y="-489.0" w="184.0" h="980.0" h-a-x="184" />
+	<g c="E095" x="0.0" y="-489.0" w="184.0" h="980.0" h-a-x="184" />
 	<g c="E0A2" x="0.0" y="-125.0" w="422.0" h="250.0" h-a-x="422" >
 		<a n="cutOutNW" x="0.172" y="0.332"/>
 		<a n="cutOutSE" x="1.532" y="-0.364"/>
@@ -660,4 +668,6 @@
 	<g c="EBE7" x="25.0" y="0.0" w="242.0" h="301.0" h-a-x="242" />
 	<g c="EBE8" x="24.0" y="0.0" w="230.0" h="301.0" h-a-x="230" />
 	<g c="EBE9" x="24.0" y="0.0" w="235.0" h="300.0" h-a-x="235" />
+	<g c="ED40" x="0.0" y="1.0" w="708.0" h="244.0" h-a-x="708" />
+	<g c="ED41" x="0.0" y="-245.0" w="708.0" h="244.0" h-a-x="708" />
 </bounding-boxes>

data/Bravura/E08E-timeSigFractionalSlash.xml

@@ -0,0 +1 @@
+<symbol id="E08E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -162c0 4 2 8 5 12l333 333c4 4 8 6 12 6c2 0 4 -1 5 -2l21 -21c1 -1 2 -3 2 -5c0 -4 -2 -9 -6 -12l-333 -333c-3 -4 -7 -6 -11 -6c-2 0 -4 1 -5 2l-22 21c-1 1 -1 3 -1 5z" /></symbol>

data/Bravura/E08F-timeSigEquals.xml

@@ -0,0 +1 @@
+<symbol id="E08F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 62v49c0 7 8 13 19 13h411c10 0 18 -6 18 -13v-49c0 -7 -8 -13 -18 -13h-411c-11 0 -19 6 -19 13zM19 -125c-11 0 -19 6 -19 13v49c0 7 8 13 19 13h411c10 0 18 -6 18 -13v-49c0 -7 -8 -13 -18 -13h-411z" /></symbol>

data/Bravura/E090-timeSigMinus.xml

@@ -0,0 +1 @@
+<symbol id="E090" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 27c0 7 8 13 19 13h411c10 0 18 -6 18 -13v-49c0 -7 -8 -13 -18 -13h-411c-11 0 -19 6 -19 13v49z" /></symbol>

data/Bravura/E091-timeSigMultiply.xml

@@ -0,0 +1 @@
+<symbol id="E091" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 141c-3 3 -4 6 -4 10c0 3 1 7 4 10l32 32c4 3 8 5 12 5s7 -2 9 -4l128 -128c4 -4 9 -7 14 -7c3 0 6 1 8 3l131 131c3 3 6 4 10 4c3 0 7 -1 10 -4l32 -32c3 -4 5 -8 5 -12s-2 -7 -4 -9l-130 -130c-3 -3 -4 -6 -4 -10s1 -8 5 -11l129 -129c2 -2 4 -5 4 -9s-2 -8 -5 -12 l-32 -32c-3 -3 -7 -4 -10 -4c-4 0 -7 1 -10 4c0 0 -128 127 -130 130c-2 2 -6 4 -10 4s-8 -2 -11 -5l-130 -130c-2 -2 -5 -4 -9 -4s-8 2 -12 5l-32 32c-3 3 -4 7 -4 10c0 4 1 7 4 10l130 130c2 2 3 6 3 10c0 5 -2 10 -5 14z" /></symbol>

data/Bravura/E092-timeSigParensLeftSmall.xml

@@ -0,0 +1 @@
+<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M108 -251c-76 62 -108 150 -108 251c0 102 34 189 107 249c1 0 3 -1 3 -4v-10s0 -6 -2 -8c-40 -56 -61 -116 -61 -227s20 -173 60 -228c1 -1 3 -3 3 -6v-13c0 -1 -1 -4 -2 -4z" /></symbol>

data/Bravura/E093-timeSigParensRightSmall.xml

@@ -0,0 +1 @@
+<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 245c0 3 2 4 3 4c73 -60 107 -147 107 -249c0 -101 -32 -189 -108 -251c-1 0 -2 3 -2 4v13c0 3 2 5 3 6c40 55 60 117 60 228s-21 171 -61 227c-2 2 -2 8 -2 8v10z" /></symbol>

data/Bravura/E094-timeSigParensLeft.xml

@@ -0,0 +1 @@
+<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 -488c-125 120 -179 292 -179 489c0 200 54 368 176 486c0 0 4 4 5 4c2 0 3 -3 3 -8v-21s0 -10 -3 -15c-75 -98 -113 -228 -113 -446c0 -217 40 -346 112 -446c2 -2 4 -7 4 -12v-26c0 -2 -1 -6 -2 -6s-2 0 -3 1z" /></symbol>

data/Bravura/E095-timeSigParensRight.xml

@@ -0,0 +1 @@
+<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 483c0 5 1 8 3 8c1 0 5 -4 5 -4c122 -118 176 -286 176 -486c0 -197 -54 -369 -179 -489c-1 -1 -2 -1 -3 -1s-2 4 -2 6v26c0 5 2 10 4 12c72 100 112 229 112 446c0 218 -38 348 -113 446c-3 5 -3 15 -3 15v21z" /></symbol>

data/Bravura/ED40-articSoftAccentAbove.xml

@@ -0,0 +1 @@
+<symbol id="ED40" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M369 221c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z M0 123c0 8 0 14 13 18l300 102c4 1 8 2 9 2c9 0 12 -6 15 -14c1 -4 2 -7 2 -10c0 -5 -3 -10 -14 -14c0 0 -216 -73 -226 -77c-5 -1 -7 -4 -7 -7s2 -5 8 -7c11 -3 225 -76 225 -76c11 -5 14 -10 14 -15c0 -3 -1 -6 -2 -9c-3 -7 -7 -15 -14 -15c-1 0 -3 0 -4 1l-306 103 c-13 3 -13 10 -13 18z" /></symbol>

data/Bravura/ED41-articSoftAccentBelow.xml

@@ -0,0 +1 @@
+<symbol id="ED41" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M369 -25c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z M0 -123c0 8 0 14 13 18l300 102c4 1 8 2 9 2c9 0 12 -6 15 -14c1 -4 2 -7 2 -10c0 -5 -3 -10 -14 -14c0 0 -216 -73 -226 -77c-5 -1 -7 -4 -7 -7s2 -5 8 -7c11 -3 225 -76 225 -76c11 -5 14 -10 14 -15c0 -3 -1 -6 -2 -9c-3 -7 -7 -15 -14 -15c-1 0 -3 0 -4 1l-306 103 c-13 3 -13 10 -13 18z" /></symbol>

data/Gootville.xml

@@ -99,6 +99,10 @@
 	<g c="E089" x="0.0" y="-243.0" w="390.0" h="486.0" h-a-x="390" />
 	<g c="E08A" x="0.0" y="-243.0" w="426.0" h="486.0" h-a-x="426" />
 	<g c="E08B" x="0.0" y="-412.0" w="426.0" h="824.0" h-a-x="426" />
+	<g c="E092" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="120" />
+	<g c="E093" x="16.0" y="-267.0" w="104.0" h="534.0" h-a-x="120" />
+	<g c="E094" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" />
+	<g c="E095" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" />
 	<g c="E0A2" x="0.0" y="-135.0" w="454.0" h="270.0" h-a-x="454" />
 	<g c="E0A3" x="0.0" y="-135.0" w="316.0" h="270.0" h-a-x="316" >
 		<a n="splitStemDownNE" x="0.956" y="-0.3"/>

data/Gootville/E092-timeSigParensLeftSmall.xml

@@ -0,0 +1 @@
+<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z" /></symbol>

data/Gootville/E093-timeSigParensRightSmall.xml

@@ -0,0 +1 @@
+<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z" /></symbol>

data/Gootville/E094-timeSigParensLeft.xml

@@ -0,0 +1 @@
+<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z" /></symbol>

data/Gootville/E095-timeSigParensRight.xml

@@ -0,0 +1 @@
+<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z" /></symbol>

data/Leipzig.xml

@@ -92,7 +92,7 @@
 	<g c="E0FA" x="0.0" y="-133.0" w="405.0" h="266.0" h-a-x="405" />
 	<g c="E240" x="0.0" y="-694.0" w="276.0" h="694.0" h-a-x="277" />
 	<g c="E241" x="0.0" y="0.0" w="276.0" h="694.0" h-a-x="277" />
-	<g c="E08B" x="0.0" y="-319.0" w="417.0" h="637.0" h-a-x="2048" />
+	<g c="E08B" x="0.0" y="-319.0" w="417.0" h="637.0" h-a-x="417" />
 	<g c="E08A" x="0.0" y="-249.0" w="414.0" h="500.0" h-a-x="422" />
 	<g c="E4E5" x="0.0" y="-388.0" w="305.0" h="760.0" h-a-x="304" />
 	<g c="E4E6" x="0.0" y="-250.0" w="276.0" h="433.0" h-a-x="277" />
@@ -315,7 +315,7 @@
 	<g c="E4EC" x="-1.0" y="-955.0" w="721.0" h="1868.0" h-a-x="720" />
 	<g c="E4ED" x="-1.0" y="-955.0" w="795.0" h="2099.0" h-a-x="795" />
 	<g c="E08D" x="0.0" y="-126.0" w="253.0" h="252.0" h-a-x="253" />
-	<g c="E08C" x="0.0" y="-171.0" w="341.0" h="342.0" h-a-x="342" />
+	<g c="E08C" x="0.0" y="-171.0" w="342.0" h="342.0" h-a-x="342" />
 	<g c="E59E" x="0.0" y="0.0" w="375.0" h="192.3" h-a-x="375" />
 	<g c="E59D" x="0.0" y="0.0" w="304.6" h="192.2" h-a-x="244" />
 	<g c="EAAA" x="0.0" y="0.0" w="198.0" h="112.0" h-a-x="198" />
@@ -538,4 +538,14 @@
 	<g c="E51C" x="0.0" y="0.0" w="620.0" h="332.0" h-a-x="620" />
 	<g c="E51D" x="3.0" y="-8.0" w="881.0" h="329.0" h-a-x="884" />
 	<g c="E51E" x="0.0" y="-15.0" w="959.0" h="326.0" h-a-x="959" />
+	<g c="E08E" x="0.0" y="-243.0" w="186.0" h="486.0" h-a-x="186" />
+	<g c="E08F" x="0.0" y="-120.0" w="342.0" h="240.0" h-a-x="342" />
+	<g c="E090" x="0.0" y="-37.0" w="342.0" h="74.0" h-a-x="342" />
+	<g c="E091" x="0.0" y="-167.0" w="334.0" h="334.0" h-a-x="334" />
+	<g c="E092" x="0.0" y="-250.4" w="134.0" h="500.9" h-a-x="134" />
+	<g c="E093" x="0.0" y="-250.4" w="134.0" h="500.9" h-a-x="134" />
+	<g c="E094" x="0.0" y="-501.0" w="220.0" h="1002.0" h-a-x="220" />
+	<g c="E095" x="0.0" y="-501.0" w="220.0" h="1002.0" h-a-x="220" />
+	<g c="ED40" x="0.0" y="0.0" w="720.0" h="236.0" h-a-x="720" />
+	<g c="ED41" x="0.0" y="-236.0" w="720.0" h="236.0" h-a-x="720" />
 </bounding-boxes>

data/Leipzig/E08C-timeSigPlus.xml

@@ -1 +1 @@
-<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M341 -38h-133v-133h-75v133h-133v77h133v132h75v-132h133v-77z" /></symbol>
+<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M342 -37h-134v-134h-74v134h-134v74h134v134h74v-134h134v-74z" /></symbol>

data/Leipzig/E08E-timeSigFractionalSlash.xml

@@ -0,0 +1 @@
+<symbol id="E08E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M49 -243l-49 25l137 461l49 -25z" /></symbol>

data/Leipzig/E08F-timeSigEquals.xml

@@ -0,0 +1 @@
+<symbol id="E08F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -120v74h342v-74h-342zM0 46v74h342v-74h-342z" /></symbol>

data/Leipzig/E090-timeSigMinus.xml

@@ -0,0 +1 @@
+<symbol id="E090" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37v74h342v-74h-342z" /></symbol>

data/Leipzig/E091-timeSigMultiply.xml

@@ -0,0 +1 @@
+<symbol id="E091" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M334 115l-115 -115l115 -115l-52 -52l-115 115l-115 -115l-52 52l115 115l-115 115l52 52l115 -115l115 115z" /></symbol>

data/Leipzig/E092-timeSigParensLeftSmall.xml

@@ -0,0 +1 @@
+<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M134 -235v-11c0 -3 -1 -4 -1 -4s-1 -1 -2 0c-108 82 -131 150 -131 250s23 168 131 250c1 1 2 0 2 0s1 -1 1 -4v-11s-1 -8 -3 -10c-68 -55 -81 -110 -81 -225s13 -170 81 -225c2 -2 3 -7 3 -10z" /></symbol>

data/Leipzig/E093-timeSigParensRightSmall.xml

@@ -0,0 +1 @@
+<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -235c0 3 1 8 3 10c68 55 81 110 81 225s-13 170 -81 225c-2 2 -3 10 -3 10v11c0 3 1 4 1 4s1 1 2 0c108 -82 131 -150 131 -250s-23 -168 -131 -250c-1 -1 -2 0 -2 0s-1 1 -1 4v11z" /></symbol>

data/Leipzig/E094-timeSigParensLeft.xml

@@ -0,0 +1 @@
+<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M220 -470v-22c0 -6 -2 -8 -2 -8s-1 -1 -2 -1s-1 1 -2 1c-212 181 -214 315 -214 490v10v10c0 175 2 309 214 490c1 0 1 1 2 1s2 -1 2 -1s2 -2 2 -8v-22s-2 -15 -6 -20c-136 -140 -144 -230 -144 -450s8 -310 144 -450c4 -5 6 -14 6 -20z" /></symbol>

data/Leipzig/E095-timeSigParensRight.xml

@@ -0,0 +1 @@
+<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-0 -470c0 6 2 15 6 20c136 140 144 230 144 450s-8 310 -144 450c-4 5 -6 20 -6 20v22c0 6 2 8 2 8s1 1 2 1s1 -1 2 -1c212 -181 214 -315 214 -490v-10v-10c0 -175 -2 -309 -214 -490c-1 0 -1 -1 -2 -1s-2 1 -2 1s-2 2 -2 8v22z" /></symbol>

data/Leipzig/ED40-articSoftAccentAbove.xml

@@ -0,0 +1 @@
+<symbol id="ED40" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M347 236v-33l-252 -86l252 -84v-33l-347 117zM373 236l347 -119l-347 -117v33l252 84l-252 86v33z" /></symbol>

data/Leipzig/ED41-articSoftAccentBelow.xml

@@ -0,0 +1 @@
+<symbol id="ED41" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M347 -236l-347 119l347 117v-33l-252 -84l252 -86v-33zM373 -236v33l252 86l-252 84v33l347 -117z" /></symbol>

data/Petaluma.xml

@@ -549,6 +549,14 @@
 	<g c="E08B" x="20.0" y="-687.0" w="675.0" h="1374.0" h-a-x="715" />
 	<g c="E08C" x="0.0" y="-358.0" w="661.0" h="716.0" h-a-x="661" />
 	<g c="E08D" x="0.0" y="-197.0" w="418.0" h="396.0" h-a-x="418" />
+	<g c="E08E" x="0.0" y="-423.0" w="405.0" h="846.0" h-a-x="405" />
+	<g c="E08F" x="0.0" y="-177.0" w="559.0" h="353.0" h-a-x="559" />
+	<g c="E090" x="0.0" y="-54.0" w="662.0" h="109.0" h-a-x="662" />
+	<g c="E091" x="0.0" y="-305.0" w="574.1" h="610.0" h-a-x="574" />
+	<g c="E092" x="0.0" y="-405.0" w="173.5" h="809.0" h-a-x="173" />
+	<g c="E093" x="0.0" y="-422.0" w="154.4" h="844.0" h-a-x="154" />
+	<g c="E094" x="0.6" y="-728.0" w="399.1" h="1456.0" h-a-x="399" />
+	<g c="E095" x="0.0" y="-722.6" w="274.3" h="1447.6" h-a-x="274" />
 	<g c="E220" x="-158.0" y="-88.0" w="314.2" h="176.0" h-a-x="156" />
 	<g c="E221" x="-148.0" y="-177.0" w="297.0" h="354.0" h-a-x="149" />
 	<g c="E222" x="-146.6" y="-253.0" w="293.8" h="506.0" h-a-x="147" />

data/Petaluma/E08E-timeSigFractionalSlash.xml

@@ -0,0 +1 @@
+<symbol id="E08E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M37 -423c-9 0 -10 9 -14 14c-17 20 -23 40 -23 60c0 23 9 46 22 72c75 145 293 601 332 681c4 9 10 19 19 19s14 -11 18 -20c9 -16 11 -35 14 -49c-1 -16 -5 -27 -10 -38c-76 -159 -306 -642 -346 -725c-3 -5 -4 -13 -12 -14z" /></symbol>

data/Petaluma/E08F-timeSigEquals.xml

@@ -0,0 +1 @@
+<symbol id="E08F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M50 -177c-5 0 -9 2 -12 6c-11 21 -27 39 -36 61c-1 4 -2 8 -2 11c0 12 8 19 24 19c78 1 387 12 463 16c19 0 29 -8 37 -23c2 -4 4 -9 5 -13c7 -19 10 -33 10 -43c0 -19 -15 -24 -54 -25l-431 -9h-4zM362 70c-135 0 -292 5 -310 4c-2 1 -3 1 -4 1h-3c-9 0 -13 4 -17 14 c-7 18 -19 34 -24 54c-2 6 -3 11 -3 15c0 12 9 18 27 17c54 1 214 1 338 1c31 0 60 -1 84 -1c25 0 45 1 58 1c23 0 36 -7 41 -29c4 -15 10 -30 10 -45c0 -6 -1 -12 -4 -18c-5 -11 -92 -14 -193 -14z" /></symbol>

data/Petaluma/E090-timeSigMinus.xml

@@ -0,0 +1 @@
+<symbol id="E090" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 -54c-5 1 -10 2 -11 8c-4 24 -16 46 -16 72c0 22 10 28 29 28h298c123 0 247 0 295 1c23 0 31 -11 35 -29c1 -2 1 -5 1 -7c2 -13 4 -24 4 -33c0 -32 -18 -41 -64 -39c-33 0 -159 1 -284 1s-249 0 -280 -1c-3 0 -5 -1 -7 -1z" /></symbol>