Merge commit 'acfdfdb082119b803c3914899890e80d017655df'

Conflicts: .clang-format doc/guidelines.md src/vrv.cpp tools/main.cpp
rism-digital · May 17, 2016 · 1324a0d · 1324a0d
2 parents ae75099 + acfdfdb
commit 1324a0d
Show file tree

Hide file tree

Showing 630 changed files with 63,238 additions and 46,673 deletions.
diff --git a/.clang-format b/.clang-format
@@ -24,7 +24,7 @@ BreakConstructorInitializersBeforeComma: true
 BinPackParameters: true
 BinPackArguments: true
 # Verovio
-ColumnLimit:     150
+ColumnLimit:     120
 # Verovio
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4

diff --git a/README.md b/README.md
@@ -19,6 +19,6 @@ The Verovio coding style is available [here](doc/guidelines.md).
 Example output
 --------------
 
-This page was generated with version 0.9.5
+This page was generated with version 0.9.11
 
-![Example page](/images/page.png)
+![Example page](/images/page-0.9.11.png)
diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
diff --git a/data/Bravura.xml b/data/Bravura.xml
diff --git a/data/Bravura/E003-bracketTop.xml b/data/Bravura/E003-bracketTop.xml
@@ -1,7 +1,4 @@
-<symbol id="E003"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1087">
+<symbol id="E003" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M16 0q-16 0 -16 20v197q0 23 4 27t16 4q439 16 700 251q79 71 123 128q91 118 154 307q23 88 56 88q2 0 16 -8t14 -30q1 -22 -27 -138q-28 -117 -97 -261t-141 -238q-73 -93 -165 -162t-168 -103q-187 -82 -419 -82h-50z"/>
    </g>

diff --git a/data/Bravura/E004-bracketBottom.xml b/data/Bravura/E004-bracketBottom.xml
@@ -1,7 +1,4 @@
-<symbol id="E004"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1085">
+<symbol id="E004" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M16 0h50q236 0 419 -83q76 -35 168 -103t165 -161t143 -237t112 -323q10 -43 10 -71t-14 -36t-16 -8q-33 0 -56 88l-25 78q-11 32 -48 102t-81 127t-123 128q-154 138 -403 207q-137 38 -297 44q-12 0 -16 4t-4 27v197q0 14 3 17t13 3z"/>
    </g>

diff --git a/data/Bravura/E045-dalSegno.xml b/data/Bravura/E045-dalSegno.xml
@@ -1,7 +1,4 @@
-<symbol id="E045"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="2215">
+<symbol id="E045" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M1229 636q0 118 88 194t222 75q134 0 228 -65l66 55h55l15 -317h-64q-113 264 -303 264q-72 0 -119 -36t-47 -93q0 -76 84 -107q17 -7 41 -9q24 -3 84 -19l59 -15q160 -33 233 -103t73 -192q0 -123 -92 -205q-92 -81 -232 -81q-141 0 -254 81l-76 -71h-63v348h63 q51 -139 137 -217q87 -78 179 -78t141 40q49 41 49 107t-55 95q-29 12 -86 26l-29 6l-18 5l-76 16q-143 26 -223 102t-80 194zM2216 97q0 -48 -34 -82q-34 -33 -82 -33t-82 34t-34 81q0 48 34 82t82 34t82 -34t34 -82zM1056 213q48 0 82 -34t33 -82q1 -48 -33 -82 q-34 -33 -82 -33t-82 34t-34 81q0 48 34 82t82 34zM729 457q0 365 -252 364h-31q-45 0 -59 -14t-14 -59v-603q0 -49 14 -64t59 -15h25q137 0 198 93q60 93 60 298zM975 450q0 -255 -170 -374q-109 -76 -330 -76h-452v66h18q84 0 102 18q8 10 9 92v535q0 82 -14 96t-97 14 h-18v66h438q240 0 338 -66q176 -116 176 -371z"/>
    </g>

