Merge pull request #3718 from rism-digital/develop-neumes

Refactoring of neume drawing code

bindings/iOS/all.h

@@ -54,7 +54,7 @@
 #import <VerovioFramework/calcchordnoteheadsfunctor.h>
 #import <VerovioFramework/calcdotsfunctor.h>
 #import <VerovioFramework/calcledgerlinesfunctor.h>
-#import <VerovioFramework/calcligaturenoteposfunctor.h>
+#import <VerovioFramework/calcligatureorneumeposfunctor.h>
 #import <VerovioFramework/calcslurdirectionfunctor.h>
 #import <VerovioFramework/calcspanningbeamspansfunctor.h>
 #import <VerovioFramework/calcstemfunctor.h>

data/Bravura.xml

@@ -716,6 +716,7 @@
   <g c="E99B" x="0.0" y="-115.0" w="154.0" h="230.0" h-a-x="154" n="chantQuilisma" />
   <g c="E99E" x="0.0" y="-246.0" w="153.0" h="360.0" h-a-x="153" n="chantOriscusLiquescens" />
   <g c="E99F" x="0.0" y="-92.0" w="124.0" h="185.0" h-a-x="124" n="chantStrophicus" />
+  <g c="E9A1" x="0.0" y="-57.0" w="91.0" h="115.0" h-a-x="91" n="chantPunctumDeminutum" />
   <g c="E9B0" x="0.0" y="0.0" w="154.0" h="164.0" h-a-x="139" n="chantPodatusLower" />
   <g c="E9B1" x="-127.0" y="-3.0" w="141.0" h="198.0" h-a-x="0" n="chantPodatusUpper" />
   <g c="E9B2" x="-62.0" y="-121.0" w="76.0" h="188.0" h-a-x="14" n="chantDeminutumUpper" />
@@ -749,6 +750,7 @@
   <g c="E9F8" x="0.0" y="0.0" w="138.0" h="165.0" h-a-x="138" n="mensuralRestSemifusa" />
   <g c="EA02" x="1.0" y="0.0" w="613.0" h="411.0" h-a-x="615" n="mensuralCustosUp" />
   <g c="EA06" x="0.0" y="-101.0" w="60.0" h="416.0" h-a-x="60" n="chantCustosStemUpPosMiddle" />
+  <g c="EA2A" x="0.0" y="-131.0" w="319.0" h="263.0" h-a-x="319" n="medRenOriscusCMN" />
   <g c="EA50" x="20.0" y="-1.0" w="215.0" h="252.0" h-a-x="255" n="figbass0" />
   <g c="EA51" x="20.0" y="0.0" w="117.0" h="254.0" h-a-x="157" n="figbass1" />
   <g c="EA52" x="20.0" y="-3.0" w="202.0" h="256.0" h-a-x="242" n="figbass2" />

data/Bravura/E9A1.xml

@@ -0,0 +1 @@
+<symbol id="E9A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -55v83c0 20 21 30 43 30c24 0 48 -11 48 -31v-82s0 -2 -1 -2s-1 0 -3 2c-4 4 -18 11 -39 11h-2c-19 0 -35 -7 -41 -11c-1 -1 -3 -2 -4 -2c0 0 -1 0 -1 2z" /></symbol>

data/Bravura/EA2A.xml

@@ -0,0 +1 @@
+<symbol id="EA2A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -75c0 44 12 114 34 205h26v-12c0 -16 -1 -31 -1 -44c0 -40 4 -64 23 -64c32 0 175 122 214 122c16 0 23 -19 23 -55c0 -44 -11 -115 -34 -207h-25v12c0 16 1 31 1 44c0 40 -4 65 -23 65c-32 0 -175 -122 -214 -122c-16 0 -24 19 -24 56z" /></symbol>

data/Leipzig.xml

@@ -709,6 +709,7 @@
   <g c="E996" x="0.0" y="-401.0" w="144.0" h="503.0" h-a-x="144" n="chantPunctumVirga" />
   <g c="E997" x="0.0" y="-401.0" w="144.0" h="503.0" h-a-x="144" n="chantPunctumVirgaReversed" />
   <g c="E99E" x="0.0" y="-250.0" w="145.0" h="364.0" h-a-x="145" n="chantOriscusLiquescens" />
