From b0105196889a463579aab21cd29bbf1abb96dab1 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Sat, 7 Dec 2024 15:20:11 +0100 Subject: Enable start end commands for satins (#3315) Updates commands fill_start (_end) => starting_point (_end) stain_start (_end) and run_start (_end) => autoroute_start ripple_target => target_point Sets inkstitch svg version to 3 --- "fonts/Brockscript/\342\206\222.svg" | 66 -- "fonts/Shojumaru/\342\206\222.svg" | 142 --- "fonts/abecedaire/\342\206\222.svg" | 57 - .../\342\206\222/latin.svg" | 117 --- "fonts/amitaclo/\342\206\222.svg" | 52 - "fonts/amitaclo_small/\342\206\222.svg" | 55 - "fonts/apex_lake/\342\206\222.svg" | 98 -- "fonts/apex_simple_AGS/\342\206\222.svg" | 67 -- "fonts/auberge_marif/\342\206\222.svg" | 144 --- "fonts/auberge_small/\342\206\222.svg" | 144 --- "fonts/aventurina/\342\206\222.svg" | 108 -- "fonts/baumans_FI/\342\206\220.svg" | 126 --- "fonts/baumans_FI/\342\206\222.svg" | 46 +- "fonts/baumans_FI_Small/\342\206\220.svg" | 126 --- "fonts/baumans_FI_Small/\342\206\222.svg" | 45 +- "fonts/cherryforinkstitch/\342\206\222.svg" | 66 -- "fonts/cherryforkaalleen/\342\206\222.svg" | 73 -- "fonts/chicken_little/\342\206\222.svg" | 75 -- "fonts/chicken_little_small/\342\206\222.svg" | 78 -- "fonts/chopin/\342\206\222.svg" | 86 -- "fonts/cogs_KOR/\342\206\222.svg" | 156 --- "fonts/cooper_marif/\342\206\222.svg" | 1108 ++++++++++---------- "fonts/dejavufont/\342\206\221.svg" | 69 -- "fonts/digory_doodles_bean/\342\206\222.svg" | 117 --- "fonts/emilio_20_applique/\342\206\222.svg" | 85 -- "fonts/emilio_20_bold/\342\206\222.svg" | 85 -- "fonts/emilio_20_tartan/\342\206\222.svg" | 147 --- "fonts/espresso_KOR/\342\206\220.svg" | 42 - "fonts/espresso_KOR/\342\206\222.svg" | 93 -- "fonts/espresso_tiny/\342\206\220.svg" | 42 - "fonts/espresso_tiny/\342\206\222.svg" | 93 -- "fonts/excalibur_KOR/\342\206\222.svg" | 42 - "fonts/excalibur_small/\342\206\222.svg" | 42 - "fonts/glacial_tiny/\342\206\220.svg" | 104 -- "fonts/glacial_tiny/\342\206\222.svg" | 98 -- "fonts/honoka/\342\206\222/hiragana.svg" | 121 --- "fonts/honoka/\342\206\222/jlpt5.svg" | 124 --- "fonts/honoka/\342\206\222/katakana.svg" | 121 --- "fonts/invercelia/\342\206\222.svg" | 86 +- "fonts/kaushan_script_MAM/\342\206\222.svg" | 93 -- "fonts/lobster_AGS/\342\206\222.svg" | 102 -- "fonts/magnolia_KOR/\342\206\222.svg" | 45 - "fonts/magnolia_bicolor/\342\206\222.svg" | 155 --- "fonts/magnolia_small/\342\206\222.svg" | 45 - "fonts/magnolia_tamed/\342\206\222.svg" | 155 --- "fonts/manuskript_gotisch/\342\206\222.svg" | 80 -- "fonts/marcelusSC_FI/\342\206\222.svg" | 87 -- "fonts/medium_font/\342\206\222.svg" | 68 -- "fonts/milli_marif_bold/\342\206\222.svg" | 83 -- "fonts/namskout_AGS/\342\206\222.svg" | 63 -- "fonts/namskout_relief/\342\206\222.svg" | 129 --- "fonts/namskout_tartan/\342\206\222.svg" | 101 -- "fonts/ondulamarif_Medium/\342\206\222.svg" | 24 +- "fonts/ondulamarif_S/\342\206\222.svg" | 24 +- "fonts/ondulamarif_XL/\342\206\222.svg" | 24 +- "fonts/pacificlo/\342\206\222.svg" | 42 - "fonts/pacificlo_tiny/\342\206\222.svg" | 42 - "fonts/perspective_tricolore_KOR/\342\206\222.svg" | 166 --- "fonts/roaring_twenties_KOR/\342\206\222.svg" | 119 --- .../roaring_twenties_KOR_small/\342\206\222.svg" | 119 --- "fonts/roman_ags/\342\206\220.svg" | 78 -- "fonts/roman_ags/\342\206\222.svg" | 63 -- "fonts/roman_ags_bicolor/\342\206\220/mono.svg" | 78 -- "fonts/roman_ags_bicolor/\342\206\220/zbi.svg" | 107 -- "fonts/roman_ags_bicolor/\342\206\222/mono.svg" | 63 -- "fonts/roman_ags_bicolor/\342\206\222/zbi.svg" | 66 -- lib/commands.py | 20 +- lib/elements/fill_stitch.py | 14 +- lib/elements/satin_column.py | 308 +++++- lib/elements/stroke.py | 2 +- lib/extensions/auto_run.py | 4 +- lib/extensions/auto_satin.py | 4 +- lib/extensions/cut_satin.py | 2 + lib/extensions/gradient_blocks.py | 6 +- lib/extensions/redwork.py | 4 +- lib/svg/path.py | 3 + lib/svg/tags.py | 2 + lib/tartan/svg.py | 4 +- lib/update.py | 42 +- symbols/inkstitch.svg | 84 +- tests/test_clone.py | 12 +- 81 files changed, 897 insertions(+), 6381 deletions(-) diff --git "a/fonts/Brockscript/\342\206\222.svg" "b/fonts/Brockscript/\342\206\222.svg" index 119d645d..a114ac06 100644 --- "a/fonts/Brockscript/\342\206\222.svg" +++ "b/fonts/Brockscript/\342\206\222.svg" @@ -94,72 +94,6 @@ Copyright (c) Typographer Mediengestaltung, 2000. All rights reserved. id="min_stitch_len_mm6075">0.5 2 - - - Satin Column cut point - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin Column cut point - - - - - - - - - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Trim the thread after sewing this object. - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Fill stitch starting point - - - - - Fill stitch ending point - - - - - Running stitch ending point - - - - - - - - Satin Column cut point - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - - 0.5 1 - - - Satin column starting point - - - - - - Satin column ending point - - - - - - - - - - Satin column ending point - - - - - - Satin column starting point - - - - - - Fill stitch ending point - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Fill stitch starting point - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Ignore object when generating stitch plan - - - - - - Ignore entire layer when generating stitch plan - - - - - - - Fill stitch starting point - - - - - Fill stitch ending point - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Ignore object when generating stitch plan - - - - - - Ignore entire layer when generating stitch plan - - - - - - - Fill stitch starting point - - - - - Fill stitch ending point - - - - - Fill stitch starting point - - - - - Fill stitch ending point - - - - - Satin column ending point - - - - - - Satin column starting point - - - - - - Satin Column cut point - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin Column cut point - - - - image/svg+xml2.00.51Satin Column cut pointSatin column starting pointSatin column ending point0.51 - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin Column cut point - - - - 2.00.51Satin Column cut pointSatin column starting pointSatin column ending point0 2 - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin Column cut point - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin Column cut point - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin Column cut point - - - - - - - 0.5 1 - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin Column cut point - - - - - - - - 3 1 - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Running stitch ending point - - - - - Satin Column cut point - - - - - - - - - - - - + showguides="true" + inkscape:window-width="1920" + inkscape:window-height="1131" + inkscape:window-x="0" + inkscape:window-y="32" + inkscape:window-maximized="1"> 0.5 3.0 -2 +3 @@ -1099,7 +1104,7 @@ Created by FontForge 20201107 at Mon Jun 17 22:36:34 2024 id="hkern172" /> + id="inkstitch_starting_point"> Fill stitch starting point + id="inkstitch_ending_point"> Fill stitch ending point - - Satin column starting point - - - - - - Satin column ending point - - - - DejaVu serif semi condensed - - Trim the thread after sewing this object. - - - - - Satin Column cut point - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - diff --git "a/fonts/digory_doodles_bean/\342\206\222.svg" "b/fonts/digory_doodles_bean/\342\206\222.svg" index 75272a01..743415b8 100644 --- "a/fonts/digory_doodles_bean/\342\206\222.svg" +++ "b/fonts/digory_doodles_bean/\342\206\222.svg" @@ -103,123 +103,6 @@ SIL Open Font License (OFL) id="min_stitch_len_mm6747">0 1 - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin Column cut point - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Trim the thread after sewing this object. - - - - - Running stitch starting point - - - - - Running stitch ending point - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Trim the thread after sewing this object. - - - - - Running stitch starting point - - - - - Running stitch ending point - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Trim the thread after sewing this object. - - - - - Running stitch starting point - - - - - Running stitch ending point - - - - - Satin Column cut point - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin Column cut point - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Fill stitch starting point - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - - - - - - - 3.0 2 - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - - - - - - - - - - Satin column starting point - - - - - - Satin column ending point - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - - - - - - - - 032 - Satin column starting point - - - - - - Satin column ending point - - - - - - Ignore entire layer when generating stitch plan - - - - - - - - - - 032