diff --git a/data/Bravura/E046-daCapo.xml b/data/Bravura/E046-daCapo.xml
@@ -1,7 +1,4 @@
-<symbol id="E046"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="2217">
+<symbol id="E046" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M2216 97q0 -48 -34 -82q-34 -33 -82 -33t-82 34t-34 81q0 48 34 82t82 34t82 -34t34 -82zM1056 213q48 0 82 -34t33 -82q1 -48 -33 -82q-34 -33 -82 -33t-82 34t-34 81q0 48 34 82t82 34zM1155 444q0 194 131 328q131 133 334 133q117 0 225 -65l66 61h53l12 -352l-65 -6 q-80 299 -281 299q-231 0 -231 -392t246 -393q106 0 177 71t97 198l76 -19q-70 -326 -389 -325q-213 0 -332 134t-119 328zM729 457q0 365 -252 364h-31q-45 0 -59 -14t-14 -59v-603q0 -49 14 -64t59 -15h25q137 0 198 93q60 93 60 298zM975 450q0 -255 -170 -374 q-109 -76 -330 -76h-452v66h18q84 0 102 18q8 10 9 92v535q0 82 -14 96t-97 14h-18v66h438q240 0 338 -66q176 -116 176 -371z"/>
    </g>

diff --git a/data/Bravura/E047-segno.xml b/data/Bravura/E047-segno.xml
@@ -1,7 +1,4 @@
-<symbol id="E047"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1140">
+<symbol id="E047" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M104 -6q0 24 7 37q295 531 308 555t13 36t-12 17q-16 6 -90 55t-167 132t-124 154t-31 148q0 148 97 264t197 116t182 -32q81 -32 104 -98q16 -53 16 -96q0 -98 -82 -127q-29 -10 -59 -10q-104 0 -150 176l-4 14q-8 27 -33 27h-12q-111 -18 -110 -127q0 -55 30 -111 t201 -138q170 -83 199 -83q8 0 18 17l338 606q26 46 78 22q31 -16 31 -40t-9 -40q-317 -571 -324 -583t-7 -17q1 -12 29 -28t73 -46t117 -86t128 -136t63 -138q7 -59 7 -78q0 -125 -74 -220t-198 -138q-43 -14 -86 -14q-96 0 -172 72t-76 161q0 98 146 133q16 4 24 4 q43 0 76 -39t33 -96v-22q-1 -45 21 -69t52 -24q132 16 130 150q0 64 -63 126q-62 62 -148 102q-176 82 -230 89q-4 0 -24 -10l-324 -586q-16 -31 -51 -30q-14 0 -36 12q-22 13 -22 37zM287 540q0 -48 -34 -82t-82 -34t-83 34t-35 82t35 83t83 35t82 -36q34 -34 34 -82z M850 955q0 48 35 82t83 34t82 -34t34 -82t-34 -83q-34 -34 -82 -34t-83 34t-35 83z"/>
    </g>

diff --git a/data/Bravura/E048-coda.xml b/data/Bravura/E048-coda.xml
@@ -1,7 +1,4 @@
-<symbol id="E048"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1953">
+<symbol id="E048" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M1036 721v-623q183 20 245 209q52 160 56 414h-301zM647 721q0 -300 47 -420q20 -51 51 -97q60 -89 193 -106v623h-291zM647 819h291v606q-114 -9 -168 -59q-30 -28 -52 -54t-41 -101q-30 -113 -30 -392zM1337 819q0 324 -47 432t-132 146q-52 23 -122 28v-606h301z M1919 819q37 0 37 -49t-37 -49h-244q-14 -285 -201 -493t-438 -228v-287q0 -37 -49 -37t-49 37v287q-250 20 -436 228t-203 493h-270q-37 0 -37 49t37 49h270q15 287 201 494t438 227v264q0 35 49 35t49 -35v-264q252 -20 438 -227t201 -494h244z"/>
    </g>

