add & when missing… (#3744)

* add & when missing in the embroidery font but existing in the original  font

garamond
auberge marif  & auberge marif small
cooper marif
deja vu forward and backward
inkstitch small and medium
kaushan script
millimarif
nickainley
ondulamarif medium small and xl
shojumaru

* small correction

2 files changed, 147 insertions, 7 deletions

diff --git a/fonts/Shojumaru/font.json b/fonts/Shojumaru/font.json
index af05c3cc..adcf3178 100644
--- a/fonts/Shojumaru/font.json
+++ b/fonts/Shojumaru/font.json
@@ -10452,6 +10452,7 @@
         "!",
         "\"",
         "%",
+        "&",
         "'",
         "(",
         ")",
diff --git a/fonts/Shojumaru/→.svg b/fonts/Shojumaru/→.svg
index c222071e..7ff8b769 100644
--- a/fonts/Shojumaru/→.svg
+++ b/fonts/Shojumaru/→.svg
@@ -4,7 +4,7 @@
    id="svg3294"
    sodipodi:docname="→.svg"
    width="100"
-   inkscape:version="1.4-rc1 (61ec3f24, 2024-09-26)"
+   inkscape:version="1.4.2 (ebf0e940, 2025-05-08)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -19,15 +19,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="11.463532"
-     inkscape:cx="46.538885"
-     inkscape:cy="90.896942"
+     inkscape:zoom="12.076424"
+     inkscape:cx="26.456508"
+     inkscape:cy="49.186747"
      inkscape:window-width="1920"
      inkscape:window-height="991"
      inkscape:window-x="-9"
      inkscape:window-y="-9"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g3360"
+     inkscape:current-layer="layer1"
      showgrid="true">
     <sodipodi:guide
        position="-27.373997,48.941389"
@@ -54,7 +54,7 @@
        id="guide3297"
        inkscape:locked="false" />
     <sodipodi:guide
-       position="0,20"
+       position="59.745395,20.013236"
        orientation="0,1"
        inkscape:label="decender"
        id="guide3298"
@@ -19292,7 +19292,7 @@ Copyright (c) 2012 by Brian J. Bonislawsky DBA Astigmatic (AOETI) (astigma@astig
   <g
      inkscape:groupmode="layer"
      inkscape:label="GlyphLayer-¿"
-     style="display:inline"
+     style="display:none"
      id="g3413">
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-dasharray:none"
@@ -31128,4 +31128,143 @@ Copyright (c) 2012 by Brian J. Bonislawsky DBA Astigmatic (AOETI) (astigma@astig
        inkstitch:min_stitch_length_mm=".5"
        inkstitch:force_lock_stitches="True" />
   </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="GlyphLayer-&amp;">
+    <path
+       d="m 42.1669,89.995157 0.929,11.011843 0.3575,2.231 0.3972,2.48 0.9009,4.492 -2.6296,-0.438 -1.6556,-0.049 -3.6036,0.244 -3.9931,0.828 -4.1392,1.363 -0.4231,0.2 -3.5213,1.846 m 2.242206,-25.06589 -0.379506,7.02349 -0.1871,2.345 -0.3121,3.9124 -0.6087,6.038 -0.2152,1.639 -0.423,3.221 m -1.6519,-13.05481 23.084988,10.6149"
+       style="fill:none;stroke:#000000;stroke-width:1"
+       inkscape:label="Colonne satin 1"
+       id="path225"
+       sodipodi:nodetypes="ccccccccccccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:max_stitch_length_mm="6"
+       inkstitch:random_split_phase="True"
+       inkstitch:ties="2"
+       inkstitch:zigzag_spacing_mm="0.3"
+       inkstitch:pull_compensation_mm="0.3"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:zigzag_underlay_max_stitch_length_mm="3"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:contour_underlay="False"
+       inkstitch:swap_satin_rails="True"
+       inkstitch:reverse_rails="none"
+       inkstitch:start_at_nearest_point="True"
+       inkstitch:end_at_nearest_point="True"
+       inkstitch:min_jump_stitch_length_mm="6"
+       inkstitch:min_stitch_length_mm=".5"
+       inkstitch:force_lock_stitches="False" />
+    <path
+       d="M 25.8119,90.4089 18.772029,45.839601 34.493,37.5887"
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-dasharray:3, 1"
+       inkstitch:running_stitch_length_mm="2.0"
+       inkstitch:running_stitch_tolerance_mm="0.2"
+       id="path230"
+       sodipodi:nodetypes="ccc" />
+    <path
+       d="M 26.318888,38.845387 25.8574,28.1572 l -0.56,-4.0418 -0.7061,-3.7496 2.6296,0.3895 0.4204,0.0183 1.8196,0.0791 3.7009,-0.2921 2.0696,-0.4261 2.1183,-0.5966 2.1913,-0.7791 2.0624,-0.9166 4.3168,-2.6869 m -3.253,21.176619 0.8509,-8.371919 0.3082,-2.4324 0.9096,-5.1152 0.9209,-4.0879 m -7.9848,-1.7082 11.4782,9.418 M 21.1905,17.8538 49.1502,30.5092 m -25.633304,3.728053 23.351283,-0.165612"
+       style="fill:none;stroke:#000000;stroke-width:1"
+       inkscape:label="Colonne satin 4"
+       id="path218"
+       sodipodi:nodetypes="cccccccccccccccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:max_stitch_length_mm="6"
+       inkstitch:random_split_phase="True"
+       inkstitch:ties="2"
+       inkstitch:zigzag_spacing_mm="0.3"
+       inkstitch:pull_compensation_mm="0.3"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:zigzag_underlay_max_stitch_length_mm="3"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:contour_underlay="False"
+       inkstitch:swap_satin_rails="True"
+       inkstitch:reverse_rails="none"
+       inkstitch:start_at_nearest_point="True"
+       inkstitch:end_at_nearest_point="True"
+       inkstitch:min_jump_stitch_length_mm="6"
+       inkstitch:min_stitch_length_mm=".5"
+       inkstitch:force_lock_stitches="False" />
+    <path
+       d="M 25.1376 37.7058 L 26.0999 43.3836"
+       style="stroke:#000000;stroke-width:1.0;stroke-dasharray:3, 1;fill:none"
+       inkstitch:running_stitch_length_mm="2.0"
+       inkstitch:running_stitch_tolerance_mm="0.2"
+       id="path231" />
+    <path
+       d="M 55.1073,57.5894 C 53.191341,56.398109 51.23541,55.290874 49.2316,54.2584 35.058127,47.056726 19.767398,49.093871 4.8694729,52.328572 M 56.3899,58.3489 c 1.054847,-6.439163 3.762914,-12.224035 7.1097,-17.7742 L 58.7761,39.1138 C 55.947427,38.384242 53.090042,37.84197 50.2115,37.3664 34.759679,34.822841 12.276545,36.954622 3.21649,51.7369 M 49.720784,58.101743 61.8056,51.6997 M 5.2995821,43.677134 8.7774329,53.282626 M 67.238448,39.039999 40.740538,56.594865"
+       style="fill:none;stroke:#000000;stroke-width:1"
+       inkscape:label="Colonne satin 3"
+       id="path222"
+       sodipodi:nodetypes="cccccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:max_stitch_length_mm="6"
+       inkstitch:random_split_phase="True"
+       inkstitch:ties="2"
+       inkstitch:zigzag_spacing_mm="0.3"
+       inkstitch:pull_compensation_mm="0.3"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:zigzag_underlay_max_stitch_length_mm="3"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:contour_underlay="False"
+       inkstitch:swap_satin_rails="True"
+       inkstitch:reverse_rails="none"
+       inkstitch:start_at_nearest_point="True"
+       inkstitch:end_at_nearest_point="True"
+       inkstitch:min_jump_stitch_length_mm="6"
+       inkstitch:min_stitch_length_mm=".5"
+       inkstitch:force_lock_stitches="False" />
+    <path
+       d="M 27.457 50.2149 L 18.8689 53.3521"
+       style="stroke:#000000;stroke-width:1.0;stroke-dasharray:3, 1;fill:none"
+       inkstitch:running_stitch_length_mm="2.0"
+       inkstitch:running_stitch_tolerance_mm="0.2"
+       id="path232" />
+    <path
+       d="m 7.5519406,50.695101 1.8088837,4.439929 c 0.450354,1.0802 1.1786287,2.000938 1.9045097,2.907023 2.080559,2.517698 4.846816,4.346767 7.628466,6.004347 -1.637943,0.909139 -3.188632,1.973715 -4.655332,3.137561 -1.78198,1.553375 -3.877532,5.279341 -4.7178819,7.542982 M 27.373088,48.309057 c 0.0167,0.484253 0.237716,2.953833 0.315086,3.431927 0.304328,2.154436 1.287829,4.251241 2.930269,5.705634 0.65919,0.623426 1.398447,1.159009 2.21219,1.568428 2.505803,1.568541 5.523911,1.904453 8.414767,2.012154 -0.09746,2.499731 -0.19483,4.999465 -0.2922,7.4992 -2.338369,0.148293 -4.636471,0.735746 -6.800173,1.623793 -2.360051,0.994052 -4.356122,4.528495 -4.901727,7.078014 M 34.1301,56.1423 8.94874,60.0964 M 48.9059,64.6748 11.0298,62.5937 M 35.1706,73.8317 9.15685,67.1721"
+       style="fill:none;stroke:#000000;stroke-width:1"
+       inkscape:label="Colonne satin 2"
+       id="path224"
+       sodipodi:nodetypes="cccccccccccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:max_stitch_length_mm="6"
+       inkstitch:random_split_phase="True"
+       inkstitch:ties="2"
+       inkstitch:zigzag_spacing_mm="0.3"
+       inkstitch:pull_compensation_mm="0.3"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:zigzag_underlay_max_stitch_length_mm="3"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:contour_underlay="False"
+       inkstitch:swap_satin_rails="True"
+       inkstitch:reverse_rails="none"
+       inkstitch:start_at_nearest_point="True"
+       inkstitch:end_at_nearest_point="True"
+       inkstitch:min_jump_stitch_length_mm="6"
+       inkstitch:min_stitch_length_mm=".5"
+       inkstitch:force_lock_stitches="False" />
+    <path
+       d="M 4.9507387,74.957797 C 17.580179,93.148461 32.710552,90.3313 47.4505,90.7937 l 3.7776,-0.3053 4.9184,-0.5843 4.5774,-0.8279 L 59.0682,85.2658 57.8995,81.2361 57.2421,76.89 57.2378,76.7962 57.0699,73.148 M 4.8440371,73.859801 C 13.65663,77.162497 22.867978,77.673905 32.1148,77.937 c 4.714783,-0.474443 9.404734,-1.170934 14.0124,-2.2888 l 3.6887,-0.9861 3.0328,-0.9704 4.1743,-1.5618 M 48.2816,93.8102 42.6626,73.4154 M 59.5195,78.4101 50.987,72.3749 M 6.7900896,81.271044 12.255284,73.156059"
+       style="fill:none;stroke:#000000;stroke-width:1"
+       inkscape:label="Colonne satin 0"
+       id="path233"
+       sodipodi:nodetypes="cccccccccccccccccccccc"
+       inkstitch:satin_column="True"
+       inkstitch:max_stitch_length_mm="6"
+       inkstitch:random_split_phase="True"
+       inkstitch:ties="2"
+       inkstitch:zigzag_spacing_mm="0.3"
+       inkstitch:pull_compensation_mm="0.3"
+       inkstitch:zigzag_underlay="True"
+       inkstitch:zigzag_underlay_max_stitch_length_mm="3"
+       inkstitch:center_walk_underlay="False"
+       inkstitch:contour_underlay="False"
+       inkstitch:swap_satin_rails="True"
+       inkstitch:reverse_rails="none"
+       inkstitch:start_at_nearest_point="True"
+       inkstitch:end_at_nearest_point="True"
+       inkstitch:min_jump_stitch_length_mm="6"
+       inkstitch:min_stitch_length_mm=".5"
+       inkstitch:force_lock_stitches="False" />
+  </g>
 </svg>