From 183b2451fd6515f72c709a40b4e5ab5735427823 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Mon, 22 Mar 2021 17:06:48 +0100
Subject: update font tools etc (#1086)

* update font tools
* fix tie error
* ignore duplicated commands
---
 templates/embroider_settings.xml        |  2 +-
 templates/lettering_custom_font_dir.xml |  2 +-
 templates/lettering_generate_json.xml   | 49 +++++++++++++++++++++++++--------
 3 files changed, 39 insertions(+), 14 deletions(-)

(limited to 'templates')

diff --git a/templates/embroider_settings.xml b/templates/embroider_settings.xml
index 51ce9d16..450068b4 100644
--- a/templates/embroider_settings.xml
+++ b/templates/embroider_settings.xml
@@ -3,7 +3,7 @@
     <name>{% trans %}Settings{% endtrans %}</name>
     <id>org.inkstitch.embroider_settings.{{ locale }}</id>
     <param name="extension" type="string" gui-hidden="true">embroider_settings</param>
-    <effect>
+    <effect needs-live-preview="false">
         <object-type>all</object-type>
         <effects-menu>
             <submenu name="Ink/Stitch" />
diff --git a/templates/lettering_custom_font_dir.xml b/templates/lettering_custom_font_dir.xml
index b08c37d6..7f28fa33 100644
--- a/templates/lettering_custom_font_dir.xml
+++ b/templates/lettering_custom_font_dir.xml
@@ -18,7 +18,7 @@
     <param name="path" type="path" mode="folder" gui-text="{% trans %}Custom font directory{% endtrans %}"  indent="1"></param>
     <spacer />
     <param name="file-description" type="description" indent="1" >
-        {% trans %}Usage: Create a subdirectory for each font you add.{% endtrans %}
+        {% trans %}Usage: The custom font directory must contain a subdirectory for each font.{% endtrans %}
     </param>
     <script>
         {{ command_tag | safe }}
diff --git a/templates/lettering_generate_json.xml b/templates/lettering_generate_json.xml
index 5f4907f7..d6fb1e9a 100644
--- a/templates/lettering_generate_json.xml
+++ b/templates/lettering_generate_json.xml
@@ -14,30 +14,55 @@
     <param name="header" type="description" appearance="header" indent="1" >
         {% trans %}Generates font.json which can be used by the lettering tool.{% endtrans %}
     </param>
+    <param name="file-description" type="description" indent="1" >{% trans %}The generated file can be viewed and updated with a standard text editor tool.{% endtrans %}</param>
     <spacer />
     <separator indent="1"/>
+    <spacer />
+    <param type="path" name="font-file" gui-text="{% trans %}SVG Font File{% endtrans %}" indent="1" mode="file" filetypes="svg"/>
+    <spacer />
+    <separator indent="1"/>
+    <spacer />
     <param type="string" name="font-name" gui-text="{% trans %}Name{% endtrans %}" indent="1" />
     <param type="string" name="font-description" gui-text="{% trans %}Description{% endtrans %}" indent="1" />
-    <separator indent="1"/>
-        <spacer />
-    <param name="file-description" type="description" indent="1" >
-        {% trans %}Insert a font SVG file with kerning information.{% endtrans %}
-    </param>
-    <param type="path" name="font-file" gui-text="{% trans %}Font File{% endtrans %}" indent="1" mode="file" filetypes="svg"/>
     <spacer />
     <separator indent="1"/>
+    <spacer />
+    <hbox>
+    <vbox>
     <param type="bool" name="auto-satin" gui-text="{% trans %}Autoroute Satin{% endtrans %}"
            gui-description="{% trans %}Disable if you defined manual routing in your font.{% endtrans %}" indent="1">true</param>
     <param type="bool" name="reversible" gui-text="{% trans %}Reversible{% endtrans %}"
-          gui-description="{% trans %}If disabled back and forth stitching will not be possile for this font.{% endtrans %}" indent="1">true</param>
-    <separator indent="1"/>
-    <param type="string" name="default-glyph" gui-text="{% trans %}Default Glyph{% endtrans %}" indent="1">&#65533;</param>
-    <separator indent="1"/>
-    <spacer />
+          gui-description='{% trans %}If disabled back and forth stitching will not be possile for this font.{% endtrans %}' indent="1">true</param>
+    </vbox>
+    <vbox indent="20">
     <param name="min-scale" type="float" precision="1" min="0.1" max="1" gui-text="{% trans %}Min Scale{% endtrans %}" indent="1">1</param>
     <param name="max-scale" type="float" precision="1" min="1" max="10" gui-text="{% trans %}Max Scale{% endtrans %}" indent="1">1</param>
+    </vbox>
+    </hbox>
+    <spacer />
+    <param type="string" name="default-glyph" gui-text="{% trans %}Default Glyph{% endtrans %}" indent="1">&#65533;</param>
+    <spacer />
     <separator indent="1"/>
-    <param name="leading" type="int" precision="1" min="-100" max="100" gui-text="{% trans %}Leading (px){% endtrans %}" gui-description="{% trans %}If 0, the value will be calculated or defaults to 100{% endtrans %}" indent="1"></param>
+    <spacer />
+    <param name="header" type="description" appearance="header" indent="1" >{% trans %}Kerning{% endtrans %}</param>
+    <param name="kering-info" type="description" indent="1" >
+        {% trans %}If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).
+                   If the kerning information cannot be found, these values will apply automatically.{% endtrans %}
+    </param>
+    <spacer />
+    <hbox indent="1">
+    <param name="use-custom-leading" type="bool" gui-text="{% trans %}Force{% endtrans %}" indent="1"
+           gui-description="{% trans %}Overwrite leading information from font file.{% endtrans %}">false</param>
+    <param name="leading" type="int" precision="1" min="-100" max="500" gui-text="{% trans %}Leading (px){% endtrans %}"
+           gui-description="{% trans %}Line height (default: 100){% endtrans %}" indent="1">100</param>
+    </hbox>
+    <spacer />
+    <hbox indent="1">
+    <param name="use-custom-spacing" type="bool" gui-text="{% trans %}Force{% endtrans %}" indent="1"
+           gui-description="{% trans %}Overwrite word spacing information from font file.{% endtrans %}">false</param>    
+    <param name="word-spacing" type="int" precision="1" min="-100" max="500" gui-text="{% trans %}Word spacing (px){% endtrans %}"
+           gui-description="{% trans %}Space character width (default: 20){% endtrans %}" indent="1">20</param>
+     </hbox>
      <spacer />
     <separator indent="1"/>
     <script>
-- 
cgit v1.3.1