diff --git a/data/Bravura/E04B-segnoSerpent2.xml b/data/Bravura/E04B-segnoSerpent2.xml
@@ -1,7 +1,4 @@
-<symbol id="E04B"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="823">
+<symbol id="E04B" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M686 1141q10 20 10 37q0 45 -39 75q0 2 -43 33t-77 31q-14 0 -15 -19v-155q0 -25 14 -30q57 -21 92 -21t58 49zM678 680q0 53 -41 82q-2 2 -47 28t-51 25q-16 0 -17 -14v-164q0 -29 15 -35q4 -2 9 -4q4 -2 12 -7t44 -5t66 53q10 25 10 41zM385 702q0 -25 12 -34l45 -23 q2 -2 7 -2q14 0 14 16v170q-1 27 -11 33t-27 16t-24 11q-14 0 -14 -19q-2 -8 -2 -168zM316 717q11 0 12 10v176q0 21 -20 33q-75 46 -101 45q-55 0 -88 -59q-10 -20 -10 -45q-1 -25 35 -62t71 -49l63 -34q26 -14 38 -15zM311 1229q16 0 17 12v166q0 14 -17 23l-39 18 q-10 6 -30 6q-53 0 -86 -51q-8 -14 -9 -31q0 -49 97 -110q17 -13 59 -33h8zM463 1163v168q0 23 -16 31t-41 18l-9 6q-10 0 -10 -10q-2 -4 -2 -74t1 -94q1 -22 13 -28q39 -27 51 -27t13 10zM685 528q-7 -10 -7 -27q0 -16 20 -39q84 -92 84 -204v-14q-4 -110 -80 -203 q-40 -49 -112 -79t-167 -30t-169 27q-116 42 -166 140q-18 36 -18 76t26 70q27 30 74 29q70 0 123 -79q3 -5 25 -47t39 -68t51 -50t73 -24q78 0 117 45t41 103q-6 16 -15 42t-38 68q-28 42 -46 41q-18 0 -18 -8q0 -29 -30 -29q-10 0 -20 10t-9 19v49q0 10 -19 29l-32 22 l-9 4q-4 0 -10 -5t-6 -11v-88q0 -10 -17 -25t-29 0q-13 15 -13 25v125q0 14 -35 43q-291 166 -291 362q0 86 80 207q20 31 20 43t-16 31q-78 84 -78 195q0 63 41 128t65 80t25 30q0 15 -16 38q-88 96 -88 221t100 218t277 93h10q81 0 168 -34q88 -35 126 -73t38 -87 q0 -129 -113 -129q-49 0 -81 22t-56 79q-24 58 -80 88t-99 30t-95 -27q-52 -28 -52 -94t129 -160q4 -4 10 -4t11 7v12q0 31 28 31q10 0 20 -10t11 -21v-49q0 -16 10 -23q49 -33 57 -33t9 21v84q0 12 9 21t20 10q31 0 30 -31v-119q0 -25 17 -33q206 -119 257 -203 q39 -63 24 -155t-76 -159q-37 -43 -37 -59q0 -17 16 -34q86 -100 86 -207t-93 -207q-24 -27 -31 -37z"/>
    </g>

diff --git a/data/Bravura/E050-gClef.xml b/data/Bravura/E050-gClef.xml
@@ -1,7 +1,4 @@
-<symbol id="E050"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="">
+<symbol id="E050" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M999 -403q219 94 220 309v22q-7 129 -103 219t-225 91h-8q73 -401 116 -641zM176 33v-17q4 -127 66 -221q102 -156 347 -215q95 -22 184 -22t138 16l-110 655q-242 -41 -242 -233v-21q2 -57 51 -121t83 -80q34 -15 34 -38q0 -32 -71 -8q-71 26 -132 98t-86 174 q-12 43 -12 90q0 137 95 255t235 159l-51 319q-155 -115 -261 -219t-187 -256t-81 -315zM698 1416q0 -81 2 -93t19 -111q334 252 371 510q4 33 4 45q0 78 -40 121q-41 43 -96 43q-76 -4 -138 -97t-92 -215t-30 -203zM279 -1012q0 62 8 62q8 70 61 119t125 53h14 q81 0 141 -56t68 -139v-14q0 -68 -40 -120t-103 -73q-4 -2 -51 -12q-18 -8 -19 -16q0 -10 19 -23q57 -41 170 -41h39q49 0 100 20t85 54t62 102t27 146q0 78 -12 155l-47 287h-11q-59 -8 -167 -8q-245 0 -462 139q-112 72 -193 218t-81 358q0 314 287 622q96 104 167 169 t185 163l-24 129q-14 100 -15 209q0 279 92 489t240 277q8 -2 22 -9q14 -8 56 -56q41 -48 76 -130q88 -205 88 -393q0 -418 -414 -801q17 -74 66 -350q8 4 26 4h23q197 0 342 -136t157 -335v-28q0 -169 -99 -303t-273 -199l51 -305q12 -76 12 -166t-35 -176 q-35 -84 -93 -128q-111 -84 -234 -92l-47 -2q-311 0 -375 225q-14 49 -14 111z"/>
    </g>