+  <g c="E9A1" x="0.0" y="-57.0" w="91.0" h="115.0" h-a-x="91" n="chantPunctumDeminutum" />
   <g c="E99B" x="0.0" y="-115.0" w="139.0" h="230.0" h-a-x="140" n="chantQuilisma" />
   <g c="E9B1" x="-113.0" y="-3.0" w="127.0" h="198.0" h-a-x="14" n="chantPodatusUpper" />
   <g c="E9B2" x="-56.0" y="-121.0" w="69.0" h="188.0" h-a-x="13" n="chantDeminutumUpper" />
@@ -805,13 +806,14 @@
     <a n="stemDownNW" x="0.0" y="-0.14" />
     <a n="stemUpSE" x="1.26" y="0.16" />
   </g>
-  <g c="E926" x="-0.14" y="-200.0" w="180.14" h="390.0" h-a-x="180" n="mensuralProportion1" />
-  <g c="E928" x="1.0" y="-201.0" w="215.0" h="391.0" h-a-x="216" n="mensuralProportion3" />
-  <g c="E927" x="-0.0" y="-200.0" w="254.04" h="390.02" h-a-x="254" n="mensuralProportion2" />
-  <g c="E929" x="0.0" y="-202.0" w="254.0" h="382.0" h-a-x="254" n="mensuralProportion4" />
-  <g c="EE90" x="-2.0" y="-200.02" w="256.0" h="392.02" h-a-x="254" n="mensuralProportion5" />
-  <g c="EE91" x="-5.34" y="-200.0" w="233.34" h="390.0" h-a-x="227" n="mensuralProportion6" />
-  <g c="EE94" x="-5.34" y="-200.0" w="233.34" h="390.0" h-a-x="227" n="mensuralProportion9" />
-  <g c="EE93" x="0.0" y="-200.0" w="233.0" h="390.0" h-a-x="233" n="mensuralProportion8" />
-  <g c="EE92" x="0.0" y="-200.0" w="233.0" h="390.0" h-a-x="233" n="mensuralProportion7" />
+  <g c="E926" x="19.86" y="-200.0" w="180.14" h="390.0" h-a-x="220" n="mensuralProportion1" />
+  <g c="E928" x="23.0" y="-201.0" w="215.0" h="391.0" h-a-x="256" n="mensuralProportion3" />
+  <g c="E927" x="20.0" y="-200.0" w="254.04" h="390.02" h-a-x="294" n="mensuralProportion2" />
+  <g c="E929" x="20.0" y="-202.0" w="254.0" h="382.0" h-a-x="294" n="mensuralProportion4" />
+  <g c="EE90" x="13.0" y="-200.02" w="247.0" h="392.02" h-a-x="280" n="mensuralProportion5" />
+  <g c="EE91" x="14.66" y="-200.0" w="232.34" h="390.0" h-a-x="267" n="mensuralProportion6" />
+  <g c="EE94" x="15.66" y="-200.0" w="232.34" h="390.0" h-a-x="267" n="mensuralProportion9" />
+  <g c="EE93" x="20.0" y="-200.0" w="233.0" h="390.0" h-a-x="273" n="mensuralProportion8" />
+  <g c="EE92" x="20.0" y="-201.0" w="233.0" h="391.0" h-a-x="273" n="mensuralProportion7" />
+  <g c="EA2A" x="0.0" y="-131.0" w="319.0" h="261.0" h-a-x="319" n="medRenOriscusCMN" />
 </bounding-boxes>

data/Leipzig/E926.xml

@@ -1 +1 @@
-<symbol id="E926" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M70 190h40v-307s0 -24 11 -35c9.17647 -9.94118 20.692 -11.1107 25.6031 -11.1107c1.51109 0 2.39691 0.110727 2.39691 0.110727l31 -1v-36h-70h-40h-70v36h31s13 1 29 16c8 8 10 32 10 32v213c-9 -5 -22 -12 -30 -15 c-19.5181 -7.63751 -36.1556 -10.234 -39.5235 -10.234c-0.408035 0 -0.62129 0.0381131 -0.62129 0.109992c0 0.033959 0.0475999 0.0754547 0.144748 0.124029v48s24 1 49 33c16 19 20 29 21 33v1v2v1z" /></symbol>
+<symbol id="E926" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 190h40v-307s0 -24 11 -35c9.17676 -9.94141 20.6924 -11.1104 25.6035 -11.1104c1.51074 0 2.39648 0.110352 2.39648 0.110352l31 -1v-36h-70h-40h-70v36h31s13 1 29 16c8 8 10 32 10 32v213c-9 -5 -22 -12 -30 -15 c-19.5186 -7.6377 -36.1553 -10.2344 -39.5234 -10.2344c-0.408203 0 -0.621094 0.0380859 -0.621094 0.110352c0 0.0341797 0.0478516 0.0751953 0.144531 0.124023v48s24 1 49 33c16 19 20 29 21 33v1v2v1z" /></symbol>

