From a5d9a656b54255db699cead4e54af1b86da57be6 Mon Sep 17 00:00:00 2001
From: Claudine Peyrat <88194877+claudinepeyrat06@users.noreply.github.com>
Date: Wed, 22 May 2024 14:17:06 +0200
Subject: [PATCH] add comma and apostrophe (#2934)

---
 fonts/milli_marif_bold/font.json |   6 +-
 fonts/milli_marif_bold/→.svg     | 245 ++++++++++++++++++++++++++++++-
 2 files changed, 244 insertions(+), 7 deletions(-)

diff --git a/fonts/milli_marif_bold/font.json b/fonts/milli_marif_bold/font.json
index fc51a704a..146be0f59 100644
--- a/fonts/milli_marif_bold/font.json
+++ b/fonts/milli_marif_bold/font.json
@@ -154,6 +154,10 @@
         "7",
         "8",
         "9",
-        "%"
+        "%",
+        ",",
+        "'",
+        "‘",
+        "‘"
     ]
 }
\ No newline at end of file
diff --git a/fonts/milli_marif_bold/→.svg b/fonts/milli_marif_bold/→.svg
index 44f785bb2..87c1031ec 100644
--- a/fonts/milli_marif_bold/→.svg
+++ b/fonts/milli_marif_bold/→.svg
@@ -21,15 +21,15 @@
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
      showgrid="true"
-     inkscape:zoom="3.8294768"
-     inkscape:cx="36.689085"
-     inkscape:cy="84.084593"
+     inkscape:zoom="34.239173"
+     inkscape:cx="10.820939"
+     inkscape:cy="109.37764"
      inkscape:window-width="1632"
      inkscape:window-height="954"
      inkscape:window-x="78"
      inkscape:window-y="39"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g215"
+     inkscape:current-layer="layer4"
      showguides="true"
      inkscape:lockguides="false"
      inkscape:document-units="mm">
@@ -92,7 +92,7 @@ Created by FontForge 20230101 at Tue Feb 27 22:18:18 2024
 Jeremy Landes
 <inkstitch:min_stitch_len_mm>0</inkstitch:min_stitch_len_mm>
 <inkstitch:collapse_len_mm>3</inkstitch:collapse_len_mm>
-<inkstitch:inkstitch_svg_version>1</inkstitch:inkstitch_svg_version>
+<inkstitch:inkstitch_svg_version>2</inkstitch:inkstitch_svg_version>
 </metadata>
   <defs
      id="defs109">
@@ -746,6 +746,48 @@ Jeremy Landes
            style="fill:none;stroke:#ffffff;stroke-width:1.8;stroke-linejoin:round" />
       </g>
     </symbol>