diff --git a/data/Bravura/E051-gClef15mb.xml b/data/Bravura/E051-gClef15mb.xml
@@ -1,7 +1,4 @@
-<symbol id="E051"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1374">
+<symbol id="E051" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M1202 -76v19q-6 127 -100 216t-221 89h-9q93 -514 113 -633q217 88 217 309zM174 49v-20q4 -125 64 -219t154 -142q181 -92 374 -92q86 0 135 16l-110 646q-242 -39 -242 -234v-16q2 -56 52 -120t87 -79q29 -14 29 -35q1 -16 -21 -16t-47 8q-76 22 -135 94t-82 176 q-10 35 -10 86q0 135 92 251t231 159l-49 311q-215 -155 -369 -345q-153 -191 -153 -429zM950 1919h-10q-106 -6 -179 -183t-73 -354q0 -49 2 -61t19 -111q328 246 368 506q2 14 2 41q0 76 -38 119t-91 43zM422 -1708q0 -33 33 -33q17 0 16 -12q0 -18 -22 -19h-209 q-18 0 -19 13q0 4 2 6q0 12 17 12l43 10q12 0 30 33l74 191q4 6 4 16t-14 10t-21 -12q-31 -25 -43 -25q-25 0 -24 21q0 6 5 11t86 99t87 99q-193 72 -193 291q0 72 9 71q8 70 60 117t124 53h14q81 0 139 -56t68 -136v-8q0 -68 -40 -122t-103 -75q-6 -2 -49 -12 q-18 -8 -19 -17q0 -8 19 -20q57 -43 159 -43q152 0 229 75q34 32 60 100t27 146q0 76 -13 152l-45 285h-8q-356 -47 -625 128q-110 71 -190 216t-80 348q0 113 41 227t92 199t153 193t164 166t181 163l-23 125q-14 121 -14 207q0 276 90 484t238 272q27 -7 71 -59t78 -130 q90 -199 90 -387q0 -418 -407 -797q8 -59 31 -173t32 -171q8 4 27 4h27q195 0 336 -134t151 -331v-32q0 -168 -98 -297t-271 -195l52 -303q12 -76 12 -141q0 -166 -72 -262t-178 -129h107q2 -2 2 -8t-4 -17q-4 -10 -9 -10q-4 -6 -18 -17q-8 -10 -29 -18l-49 -14l-59 -13 q-6 -2 -28 -4t-30 -5t-19 -5q-27 -5 -28 -39q-4 -4 -4 -13t4 -11l19 4h14q14 4 47 4t70 -24t51 -73q2 -10 2 -44t-2 -44q-20 -72 -96 -114q-57 -33 -119 -33q-125 0 -125 113q0 45 31 61q8 0 16 4q23 0 38 -16t15 -34t-6 -30q-6 -10 -11 -14q-15 -12 -15 -29q0 -33 53 -33 q80 10 119 138q14 38 14 68t-30 50t-59 4t-52 -34t-33 -17l-17 4q-4 1 -4 15t7 42q6 28 22 68q16 39 23 62q6 23 9 29t11 26h-49q-170 -377 -170 -391z"/>
    </g>

diff --git a/data/Bravura/E052-gClef8vb.xml b/data/Bravura/E052-gClef8vb.xml
@@ -1,7 +1,4 @@
-<symbol id="E052"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1359">
+<symbol id="E052" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M1202 -76v23q-6 127 -100 215t-221 88h-9q23 -119 115 -633q215 92 215 307zM170 51v-20q4 -127 64 -220q100 -156 344 -212q94 -23 183 -23t138 16l-108 650q-242 -39 -242 -230v-20q4 -57 52 -122t81 -79t33 -37q1 -16 -21 -16t-47 6q-72 26 -133 100q-60 74 -78 146 t-18 112q0 137 93 254t232 158l-51 317q-236 -173 -379 -361t-143 -419zM684 1427q0 -68 2 -97t23 -111q326 246 368 505q2 14 2 43q0 78 -38 122t-93 44q-76 -4 -139 -99t-94 -217t-31 -190zM791 -1399q0 35 -19 45q-33 33 -80 33q-57 -8 -63 -49q0 -31 45 -77t69 -46 q36 0 48 80v14zM636 -1749q30 0 52 23t21 44q0 55 -56 99q-4 4 -15 13t-15 14l-29 16q-8 0 -14 -4t-16 -10t-9 -19q-23 -23 -23 -61q12 -61 43 -88t61 -27zM809 -1632q0 -137 -172 -140q-55 0 -117 36t-61 88q-1 50 31 90t56 48t25 13q0 6 -4 10q-33 35 -33 83t46 83 q-94 12 -161 50q-145 82 -149 276q0 68 9 67q10 72 62 120t126 50h14q81 0 139 -56t64 -136v-11q0 -67 -39 -119t-102 -75q-9 -6 -37 -12t-29 -17q0 -8 17 -22q57 -41 170 -41h32q180 0 249 176q28 69 28 147t-12 154l-46 278h-12q-82 -8 -172 -8t-212 33q-291 79 -421 307 q-90 159 -90 371q0 115 40 229t93 199q53 86 151 191q97 104 164 166t181 163l-19 129q-14 100 -14 211q0 276 90 484t238 272q8 -2 22 -9q14 -8 56 -56t73 -126q88 -205 88 -393q0 -412 -407 -794q8 -61 31 -177t32 -170q8 4 29 5h23q195 0 338 -135t153 -332v-33 q0 -168 -99 -299t-270 -199l48 -299q14 -74 14 -147q0 -179 -82 -275t-201 -127q80 -27 80 -98q0 -57 -68 -102q-16 -11 -1 -54q18 -33 18 -67z"/>
    </g>

