Skip to content

Commit

Permalink
Add proportion number glyphs
Browse files Browse the repository at this point in the history
  • Loading branch information
@lpugin
lpugin committed Jun 5, 2024
1 parent 398bc10 commit b0e16de
Show file tree
Hide file tree
Showing 23 changed files with 52 additions and 15 deletions.
2 changes: 1 addition & 1 deletion data/Bravura.css
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions data/Bravura.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,10 @@
<g c="E923" x="0.0" y="-125.0" w="266.0" h="251.0" h-a-x="266" n="mensuralProlationCombiningThreeDotsTri" />
<g c="E924" x="0.0" y="-162.0" w="324.0" h="324.0" h-a-x="324" n="mensuralProlationCombiningDotVoid" />
<g c="E925" x="0.0" y="-371.0" w="48.0" h="743.0" h-a-x="48" n="mensuralProlationCombiningStroke" />
<g c="E926" x="0.0" y="-250.0" w="249.0" h="503.0" h-a-x="249" n="mensuralProportion1" />
<g c="E927" x="0.0" y="-250.0" w="331.0" h="503.0" h-a-x="331" n="mensuralProportion2" />
<g c="E928" x="0.0" y="-250.0" w="294.0" h="503.0" h-a-x="293" n="mensuralProportion3" />
<g c="E929" x="0.0" y="-250.0" w="379.0" h="500.0" h-a-x="379" n="mensuralProportion4" />
<g c="E938" x="0.0" y="-141.0" w="282.0" h="282.0" h-a-x="282" n="mensuralNoteheadSemibrevisBlack" />
<g c="E939" x="1.0" y="-141.0" w="282.0" h="282.0" h-a-x="283" n="mensuralNoteheadSemibrevisVoid" />
<g c="E93C" x="0.0" y="-184.0" w="320.0" h="369.0" h-a-x="320" n="mensuralNoteheadMinimaWhite">
Expand Down Expand Up @@ -1005,6 +1009,7 @@
<g c="F433" x="0.0" y="0.0" w="200.0" h="300.0" h-a-x="200" n="pluckedSnapPizzicatoAboveGerman" />
<g c="F434" x="0.0" y="-8.0" w="923.0" h="563.0" h-a-x="922" n="keyboardPedalPedNoDot" />
<g c="F435" x="0.0" y="-15.0" w="1014.0" h="606.0" h-a-x="1014" n="keyboardPedalSostNoDot" />
<g c="F43D" x="0.0" y="-251.0" w="455.0" h="504.0" h-a-x="455" n="mensuralProportion4Old" />
<g c="F43F" x="0.0" y="-169.0" w="529.0" h="338.0" h-a-x="529" n="noteheadDoubleWholeAlt">
<a n="noteheadOrigin" x="0.14" y="0.0" />
</g>
Expand Down
1 change: 1 addition & 0 deletions data/Bravura/E926.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<symbol id="E926" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -242v25s0 8 7 8c87 0 88 14 88 73v251c0 47 -10 49 -52 49c0 0 -5 -1 -10 -1c-7 0 -16 2 -16 8l1 20s5 11 15 11c9 0 60 8 96 44c0 0 9 7 17 7c7 0 13 -5 13 -24v-366c0 -64 16 -72 80 -72c3 0 10 -1 10 -6v-24c0 -3 -1 -11 -12 -11h-227c-3 0 -10 1 -10 8z" /></symbol>
1 change: 1 addition & 0 deletions data/Bravura/E927.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<symbol id="E927" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 -250c0 0 -9 4 -9 14c0 16 12 47 27 57c12 8 227 151 227 269c0 49 -22 99 -89 99c-66 0 -120 -87 -124 -91s-10 -10 -16 -10c-1 0 -3 0 -4 1c-10 5 -14 13 -14 23c0 9 4 19 9 26c3 3 5 7 8 11c31 43 75 104 153 104c85 0 152 -72 152 -156c0 -82 -58 -137 -78 -156 c-19 -19 -124 -112 -124 -112s-22 -14 -22 -23c0 -5 6 -8 22 -8c20 0 131 2 140 2c6 0 10 17 17 47c3 13 6 26 13 26h26c5 -1 6 -7 6 -11c0 -31 2 -62 2 -94c0 -4 -1 -18 -20 -18h-302z" /></symbol>
1 change: 1 addition & 0 deletions data/Bravura/E928.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<symbol id="E928" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -158c0 2 1 5 8 5c9 0 19 -9 30 -19c11 -11 12 -32 70 -32s118 60 118 118c0 57 -44 80 -116 80h-22s-8 0 -8 8v16s0 9 6 9c19 0 104 32 104 127c0 33 -24 48 -64 48s-76 -47 -84 -55c-1 -1 -6 -6 -9 -6s-21 26 -21 31c0 3 10 13 14 17c19 20 63 64 118 64 c58 0 109 -39 109 -101c0 -61 -64 -100 -64 -100s-5 -2 -5 -4c0 -1 1 -3 5 -4c1 0 2 -1 3 -1c20 -6 102 -33 102 -120c0 -93 -111 -173 -216 -173c-42 0 -78 20 -78 47v45z" /></symbol>
1 change: 1 addition & 0 deletions data/Bravura/E929.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<symbol id="E929" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -85v17s2 9 8 17l223 293s5 8 14 8h22s12 0 12 -11v-263c0 -2 1 -8 9 -8h86c2 0 5 -1 5 -6v-49c0 -3 -1 -8 -7 -8h-86s-7 -3 -7 -11v-138s-1 -6 -7 -6h-67s-5 3 -5 12s2 135 2 135s0 10 -9 10h-183s-10 1 -10 8zM77 -30c0 -4 5 -4 5 -4h111c7 0 9 6 9 6v163 c0 2 0 3 -1 3c-2 0 -8 -8 -8 -8s-100 -133 -111 -149c-4 -5 -5 -9 -5 -11z" /></symbol>
1 change: 1 addition & 0 deletions data/Bravura/F43D.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<symbol id="F43D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -181c0 8 6 15 18 15c3 0 6 -1 10 -2c1 0 2 -1 3 -1c13 -3 35 -8 50 -8c47 0 79 21 115 46c-74 68 -125 152 -125 225c0 127 104 159 157 159c42 0 159 -33 159 -157c0 -69 -64 -147 -133 -211c43 -47 83 -64 111 -64c15 0 28 3 36 5c3 1 4 1 6 1c17 3 30 9 38 9 c2 0 3 0 4 -1c5 -2 6 -9 6 -14c0 0 -33 -46 -42 -58c-5 -8 -8 -13 -16 -13c-3 0 -6 1 -10 2c-60 17 -120 58 -172 100c-70 -58 -134 -98 -134 -98c-6 -4 -11 -5 -15 -5c-8 0 -13 5 -13 5s-38 43 -49 55c-3 3 -4 7 -4 10zM227 218c-56 0 -77 -56 -77 -117s42 -127 42 -127 c15 -28 30 -50 45 -69c69 74 69 156 69 195c0 48 -24 118 -79 118z" /></symbol>
2 changes: 1 addition & 1 deletion data/Gootville.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/Leipzig.css
View file

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions data/Leipzig.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -805,4 +805,13 @@
<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" />
</bounding-boxes>
1 change: 1 addition & 0 deletions data/Leipzig/E926.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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>
1 change: 1 addition & 0 deletions data/Leipzig/E927.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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>
1 change: 1 addition & 0 deletions data/Leipzig/E928.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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>
1 change: 1 addition & 0 deletions data/Leipzig/E929.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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>
1 change: 1 addition & 0 deletions data/Leipzig/EE90.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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>
1 change: 1 addition & 0 deletions data/Leipzig/EE91.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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>
1 change: 1 addition & 0 deletions data/Leipzig/EE92.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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>
1 change: 1 addition & 0 deletions data/Leipzig/EE93.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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>
1 change: 1 addition & 0 deletions data/Leipzig/EE94.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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>
2 changes: 1 addition & 1 deletion data/Leland.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/Petaluma.css
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions fonts/supported.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2236,10 +2236,10 @@
<glyph glyph-code="E923" smufl-name="mensuralProlationCombiningThreeDotsTri" />
<glyph glyph-code="E924" smufl-name="mensuralProlationCombiningDotVoid" />
<glyph glyph-code="E925" smufl-name="mensuralProlationCombiningStroke" />
<!--<glyph glyph-code="E926" smufl-name="mensuralProportion1" />-->
<!--<glyph glyph-code="E927" smufl-name="mensuralProportion2" />-->
<!--<glyph glyph-code="E928" smufl-name="mensuralProportion3" />-->
<!--<glyph glyph-code="E929" smufl-name="mensuralProportion4" />-->
<glyph glyph-code="E926" smufl-name="mensuralProportion1" />
<glyph glyph-code="E927" smufl-name="mensuralProportion2" />
<glyph glyph-code="E928" smufl-name="mensuralProportion3" />
<glyph glyph-code="E929" smufl-name="mensuralProportion4" />
<!--<glyph glyph-code="E92A" smufl-name="mensuralProportionMinor" />-->
<!--<glyph glyph-code="E92B" smufl-name="mensuralProportionMajor" />-->
<!--<glyph glyph-code="E92C" smufl-name="mensuralModusPerfectumVert" />-->
Expand Down Expand Up @@ -3190,11 +3190,11 @@
</fingeringSupplement>
<medievalAndRenaissanceProlationsSupplement>
<description>Medieval and Renaissance prolations supplement</description>
<!--<glyph glyph-code="EE90" smufl-name="mensuralProportion5" />-->
<!--<glyph glyph-code="EE91" smufl-name="mensuralProportion6" />-->
<!--<glyph glyph-code="EE92" smufl-name="mensuralProportion7" />-->
<!--<glyph glyph-code="EE93" smufl-name="mensuralProportion8" />-->
<!--<glyph glyph-code="EE94" smufl-name="mensuralProportion9" />-->
<glyph glyph-code="EE90" smufl-name="mensuralProportion5" />
<glyph glyph-code="EE91" smufl-name="mensuralProportion6" />
<glyph glyph-code="EE92" smufl-name="mensuralProportion7" />
<glyph glyph-code="EE93" smufl-name="mensuralProportion8" />
<glyph glyph-code="EE94" smufl-name="mensuralProportion9" />
<range_end>U+EE9F</range_end>
<range_start>U+EE90</range_start>
</medievalAndRenaissanceProlationsSupplement>
Expand Down
11 changes: 10 additions & 1 deletion include/vrv/smufl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,10 @@ enum {
SMUFL_E923_mensuralProlationCombiningThreeDotsTri = 0xE923,
SMUFL_E924_mensuralProlationCombiningDotVoid = 0xE924,
SMUFL_E925_mensuralProlationCombiningStroke = 0xE925,
SMUFL_E926_mensuralProportion1 = 0xE926,
SMUFL_E927_mensuralProportion2 = 0xE927,
SMUFL_E928_mensuralProportion3 = 0xE928,
SMUFL_E929_mensuralProportion4 = 0xE929,
SMUFL_E938_mensuralNoteheadSemibrevisBlack = 0xE938,
SMUFL_E939_mensuralNoteheadSemibrevisVoid = 0xE939,
SMUFL_E93C_mensuralNoteheadMinimaWhite = 0xE93C,
Expand Down Expand Up @@ -642,10 +646,15 @@ enum {
SMUFL_ECB7_metAugmentationDot = 0xECB7,
SMUFL_ED40_articSoftAccentAbove = 0xED40,
SMUFL_ED41_articSoftAccentBelow = 0xED41,
SMUFL_EE90_mensuralProportion5 = 0xEE90,
SMUFL_EE91_mensuralProportion6 = 0xEE91,
SMUFL_EE92_mensuralProportion7 = 0xEE92,
SMUFL_EE93_mensuralProportion8 = 0xEE93,
SMUFL_EE94_mensuralProportion9 = 0xEE94,
};

/** The number of glyphs for verification **/
#define SMUFL_COUNT 620
#define SMUFL_COUNT 629

} // namespace vrv

Expand Down

0 comments on commit b0e16de

Please sign in to comment.