+    <symbol
+       style="display:inline"
+       id="inkstitch_satin_start">
+      <title
+         id="inkstitch_title9432-1">Satin column starting point</title>
+      <path
+         inkscape:connector-curvature="0"
+         id="inkstitch_circle13166-6-2"
+         d="M 9.2465269,-4.9265995e-6 C 9.246525,5.1067241 5.1067022,9.2465451 -2.715882e-5,9.2465451 -5.106756,9.2465451 -9.2465782,5.1067241 -9.2465801,-4.9265995e-6 -9.2465799,-5.1067349 -5.1067572,-9.2465579 -2.715882e-5,-9.2465579 c 2.45233855882,0 4.80423565882,0.974187 6.53830095882,2.708252 1.7340652,1.734066 2.708253,4.085963 2.7082531,6.5383009734005 0,0 0,0 0,0"
+         style="opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:evenodd;stroke:#003399;stroke-width:1.06501234;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.19503705, 3.19503705;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.74180555;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 6.5728129,0.00355507 c 0,0 -10.4514,6.03412003 -10.4514,6.03412003 0,0 0,-12.06823 0,-12.06823 0,0 10.4514,6.03410997 10.4514,6.03410997"
+         id="inkstitch_path4183-7" />
+      <path
+         inkscape:connector-curvature="0"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+         d="m -3.0312502,1.577739 c 0,0 0.25,-3.6875002 0.25,-3.6875002 0,0 1.0312501,3.8437502 1.0312501,3.8437502 0,0 0.34375,-3.6250002 0.34375,-3.6250002 0,0 0.96874997,3.5625002 0.96874997,3.5625002 0,0 0.28125,-3.3125002 0.28125,-3.3125002 0,0 0.9375001,3.3125002 0.9375001,3.3125002 0,0 0.21875,-3.0937502 0.21875,-3.0937502 0,0 1.03125013,2.9687502 1.03125013,2.9687502 0,0 0.0625,-2.7187501 0.0625,-2.7187501 0,0 0.96875,2.4687501 0.96875,2.4687501 0,0 0.15625,-2.18750023 0.15625,-2.18750023"
+         id="path31975" />
+    </symbol>
+    <symbol
+       id="inkstitch_satin_end"
+       style="display:inline">
+      <title
+         id="inkstitch_title9427-3">Satin column ending point</title>
+      <path
+         id="inkstitch_circle13166-60"
+         d="m 9.220113,0.0792309 c -1.9e-6,5.106729 -4.1398241,9.24655 -9.246553,9.24655 -5.1067293,0 -9.2465521,-4.139821 -9.246554,-9.24655 1e-7,-2.452338 0.9741879,-4.804235 2.7082531,-6.538301 1.7340653,-1.734065 4.0859624,-2.708252 6.5383009,-2.708252 5.1067301,0 9.2465528,4.139823 9.246553,9.246553 0,0 0,0 0,0"
+         style="opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:evenodd;stroke:#003399;stroke-width:1.06500006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.19500017, 3.19500017;stroke-dashoffset:0;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.27154255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4.81866985, 4.81866985;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+         d="m -4.570439,-4.5704391 c 0,0 9.140878,0 9.140878,0 0,0 0,9.14087 0,9.14087 0,0 -9.140878,0 -9.140878,0 0,0 0,-9.14087 0,-9.14087"
+         id="inkstitch_rect5371-2-6"
+         inkscape:connector-curvature="0" />
+      <path
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+         d="m -3.2964153,1.5777408 0.25,-3.6875001 1.0312501,3.8437501 0.34375,-3.6250001 0.9687501,3.5625001 0.28125,-3.3125001 0.9375,3.3125001 0.21875,-3.0937501 1.0312499,2.9687501 0.0625,-2.7187501 0.96875,2.4687501 0.15625,-2.1875"
+         id="path31975-0-2"
+         inkscape:connector-curvature="0" />
+    </symbol>
   </defs>
   <g
      inkscape:groupmode="layer"
@@ -11075,7 +11117,7 @@ Jeremy Landes
   <g
      inkscape:groupmode="layer"
      inkscape:label="GlyphLayer-%"
-     style="display:inline"
+     style="display:none"
      id="g215">
     <path
        d="M 29,100.25895 12,115"
@@ -11166,4 +11208,195 @@ Jeremy Landes
        inkstitch:min_jump_stitch_length_mm="3"
        inkstitch:zigzag_underlay_max_stitch_length_mm="6" />
   </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="GlyphLayer-,"