diff --git a/data/Bravura/E053-gClef8va.xml b/data/Bravura/E053-gClef8va.xml
@@ -1,7 +1,4 @@
-<symbol id="E053"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1384">
+<symbol id="E053" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M1212 -82v23q-6 129 -101 219t-224 90h-8l114 -639q219 92 219 307zM172 49v-20q2 -101 45 -185t105 -133q180 -141 450 -141q86 0 135 16l-110 654q-244 -41 -244 -232v-20q2 -57 51 -122t83 -80t34 -38q1 -16 -21 -16t-47 8q-76 26 -136 98q-59 72 -77 148t-18 114 q0 137 93 256t235 160l-50 318q-215 -156 -372 -348q-156 -191 -156 -437zM692 1397q0 -51 2 -63t19 -109q332 248 372 508q2 14 2 43q0 80 -39 122t-94 41q-114 -6 -188 -185t-74 -357zM962 2267q30 0 58 30t10 66q-10 35 -49 70q-4 6 -16 14t-17 13l-28 16q-24 0 -43 -31 t-19 -61q8 -58 41 -87q33 -30 63 -30zM1071 2523q35 0 47 90q0 25 -18 53q-25 29 -68 29h-10q-60 0 -66 -45q0 -27 44 -77q43 -50 71 -50zM483 -766q79 0 139 -56t68 -139v-12q0 -68 -40 -122t-103 -70l-49 -17q-18 -4 -19 -14q0 -8 19 -21q57 -43 172 -43h35q46 0 98 22 q53 22 87 53q34 32 60 102q27 70 27 147t-12 156l-45 284h-9q-59 -8 -167 -8q-245 0 -462 139q-112 72 -193 217t-81 357q0 115 41 229t94 202q53 86 151 192t167 168q68 62 184 163l-22 129q-14 100 -15 213q0 260 82 464t217 284q-45 12 -84 44t-39 78t30 85t56 47t25 14 q0 6 -2 8q-33 35 -33 80q0 78 80 111q31 12 65 12q33 0 69 -8t75 -37t39 -75t-18 -65t-44 -36q-18 -15 -18 -29t14 -40t15 -58q0 -94 -93 -131q-37 -8 -63 -8q68 -68 111 -170q88 -197 88 -392q0 -420 -410 -804q8 -59 31 -175t33 -174q8 4 26 5h27q195 0 339 -136t154 -333 v-33q0 -170 -99 -302t-271 -200l49 -301q12 -80 12 -169t-35 -173q-59 -141 -209 -195q-57 -20 -118 -24l-50 -2q-119 0 -201 33t-119 86q-65 90 -66 183t10 93q10 72 62 121t124 51h14z"/>
    </g>