data/Leipzig/E927.xml

@@ -1 +1 @@
-<symbol id="E927" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M132.023 148.018c-79.1898 0 -96.8182 -91.014 -97.0233 -91.0175l-35 9c14.8031 86.8447 67.5889 124.02 133.368 124.02c67.4886 0 120.668 -59.0471 120.668 -119.274c0 -78.9891 -82.9969 -122.256 -83.0361 -123.745 c-62.9428 -36.3888 -121.049 -61.1708 -121.049 -103.835c0 -0.716593 0.0163925 -1.43823 0.0494299 -2.16505c36 1 91 1 141 2c28 1 63 55 63 55v-98l-254 1v39h1c5 21 10.0928 42.9297 23 60c31 41 103 69 103 69s69.3187 33.9187 81 99 c0.723905 4.03319 1.0842 8.09843 1.0842 12.1449c0 34.625 -26.381 67.8727 -77.0609 67.8727z" /></symbol>
+<symbol id="E927" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152.023 146.018c-79.1904 0 -100.818 -85.0137 -101.023 -85.0176l-31 5c14.8027 86.8447 67.5889 124.02 133.368 124.02c67.4883 0 120.668 -59.0469 120.668 -119.274c0 -78.9893 -82.9971 -116.256 -83.0361 -117.745 c-62.9424 -36.3887 -121.05 -67.1709 -121.05 -109.835c0 -0.716797 0.0166016 -1.43848 0.0498047 -2.16504c36 1 91 1 141 2c28 1 63 55 63 55v-98l-254 1v39h1c5 21 9.1053 43.7233 23 60c35 41 106 74 106 74s73 32 78 94 c0.329383 4.08435 1.08398 8.09863 1.08398 12.1445c0 34.625 -26.3809 65.873 -77.0605 65.873z" /></symbol>

data/Leipzig/E928.xml

@@ -1 +1 @@
-<symbol id="E928" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 190h211c0 -7.33301 -0.555664 -28 -0.555664 -43.6299c0 -7.81445 -0.111328 -10.3701 -0.444336 -13.3701l-84 -106c52 -13 85 -49 85 -110c0 -63 -52 -118 -115 -118c-37 0 -52 5 -100 48c11 11 14 15 27 29c16 -19 39 -39 73 -39 c44.4595 0 74.1212 41.6592 74.1212 81.1197c0 32.283 -22.339 60.2863 -51.1212 69.8803c-8.55566 2.72266 -15.9014 1.08301 -23.0371 1.08301c-11.2129 0 -21.9072 -1.36035 -35.9629 -8.08301v33c50 62 59 71 109 136c0 0 -43.1113 0.888672 -88.7412 0.888672 c-22.8145 0 -23.2588 -0.22168 -42.2588 -0.888672c-17 -1 -37 -35 -37 -35z" /></symbol>
+<symbol id="E928" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 190h211c0 -7.33301 -0.555664 -28 -0.555664 -43.6299c0 -7.81445 -0.111328 -10.3701 -0.444336 -13.3701l-89 -109c50 -6 90 -46 90 -107c0 -63 -52 -118 -115 -118c-37 0 -59 6 -100 48c11 11 9 10 22 24c16 -19 44 -34 78 -34 c44.46 0 74.1211 41.6592 74.1211 81.1201c0 32.2822 -22.3389 60.2861 -51.1211 69.8799c-8.55566 2.72266 -15.9014 3.08301 -23.0371 3.08301c-11.2129 0 -21.9072 -3.36035 -35.9629 -10.083v29c50 62 67 77 117 142c0 0 -51.1113 -1.11133 -96.7412 -1.11133 c-22.8145 0 -23.2588 -0.22168 -42.2588 -0.888672c-17 -1 -37 -35 -37 -35z" /></symbol>

data/Leipzig/E929.xml

