Merge pull request #3607 from rettinghaus/fonts

fonts update with filled half note

data/Bravura.xml

@@ -137,6 +137,7 @@
   <g c="E0F5" x="0.0" y="-181.0" w="109.0" h="362.0" h-a-x="73" n="noteheadParenthesisLeft" />
   <g c="E0F6" x="-36.0" y="-181.0" w="109.0" h="362.0" h-a-x="73" n="noteheadParenthesisRight" />
   <g c="E0FA" x="0.0" y="-125.0" w="422.0" h="250.0" h-a-x="422" n="noteheadWholeFilled" />
+  <g c="E0FB" x="0.0" y="-125.0" w="295.0" h="250.0" h-a-x="295" n="noteheadHalfFilled" />
   <g c="E101" x="0.0" y="-250.0" w="530.0" h="500.0" h-a-x="531" n="noteheadSlashHorizontalEnds">
     <a n="stemDownNW" x="0.0" y="-1.0" />
     <a n="stemUpSE" x="2.12" y="1.0" />

data/Bravura/E0FB.xml

@@ -0,0 +1 @@
+<symbol id="E0FB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -42c0 52 47 167 196 167c58 0 99 -32 99 -83c0 -33 -33 -167 -198 -167c-55 0 -97 30 -97 83z" /></symbol>

data/Leipzig.xml

@@ -89,7 +89,7 @@
   <g c="E4C1" x="0.0" y="-320.0" w="600.0" h="323.0" h-a-x="600" n="fermataBelow" />
   <g c="E0FA" x="0.0" y="-133.0" w="405.0" h="266.0" h-a-x="405" n="noteheadWholeFilled">
     <a n="cutOutNW" x="0.2" y="0.4" />
-    <a n="cutOutSE" x="1.42" y="-0.4" />
+    <a n="cutOutSE" x="1.4" y="-0.4" />
   </g>
   <g c="E240" x="0.0" y="-694.0" w="276.0" h="694.0" h-a-x="277" n="flag8thUp" />
   <g c="E241" x="0.0" y="0.0" w="276.0" h="694.0" h-a-x="277" n="flag8thDown" />
@@ -793,4 +793,10 @@
   <g c="EB9D" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="0" n="staffPosLower6" />
   <g c="EB9E" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="0" n="staffPosLower7" />
   <g c="EB9F" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="0" n="staffPosLower8" />
+  <g c="E0FB" x="0.0" y="-132.0" w="314.0" h="270.0" h-a-x="314" n="noteheadHalfFilled">
+    <a n="cutOutNW" x="0.14" y="0.24" />
+    <a n="cutOutSE" x="1.08" y="-0.24" />
+    <a n="stemDownNW" x="0.0" y="-0.14" />
+    <a n="stemUpSE" x="1.26" y="0.16" />
+  </g>
 </bounding-boxes>

data/Leipzig/E0FA.xml

@@ -1 +1 @@
-<symbol id="E0FA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 -133c-51 0 -96 11 -133 32c-43 24 -65 58 -65 101s21 77 64 102c37 21 82 31 134 31c53 0 99 -11 138 -32c46 -24 69 -58 69 -101c0 -46 -23 -81 -69 -104c-37 -19 -83 -29 -138 -29z" /></symbol>
+<symbol id="E0FA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 133c102 0 207 -45 207 -133c0 -92 -118 -133 -227 -133c-101 0 -178 46 -178 133c0 88 93 133 198 133z" /></symbol>

data/Leipzig/E0FB.xml

@@ -0,0 +1 @@
+<symbol id="E0FB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -36c0 68 73 174 200 174c66 0 114 -39 114 -97c0 -84 -106 -173 -218 -173c-64 0 -96 32 -96 96z" /></symbol>

data/Petaluma.xml

@@ -645,6 +645,7 @@
   <g c="E0F5" x="0.0" y="-197.0" w="106.0" h="394.0" h-a-x="76" n="noteheadParenthesisLeft" />
   <g c="E0F6" x="-30.0" y="-199.08" w="112.0" h="405.08" h-a-x="81" n="noteheadParenthesisRight" />
   <g c="E0FA" x="0.0" y="-130.0" w="489.0" h="260.0" h-a-x="490" n="noteheadWholeFilled" />