diff --git a/data/Bravura/E054-gClef15ma.xml b/data/Bravura/E054-gClef15ma.xml
@@ -1,7 +1,4 @@
-<symbol id="E054"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1372">
+<symbol id="E054" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M1200 -72v19q-6 125 -99 214t-220 89h-11q99 -543 113 -631q217 92 217 309zM170 51v-18q4 -125 64 -219t154 -142q182 -92 372 -92q88 0 137 17l-109 645q-242 -41 -241 -232v-18q2 -55 51 -120t82 -80t33 -38q-1 -16 -21 -16t-45 8q-74 26 -135 98q-94 112 -94 253 q0 142 92 259t231 158l-49 313q-236 -171 -379 -359t-143 -417zM684 1417q0 -80 2 -95t21 -108q324 244 368 506q2 14 2 39q0 78 -39 122t-94 44q-76 -4 -138 -96t-92 -212t-30 -200zM1360 2668q0 -4 -5 -14t-7 -10l-19 -18q-10 -10 -26 -19l-52 -14q-37 -8 -59 -8 q-16 -7 -52 -14t-44 -13t-9 -33q-4 -4 -4 -12t11 -8q2 0 8 2h4q10 0 14 4h35q49 0 92 -31q23 -14 41 -63q2 -12 2 -45t-2 -48q-20 -68 -86 -106t-124 -39q-58 0 -85 19q37 -37 86 -142q88 -195 88 -387q0 -416 -407 -795q10 -54 32 -168t31 -178q10 4 29 4h27 q195 0 336 -134t151 -328v-29q0 -170 -99 -302t-270 -198l50 -301q12 -80 12 -168t-35 -171q-59 -140 -207 -191q-57 -20 -117 -25l-47 -2q-117 0 -199 33t-118 86q-64 92 -65 183q-1 92 8 91q10 70 62 118t124 52h14q80 0 138 -56t65 -136v-15q0 -65 -39 -117t-100 -73 q-4 -2 -51 -12q-16 -7 -16 -17t16 -20q57 -41 167 -41h37q49 0 100 20q52 21 86 53t60 100t27 146q0 78 -13 154l-45 283h-10q-350 -48 -623 130q-110 71 -190 215t-80 353q0 113 40 227t93 198q53 85 151 190q97 106 163 166t182 161l-23 129q-14 98 -14 207q0 236 69 427 t183 284h-174q-18 0 -19 18q0 14 19 14l41 9q14 0 33 32l71 191q4 8 4 17t-14 9t-20 -12q-23 -22 -45 -22t-23 16q0 2 4 10q154 178 170 194q15 16 29 15q14 0 30 -11t35 -11l27 8q10 0 10 -6t-2 -11l-168 -397q0 -29 27 -31h10l31 13q14 0 37 -23q-19 37 -19 75t33 54l18 4 q19 0 35 -16q32 -33 6 -70q-23 -23 -22 -39q0 -31 53 -30q78 10 119 137q14 37 14 65q0 61 -63 62q-29 0 -64 -26q-34 -26 -49 -27l-16 4q-4 2 -4 14t4 24l37 111q10 20 22 68q18 41 33 41l182 2q61 0 72 -2q4 -4 4 -7z"/>
    </g>

diff --git a/data/Bravura/E05C-cClef.xml b/data/Bravura/E05C-cClef.xml
@@ -1,7 +1,4 @@
-<symbol id="E05C"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1431">
+<symbol id="E05C" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M262 983v-1966q0 -19 -13 -33t-34 -14h-168q-18 0 -33 14q-14 14 -14 33v1966q0 19 14 33t33 14h168q20 0 34 -14q13 -15 13 -33zM1432 -552q0 -190 -126 -334t-331 -144t-299 73t-94 147t46 129q46 56 110 56q64 1 104 -33q39 -34 39 -94q0 -86 -88 -139q-1 -2 -11 -6 t-15 -9t-5 -9t8 -13q47 -47 131 -47q121 0 181 94t61 209v244q0 129 -36 187q-36 59 -131 59t-143 -49q-49 -49 -73 -123t-49 -74q-33 0 -45 59q-63 276 -195 291v-909q0 -19 -12 -31q-11 -12 -31 -12t-33 12q-12 12 -12 31v1972q0 45 45 45q18 0 30 -12t13 -33v-909 q133 18 195 293q12 59 45 59q25 0 49 -74t73 -122q48 -50 143 -50t131 58t36 186v246q-1 115 -61 209t-181 94q-84 0 -135 -51q-4 -2 -4 -8t7 -12q7 -5 16 -9t12 -6q84 -66 84 -131q0 -66 -39 -100q-40 -34 -104 -34t-110 57q-46 56 -46 130q0 75 94 147t299 72t331 -144 t126 -334t-106 -318t-318 -128q-58 0 -106 16t-58 17q-10 0 -26 -14q-17 -15 -24 -25l-12 -15t-10 -15t-18 -34t-13 -36q1 -12 11 -32l16 -34q47 -78 80 -77q6 0 54 18t106 19q212 0 318 -128t106 -318z"/>
    </g>