@@ -1 +1 @@
-<symbol id="E929" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 180h40v-242h48v-40h-48v-100h-40v100h-166v28v8v2zM166 139l-136 -201h136v201z" /></symbol>
+<symbol id="E929" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M186 180h40v-242h48v-40h-48v-100h-40v100h-166v28v8v2zM186 132l-131 -194h131v194z" /></symbol>

data/Leipzig/E9A1.xml

@@ -0,0 +1 @@
+<symbol id="E9A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -55v83c0 20 21 30 43 30c24 0 48 -11 48 -31v-82s0 -2 -1 -2s-1 0 -3 2c-4 4 -18 11 -39 11h-2c-19 0 -35 -7 -41 -11c-1 -1 -3 -2 -4 -2c0 0 -1 0 -1 2z" /></symbol>

data/Leipzig/EA2A.xml

@@ -0,0 +1 @@
+<symbol id="EA2A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -75c0 44 12 114 34 205h22l1 -12c0 -16 1.3082 -30.8653 2 -44c2.08229 -39.5349 8 -68 27 -68c32 0 171 123 210 123c16 0 23 -16 23 -52c0 -44 -11 -115 -34 -207h-20l1 12s1 31 1 44c0 40 -14 68 -33 68c-32 0 -171 -125 -210 -125c-16 0 -24 19 -24 56z" /></symbol>

data/Leipzig/EE90.xml

@@ -1 +1 @@
-<symbol id="EE90" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M74 96zM54 28zM132.023 -157.998c49.1489 0 79.9766 55.998 79.9766 97.998c0 50.04 -32 88 -84 90c-2.61259 0.100484 -5.16237 0.125957 -7.65138 0.125957c-56.5652 0 -82.0345 -21.5168 -120.349 -53.126l24 215l215 -1.98047v-98s-29.9873 54.4395 -58 55 c-22.541 0.451172 -34.0667 0.491195 -54.2091 0.491195c-4.3938 0 -8.72181 -0.00192075 -12.9802 -0.00192075c-19.5218 0 -37.5808 0.0403658 -53.8107 0.491195c-2.94336 -20.751 -10 -70 -12 -88c23.6634 4.77413 39.6988 8.0479 73.6612 8.0479 c2.35708 0 4.80051 -0.0157689 7.33882 -0.0478995c79 -1 125 -49 125 -128c0 -109.034 -73 -140 -109 -140c-4.48073 0 -8.80135 -0.0192 -12.9895 -0.0192c-48.1639 0 -78.8105 2.5392 -134.01 66.0192l40 30c0.925781 0 36.7681 -53.998 94.0234 -53.998z" /></symbol>
+<symbol id="EE90" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M94 96zM74 28zM128.16 -160.998c55.0116 0 93.8398 54.998 93.8398 101.573c0 45.4652 -37 91.4252 -89.4932 93.4442c-2.11906 0.0815067 -4.66886 0.106897 -6.63013 0.106897c-57.0934 0 -67.5622 -21.5166 -105.877 -53.126l24 211l200 -1.98047v-98 s-29.9873 54.4395 -77.7024 55.3944c-2.83865 0.0568092 -14.364 0.0968483 -34.4614 0.0968483c-4.43877 0 -8.76689 -0.00195313 -13.0689 -0.00195313c-19.4782 0 -25.5378 0.0400391 -41.7673 0.491211c-2.94336 -20.751 -10 -70 -12 -88 c23.6631 4.77441 27.6992 8.04785 61.6715 8.04785c2.3471 0 4.79046 -0.015625 6.22534 -0.0337897c80.1032 -1.01406 127.103 -49.0141 127.103 -132.408c0 -104.641 -74 -135.606 -113.489 -135.606c-0.991738 0 -5.31303 -0.0195312 -9.53433 -0.0195312 c-48.1303 0 -87.9769 19.0195 -123.977 64.0195l22 23c0.925781 0 41.7686 -47.998 93.1602 -47.998z" /></symbol>

data/Leipzig/EE91.xml