+  <g c="E0FB" x="-1.0" y="-130.0" w="322.0" h="261.0" h-a-x="322" n="noteheadHalfFilled" />
   <g c="E510" x="10.0" y="0.0" w="212.04" h="422.0" h-a-x="222" n="ottava" />
   <g c="E511" x="10.0" y="0.0" w="625.0" h="426.0" h-a-x="635" n="ottavaAlta" />
   <g c="E512" x="10.0" y="-37.81" w="616.0" h="459.81" h-a-x="610" n="ottavaBassa" />

data/Petaluma/E0FB.xml

@@ -0,0 +1 @@
+<symbol id="E0FB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M146 -130c-20 2 -51 5 -82 11c-40 8 -65 38 -65 77c0 7 1 15 3 22c16 67 64 106 122 135c20 11 40 16 60 16c21 0 42 -6 65 -15c47 -19 72 -63 72 -108c0 -34 -14 -67 -43 -91c-30 -25 -84 -47 -132 -47z" /></symbol>

fonts/Leipzig/leipzig_metadata.json

@@ -30,7 +30,7 @@
         "tupletBracketThickness": 0.16
     },
     "fontName": "Leipzig",
-    "fontVersion": "5.2.87",
+    "fontVersion": "5.2.88",
     "glyphBBoxes": {
         "4stringTabClef": {
             "bBoxNE": [
@@ -4972,6 +4972,16 @@
                 -0.528
             ]
         },
+        "noteheadHalfFilled": {
+            "bBoxNE": [
+                1.256,
+                0.552
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.528
+            ]
+        },
         "noteheadHalfWithX": {
             "bBoxNE": [
                 1.256,
@@ -7766,6 +7776,24 @@
                 0.164
             ]
         },
+        "noteheadHalfFilled": {
+            "cutOutNW": [
+                0.14,
+                0.24
+            ],
+            "cutOutSE": [
+                1.076,
+                -0.24
+            ],
+            "stemDownNW": [
+                0.0,
+                -0.144
+            ],
+            "stemUpSE": [
+                1.256,
+                0.164
+            ]
+        },
         "noteheadHalfWithX": {
             "cutOutNW": [
                 0.14,
@@ -7860,7 +7888,7 @@
                 0.4
             ],
             "cutOutSE": [
-                1.42,
+                1.4,
                 -0.4
             ]
         },

fonts/supported.xml

@@ -269,7 +269,7 @@
         <!--<glyph glyph-code="E0F8" smufl-name="noteheadHeavyX" />-->
         <!--<glyph glyph-code="E0F9" smufl-name="noteheadHeavyXHat" />-->
         <glyph glyph-code="E0FA" smufl-name="noteheadWholeFilled" />
-        <!--<glyph glyph-code="E0FB" smufl-name="noteheadHalfFilled" />-->
+        <glyph glyph-code="E0FB" smufl-name="noteheadHalfFilled" />
         <!--<glyph glyph-code="E0FC" smufl-name="noteheadDiamondOpen" />-->
         <range_end>U+E0FF</range_end>
         <range_start>U+E0A0</range_start>

include/vrv/smufl.h

@@ -106,6 +106,7 @@ enum {
     SMUFL_E0F5_noteheadParenthesisLeft = 0xE0F5,
     SMUFL_E0F6_noteheadParenthesisRight = 0xE0F6,
     SMUFL_E0FA_noteheadWholeFilled = 0xE0FA,
+    SMUFL_E0FB_noteheadHalfFilled = 0xE0FB,
     SMUFL_E101_noteheadSlashHorizontalEnds = 0xE101,
     SMUFL_E102_noteheadSlashWhiteWhole = 0xE102,
     SMUFL_E103_noteheadSlashWhiteHalf = 0xE103,
@@ -644,7 +645,7 @@ enum {
 };
 
 /** The number of glyphs for verification **/
-#define SMUFL_COUNT 619
+#define SMUFL_COUNT 620
 
 } // namespace vrv