Merge branch 'develop'

# Conflicts: # CHANGELOG.md # Verovio.podspec # bindings/java/pom.xml # codemeta.json
rism-digital · Dec 22, 2021 · 0b236d7 · 0b236d7
2 parents a14ab1a + d617b71
commit 0b236d7
Show file tree

Hide file tree

Showing 447 changed files with 7,364 additions and 4,761 deletions.
diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
@@ -229,7 +229,7 @@ jobs:
           key: ${{ runner.os }}-emsdk-${{ env.EM_VERSION }}
 
       - name: Set up emsdk
-        uses: mymindstorm/setup-emsdk@v7
+        uses: mymindstorm/setup-emsdk@v11
         with:
           version: ${{ env.EM_VERSION }}
           actions-cache-folder: ${{ env.EM_CACHE_FOLDER }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,17 @@
 # Changelog
 
+## [unreleased]
+* Support for figured-bass extenders on `f` without `@tstamp` or `@startid` 
+* Improved page-based MEI output with validation with a customized MEI Schema
+* Improved layout with beams and control events (ornaments, fingering, etc.) (@eNote-GmBH)
+* Improve enharmonic tie overlap with accidentals (@eNote-GmBH)
+* Improved Plaine and Easie validation output with error codes and values
+* Improved adjacent note tie and enharmonic tie overlap (eNote-GmBH)
+* Additional parameters to the getMEI method for exporting selected content (@eNote-GmBH)
+* Option --multi-rest-thickness to control the thickness of measure rests (@eNote-GmBH)
+
 ## [3.7.0] - 2021-11-22
 * Complete refactoring of the Plaine and Easie parser
-* Support for `arpeg@enclose` (@eNote-GmBH)
-* Support for `clef@enclose` (@eNote-GmBH)
-* Support for `metersig@enclose` (@eNote-GmBH)
 * Support for `[email protected]` (@eNote-GmBH)
 * Support for `meterSig@enclose`, `clef@enclose` and `arpeg@enclose` (@eNote-GmBH)
 * Support for `accid@loc` and `accid@oloc`/`accid@ploc` (@eNote-GmBH)

diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
diff --git a/bindings/iOS/all.h b/bindings/iOS/all.h
@@ -107,6 +107,7 @@
 #import <VerovioFramework/iomusxml.h>
 #import <VerovioFramework/git_commit.h>
 #import <VerovioFramework/rend.h>
+#import <VerovioFramework/pagemilestone.h>
 #import <VerovioFramework/sic.h>
 #import <VerovioFramework/grpsym.h>
 #import <VerovioFramework/fig.h>
@@ -133,6 +134,7 @@
 #import <VerovioFramework/object.h>
 #import <VerovioFramework/orig.h>
 #import <VerovioFramework/artic.h>
+#import <VerovioFramework/systemmilestone.h>
 #import <VerovioFramework/pedal.h>
 #import <VerovioFramework/iopae.h>
 #import <VerovioFramework/instrdef.h>

diff --git a/bindings/python/.pypi-version b/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.7.0
+3.8.0
diff --git a/data/Bravura.xml b/data/Bravura.xml
@@ -390,6 +390,9 @@
 	<g c="E500" x="0.0" y="-250.0" w="532.0" h="529.0" h-a-x="533" />
 	<g c="E501" x="0.0" y="-250.0" w="762.0" h="529.0" h-a-x="761" />
 	<g c="E502" x="0.0" y="-250.0" w="1232.0" h="529.0" h-a-x="1233" />
+	<g c="E503" x="0.0" y="75.0" w="125.0" h="125.0" h-a-x="125" />
+	<g c="E504" x="0.0" y="-250.0" w="532.0" h="529.0" h-a-x="532" />
+	<g c="E505" x="0.0" y="-174.0" w="125.0" h="125.0" h-a-x="124" />
 	<g c="E510" x="0.0" y="-10.0" w="386.0" h="473.0" h-a-x="386" />
 	<g c="E511" x="0.0" y="-10.0" w="885.0" h="473.0" h-a-x="885" />
 	<g c="E512" x="0.0" y="-10.0" w="839.0" h="473.0" h-a-x="839" />

diff --git a/data/Bravura/E503-repeatBarUpperDot.xml b/data/Bravura/E503-repeatBarUpperDot.xml
@@ -0,0 +1 @@
+<symbol id="E503" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 137c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62z" /></symbol>
diff --git a/data/Bravura/E504-repeatBarSlash.xml b/data/Bravura/E504-repeatBarSlash.xml
@@ -0,0 +1 @@
+<symbol id="E504" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -250c-5 0 -8 3 -8 7c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99z" /></symbol>
diff --git a/data/Bravura/E505-repeatBarLowerDot.xml b/data/Bravura/E505-repeatBarLowerDot.xml
@@ -0,0 +1 @@
+<symbol id="E505" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -112c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62z" /></symbol>
diff --git a/data/Leipzig.xml b/data/Leipzig.xml
@@ -199,6 +199,7 @@
 	<g c="E511" x="0.0" y="1.0" w="657.0" h="349.0" h-a-x="657" />
 	<g c="E512" x="0.0" y="0.0" w="650.0" h="332.0" h-a-x="650" />
 	<g c="E513" x="0.0" y="0.0" w="624.0" h="332.0" h-a-x="624" />
+	<g c="E504" x="0.0" y="-242.0" w="508.0" h="484.0" h-a-x="508" />
 	<g c="E069" x="0.0" y="-250.0" w="325.0" h="500.0" h-a-x="325" />
 	<g c="E06A" x="0.0" y="-396.0" w="257.0" h="791.0" h-a-x="257" />
 	<g c="E902" x="-189.0" y="-268.0" w="370.0" h="470.0" h-a-x="181" />
@@ -563,4 +564,6 @@
 	<g c="E043" x="0.0" y="325.0" w="100.0" h="350.0" h-a-x="100" />
 	<g c="E044" x="0.0" y="-50.0" w="100.0" h="100.0" h-a-x="100" />
 	<g c="E049" x="0.0" y="-73.0" w="537.0" h="653.0" h-a-x="537" />
+	<g c="E503" x="0.0" y="73.0" w="95.0" h="94.0" h-a-x="95" />
+	<g c="E505" x="0.0" y="-166.0" w="95.0" h="94.0" h-a-x="95" />
 </bounding-boxes>
diff --git a/data/Leipzig/E503-repeatBarUpperDot.xml b/data/Leipzig/E503-repeatBarUpperDot.xml
@@ -0,0 +1 @@
+<symbol id="E503" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 118c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z" /></symbol>
diff --git a/data/Leipzig/E504-repeatBarSlash.xml b/data/Leipzig/E504-repeatBarSlash.xml
@@ -0,0 +1 @@
+<symbol id="E504" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M508 242l-362 -484h-146l362 484h146z" /></symbol>
diff --git a/data/Leipzig/E505-repeatBarLowerDot.xml b/data/Leipzig/E505-repeatBarLowerDot.xml
@@ -0,0 +1 @@
+<symbol id="E505" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -121c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z" /></symbol>
diff --git a/data/Leland.xml b/data/Leland.xml
@@ -69,18 +69,18 @@
 	<g c="E53D" x="-12.0" y="-193.0" w="728.0" h="614.0" h-a-x="733" >
 		<a n="opticalCenter" x="1.528" y="0"/>
 	</g>
-	<g c="E000" x="-0.4" y="4.6" w="62.4" h="990.4" h-a-x="62" />
+	<g c="E000" x="-1.0" y="4.6" w="63.0" h="990.4" h-a-x="62" />
 	<g c="E003" x="0.0" y="0.0" w="491.0" h="279.0" h-a-x="491" />
 	<g c="E004" x="0.0" y="-279.0" w="491.0" h="279.0" h-a-x="491" />
 	<g c="E043" x="0.0" y="322.0" w="104.0" h="356.0" h-a-x="104" />
 	<g c="E044" x="0.0" y="-53.0" w="104.0" h="106.0" h-a-x="104" />
 	<g c="E047" x="0.0" y="0.0" w="654.0" h="869.0" h-a-x="654" />
 	<g c="E048" x="0.0" y="-113.0" w="745.0" h="848.0" h-a-x="745" />
 	<g c="E049" x="0.0" y="-113.0" w="738.0" h="848.0" h-a-x="738" />
-	<g c="E04B" x="0.0" y="-280.0" w="554.0" h="1561.0" h-a-x="554" />
+	<g c="E04B" x="0.0" y="-281.0" w="554.0" h="1562.0" h-a-x="554" />
 	<g c="E050" x="0.0" y="-666.0" w="640.0" h="1778.0" h-a-x="640" />
 	<g c="E051" x="0.0" y="-898.0" w="640.0" h="2010.0" h-a-x="640" />
-	<g c="E052" x="0.0" y="-898.0" w="640.0" h="2010.0" h-a-x="640" />
+	<g c="E052" x="0.0" y="-898.0" w="640.0" h="2011.0" h-a-x="640" />
 	<g c="E053" x="0.0" y="-666.0" w="640.0" h="2003.0" h-a-x="640" />
 	<g c="E054" x="0.0" y="-667.0" w="640.0" h="2005.0" h-a-x="640" />
 	<g c="E055" x="0.0" y="-667.0" w="1044.0" h="1779.0" h-a-x="1044" />
@@ -182,7 +182,7 @@
 	<g c="E249" x="0.0" y="-591.0" w="309.0" h="1394.0" h-a-x="309" >
 		<a n="stemDownSW" x="0" y="-2.296"/>
 	</g>
-	<g c="E24A" x="0.0" y="-820.0" w="279.0" h="1580.0" h-a-x="280" >
+	<g c="E24A" x="0.0" y="-820.1" w="279.0" h="1580.1" h-a-x="280" >
 		<a n="stemUpNW" x="0" y="2.988"/>
 	</g>
 	<g c="E24B" x="0.0" y="-779.0" w="309.0" h="1582.0" h-a-x="309" >
@@ -329,19 +329,19 @@
 	</g>
 	<g c="E4A0" x="0.0" y="0.0" w="361.0" h="235.0" h-a-x="360" />
 	<g c="E4A1" x="0.0" y="-235.0" w="361.0" h="235.0" h-a-x="360" />
-	<g c="E4A2" x="-0.3" y="-0.3" w="78.5" h="78.3" h-a-x="78" />
-	<g c="E4A3" x="-0.3" y="-78.3" w="78.5" h="78.3" h-a-x="78" />
+	<g c="E4A2" x="-0.3" y="0.0" w="78.5" h="78.0" h-a-x="78" />
+	<g c="E4A3" x="-0.3" y="-78.0" w="78.5" h="78.0" h-a-x="78" />
 	<g c="E4A4" x="0.0" y="0.0" w="316.0" h="46.0" h-a-x="316" />
 	<g c="E4A5" x="0.0" y="-46.0" w="316.0" h="46.0" h-a-x="316" />
 	<g c="E4A6" x="0.0" y="0.0" w="127.0" h="248.0" h-a-x="127" />
 	<g c="E4A7" x="0.0" y="-248.0" w="127.0" h="248.0" h-a-x="127" />
 	<g c="E4AC" x="1.0" y="0.0" w="295.0" h="253.0" h-a-x="295" />
 	<g c="E4AD" x="0.0" y="-253.0" w="295.0" h="253.0" h-a-x="296" />
-	<g c="E4AE" x="1.0" y="-0.3" w="295.0" h="386.3" h-a-x="296" />
-	<g c="E4AF" x="0.0" y="-386.0" w="295.0" h="386.3" h-a-x="296" />
-	<g c="E4B0" x="0.0" y="-0.3" w="361.0" h="344.3" h-a-x="360" />
+	<g c="E4AE" x="1.0" y="0.0" w="295.0" h="386.0" h-a-x="296" />
+	<g c="E4AF" x="0.0" y="-386.0" w="295.0" h="386.0" h-a-x="296" />
+	<g c="E4B0" x="0.0" y="0.0" w="361.0" h="344.0" h-a-x="360" />
 	<g c="E4B1" x="0.0" y="-344.0" w="361.0" h="344.0" h-a-x="360" />
-	<g c="E4B2" x="0.0" y="-0.3" w="316.0" h="187.3" h-a-x="316" />
+	<g c="E4B2" x="0.0" y="0.0" w="316.0" h="187.0" h-a-x="316" />
 	<g c="E4B3" x="0.0" y="-187.0" w="316.0" h="187.0" h-a-x="316" />
 	<g c="E4B4" x="0.0" y="0.0" w="361.0" h="358.0" h-a-x="360" />
 	<g c="E4B5" x="0.0" y="-358.0" w="361.0" h="358.0" h-a-x="360" />
@@ -372,7 +372,7 @@
 	<g c="E4E8" x="0.0" y="-507.0" w="391.0" h="967.0" h-a-x="391" />
 	<g c="E4E9" x="0.0" y="-758.0" w="423.0" h="1222.0" h-a-x="423" />
 	<g c="E4EA" x="-1.0" y="-759.0" w="476.0" h="1476.0" h-a-x="475" />
-	<g c="E4EB" x="0.0" y="-998.0" w="526.4" h="1721.0" h-a-x="526" />
+	<g c="E4EB" x="0.0" y="-998.0" w="527.0" h="1721.0" h-a-x="526" />
 	<g c="E4EC" x="0.0" y="-1004.0" w="579.0" h="1971.0" h-a-x="579" />
 	<g c="E4ED" x="1.0" y="-1004.0" w="633.0" h="2230.0" h-a-x="634" />
 	<g c="E4F2" x="0.0" y="-255.0" w="276.0" h="459.0" h-a-x="276" />
@@ -406,7 +406,7 @@
 	<g c="E524" x="0.0" y="-5.0" w="208.0" h="268.0" h-a-x="208" >
 		<a n="opticalCenter" x="0.484" y="0"/>
 	</g>
-	<g c="E525" x="-42.0" y="-1.0" w="281.0" h="259.0" h-a-x="256" >
+	<g c="E525" x="-42.0" y="-1.0" w="281.0" h="258.0" h-a-x="256" >
 		<a n="opticalCenter" x="0.596" y="0"/>
 	</g>
 	<g c="E526" x="-12.0" y="-1.0" w="267.0" h="255.0" h-a-x="272" >
@@ -427,8 +427,8 @@
 	<g c="E5BB" x="0.0" y="0.0" w="662.0" h="406.0" h-a-x="662" />
 	<g c="E5BD" x="0.0" y="-73.0" w="653.0" h="393.0" h-a-x="653" />
 	<g c="E5C6" x="-1.0" y="0.0" w="703.0" h="389.0" h-a-x="702" />
-	<g c="E5C7" x="0.0" y="-72.0" w="703.0" h="461.0" h-a-x="703" />
-	<g c="E5C8" x="0.0" y="-171.0" w="565.0" h="420.0" h-a-x="565" />
+	<g c="E5C7" x="-0.0" y="-72.0" w="703.0" h="461.0" h-a-x="703" />
+	<g c="E5C8" x="0.0" y="-172.0" w="565.0" h="421.0" h-a-x="565" />
 	<g c="E5E5" x="0.0" y="0.0" w="312.0" h="312.0" h-a-x="312" />
 	<g c="E610" x="0.0" y="0.0" w="315.0" h="293.0" h-a-x="315" />
 	<g c="E611" x="0.0" y="0.0" w="315.0" h="293.0" h-a-x="315" />
@@ -439,7 +439,7 @@
 	<g c="E631" x="0.0" y="0.0" w="269.0" h="389.0" h-a-x="269" />
 	<g c="E632" x="0.0" y="0.0" w="389.0" h="269.0" h-a-x="389" />
 	<g c="E650" x="0.0" y="-10.0" w="981.0" h="555.0" h-a-x="981" />
-	<g c="E651" x="0.0" y="-9.0" w="450.0" h="554.0" h-a-x="450" />
+	<g c="E651" x="0.0" y="-10.0" w="450.0" h="555.0" h-a-x="450" />
 	<g c="E655" x="0.0" y="0.0" w="473.0" h="473.0" h-a-x="473" />
 	<g c="E880" x="0.0" y="-7.0" w="273.0" h="370.0" h-a-x="273" />
 	<g c="E881" x="0.0" y="0.0" w="239.0" h="363.0" h-a-x="239" />
@@ -476,18 +476,25 @@
 	<g c="E4F6" x="0.0" y="-202.0" w="317.0" h="409.0" h-a-x="317" />
 	<g c="E06A" x="0.0" y="-438.0" w="304.0" h="877.0" h-a-x="304" />
 	<g c="E4CE" x="0.0" y="0.0" w="191.0" h="321.0" h-a-x="191" />
-	<g c="E500" x="0.0" y="-250.0" w="481.0" h="499.0" h-a-x="481" />
-	<g c="E501" x="0.0" y="-250.0" w="735.0" h="499.0" h-a-x="735" />
-	<g c="E502" x="0.0" y="-250.0" w="1243.0" h="499.0" h-a-x="1243" />
+	<g c="E500" x="0.0" y="-250.0" w="481.0" h="500.0" h-a-x="481" />
+	<g c="E501" x="0.0" y="-250.0" w="735.0" h="500.0" h-a-x="735" />
+	<g c="E502" x="0.0" y="-250.0" w="1243.0" h="500.0" h-a-x="1243" />
 	<g c="E4A8" x="0.0" y="0.0" w="122.0" h="254.0" h-a-x="122" />
 	<g c="E4A9" x="0.0" y="-254.0" w="122.0" h="254.0" h-a-x="122" />
-	<g c="E56F" x="-0.0" y="0.0" w="503.0" h="250.0" h-a-x="503" />
+	<g c="E56F" x="0.0" y="-13.0" w="503.0" h="250.0" h-a-x="503" />
 	<g c="E587" x="0.0" y="0.0" w="751.0" h="473.0" h-a-x="591" />
 	<g c="E5E6" x="0.0" y="0.0" w="280.0" h="280.0" h-a-x="280" />
 	<g c="E5E7" x="0.0" y="0.0" w="280.0" h="280.0" h-a-x="280" />
 	<g c="E59D" x="-43.0" y="0.0" w="231.0" h="247.0" h-a-x="172" >
 		<a n="repeatOffset" x="0.688" y="0"/>
 	</g>
-	<g c="E5BC" x="0.0" y="-72.0" w="920.0" h="393.0" h-a-x="921" />
+	<g c="E5BC" x="0.0" y="-72.0" w="918.0" h="393.0" h-a-x="918" />
 	<g c="E59E" x="-2.0" y="0.0" w="263.0" h="248.0" h-a-x="261" />
+	<g c="E5C0" x="0.0" y="0.0" w="884.0" h="248.0" h-a-x="884" />
+	<g c="E5C3" x="0.0" y="0.0" w="857.0" h="248.0" h-a-x="857" />
+	<g c="E5BE" x="0.0" y="0.0" w="704.0" h="248.0" h-a-x="704" />
+	<g c="E583" x="0.0" y="109.0" w="37.0" h="280.0" h-a-x="37" />
+	<g c="E503" x="1.0" y="62.0" w="126.0" h="126.0" h-a-x="127" />
+	<g c="E504" x="0.0" y="-250.0" w="481.0" h="500.0" h-a-x="481" />
+	<g c="E505" x="1.0" y="-190.0" w="126.0" h="126.0" h-a-x="127" />
 </bounding-boxes>
diff --git a/data/Leland/E000-brace.xml b/data/Leland/E000-brace.xml
@@ -1 +1 @@
-<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 500c18 -19 53 -57 53 -130c0 -91 -39 -183 -39 -240c0 -61 35 -118 37 -120v-2c1 -1 0 -2 -1 -3s-3 0 -4 2c-1 1 -55 56 -55 137c0 88 35 150 35 265c0 22 -9 57 -34 88v0v0c-1 1 -2 2 -1 3c0 1 0 3 1 3c25 31 34 66 34 88c0 115 -35 177 -35 265c0 82 54 136 55 137 c1 2 3 2 4 2c1 -1 1 -2 1 -3v-2c-2 -2 -37 -59 -37 -120c0 -57 39 -149 39 -240c0 -72 -35 -111 -53 -130z" /></symbol>
+<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 500c18 -19 53 -57 53 -130c0 -91 -39 -183 -39 -240c0 -61 35 -118 37 -120v-2c1 -1 0 -2 -1 -3s-3 0 -4 2c-1 1 -55 56 -55 137c0 88 35 150 35 265c0 22 -9 57 -34 88c-1 1 -2 2 -2 3c1 1 1 3 2 3c25 31 34 66 34 88c0 115 -35 177 -35 265c0 82 54 136 55 137 c1 2 3 2 4 2c1 -1 1 -2 1 -3v-2c-2 -2 -37 -59 -37 -120c0 -57 39 -149 39 -240c0 -72 -35 -111 -53 -130z" /></symbol>
diff --git a/data/Leland/E003-bracketTop.xml b/data/Leland/E003-bracketTop.xml
@@ -1 +1 @@
-<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 277c4 -3 7 -7 7 -12c0 -2 -1 -4 -1 -5c-1 -3 -60 -260 -368 -260h-122v14v90c0 8 6 13 14 13h159c191 0 291 154 293 157c2 4 7 5 11 5c2 0 5 -1 7 -2z" /></symbol>
+<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 277c4 -3 7 -7 7 -12c0 -2 -1 -4 -1 -5c-1 -3 -60 -260 -368 -260h-122v104c0 8 6 13 14 13h159c191 0 291 154 293 157c2 4 7 5 11 5c2 0 5 -1 7 -2z" /></symbol>
diff --git a/data/Leland/E004-bracketBottom.xml b/data/Leland/E004-bracketBottom.xml
@@ -1 +1 @@
-<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 -277c-2 -1 -5 -2 -7 -2c-4 0 -9 1 -11 5c-2 3 -102 157 -293 157h-159c-8 0 -14 5 -14 13v90v14h122c308 0 367 -257 368 -260c0 -1 1 -3 1 -5c0 -5 -3 -9 -7 -12z" /></symbol>
+<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 -277c-2 -1 -5 -2 -7 -2c-4 0 -9 1 -11 5c-2 3 -102 157 -293 157h-159c-8 0 -14 5 -14 13v104h122c308 0 367 -257 368 -260c0 -1 1 -3 1 -5c0 -5 -3 -9 -7 -12z" /></symbol>
diff --git a/data/Leland/E047-segno.xml b/data/Leland/E047-segno.xml
@@ -1 +1 @@
-<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 479l191 -98c56 -29 84 -85 84 -164s-49 -199 -203 -199c-153 0 -167 76 -171 95c-1 3 -1 6 -1 10c0 20 11 49 44 57c5 1 11 2 16 2c34 0 67 -24 77 -59c12 -40 38 -63 74 -63c40 0 95 31 95 118c0 43 -43 73 -96 102l-172 89l-205 -362c-2 -3 -6 -6 -9 -7h-3 c-2 0 -6 1 -8 2l-15 11c-3 2 -6 7 -6 11c0 2 0 5 1 7l204 360l-189 99c-58 33 -87 83 -87 162s50 199 204 199c153 0 167 -76 171 -95c1 -3 1 -6 1 -9c0 -21 -11 -51 -45 -59c-5 -1 -11 -2 -16 -2c-34 0 -67 24 -77 59c-12 40 -38 64 -74 64c-40 0 -95 -31 -95 -118 c0 -49 33 -68 82 -94l187 -96l204 361c2 4 8 7 12 7c2 0 6 -1 8 -2l16 -11c3 -2 6 -8 6 -12c0 -2 -1 -4 -2 -6zM36 308c-12 12 -19 29 -19 45s7 33 19 45s30 19 46 19s33 -7 45 -19s19 -29 19 -45s-7 -33 -19 -45s-29 -19 -45 -19s-34 7 -46 19zM528 507 c-12 12 -19 29 -19 45s7 34 19 46s29 19 45 19s33 -7 45 -19s19 -30 19 -46s-7 -33 -19 -45s-29 -19 -45 -19s-33 7 -45 19z" /></symbol>
+<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 479l191 -98c56 -29 84 -85 84 -164s-49 -199 -203 -199c-153 0 -167 76 -171 95c-1 3 -1 6 -1 10c0 34 26 59 60 59s67 -24 77 -59c12 -40 38 -63 74 -63c40 0 95 31 95 118c0 43 -43 73 -96 102l-172 89l-205 -362c-2 -3 -6 -6 -9 -7c-4 0 -8 0 -11 2l-15 11 c-3 2 -6 7 -6 11c0 2 0 5 1 7l204 360l-189 99c-58 33 -87 83 -87 162s50 199 204 199c153 0 167 -76 171 -95c1 -3 1 -6 1 -9c0 -36 -26 -61 -61 -61c-34 0 -67 24 -77 59c-12 40 -38 64 -74 64c-40 0 -95 -31 -95 -118c0 -49 33 -68 82 -94l187 -96l204 361c2 4 8 7 12 7 c2 0 6 -1 8 -2l16 -11c3 -2 6 -8 6 -12c0 -2 -1 -4 -2 -6zM573 488c-34 0 -64 30 -64 64c0 35 29 65 64 65s64 -30 64 -65c0 -34 -30 -64 -64 -64zM82 289c-35 0 -65 29 -65 64s30 64 65 64c34 0 64 -30 64 -64s-30 -64 -64 -64z" /></symbol>
diff --git a/data/Leland/E04B-segnoSerpent2.xml b/data/Leland/E04B-segnoSerpent2.xml
@@ -1 +1 @@
-<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M442 154c3 2 33 24 33 74c0 97 -56 114 -86 131c-5 2 -13 7 -24 12v-171c27 -13 53 -28 77 -46zM225 438v-171c34 -17 75 -36 104 -50v172c-34 16 -75 36 -104 49zM166 297c5 -3 13 -7 23 -12v170c-27 14 -52 29 -76 46c-4 -1 -34 -15 -34 -74c0 -77 57 -114 87 -130z M189 624v176c-31 16 -59 33 -85 53c-2 -2 -24 -20 -24 -62c0 -95 62 -142 109 -167zM329 555v179c-34 16 -75 36 -104 49v-179c26 -14 55 -28 104 -49zM365 716v-177c28 -11 54 -24 78 -39c3 2 32 18 32 73c0 84 -45 111 -110 143zM225 101v-97c0 -7 -6 -12 -12 -12h-11 c-7 0 -13 5 -13 12v112c-100 42 -189 103 -189 217c0 112 61 164 89 187c-54 46 -89 112 -89 174c0 86 19 127 76 183c-47 43 -76 115 -76 181c0 106 69 223 231 223c175 0 228 -64 251 -106c9 -17 16 -35 16 -53c0 -46 -31 -64 -73 -64c-48 0 -78 33 -98 89 c-16 44 -43 86 -120 86s-127 -46 -127 -105c0 -95 63 -134 109 -160v34c0 7 6 13 13 13h11c7 0 12 -6 12 -13v-53c26 -14 55 -28 104 -49v102c0 7 6 13 13 13h10c7 0 13 -6 13 -13v-118c100 -42 189 -103 189 -217c0 -108 -57 -161 -86 -184c51 -39 86 -89 86 -161 c0 -111 -61 -164 -88 -187c53 -45 88 -121 88 -193c0 -90 -49 -222 -231 -222c-88 0 -264 39 -264 156c0 35 19 68 56 73c74 0 89 -25 113 -95c18 -54 42 -87 119 -87s128 39 128 98c0 95 -64 142 -110 167v-28c0 -7 -5 -12 -13 -12h-10c-8 0 -13 5 -13 12v48 c-26 13 -55 27 -104 49z" /></symbol>
+<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M225 101v-97c0 -7 -6 -13 -12 -13h-11c-7 0 -13 6 -13 13v112c-100 42 -189 103 -189 217c0 112 61 165 89 187c-54 46 -89 112 -89 174c0 86 19 127 76 183c-46 43 -76 115 -76 181c0 106 69 223 231 223c175 0 228 -64 251 -106c9 -17 16 -35 16 -53 c0 -46 -31 -64 -73 -64c-48 0 -78 33 -98 89c-16 44 -43 86 -120 86s-127 -46 -127 -105c0 -95 63 -134 109 -159v34c0 6 6 12 13 12h11c7 0 12 -6 12 -12v-54c26 -14 55 -28 104 -49v103c0 6 6 12 13 12h10c7 0 13 -6 13 -12v-118c100 -43 189 -104 189 -218 c0 -108 -57 -161 -86 -184c51 -39 86 -89 86 -161c0 -111 -61 -164 -88 -187c53 -45 88 -121 88 -193c0 -90 -49 -223 -230 -223c-88 0 -265 40 -265 157c0 35 19 68 56 73c74 0 89 -25 113 -95c18 -54 42 -87 119 -87s128 39 128 98c0 95 -63 142 -110 167v-28 c0 -7 -5 -13 -13 -13h-10c-8 0 -13 6 -13 13v48c-26 14 -55 28 -104 49zM189 624v177c-30 15 -59 32 -84 52c-3 -2 -25 -20 -25 -62c0 -95 62 -142 109 -167zM329 555v179c-34 16 -75 36 -104 49v-179c26 -14 55 -28 104 -49zM365 716l1 -177c27 -11 53 -24 77 -39 c3 2 32 18 32 73c0 84 -45 111 -110 143zM79 427c0 -76 50 -112 110 -142v170c-26 14 -52 29 -76 46c-4 -1 -34 -15 -34 -74zM225 438v-171c35 -17 75 -36 104 -50v172c-34 16 -75 36 -104 49zM442 154c3 2 33 24 33 74c0 97 -56 114 -86 131c-5 2 -13 7 -24 12v-171 c27 -13 53 -28 77 -46z" /></symbol>