+     style="display:none">
+    <path
+       d="m 14.3357,105.713 c 0,-2.30723 0,-4.61447 0,-6.9217"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;stroke-dasharray:0.5, 0.5;paint-order:markers fill stroke"
+       inkstitch:running_stitch_length_mm=""
+       id="autosatinrun9318"
+       inkscape:label="saut" />
+    <path
+       d="m 6.17197,98.7913 v 8.4557 M 22.4995,98.7913 v 8.4877"
+       id="autosatin2315"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;paint-order:markers fill stroke"
+       aria-label=","
+       inkstitch:satin_column="True"
+       inkstitch:zigzag_spacing_mm="0.45"
+       inkstitch:pull_compensation_mm="0.15"
+       inkstitch:ties="3"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:zigzag_underlay_inset_mm=".2"
+       inkstitch:zigzag_underlay_spacing_mm="5"
+       inkscape:label="path3"
+       sodipodi:nodetypes="cccc" />
+    <path
+       d="m 14.3357,105.713 c -0.356365,6.75894 -0.579264,13.52497 -0.8164,20.291"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;stroke-dasharray:0.5, 0.5;paint-order:markers fill stroke"
+       inkstitch:running_stitch_length_mm=""
+       id="autosatinrun5403"
+       inkscape:label="saut"
+       sodipodi:nodetypes="cc" />
+    <path
+       d="m 9.43747,126.004 v -10.885 h -3.2655 v -7.872 m 11.42923,18.757 4.8983,-16.328 v -2.397 M 6.17197,120.40862 c 6.00671,-0.10233 12.01342,-0.20467 18.02013,-0.307 M 3.1149,125.157 C 9.5122667,125.10467 15.909633,125.05233 22.307,125 M 5,110 h 20"
+       id="autosatin1808"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;paint-order:markers fill stroke"
+       aria-label=","
+       inkstitch:satin_column="True"
+       inkstitch:zigzag_spacing_mm="0.45"
+       inkstitch:pull_compensation_mm="0.15"
+       inkstitch:ties="3"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:zigzag_underlay_inset_mm=".2"
+       inkstitch:zigzag_underlay_spacing_mm="5"
+       inkscape:label="path4"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="GlyphLayer-'"
+     style="display:none">
+    <path
+       d="m 14.9486,46.9512 -0.0216,-1.5054 0.0146,-1.6808 0.0011,-0.1308 v 0 l 0.0135,-1.5501 0.0146,-1.683 7e-4,-0.084 v 0 L 14.9854,38.7005 15,37"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;stroke-dasharray:0.5, 0.5;paint-order:markers fill stroke"
+       inkstitch:running_stitch_length_mm=""
+       id="autosatinrun3856"
+       inkscape:label="saut" />
+    <path
+       id="autosatin5036"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;paint-order:markers fill stroke"
+       inkscape:label="path1"
+       d="m 23,37 v 9.6224 l -0.093,0.433 M 7,37 6.83627,46.534 6.99503,47.1845 M 5.29151,46.304 24.4836,46.147 M 5.6643,40.594 h 20 M 23.8003,37.3 H 6.19459"
+       sodipodi:nodetypes="cccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:zigzag_spacing_mm="0.45"
+       inkstitch:pull_compensation_mm="0.15"
+       inkstitch:ties="3"
+       inkstitch:contour_underlay="False"
+       inkstitch:zigzag_underlay_inset_mm=".2"
+       inkstitch:zigzag_underlay_spacing_mm="5" />
+    <path
+       d="m 14.9486,46.9512 0.0024,0.1687 0.0242,1.6519 0.0219,1.4963 v 0 l 0.0023,0.1557 0.0242,1.6519 0.0152,1.5094 v 0 l 0.0014,0.1408 0.0091,1.6485 0.0084,1.5279 v 0 l 7e-4,0.1207 0.0052,1.6475 -0.0184,1.5489 v 0 L 15.0439,60.3296 15.0216,61.9609 15,63.5363"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;stroke-dasharray:0.5, 0.5;paint-order:markers fill stroke"
+       inkstitch:running_stitch_length_mm=""
+       id="autosatinrun2592"
+       inkscape:label="saut" />
+    <path
+       id="autosatin6012"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;paint-order:markers fill stroke"
+       inkscape:label="path2"
+       d="M 19,63.479 20.3745,58.3469 21.6662,52.83 22.907,47.0554 M 11,63.5936 6.99503,47.1845 M 6.83627,59.6956 24.8564,59.3886"
+       sodipodi:nodetypes="cccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:zigzag_spacing_mm="0.45"
+       inkstitch:pull_compensation_mm="0.15"
+       inkstitch:ties="3"
+       inkstitch:contour_underlay="False"
+       inkstitch:zigzag_underlay_inset_mm=".2"
+       inkstitch:zigzag_underlay_spacing_mm="5" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="g150"
+     inkscape:label="GlyphLayer-‘"
+     style="display:none">
+    <path
+       d="m 14.9486,46.9512 -0.0216,-1.5054 0.0146,-1.6808 0.0011,-0.1308 v 0 l 0.0135,-1.5501 0.0146,-1.683 7e-4,-0.084 v 0 L 14.9854,38.7005 15,37"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;stroke-dasharray:0.5, 0.5;paint-order:markers fill stroke"
+       inkstitch:running_stitch_length_mm=""
+       id="path18"
+       inkscape:label="saut" />
+    <path
+       id="path26"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;paint-order:markers fill stroke"
+       inkscape:label="path1"
+       d="m 23,37 v 9.6224 l -0.093,0.433 M 7,37 6.83627,46.534 6.99503,47.1845 M 5.29151,46.304 24.4836,46.147 M 5.6643,40.594 h 20 M 23.8003,37.3 H 6.19459"
+       sodipodi:nodetypes="cccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:zigzag_spacing_mm="0.45"
+       inkstitch:pull_compensation_mm="0.15"
+       inkstitch:ties="3"
+       inkstitch:contour_underlay="False"
+       inkstitch:zigzag_underlay_inset_mm=".2"
+       inkstitch:zigzag_underlay_spacing_mm="5" />
+    <path
+       d="m 14.9486,46.9512 0.0024,0.1687 0.0242,1.6519 0.0219,1.4963 v 0 l 0.0023,0.1557 0.0242,1.6519 0.0152,1.5094 v 0 l 0.0014,0.1408 0.0091,1.6485 0.0084,1.5279 v 0 l 7e-4,0.1207 0.0052,1.6475 -0.0184,1.5489 v 0 L 15.0439,60.3296 15.0216,61.9609 15,63.5363"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;stroke-dasharray:0.5, 0.5;paint-order:markers fill stroke"
+       inkstitch:running_stitch_length_mm=""
+       id="path68"
+       inkscape:label="saut" />
+    <path
+       id="path121"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;paint-order:markers fill stroke"
+       inkscape:label="path2"
+       d="M 19,63.479 20.3745,58.3469 21.6662,52.83 22.907,47.0554 M 11,63.5936 6.99503,47.1845 M 6.83627,59.6956 24.8564,59.3886"
+       sodipodi:nodetypes="cccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:zigzag_spacing_mm="0.45"
+       inkstitch:pull_compensation_mm="0.15"
+       inkstitch:ties="3"
+       inkstitch:contour_underlay="False"
+       inkstitch:zigzag_underlay_inset_mm=".2"
+       inkstitch:zigzag_underlay_spacing_mm="5" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="g412"
+     inkscape:label="GlyphLayer-‘"
+     style="display:none">
+    <path
+       d="m 14.9486,46.9512 -0.0216,-1.5054 0.0146,-1.6808 0.0011,-0.1308 v 0 l 0.0135,-1.5501 0.0146,-1.683 7e-4,-0.084 v 0 L 14.9854,38.7005 15,37"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;stroke-dasharray:0.5, 0.5;paint-order:markers fill stroke"
+       inkstitch:running_stitch_length_mm=""
+       id="path408"
+       inkscape:label="saut" />
+    <path
+       id="path410"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;paint-order:markers fill stroke"
+       inkscape:label="path1"
+       d="m 23,37 v 9.6224 l -0.093,0.433 M 7,37 6.83627,46.534 6.99503,47.1845 M 5.29151,46.304 24.4836,46.147 M 5.6643,40.594 h 20 M 23.8003,37.3 H 6.19459"
+       sodipodi:nodetypes="cccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:zigzag_spacing_mm="0.45"
+       inkstitch:pull_compensation_mm="0.15"
+       inkstitch:ties="3"
+       inkstitch:contour_underlay="False"
+       inkstitch:zigzag_underlay_inset_mm=".2"
+       inkstitch:zigzag_underlay_spacing_mm="5" />
+    <path
+       d="m 14.9486,46.9512 0.0024,0.1687 0.0242,1.6519 0.0219,1.4963 v 0 l 0.0023,0.1557 0.0242,1.6519 0.0152,1.5094 v 0 l 0.0014,0.1408 0.0091,1.6485 0.0084,1.5279 v 0 l 7e-4,0.1207 0.0052,1.6475 -0.0184,1.5489 v 0 L 15.0439,60.3296 15.0216,61.9609 15,63.5363"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;stroke-dasharray:0.5, 0.5;paint-order:markers fill stroke"
+       inkstitch:running_stitch_length_mm=""
+       id="path411"
+       inkscape:label="saut" />
+    <path
+       id="path412"
+       style="font-weight:bold;font-size:108.85px;font-family:Millimetre;-inkscape-font-specification:'Millimetre Bold';text-align:center;text-anchor:middle;display:inline;opacity:0.99;fill:none;stroke:#000000;stroke-width:0.377953;paint-order:markers fill stroke"
+       inkscape:label="path2"
+       d="M 19,63.479 20.3745,58.3469 21.6662,52.83 22.907,47.0554 M 11,63.5936 6.99503,47.1845 M 6.83627,59.6956 24.8564,59.3886"
+       sodipodi:nodetypes="cccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:zigzag_spacing_mm="0.45"
+       inkstitch:pull_compensation_mm="0.15"
+       inkstitch:ties="3"
+       inkstitch:contour_underlay="False"
+       inkstitch:zigzag_underlay_inset_mm=".2"
+       inkstitch:zigzag_underlay_spacing_mm="5" />
+  </g>
 </svg>