diff --git a/data/Bravura/E05D-cClef8vb.xml b/data/Bravura/E05D-cClef8vb.xml
@@ -1,7 +1,4 @@
-<symbol id="E05D"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1431">
+<symbol id="E05D" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M969 -1030q-53 0 -97 6q66 -37 66 -102t-70 -111q-20 -15 -20 -33t15 -46t15 -70t-27 -83q-28 -41 -71 -57q-44 -16 -102 -16t-128 41t-71 115q0 47 35 90t80 57q12 4 12 11t-4 9q-37 39 -37 93q0 90 92 125q31 12 78 12q-77 33 -115 85t-38 110t46 113q46 56 110 56 q64 1 104 -33q39 -34 39 -94q0 -86 -88 -139q-1 -2 -11 -6t-15 -9t-5 -9t8 -13q47 -47 131 -47q121 0 181 94t61 209v244q0 129 -36 187q-36 59 -131 59t-143 -49q-49 -49 -73 -123t-49 -74q-33 0 -45 59q-63 276 -195 291v-909q0 -19 -12 -31q-11 -12 -31 -12t-33 12 q-12 12 -12 31v1972q0 45 45 45q18 0 30 -12t13 -33v-909q133 18 195 293q12 59 45 59q25 0 49 -74t73 -122q48 -50 143 -50t131 58t36 186v246q-1 115 -61 209t-181 94q-84 0 -135 -51q-4 -2 -4 -8t7 -12q7 -5 16 -9t12 -6q84 -66 84 -131q0 -66 -39 -100q-40 -34 -104 -34 t-110 57q-46 56 -46 130q0 75 94 147t299 72t331 -144t126 -334t-106 -318t-318 -128q-58 0 -106 16t-58 17q-10 0 -26 -14q-17 -15 -24 -25l-12 -15t-10 -15t-18 -34t-13 -36q1 -12 11 -32l16 -34q47 -78 80 -77q6 0 54 18t106 19q211 0 317 -128q107 -128 107 -318 t-126 -334t-337 -144zM766 -1441q0 59 -61 114q-9 6 -39 31q-25 14 -42 14t-38 -32q-20 -32 -21 -68v-17q12 -51 48 -84t70 -32q35 1 59 26t24 48zM858 -1122q0 35 -20 63q-27 31 -90 29t-70 -57q0 -29 42 -73q60 -63 87 -65q45 1 51 103zM47 1030h168q19 0 33 -14t14 -33 v-1966q0 -19 -13 -33t-34 -14h-168q-18 0 -33 14q-14 14 -14 33v1966q0 18 14 33q15 14 33 14z"/>
    </g>

diff --git a/data/Bravura/E062-fClef.xml b/data/Bravura/E062-fClef.xml
@@ -1,7 +1,4 @@
-<symbol id="E062"
-        viewBox="0 0 2048 2048"
-        overflow="inherit"
-        horiz-adv-x="1482">
+<symbol id="E062" viewBox="0 0 2048 2048" overflow="inherit">
    <g transform="scale(1,-1)">
       <path d="M1165 249q0 45 34 79t80 34t80 -32t34 -80q0 -47 -34 -81t-81 -34t-80 34t-33 80zM1278 -137q47 0 81 -34t34 -81t-34 -81t-80 -34t-80 34t-34 81t33 81t80 34zM508 537h10q34 0 133 -23t186 -82q87 -60 135 -118t81 -151t34 -206v-14q0 -129 -52 -281 q-105 -306 -384 -581q-131 -130 -303 -225t-354 -128q-10 -2 -24 4q-13 6 -13 20q-1 14 25 28q26 16 147 82t178 108q315 242 404 502q72 219 71 452q0 322 -125 465q-74 80 -192 80q-27 0 -77 -14q-50 -15 -89 -35t-82 -64t-57 -78q-14 -32 -15 -40q0 -43 50 -43h14 q12 2 45 2q88 0 154 -47q66 -46 66 -154t-53 -164q-52 -56 -145 -57h-10q-94 -1 -169 75t-91 209q-2 10 -2 29q0 156 144 302t360 147z"/>
    </g>