@@ -1 +1 @@
-<symbol id="EE91" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M143 71zM199 190l29 -34l-98 -94l-27 -30c1.3627 0.0394987 2.71995 0.0591055 4.07141 0.0591055c67.0796 0 119.929 -48.3033 119.929 -110.059c0 -65 -53 -122 -114 -122s-116.395 39.0195 -118 104c-0.172045 6.96362 -0.337063 13.6428 -0.337063 20.1593 c0 64.8036 16.3194 113.515 204.337 265.841zM112 7c-38 0 -71 -43 -71 -89s32 -92 70 -92s70 51 70 97s-31 84 -69 84z" /></symbol>
+<symbol id="EE91" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M219 190l20 -26l-41 -29s-34.027 -25.3694 -57 -56c-18 -24 -35 -53 -35 -53c1.3623 0.0390625 19.7197 6.05957 21.0713 6.05957c67.0801 0 119.929 -48.3037 119.929 -110.06c0 -65 -53 -122 -114 -122s-116.395 39.0195 -118 104 c-0.171875 6.96387 -0.336914 13.6426 -0.336914 20.1592c0 42.8027 11.3252 103.585 70.3369 166.841c30.332 32.5137 53 50 134 99zM132 7c-38 0 -71 -43 -71 -89s32 -92 70 -92s70 51 70 97s-31 84 -69 84z" /></symbol>

data/Leipzig/EE92.xml

@@ -1 +1 @@
-<symbol id="EE92" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 190h233v-40l-195 -350h-38l189 350s-94 -1 -151 -2c-17.0264 -0.298828 -37 -33 -37 -33z" /></symbol>
+<symbol id="EE92" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 190h233v-40l-195 -351l-37 1l188 350s-94 -1 -151 -2c-17.0264 -0.298828 -37 -33 -37 -33z" /></symbol>

data/Leipzig/EE93.xml

@@ -1 +1 @@
-<symbol id="EE93" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M118 190c56 0 101 -41 101 -92c0 -34 -20 -66 -50 -82c36 -19 64 -54 64 -96c0 -72 -52 -120 -116 -120s-117 46 -117 120c0 44 27 79 66 97c-27 17 -49 49 -49 81c0 51 45 92 101 92zM118 161c-35 0 -58 -29 -58 -65c0 -50 39 -68 60 -68c26 0 56 35 56 67 c0 36 -23 66 -58 66zM117 -6c-41 0 -69 -34 -69 -77s28 -87 69 -87s68 44 68 87s-27 77 -68 77z" /></symbol>
+<symbol id="EE93" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M138 190c56 0 101 -41 101 -92c0 -34 -20 -66 -50 -82c36 -19 64 -54 64 -96c0 -72 -52 -120 -116 -120s-117 46 -117 120c0 44 27 79 66 97c-27 17 -49 49 -49 81c0 51 45 92 101 92zM138 161c-35 0 -58 -29 -58 -65c0 -50 39 -68 60 -68c26 0 56 35 56 67 c0 36 -23 66 -58 66zM140 -3c-41 0 -72 -37 -72 -80s28 -87 69 -87s68 44 68 87s-24 80 -65 80z" /></symbol>

data/Leipzig/EE94.xml

@@ -1 +1 @@
-<symbol id="EE94" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M22.6631 -200l-28 34c38.3369 24 58.3369 38 87.3369 62c19.8897 16.4605 45.3369 33 63 64c-1.3623 -0.0390625 -28.0566 -2.05957 -29.4082 -2.05957c-67.0801 0 -119.929 48.3037 -119.929 110.06c0 65 53 122 114 122c61 0 116.395 -39.0195 118 -104 c0.171875 -6.96387 0.336914 -13.6426 0.336914 -20.1592c0 -45.008 -12 -105.841 -63 -162.841c-40.5728 -45.3461 -79 -64 -142.337 -103zM110.663 -17c38 0 71 43 71 89s-32 92 -70 92c-38 0 -70 -51 -70 -97s31 -84 69 -84z" /></symbol>
+<symbol id="EE94" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M42.6631 -200l-16.6631 25c38.3369 24 48 32 80 61c19.1307 17.3372 41.3369 43 59 74c-1.3623 -0.0390625 -28.0566 -2.05957 -29.4082 -2.05957c-67.0801 0 -119.929 48.3037 -119.929 110.06c0 65 53 122 114 122c61 0 116.395 -39.0195 118 -104 c0.171875 -6.96387 0.336914 -13.6426 0.336914 -20.1592c0 -45.0078 -12 -105.841 -63 -162.841c-40.5732 -45.3457 -79 -64 -142.337 -103zM130.663 -17c38 0 71 43 71 89s-32 92 -70 92c-38 0 -70 -51 -70 -97s31 -84 69 -84z" /></symbol>