From 223c6bc4505c526408d9edaf736207ab97d49d0f Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Sun, 29 Sep 2019 17:46:31 -0700
Subject: [PATCH 01/19] Update hershey_eggbot.inx

Inkscape v1 compatibility
---
 inkscape_driver/hershey_eggbot.inx | 104 ++++++++++++++---------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/inkscape_driver/hershey_eggbot.inx b/inkscape_driver/hershey_eggbot.inx
index d350872..68621f2 100755
--- a/inkscape_driver/hershey_eggbot.inx
+++ b/inkscape_driver/hershey_eggbot.inx
@@ -1,91 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-  <_name>Hershey Text</_name>
-  <id>command.evilmad.eggbot.hershey</id>
+  <name>Hershey Text</name>
+  <id>org.evilmad.text.hershey-egg</id>
 
   <dependency type="executable" location="extensions">hershey.py</dependency>
   <dependency type="executable" location="extensions">inkex.py</dependency>
 
   <param name="tab" type="notebook">
-    <page name="render" _gui-text="Render">
+    <page name="render" gui-text="Render">
 
-<_param indent="1" name="splashTitle1" type="description" appearance="header" xml:space="preserve">
+<label indent="1" appearance="header" xml:space="preserve">
 Hershey Text
-</_param>
+</label>
 
-<_param indent="2" name="splashTitle1b" type="description" xml:space="preserve">A tool to replace text with stroke fonts
+<label indent="2" xml:space="preserve">A tool to replace text with stroke fonts
 
-Version 3.0, 2019-06-16
+Version 3.0.2, 2019-09-07
 
 
-</_param>
+</label>
 
-	<param indent="1" name="fontface" type="enum" _gui-text="Font face: ">
-		<_item value="HersheySans1">Hershey Sans 1-stroke</_item>
-		<_item value="HersheySansMed">Hershey Sans medium</_item> 
+	<param indent="1" name="fontface" type="optiongroup" appearance="combo" gui-text="Font face: ">
+		<option value="HersheySans1">Hershey Sans 1-stroke</option>
+		<option value="HersheySansMed">Hershey Sans medium</option>
 
-		<_item value="HersheySerifMed">Hershey Serif medium</_item>
-		<_item value="HersheySerifMedItalic">Hershey Serif medium italic</_item>
+		<option value="HersheySerifMed">Hershey Serif medium</option>
+		<option value="HersheySerifMedItalic">Hershey Serif medium italic</option>
 
-		<_item value="HersheySerifBold">Hershey Serif bold</_item>
-		<_item value="HersheySerifBoldItalic">Hershey Serif bold italic</_item>
+		<option value="HersheySerifBold">Hershey Serif bold</option>
+		<option value="HersheySerifBoldItalic">Hershey Serif bold italic</option>
 
-		<_item value="HersheyScript1">Hershey Script 1-stroke</_item>
-		<_item value="HersheyScriptMed">Hershey Script medium</_item>
+		<option value="HersheyScript1">Hershey Script 1-stroke</option>
+		<option value="HersheyScriptMed">Hershey Script medium</option>
+
+		<option value="HersheyGothEnglish">Hershey Gothic English</option>
 
-		<_item value="HersheyGothEnglish">Hershey Gothic English</_item>   
-		
 		<!-- Block below this are derived from fonts licensed under SIL Open Font License -->
-		<_item value="EMSAllure">EMS Allure</_item>
+		<option value="EMSAllure">EMS Allure</option>
 
-		<_item value="EMSElfin">EMS Elfin</_item>
-		<_item value="EMSFelix">EMS Felix</_item>
+		<option value="EMSElfin">EMS Elfin</option>
+		<option value="EMSFelix">EMS Felix</option>
 
-		<_item value="EMSNixish">EMS Nixish</_item>
-		<_item value="EMSNixishItalic">EMS Nixish Italic</_item>
+		<option value="EMSNixish">EMS Nixish</option>
+		<option value="EMSNixishItalic">EMS Nixish Italic</option>
 
-		<_item value="EMSOsmotron">EMS Osmotron</_item>
-		<_item value="EMSReadability">EMS Readability</_item>
-		<_item value="EMSReadabilityItalic">EMS Readability Italic</_item>
-		<_item value="EMSTech">EMS Tech</_item> 
+		<option value="EMSOsmotron">EMS Osmotron</option>
+		<option value="EMSReadability">EMS Readability</option>
+		<option value="EMSReadabilityItalic">EMS Readability Italic</option>
+		<option value="EMSTech">EMS Tech</option>
 		<!-- Block above this are derived from fonts licensed under SIL Open Font License -->
 
-		<_item value="other">Other (given below)</_item> 
+		<option value="other">Other (given below)</option>
       </param>
 
-<_param name="otherFontDesc" type="description" xml:space="preserve">
+<label xml:space="preserve">
 Other SVG font name or path (if "Other" selected above):
-</_param>
-<param name="otherfont" type="string" indent="2" _gui-text="Name/Path:">HersheySans1</param>
+</label>
+<param name="otherfont" type="string" indent="2" gui-text="Name/Path:">HersheySans1</param>
 
-<param name="preserve" indent="4" type="boolean" _gui-text="Preserve original text" >false</param>
+<param name="preserve" indent="4" type="bool" gui-text="Preserve original text" >false</param>
 
 </page>
 
-<page name="utilities" _gui-text="Utilities">
-  <_param name="utilspage" type="description" appearance="header" xml:space="preserve">
+<page name="utilities" gui-text="Utilities">
+  <label appearance="header" xml:space="preserve">
 Hershey Text Utility Functions
-  </_param>
+  </label>
 
-  <param indent="2" name="action" type="enum" _gui-text="Action: ">
-    <_item value="sample"   >Generate font table</_item> 
-    <_item value="table"    >Generate glyph table in selected font</_item> 
+  <param indent="2" name="action" type="optiongroup" appearance="combo" gui-text="Action: ">
+    <option value="sample"   >Generate font table</option>
+    <option value="table"    >Generate glyph table in selected font</option>
   </param>
 
-  <_param name="utilspage" type="description" xml:space="preserve">
+  <label xml:space="preserve">
 
-Sample text to use when generating font table:</_param>
-<param indent="2" name="text" type="string" _gui-text="Text:">
+Sample text to use when generating font table:</label>
+<param indent="2" name="text" type="string" gui-text="Text:">
 The Quick Brown Fox Jumps Over a Lazy Dog</param>
 
 </page>
 
 
-    <page name="help" _gui-text="About">
-      <_param name="aboutpage" type="description" xml:space="preserve">
+    <page name="help" gui-text="About">
+      <label xml:space="preserve">
 This extension renders all text (or all selected text)
 in your document into using specialized "stroke" or
-"engraving" fonts designed for plotters. 
+"engraving" fonts designed for plotters.
 
 Whereas regular "outline" fonts (e.g., TrueType) work
 by filling in the region inside an invisible outline,
@@ -94,19 +94,19 @@ or strokes; much like human handwriting.
 
 Engraving fonts are used for creating text paths that
 computer controlled drawing and cutting machines (from
-pen plotters to CNC routers) can efficiently follow. 
+pen plotters to CNC routers) can efficiently follow.
 
 A complete user guide is available to download at:
   http://wiki.evilmadscientist.com/hershey
-  
+
 For extended help, click "Apply" with this tab selected.
 
-  </_param>
+  </label>
 </page>
 
 
-<page name="info3" _gui-text="Credits">
-<_param name="aboutpage3" type="description" xml:space="preserve">
+<page name="info3" gui-text="Credits">
+<label xml:space="preserve">
 The classic Hershey fonts included are derived from
 work by Dr. A. V. Hershey.
 
@@ -117,7 +117,7 @@ Open Font License.
 For full credits and license information, please read the
 credits embedded within the SVG fonts included with this
 distribution.
-</_param>
+</label>
 
 </page>
 </param>
@@ -125,7 +125,7 @@ distribution.
   <effect needs-live-preview="true">
     <object-type>all</object-type>
     <effects-menu>
-      <submenu _name="EggBot"/>
+    <submenu _name="EggBot"/>
     </effects-menu>
   </effect>
     <script>

From 7e0ec5298924dc076747bee51bb112c3d56278ed Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Sun, 29 Sep 2019 19:22:22 -0700
Subject: [PATCH 02/19] Updates for v1 compatibility

---
 inkscape_driver/eggbot_presethatch.py |  5 ++++-
 inkscape_driver/eggbot_stretch.inx    |  6 -----
 inkscape_driver/eggbot_stretch.py     | 32 +++++++++++++++------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/inkscape_driver/eggbot_presethatch.py b/inkscape_driver/eggbot_presethatch.py
index 1eefb19..a4f6332 100755
--- a/inkscape_driver/eggbot_presethatch.py
+++ b/inkscape_driver/eggbot_presethatch.py
@@ -17,8 +17,11 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-import inkex
 
+from lxml import etree
+
+from plot_utils_import import from_dependency_import # plotink
+inkex = from_dependency_import('ink_extensions.inkex')
 
 class PresetHatch(inkex.Effect):
     def __init__(self):
diff --git a/inkscape_driver/eggbot_stretch.inx b/inkscape_driver/eggbot_stretch.inx
index 7594af2..8d0bff4 100755
--- a/inkscape_driver/eggbot_stretch.inx
+++ b/inkscape_driver/eggbot_stretch.inx
@@ -2,13 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
   <_name>Stretch</_name>
   <id>command.eggbot.contributed.stretch</id>
-  <dependency type="extension">org.inkscape.output.svg.inkscape</dependency>
   <dependency type="executable" location="extensions">eggbot_stretch.py</dependency>
-  <dependency type="executable" location="extensions">inkex.py</dependency>
-  <dependency type="executable" location="extensions">simpletransform.py</dependency>
-  <dependency type="executable" location="extensions">cubicsuperpath.py</dependency>
-  <dependency type="executable" location="extensions">cspsubdiv.py</dependency>
-  <dependency type="executable" location="extensions">bezmisc.py</dependency>
 
   <_param name="Header" type="description" xml:space="preserve">
 This extension will horizontally stretch your drawing.  The
diff --git a/inkscape_driver/eggbot_stretch.py b/inkscape_driver/eggbot_stretch.py
index e9c3154..aae237a 100755
--- a/inkscape_driver/eggbot_stretch.py
+++ b/inkscape_driver/eggbot_stretch.py
@@ -19,13 +19,17 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 import math
+from lxml import etree
+from plot_utils_import import from_dependency_import # plotink
+simplepath = from_dependency_import('ink_extensions.simplepath')
+bezmisc = from_dependency_import('ink_extensions.bezmisc')
+cspsubdiv = from_dependency_import('ink_extensions.cspsubdiv')
+cubicsuperpath = from_dependency_import('ink_extensions.cubicsuperpath')
+simpletransform = from_dependency_import('ink_extensions.simpletransform')
+inkex = from_dependency_import('ink_extensions.inkex')
+
+
 
-import bezmisc
-import cspsubdiv
-import cubicsuperpath
-import inkex
-import simplepath
-from simpletransform import applyTransformToPath, applyTransformToPoint, composeTransform, parseTransform
 
 N_PAGE_WIDTH = 3200
 N_PAGE_HEIGHT = 800
@@ -218,7 +222,7 @@ class Map(inkex.Effect):
                 if (vinfo[2] != 0) and (vinfo[3] != 0):
                     sx = self.docWidth / float(vinfo[2])
                     sy = self.docHeight / float(vinfo[3])
-                    self.docTransform = parseTransform('scale({0:f},{1:f})'.format(sx, sy))
+                    self.docTransform = simpletransform.parseTransform('scale({0:f},{1:f})'.format(sx, sy))
 
     def getPathVertices(self, path, node=None, transform=None, find_bbox=False):
 
@@ -246,7 +250,7 @@ class Map(inkex.Effect):
             return None
 
         if transform:
-            applyTransformToPath(transform, p)
+            simpletransform.applyTransformToPath(transform, p)
 
         # Now traverse the cubic super path
         subpath_list = []
@@ -298,13 +302,13 @@ class Map(inkex.Effect):
             last_point = subpath[0]
             last_point[0] = self.cx + (last_point[0] - self.cx) / math.cos((last_point[1] - self.cy) * steps2rads)
             if inv_transform is not None:
-                applyTransformToPoint(inv_transform, last_point)
+                simpletransform.applyTransformToPoint(inv_transform, last_point)
             new_path += ' M {0:f},{1:f}'.format(last_point[0], last_point[1])
             for point in subpath[1:]:
                 x = self.cx + (point[0] - self.cx) / math.cos((point[1] - self.cy) * steps2rads)
                 pt = [x, point[1]]
                 if inv_transform is not None:
-                    applyTransformToPoint(inv_transform, pt)
+                    simpletransform.applyTransformToPoint(inv_transform, pt)
                 new_path += ' l {0:f},{1:f}'.format(pt[0] - last_point[0], pt[1] - last_point[1])
                 last_point = pt
 
@@ -344,7 +348,7 @@ class Map(inkex.Effect):
                 pass
 
             # First apply the current matrix transform to this node's transform
-            mat_new = composeTransform(mat_current, parseTransform(node.get("transform")))
+            mat_new = simpletransform.composeTransform(mat_current, simpletransform.parseTransform(node.get("transform")))
 
             if node.tag in [inkex.addNS('g', 'svg'), 'g']:
                 self.recursivelyTraverseSvg(node, mat_new, v, find_bbox)
@@ -375,7 +379,7 @@ class Map(inkex.Effect):
                     y = float(node.get('y', '0'))
                     # Note: the transform has already been applied
                     if (x != 0) or (y != 0):
-                        mat_new2 = composeTransform(mat_new, parseTransform('translate({0:f},{1:f})'.format(x, y)))
+                        mat_new2 = simpletransform.composeTransform(mat_new, simpletransform.parseTransform('translate({0:f},{1:f})'.format(x, y)))
                     else:
                         mat_new2 = mat_new
                     v = node.get('visibility', v)
@@ -604,11 +608,11 @@ class Map(inkex.Effect):
             if node_transform is None:
                 return parent_transform
             else:
-                tr = parseTransform(node_transform)
+                tr = simpletransform.parseTransform(node_transform)
                 if parent_transform is None:
                     return tr
                 else:
-                    return composeTransform(parent_transform, tr)
+                    return simpletransform.composeTransform(parent_transform, tr)
         else:
             return self.docTransform
 

From 100945ce268282dc8e28e278ec21c19956497e09 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Sun, 29 Sep 2019 19:43:00 -0700
Subject: [PATCH 03/19] Update empty_eggbot.py

---
 inkscape_driver/empty_eggbot.py | 57 ++++++++++++++-------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/inkscape_driver/empty_eggbot.py b/inkscape_driver/empty_eggbot.py
index 5852547..e98e1bc 100755
--- a/inkscape_driver/empty_eggbot.py
+++ b/inkscape_driver/empty_eggbot.py
@@ -3,42 +3,33 @@
 # Adapted from generic template by Tavmjong Bah
 
 import inkex
-import re
 
-class C(inkex.Effect):
-  def __init__(self):
-    inkex.Effect.__init__(self)
-    self.OptionParser.add_option("-w", "--width",  action="store", type="int",    dest="generic_width",  default="1920", help="Custom width")
-    self.OptionParser.add_option("-z", "--height", action="store", type="int",    dest="generic_height", default="1080", help="Custom height")
+class EmptyEggBot(inkex.EffectExtension):
 
-  def effect(self):
+    def __init__(self):
+        super(EmptyEggBot, self).__init__()
+        self.arg_parser.add_argument("-w", "--width", type=int, dest="generic_width", default="3200", help="Custom width")
+        self.arg_parser.add_argument("-z", "--height", type=int, dest="generic_height", default="800", help="Custom height")
 
-    width  = self.options.generic_width
-    height = self.options.generic_height
-    unit   = "px"
+    def effect(self):
 
-    root = self.document.getroot()
-    root.set("id", "SVGRoot")
-    root.set("width",  str(width) + unit)
-    root.set("height", str(height) + unit)
-    root.set("viewBox", "0 0 " + str(width) + " " + str(height) )
-
-    namedview = root.find(inkex.addNS('namedview', 'sodipodi'))
-    if namedview is None:
-        namedview = inkex.etree.SubElement( root, inkex.addNS('namedview', 'sodipodi') );
-
-    namedview.set(inkex.addNS('document-units', 'inkscape'), unit)
-
-    # Until units are supported in 'cx', etc.
-    namedview.set(inkex.addNS('zoom', 'inkscape'), str(512.0/self.uutounit( width,  'px' )) )
-    namedview.set(inkex.addNS('cx',   'inkscape'), str(self.uutounit( width,  'px' )/2.0 ) )
-    namedview.set(inkex.addNS('cy',   'inkscape'), str(self.uutounit( height, 'px' )/2.0 ) )
-
-    namedview.set( 'pagecolor', "#ffffff" )
-    namedview.set( 'bordercolor', "#666666" )
-    namedview.set(inkex.addNS('pageopacity', 'inkscape'), "1.0" )
-    namedview.set(inkex.addNS('pageshadow', 'inkscape'), "0" )
+        width  = self.options.generic_width
+        height = self.options.generic_height
     
+        root = self.document.getroot()
+        root.set("id", "SVGRoot")
+        root.set("width",  str(width) + 'px')
+        root.set("height", str(height) + 'px')
+        root.set("viewBox", "0 0 " + str(width) + " " + str(height) )
 
-c = C()
-c.affect()
+        namedview = self.svg.namedview
+        namedview.set(inkex.addNS('document-units', 'inkscape'), 'px')
+
+        namedview.set(inkex.addNS('zoom', 'inkscape'), str(512.0 / width) )
+
+        namedview.set(inkex.addNS('cx', 'inkscape'), str(width / 2.0))
+        namedview.set(inkex.addNS('cy', 'inkscape'), str(height / 2.0))
+
+
+if __name__ == '__main__':
+    EmptyEggBot().run()

From 14baf56f89c3d0b11b9c112fd4f5832a39de2d35 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Sun, 29 Sep 2019 20:03:39 -0700
Subject: [PATCH 04/19] Update for V1

---
 inkscape_driver/eggbot.py | 47 +++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py
index a1c7e86..66221ae 100755
--- a/inkscape_driver/eggbot.py
+++ b/inkscape_driver/eggbot.py
@@ -25,14 +25,23 @@ import gettext
 import math
 import time
 
-import cubicsuperpath
-import ebb_motion  # https://github.com/evil-mad/plotink    Requires version 0.2 or newer.
-import ebb_serial  # https://github.com/evil-mad/plotink
+from lxml import etree
+
+from plot_utils_import import from_dependency_import # plotink
+simplepath = from_dependency_import('ink_extensions.simplepath')
+simplestyle = from_dependency_import('ink_extensions.simplestyle')
+cubicsuperpath = from_dependency_import('ink_extensions.cubicsuperpath')
+simpletransform = from_dependency_import('ink_extensions.simpletransform')
+inkex = from_dependency_import('ink_extensions.inkex')
+exit_status = from_dependency_import('ink_extensions_utils.exit_status')
+message = from_dependency_import('ink_extensions_utils.message')
+ebb_serial = from_dependency_import('plotink.ebb_serial')  # Requires v 0.13 in plotink    https://github.com/evil-mad/plotink
+ebb_motion = from_dependency_import('plotink.ebb_motion')  # Requires v 0.16 in plotink
+plot_utils = from_dependency_import('plotink.plot_utils')  # Requires v 0.15 in plotink
+
 import eggbot_conf  # Some settings can be changed here.
-import inkex
-import plot_utils  # https://github.com/evil-mad/plotink
-import simplepath
-from simpletransform import applyTransformToPath, composeTransform, parseTransform
+
+
 
 F_DEFAULT_SPEED = 1
 N_PEN_DOWN_DELAY = 400  # delay (ms) for the pen to go down before the next move
@@ -184,14 +193,14 @@ class EggBot(inkex.Effect):
         self.svg = self.document.getroot()
         self.CheckSVGforEggbotData()
 
-        if self.options.tab in ['"Help"', '"options"', '"timing"']:
+        if self.options.tab in ["Help", "options", "timing"]:
             pass
         else:
             self.serialPort = ebb_serial.openPort()
             if self.serialPort is None:
                 inkex.errormsg(gettext.gettext("Failed to connect to EggBot. :("))
 
-            if self.options.tab == '"splash"':
+            if self.options.tab == "splash":
                 self.allLayers = True
                 self.plotCurrentLayer = True
                 self.svgNodeCount = 0
@@ -200,7 +209,7 @@ class EggBot(inkex.Effect):
                 self.svgLayer = 12345  # indicate that we are plotting all layers.
                 self.plotToEggBot()
 
-            elif self.options.tab == '"resume"':
+            elif self.options.tab == "resume":
                 unused_button = ebb_motion.QueryPRGButton(self.serialPort)  # Query if button pressed
                 self.resumePlotSetup()
                 if self.resumeMode:
@@ -210,7 +219,7 @@ class EggBot(inkex.Effect):
                 else:
                     inkex.errormsg(gettext.gettext("Truly sorry, there does not seem to be any in-progress plot to resume."))
 
-            elif self.options.tab == '"layers"':
+            elif self.options.tab == "layers":
                 self.allLayers = False
                 self.plotCurrentLayer = False
                 self.LayersPlotted = 0
@@ -222,10 +231,10 @@ class EggBot(inkex.Effect):
                 if self.LayersPlotted == 0:
                     inkex.errormsg(gettext.gettext("Truly sorry, but I did not find any numbered layers to plot."))
 
-            elif self.options.tab == '"setup"':
+            elif self.options.tab == "setup":
                 self.setupCommand()
 
-            elif self.options.tab == '"manual"':
+            elif self.options.tab == "manual":
                 if self.options.manualType == "strip-data":
                     for node in self.svg.xpath('//svg:WCB', namespaces=inkex.NSS):
                         self.svg.remove(node)
@@ -430,7 +439,7 @@ class EggBot(inkex.Effect):
             if float(vinfo[2]) != 0 and float(vinfo[3]) != 0:
                 sx = self.svgWidth / float(vinfo[2])
                 sy = self.svgHeight / float(vinfo[3])
-                self.svgTransform = parseTransform('scale({0:f},{1:f}) translate({2:f},{3:f})'.format(sx, sy, -float(vinfo[0]), -float(vinfo[1])))
+                self.svgTransform = simpletransform.parseTransform('scale({0:f},{1:f}) translate({2:f},{3:f})'.format(sx, sy, -float(vinfo[0]), -float(vinfo[1])))
 
         self.ServoSetup()
         ebb_motion.sendEnableMotors(self.serialPort, 1)  # 16X microstepping
@@ -499,7 +508,7 @@ class EggBot(inkex.Effect):
                 continue
 
             # first apply the current matrix transform to this node's transform
-            mat_new = composeTransform(mat_current, parseTransform(node.get("transform")))
+            mat_new = simpletransform.composeTransform(mat_current, simpletransform.parseTransform(node.get("transform")))
 
             if node.tag in [inkex.addNS('g', 'svg'), 'g']:
 
@@ -535,7 +544,7 @@ class EggBot(inkex.Effect):
                         y = float(node.get('y', '0'))
                         # Note: the transform has already been applied
                         if x != 0 or y != 0:
-                            mat_new2 = composeTransform(mat_new, parseTransform('translate({0:f},{1:f})'.format(x, y)))
+                            mat_new2 = simpletransform.composeTransform(mat_new, simpletransform.parseTransform('translate({0:f},{1:f})'.format(x, y)))
                         else:
                             mat_new2 = mat_new
                         v = node.get('visibility', v)
@@ -947,7 +956,7 @@ class EggBot(inkex.Effect):
         p = cubicsuperpath.parsePath(d)
 
         # ...and apply the transformation to each point
-        applyTransformToPath(mat_transform, p)
+        simpletransform.applyTransformToPath(mat_transform, p)
 
         # p is now a list of lists of cubic beziers [control pt1, control pt2, endpoint]
         # where the start-point is the last point in the previous segment.
@@ -1003,7 +1012,7 @@ class EggBot(inkex.Effect):
             if not self.resumeMode:  # or if we're resuming.
                 ebb_motion.sendPenUp(self.serialPort, self.options.penUpDelay)
                 if self.options.penUpDelay > 15:
-                    if self.options.tab != '"manual"':
+                    if self.options.tab != "manual":
                         time.sleep(float(self.options.penUpDelay - 10) / 1000.0)  # pause before issuing next command
                 self.bPenIsUp = True
 
@@ -1016,7 +1025,7 @@ class EggBot(inkex.Effect):
                     self.engraverOn()  # will check self.enableEngraver
                 ebb_motion.sendPenDown(self.serialPort, self.options.penDownDelay)
                 if self.options.penUpDelay > 15:
-                    if self.options.tab != '"manual"':
+                    if self.options.tab != "manual":
                         time.sleep(float(self.options.penDownDelay - 10) / 1000.0)  # pause before issuing next command
 
     def engraverOff(self):

From 00dcedd7269f66e41da9ac9222f3374d70769faa Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Wed, 9 Oct 2019 13:35:10 -0700
Subject: [PATCH 05/19] Update eggbot_hatch.py

---
 inkscape_driver/eggbot_hatch.py | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/inkscape_driver/eggbot_hatch.py b/inkscape_driver/eggbot_hatch.py
index 9eb4fa7..c2e92a6 100755
--- a/inkscape_driver/eggbot_hatch.py
+++ b/inkscape_driver/eggbot_hatch.py
@@ -85,7 +85,7 @@
 # Modifications are limited to recursivelyTraverseSvg and effect methods 
 
 # Current software version:
-# (v2.3.1, June 19, 2019)
+# (v2.3.2, September 29, 2019)
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -102,26 +102,17 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 import math
+from lxml import etree
 
-try:
-    from plot_utils_import import from_dependency_import # plotink
-    inkex = from_dependency_import('ink_extensions.inkex')
-    simplepath = from_dependency_import('ink_extensions.simplepath')
-    simpletransform = from_dependency_import('ink_extensions.simpletransform')
-    simplestyle = from_dependency_import('ink_extensions.simplestyle')
-    cubicsuperpath = from_dependency_import('ink_extensions.cubicsuperpath')
-    cspsubdiv = from_dependency_import('ink_extensions.cspsubdiv')
-    bezmisc = from_dependency_import('ink_extensions.bezmisc')
-except:
-    import inkex
-    import simplepath
-    import simpletransform
-    import simplestyle
-    import cubicsuperpath
-    import cspsubdiv
-    import bezmisc
-
-import plot_utils  # https://github.com/evil-mad/plotink
+from plot_utils_import import from_dependency_import # plotink
+inkex = from_dependency_import('ink_extensions.inkex')
+simplepath = from_dependency_import('ink_extensions.simplepath')
+simpletransform = from_dependency_import('ink_extensions.simpletransform')
+simplestyle = from_dependency_import('ink_extensions.simplestyle')
+cubicsuperpath = from_dependency_import('ink_extensions.cubicsuperpath')
+cspsubdiv = from_dependency_import('ink_extensions.cspsubdiv')
+bezmisc = from_dependency_import('ink_extensions.bezmisc')
+plot_utils = from_dependency_import('plotink.plot_utils')  # https://github.com/evil-mad/plotink
 
 N_PAGE_WIDTH = 3200
 N_PAGE_HEIGHT = 800

From 0691bbe8dc9f135703b2006c358284974674093a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20B=C3=A4hr?= <jonas.baehr@web.de>
Date: Sat, 30 Nov 2019 17:25:56 +0100
Subject: [PATCH 06/19] Fix py3 str/bytes issue

by using `isdigit` as an instance method, it works no matter whether we
have a py2 "unicode" string or a regular py2/py3 string. Thus we don't
need to `encode` to ensure a py2 string, which breaks py3 code: encode
returns a bytes object there.
---
 inkscape_driver/eggbot.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py
index 66221ae..1f750ed 100755
--- a/inkscape_driver/eggbot.py
+++ b/inkscape_driver/eggbot.py
@@ -906,7 +906,7 @@ class EggBot(inkex.Effect):
 
         temp_num_string = 'x'
         string_pos = 1
-        current_layer_name = str_layer_name.encode('ascii', 'ignore').lstrip()  # remove leading whitespace
+        current_layer_name = str_layer_name.lstrip()  # remove leading whitespace
 
         # Look at layer name.  Sample first character, then first two, and
         # so on, until the string ends or the string no longer consists of
@@ -915,14 +915,14 @@ class EggBot(inkex.Effect):
         max_length = len(current_layer_name)
         if max_length > 0:
             while string_pos <= max_length:
-                if str.isdigit(current_layer_name[:string_pos]):
+                if current_layer_name[:string_pos].isdigit():
                     temp_num_string = current_layer_name[:string_pos]  # Store longest numeric string so far
                     string_pos += 1
                 else:
                     break
 
         self.plotCurrentLayer = False  # Temporarily assume that we aren't plotting the layer
-        if str.isdigit(temp_num_string):
+        if temp_num_string.isdigit():
             if self.svgLayer == int(float(temp_num_string)):
                 self.plotCurrentLayer = True  # We get to plot the layer!
                 self.LayersPlotted += 1

From e3320037ffe9cc56f95692a9b535595eba96de0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20B=C3=A4hr?= <jonas.baehr@web.de>
Date: Sat, 30 Nov 2019 17:34:55 +0100
Subject: [PATCH 07/19] Git-Ignore vim swp-files

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 953b4db..a16f582 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 
 **/.DS_Store
 **/*.pyc
+
+# vim:
+*.swp

From 6cbfff586d20a065c704ed553a60704afbcd1f14 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Sat, 30 Nov 2019 15:30:02 -0800
Subject: [PATCH 08/19] Update eggbot.py

While not very elegant, it is reasonably straightforward and ensures operation in both python 2 and 3. (This is based on the same structure in the AxiDraw code base, which is a little further along.)
---
 inkscape_driver/eggbot.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py
index 1f750ed..2b61621 100755
--- a/inkscape_driver/eggbot.py
+++ b/inkscape_driver/eggbot.py
@@ -24,6 +24,7 @@
 import gettext
 import math
 import time
+import sys
 
 from lxml import etree
 
@@ -906,8 +907,11 @@ class EggBot(inkex.Effect):
 
         temp_num_string = 'x'
         string_pos = 1
-        current_layer_name = str_layer_name.lstrip()  # remove leading whitespace
-
+        if sys.version_info < (3,):  # Yes this is ugly. More elegant suggestions welcome. :)
+            current_layer_name = str_layer_name.encode('ascii', 'ignore')  # Drop non-ascii characters
+        else:
+            current_layer_name = str(str_layer_name)
+        
         # Look at layer name.  Sample first character, then first two, and
         # so on, until the string ends or the string no longer consists of
         # digit characters only.

From 3d40557667b9b357997933972dedbf799ecce10a Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Sat, 30 Nov 2019 15:41:22 -0800
Subject: [PATCH 09/19] Version bump, input sanitization

Better working in Inkscape v0 now.
---
 inkscape_driver/eggbot.inx | 2 +-
 inkscape_driver/eggbot.py  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/inkscape_driver/eggbot.inx b/inkscape_driver/eggbot.inx
index 8448b36..e5c686a 100755
--- a/inkscape_driver/eggbot.inx
+++ b/inkscape_driver/eggbot.inx
@@ -172,7 +172,7 @@ selected number, which can be up to 100.
       <_param name="instructions_general" type="description"
 	      xml:space="preserve">
 EggBot Control Inkscape extension 
-Release 2.8.1, dated 2019-06-19
+Release 2.8.2, dated 2019-11-30
 
 * EBB Firmware 2.5.1 or newer is recommended.
 
diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py
index 2b61621..14abbc2 100755
--- a/inkscape_driver/eggbot.py
+++ b/inkscape_driver/eggbot.py
@@ -3,7 +3,7 @@
 # Part of the Eggbot driver for Inkscape
 # https://github.com/evil-mad/EggBot
 #
-# Version 2.8.1, dated June 19, 2019.
+# Version 2.8.2, dated November 30, 2019.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -194,6 +194,11 @@ class EggBot(inkex.Effect):
         self.svg = self.document.getroot()
         self.CheckSVGforEggbotData()
 
+        # Input sanitization:
+        self.options.tab = self.options.tab.strip("\"")
+        self.options.setupType = self.options.setupType.strip("\"")
+        self.options.manualType = self.options.manualType.strip("\"")
+
         if self.options.tab in ["Help", "options", "timing"]:
             pass
         else:

From ef7936bf1656957bad9be2d50d542f7a94121b72 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Wed, 23 Dec 2020 16:03:17 -0800
Subject: [PATCH 10/19] Handle switch svg element

Basic switch element support (attempt to plot contents...)
Add continue statements after container objects
Update Hershey Text menu location for Inkscape v1
Removing dead/python2 code #135
Some cleanup as well
---
 inkscape_driver/eggbot.inx |  4 ++--
 inkscape_driver/eggbot.py  | 48 +++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/inkscape_driver/eggbot.inx b/inkscape_driver/eggbot.inx
index e5c686a..0343fcd 100755
--- a/inkscape_driver/eggbot.inx
+++ b/inkscape_driver/eggbot.inx
@@ -172,9 +172,9 @@ selected number, which can be up to 100.
       <_param name="instructions_general" type="description"
 	      xml:space="preserve">
 EggBot Control Inkscape extension 
-Release 2.8.2, dated 2019-11-30
+Release 2.8.3, dated 2020-12-23
 
-* EBB Firmware 2.5.1 or newer is recommended.
+* EBB Firmware 2.6.3 or newer is recommended.
 
 Known issues:
 * "Cancel" function does not work while plotting.
diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py
index 14abbc2..1acfe3f 100755
--- a/inkscape_driver/eggbot.py
+++ b/inkscape_driver/eggbot.py
@@ -3,7 +3,7 @@
 # Part of the Eggbot driver for Inkscape
 # https://github.com/evil-mad/EggBot
 #
-# Version 2.8.2, dated November 30, 2019.
+# Version 2.8.3, dated December 23, 2020.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,12 +19,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# TODO: Add and honor advisory locking around device open/close for non Win32
-
 import gettext
 import math
 import time
-import sys
 
 from lxml import etree
 
@@ -524,7 +521,12 @@ class EggBot(inkex.Effect):
                     if not self.allLayers:
                         self.DoWePlotLayer(self.sCurrentLayerName)
                 self.recursivelyTraverseSvg(node, mat_new, parent_visibility=v)
-
+                continue
+            if node.tag in [inkex.addNS('switch', 'svg'), 'switch']:
+                # Treat switch as a container element to plot
+                self.penUp()
+                self.recursivelyTraverseSvg(node, mat_new, parent_visibility=v)
+                continue
             elif node.tag in [inkex.addNS('use', 'svg'), 'use']:
 
                 # A <use> element refers to another SVG element via an xlink:href="#blah"
@@ -851,19 +853,19 @@ class EggBot(inkex.Effect):
                                   inkex.addNS('flowRoot', 'svg'), 'flowRoot']:
                     if 'text' not in self.warnings:
                         inkex.errormsg(gettext.gettext('Warning: in layer "' +
-                                                       self.sCurrentLayerName + '" unable to draw text; ' +
-                                                       'please convert it to a path first.  Consider using the ' +
-                                                       'Hershey Text extension which is located under the ' +
-                                                       '"Render" category of extensions.'))
+                            str(self.sCurrentLayerName) + '" unable to draw text; ' +
+                            'please convert it to a path first.  Consider using the ' +
+                            'Hershey Text extension which is located in the menu' +
+                            'under Extensions > Text.'))
                         self.warnings['text'] = 1
                     pass
                 elif node.tag in [inkex.addNS('image', 'svg'), 'image']:
                     if 'image' not in self.warnings:
                         inkex.errormsg(gettext.gettext('Warning: in layer "' +
-                                                       self.sCurrentLayerName + '" unable to draw bitmap images; ' +
-                                                       'please convert them to line art first.  Consider using the "Trace bitmap..." ' +
-                                                       'tool of the "Path" menu.  Mac users please note that some X11 settings may ' +
-                                                       'cause cut-and-paste operations to paste in bitmap copies.'))
+                            str(self.sCurrentLayerName) + '" unable to draw bitmap images; ' +
+                            'please convert them to line art first.  Consider using the "Trace bitmap..." ' +
+                            'tool of the "Path" menu.  Mac users please note that some X11 settings may ' +
+                            'cause cut-and-paste operations to paste in bitmap copies.'))
                         self.warnings['image'] = 1
                     pass
                 elif node.tag in [inkex.addNS('pattern', 'svg'), 'pattern']:
@@ -883,19 +885,14 @@ class EggBot(inkex.Effect):
                 elif node.tag in [inkex.addNS('color-profile', 'svg'), 'color-profile']:
                     # Gamma curves, color temp, etc. are not relevant to single color output
                     pass
-                elif not isinstance(node.tag, basestring):
-                    # This is likely an XML processing instruction such as an XML
-                    # comment.  lxml uses a function reference for such node tags
-                    # and as such the node tag is likely not a printable string.
-                    # Further, converting it to a printable string likely won't
-                    # be very useful.
+                elif node.tag in [inkex.addNS('foreignObject', 'svg'), 'foreignObject']:
                     pass
                 else:
                     if str(node.tag) not in self.warnings:
                         t = str(node.tag).split('}')
                         inkex.errormsg(gettext.gettext('Warning: in layer "' +
-                                                       self.sCurrentLayerName + '" unable to draw <' + str(t[-1]) +
-                                                       '> object, please convert it to a path first.'))
+                            str(self.sCurrentLayerName) + '" unable to draw <' + str(t[-1]) +
+                            '> object, please convert it to a path first.'))
                         self.warnings[str(node.tag)] = 1
                     pass
 
@@ -912,11 +909,10 @@ class EggBot(inkex.Effect):
 
         temp_num_string = 'x'
         string_pos = 1
-        if sys.version_info < (3,):  # Yes this is ugly. More elegant suggestions welcome. :)
-            current_layer_name = str_layer_name.encode('ascii', 'ignore')  # Drop non-ascii characters
-        else:
-            current_layer_name = str(str_layer_name)
-        
+
+        current_layer_name = str(str_layer_name)
+        current_layer_name.lstrip()  # Remove leading whitespace
+
         # Look at layer name.  Sample first character, then first two, and
         # so on, until the string ends or the string no longer consists of
         # digit characters only.

From e7bc7201e60d49a66f18d2b991911db65cd72868 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Wed, 23 Dec 2020 16:29:03 -0800
Subject: [PATCH 11/19] Better handling of group if/elif case

---
 inkscape_driver/eggbot.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py
index 1acfe3f..fdba6f3 100755
--- a/inkscape_driver/eggbot.py
+++ b/inkscape_driver/eggbot.py
@@ -521,12 +521,10 @@ class EggBot(inkex.Effect):
                     if not self.allLayers:
                         self.DoWePlotLayer(self.sCurrentLayerName)
                 self.recursivelyTraverseSvg(node, mat_new, parent_visibility=v)
-                continue
-            if node.tag in [inkex.addNS('switch', 'svg'), 'switch']:
+            elif node.tag in [inkex.addNS('switch', 'svg'), 'switch']:
                 # Treat switch as a container element to plot
                 self.penUp()
                 self.recursivelyTraverseSvg(node, mat_new, parent_visibility=v)
-                continue
             elif node.tag in [inkex.addNS('use', 'svg'), 'use']:
 
                 # A <use> element refers to another SVG element via an xlink:href="#blah"

From 6e528683e4ae407cac4283961fcc5b5426bb8cd8 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Sun, 18 Jul 2021 13:51:58 -0700
Subject: [PATCH 12/19] Fix issue with manual pen lower not working

---
 inkscape_driver/eggbot.inx | 2 +-
 inkscape_driver/eggbot.py  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inkscape_driver/eggbot.inx b/inkscape_driver/eggbot.inx
index 0343fcd..aa7cb2b 100755
--- a/inkscape_driver/eggbot.inx
+++ b/inkscape_driver/eggbot.inx
@@ -172,7 +172,7 @@ selected number, which can be up to 100.
       <_param name="instructions_general" type="description"
 	      xml:space="preserve">
 EggBot Control Inkscape extension 
-Release 2.8.3, dated 2020-12-23
+Release 2.8.4, dated 2021-07-18
 
 * EBB Firmware 2.6.3 or newer is recommended.
 
diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py
index fdba6f3..47d6f4b 100755
--- a/inkscape_driver/eggbot.py
+++ b/inkscape_driver/eggbot.py
@@ -3,7 +3,7 @@
 # Part of the Eggbot driver for Inkscape
 # https://github.com/evil-mad/EggBot
 #
-# Version 2.8.3, dated December 23, 2020.
+# Version 2.8.4, dated July 18, 2021.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1021,7 +1021,7 @@ class EggBot(inkex.Effect):
 
     def penDown(self):
         self.virtualPenIsUp = False  # Virtual pen keeps track of state for resuming plotting.
-        if self.bPenIsUp:  # Continue only if pen state is up (or unknown)
+        if self.bPenIsUp or self.bPenIsUp == None:  # Continue only if pen state is up (or unknown)
             if not self.resumeMode and not self.bStopped:  # skip if we're resuming or stopped
                 self.bPenIsUp = False
                 if self.penDownActivatesEngraver:

From 948d7f215764bd5003e653c5fdb8ab200bc68c8a Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Sun, 8 Aug 2021 15:25:10 -0700
Subject: [PATCH 13/19] Hatch Fill 2.4.0

- Revise GUI
- Add option to set hatch spacing and inset distances with selectable units, px, mm, or inch.
- Ignore non-fillable SVG elements (except text)
- Fill only visible layers
---
 inkscape_driver/eggbot_hatch.inx |  91 ++++++++++++----------
 inkscape_driver/eggbot_hatch.py  | 125 +++++++++++++++++++------------
 2 files changed, 130 insertions(+), 86 deletions(-)
 mode change 100755 => 100644 inkscape_driver/eggbot_hatch.py

diff --git a/inkscape_driver/eggbot_hatch.inx b/inkscape_driver/eggbot_hatch.inx
index 5b68137..b24e2f3 100755
--- a/inkscape_driver/eggbot_hatch.inx
+++ b/inkscape_driver/eggbot_hatch.inx
@@ -8,58 +8,71 @@
 <param name="tab" type="notebook">
   <page name="splash" _gui-text="Hatch Fill">
   <_param name="Header" type="description" xml:space="preserve">
-This extension fills each closed figure in your drawing
-with a path consisting of back and forth drawn "hatch" lines.
-If any objects are selected, then only those selected objects
-will be filled. 
+Hatch Fill: An extension to fill all or selected closed figures in your
+drawing with paths consisting of back-and-forth hatch line.
+</_param>
 
-Hatched figures will be grouped with their fills.
-  </_param>
-  <param name="hatchSpacing" type="float" min="0.1" max="1000" _gui-text="   Hatch spacing (px)">3.0</param>
-  <param name="hatchAngle" type="float" min="-360" max="360" _gui-text="   Hatch angle (degrees)">45</param>
-  <param name="crossHatch" type="boolean" _gui-text="   Crosshatch?">false</param>
+<param name="hatchSpacing" type="float" min="0.001" max="1000" indent="2"
+    precision="3" _gui-text="Hatch Spacing">3.0</param>
 
-  <param name="reducePenLifts" type="boolean" _gui-text="   Connect nearby ends?">true</param>
-  <param name="hatchScope" type="float" min="1.1" max="5.0" _gui-text="   Range of end connections (default: 3)">3.0</param>
-  <param name="holdBackHatchFromEdges" type="boolean" _gui-text="   Inset fill from edges?">true</param>
-  <param name="holdBackSteps" type="float" min="0.1" max="10.0" _gui-text="   Inset distance (px) (default: 1)">1.0</param>
-  <param name="tolerance" type="float" min="0.1" max="100" _gui-text="   Tolerance (default: 3.0)">3.0</param>
+<param name="units" type="optiongroup" appearance="minimal"
+    indent="4" _gui-text="Spacing Units :">
+    <_option value="2">px</_option>
+    <_option value="3">mm</_option>
+    <_option value="4">inch</_option>
+</param>
 
-  <param name="footer" type="description" xml:space="preserve">
-            (v2.3.0, June 11, 2019)</param>
+<param name="hatchAngle" type="float" min="-360" max="360" indent="4" _gui-text="Hatch Angle (degrees)">45</param>
+<param name="crossHatch" type="boolean" indent="4" _gui-text="Crosshatch">false</param>
 
-  </page>
-  <page name="info" _gui-text="More info...">
-  <_param name="aboutpage" type="description" xml:space="preserve">
-Hatch spacing is the distance between hatch lines, 
-measured in units of screen pixels (px). Angles are in
-degrees from horizontal; for example 90 is vertical.
+<separator />
 
-The Crosshatch option will apply a second set of
-hatches, perpendicular to the first.
+<param name="connect_bool" type="boolean"  indent="2" _gui-text="Connect Nearby Ends">true</param>
+<param name="hatchScope" type="float" min="1.1" max="5.0"  indent="2" _gui-text="Range of end connections (default: 3)">3.0</param>
 
-The "Connect nearby ends" option will attempt to connect
-nearby line ends with a smoothly flowing curve, to improve
-the smoothness of plotting.
+<separator />
+<param name="inset_bool" type="boolean"  indent="2" _gui-text="Inset Fill from Edges">true</param>
+<param name="inset_dist" type="float"  min="0.001" max="1000" precision="3"  indent="2"
+    _gui-text="Inset Distance, in selected units">0.5</param>
 
-The Range parameter sets the distance (in hatch widths)
-over which that option searches for segments to join. 
-Large values may result in hatches where you don't want
-them. Consider using a value in the range of 2-4. 
+<separator />
+<param name="tolerance" type="float" min="0.1" max="100"  indent="2"
+    _gui-text="Tolerance (default: 2.0)">2.0</param>
 
-The Inset option allows you to hold back the edges of the
-fill somewhat from the edge of your original object.
-This can improve performance, as it allows you to more
-reliably "color inside the lines" when using pens.
+</page>
+<page name="info" _gui-text="More info...">
+<param name="aboutpage" type="description" xml:space="preserve">
+Hatch spacing is the distance between hatch lines, measured in selected
+units. Hatch angle is in degrees from horizontal; e.g., 90 for vertical.
 
-The hatches will be the same color and width
-as the original object.
+The Crosshatch option will add a second set of hatches, perpendicular
+to the first.
 
-The Tolerance parameter affects how precisely
-the hatches try to fill the input paths.</_param>
+The Connect Nearby Ends option will join nearby line ends with a
+smooth curve, giving a differnt appearance and reducing the number of
+pen lifts when using robotic tools like pen plotters. The Range
+parameter sets the distance (in hatch spacing) over which end
+connections may be made. Large values may result in hatches where you
+don't want them.
+
+The Inset Fill from Edges option allows you to hold back the hatches
+away from the edge of your original object. This can allow you to more
+reliably "color inside the lines".
+
+The Tolerance parameter affects how precisely the hatches try
+to fill the input paths.
+
+
+Hatches will have the same stroke color and width as the original
+object. When filling more than one object, the hatches will be grouped
+with their original (filled) objects.
+
+
+v2.4.0, August 8, 2021</_param> 
  
   </page>
   </param>
+
   <effect needs-live-preview="true">
     <object-type>all</object-type>
     <effects-menu>
diff --git a/inkscape_driver/eggbot_hatch.py b/inkscape_driver/eggbot_hatch.py
old mode 100755
new mode 100644
index c2e92a6..12653db
--- a/inkscape_driver/eggbot_hatch.py
+++ b/inkscape_driver/eggbot_hatch.py
@@ -84,8 +84,12 @@
 # This prevents extremely complex plots from generating glitches
 # Modifications are limited to recursivelyTraverseSvg and effect methods 
 
+# Updated by Windell H. Oskay, 2021
+# Add option for selecting units.
+# Make inset settable in selected units as well.
+
 # Current software version:
-# (v2.3.2, September 29, 2019)
+# (v2.4.0, August 8, 2021)
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -104,7 +108,7 @@
 import math
 from lxml import etree
 
-from plot_utils_import import from_dependency_import # plotink
+from axidrawinternal.plot_utils_import import from_dependency_import # plotink
 inkex = from_dependency_import('ink_extensions.inkex')
 simplepath = from_dependency_import('ink_extensions.simplepath')
 simpletransform = from_dependency_import('ink_extensions.simpletransform')
@@ -471,7 +475,7 @@ def interstices(self, p1, p2, paths, hatches, b_hold_back_hatches, f_hold_back_s
             # remove it from consideration by marking it as already drawn - a
             # fiction, but is much quicker than actually removing the hatch from the list.
 
-            f_min_allowed_hatch_length = self.options.hatchSpacing * MIN_HATCH_FRACTION
+            f_min_allowed_hatch_length = self.hatch_spacing_px * MIN_HATCH_FRACTION
             f_initial_hatch_length = math.hypot(x2 - x1, y2 - y1)
             # We did as much as possible of the inset operation back when we were finding intersections.
             # We did it back then because at that point we knew more about the geometry than we know now.
@@ -610,19 +614,19 @@ class Eggbot_Hatch(inkex.Effect):
         self.docTransform = [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]]
 
         self.OptionParser.add_option(
-                "--holdBackSteps", action="store", type="float",
-                dest="holdBackSteps", default=3.0,
-                help="How far hatch strokes stay from boundary (steps)")
+                "--inset_dist", action="store", type="float",
+                dest="inset_dist", default=3.0,
+                help="How far hatch strokes stay from boundary")
         self.OptionParser.add_option(
                 "--hatchScope", action="store", type="float",
                 dest="hatchScope", default=3.0,
                 help="Radius searched for segments to join (units of hatch width)")
         self.OptionParser.add_option(
-                "--holdBackHatchFromEdges", action="store", dest="holdBackHatchFromEdges",
+                "--inset_bool", action="store", dest="inset_bool",
                 type="inkbool", default=True,
                 help="Stay away from edges, so no need for inset")
         self.OptionParser.add_option(
-                "--reducePenLifts", action="store", dest="reducePenLifts",
+                "--connect_bool", action="store", dest="connect_bool",
                 type="inkbool", default=True,
                 help="Reduce plotting time by joining some hatches")
         self.OptionParser.add_option(
@@ -639,11 +643,18 @@ class Eggbot_Hatch(inkex.Effect):
                 help="Spacing between hatch lines")
         self.OptionParser.add_option(
                 "--tolerance", action="store", type="float",
-                dest="tolerance", default=20.0,
+                dest="tolerance", default=3.0,
                 help="Allowed deviation from original paths")
+        self.OptionParser.add_option(
+                "--units",
+                 action="store",  type="int",
+                 dest="units", default=1,
+                 help="Units to use for hatches. 1: line width. 2: px. 3: mm. 4: inch")
+
         self.OptionParser.add_option("--tab",  # NOTE: value is not used.
-                                     action="store", type="string", dest="tab", default="splash",
+                                     action="store", type="string", dest="_tab", default="splash",
                                      help="The active tab when Apply was pressed")
+                                     
 
     def getDocProps(self):
 
@@ -753,11 +764,11 @@ class Eggbot_Hatch(inkex.Effect):
                 for vertex in subpath:
                     if vertex[0] < self.xmin:
                         self.xmin = vertex[0]
-                    elif vertex[0] > self.xmax:
+                    if vertex[0] > self.xmax:
                         self.xmax = vertex[0]
                     if vertex[1] < self.ymin:
                         self.ymin = vertex[1]
-                    elif vertex[1] > self.ymax:
+                    if vertex[1] > self.ymax:
                         self.ymax = vertex[1]
 
     def recursivelyTraverseSvg(self, a_node_list, mat_current=None, parent_visibility='visible'):
@@ -803,7 +814,17 @@ class Eggbot_Hatch(inkex.Effect):
             if v == 'inherit':
                 v = parent_visibility
             if v == 'hidden' or v == 'collapse':
-                pass
+                continue
+
+            style = simplestyle.parseStyle(node.get('style'))
+
+            # Check for "display:none" in the node's style attribute:
+            if 'display' in style.keys() and style['display'] == 'none':
+                continue  # Do not hatch this object or its children
+
+            # The node may have a display="none" attribute as well:
+            if node.get('display') == 'none':
+                continue  # Do not hatch this object or its children
 
             # first apply the current matrix transform to this node's transform
             mat_new = simpletransform.composeTransform(mat_current, simpletransform.parseTransform(node.get("transform")))
@@ -849,13 +870,13 @@ class Eggbot_Hatch(inkex.Effect):
                     self.addPathVertices(path_data, node, mat_new)
                     # We now have a path we want to apply a (cross)hatch to
                     # Apply appropriate functions
-                    b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.options.hatchSpacing), True)
+                    b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.hatch_spacing_px), True)
                     if b_have_grid:
                         if self.options.crossHatch:
-                            self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.options.hatchSpacing), False)
+                            self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.hatch_spacing_px), False)
                         # Now loop over our hatch lines looking for intersections
                         for h in self.grid:
-                            interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.holdBackHatchFromEdges, self.options.holdBackSteps)
+                            interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.inset_bool, self.inset_dist_px)
 
             elif node.tag in [inkex.addNS('rect', 'svg'), 'rect']:
 
@@ -885,13 +906,13 @@ class Eggbot_Hatch(inkex.Effect):
                 self.addPathVertices(simplepath.formatPath(a), node, mat_new)
                 # We now have a path we want to apply a (cross)hatch to
                 # Apply appropriate functions
-                b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.options.hatchSpacing), True)
+                b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.hatch_spacing_px), True)
                 if b_have_grid:
                     if self.options.crossHatch:
-                        self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.options.hatchSpacing), False)
+                        self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.hatch_spacing_px), False)
                         # Now loop over our hatch lines looking for intersections
                     for h in self.grid:
-                        interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.holdBackHatchFromEdges, self.options.holdBackSteps)
+                        interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.inset_bool, self.inset_dist_px)
 
             elif node.tag in [inkex.addNS('line', 'svg'), 'line']:
 
@@ -914,13 +935,13 @@ class Eggbot_Hatch(inkex.Effect):
                 self.addPathVertices(simplepath.formatPath(a), node, mat_new)
                 # We now have a path we want to apply a (cross)hatch to
                 # Apply appropriate functions
-                b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.options.hatchSpacing), True)
+                b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.hatch_spacing_px), True)
                 if b_have_grid:
                     if self.options.crossHatch:
-                        self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.options.hatchSpacing), False)
+                        self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.hatch_spacing_px), False)
                         # Now loop over our hatch lines looking for intersections
                     for h in self.grid:
-                        interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.holdBackHatchFromEdges, self.options.holdBackSteps)
+                        interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.inset_bool, self.inset_dist_px)
 
             elif node.tag in [inkex.addNS('polyline', 'svg'), 'polyline']:
 
@@ -955,13 +976,13 @@ class Eggbot_Hatch(inkex.Effect):
 
                     # We now have a path we want to apply a (cross)hatch to
                     # Apply appropriate functions
-                    b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.options.hatchSpacing), True)
+                    b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.hatch_spacing_px), True)
                     if b_have_grid:
                         if self.options.crossHatch:
-                            self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.options.hatchSpacing), False)
+                            self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.hatch_spacing_px), False)
                             # Now loop over our hatch lines looking for intersections
                         for h in self.grid:
-                            interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.holdBackHatchFromEdges, self.options.holdBackSteps)
+                            interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.inset_bool, self.inset_dist_px)
 
             elif node.tag in [inkex.addNS('polygon', 'svg'), 'polygon']:
                 # Convert
@@ -982,13 +1003,13 @@ class Eggbot_Hatch(inkex.Effect):
                 self.addPathVertices(d, node, mat_new)
                 # We now have a path we want to apply a (cross)hatch to
                 # Apply appropriate functions
-                b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.options.hatchSpacing), True)
+                b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.hatch_spacing_px), True)
                 if b_have_grid:
                     if self.options.crossHatch:
-                        self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.options.hatchSpacing), False)
+                        self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.hatch_spacing_px), False)
                         # Now loop over our hatch lines looking for intersections
                     for h in self.grid:
-                        interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.holdBackHatchFromEdges, self.options.holdBackSteps)
+                        interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.inset_bool, self.inset_dist_px)
 
             elif node.tag in [inkex.addNS('ellipse', 'svg'), 'ellipse',
                               inkex.addNS('circle', 'svg'), 'circle']:
@@ -1033,34 +1054,33 @@ class Eggbot_Hatch(inkex.Effect):
                 self.addPathVertices(d, node, mat_new)
                 # We now have a path we want to apply a (cross)hatch to
                 # Apply appropriate functions
-                b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.options.hatchSpacing), True)
+                b_have_grid = self.makeHatchGrid(float(self.options.hatchAngle), float(self.hatch_spacing_px), True)
                 if b_have_grid:
                     if self.options.crossHatch:
-                        self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.options.hatchSpacing), False)
+                        self.makeHatchGrid(float(self.options.hatchAngle + 90.0), float(self.hatch_spacing_px), False)
                     # Now loop over our hatch lines looking for intersections
                     for h in self.grid:
-                        interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.holdBackHatchFromEdges, self.options.holdBackSteps)
+                        interstices(self, (h[0], h[1]), (h[2], h[3]), self.paths, self.hatches, self.options.inset_bool, self.inset_dist_px)
 
             elif node.tag in [inkex.addNS('pattern', 'svg'), 'pattern']:
-                pass
+                continue
             elif node.tag in [inkex.addNS('metadata', 'svg'), 'metadata']:
-                pass
+                continue
             elif node.tag in [inkex.addNS('defs', 'svg'), 'defs']:
-                pass
+                continue
             elif node.tag in [inkex.addNS('namedview', 'sodipodi'), 'namedview']:
-                pass
+                continue
             elif node.tag in [inkex.addNS('eggbot', 'svg'), 'eggbot']:
-                pass
+                continue
             elif node.tag in [inkex.addNS('WCB', 'svg'), 'WCB']:
-                pass
+                continue
+            elif node.tag in [inkex.addNS('image', 'svg'), 'image']:
+                continue
             elif node.tag in [inkex.addNS('text', 'svg'), 'text']:
-                inkex.errormsg('Warning: unable to draw text, please convert it to a path first.')
-                pass
-            elif not isinstance(node.tag, basestring):
-                pass
+                inkex.errormsg('Warning: unable to hatch text, please convert it to a path first.')
+                continue
             else:
-                inkex.errormsg('Warning: unable to hatch object <{0}>, please convert it to a path first.'.format(node.tag))
-                pass
+                continue # produce no error on other SVG elements.
 
     def joinFillsWithNode(self, node, stroke_width, path):
 
@@ -1193,8 +1213,19 @@ class Eggbot_Hatch(inkex.Effect):
         # Viewbox handling
         self.handleViewBox()
 
-        if self.options.hatchSpacing == 0:
-            self.options.hatchSpacing = 0.1 # Hardcode minimum value
+        # Default spacing values for hatches and inset; handle px units case:
+        self.hatch_spacing_px = self.options.hatchSpacing
+        self.inset_dist_px = self.options.inset_dist
+
+        if self.options.units == 3: # Units in mm
+            self.hatch_spacing_px =  (96.0 / 25.4) * self.options.hatchSpacing
+            self.inset_dist_px =  (96.0 / 25.4) * self.options.inset_dist
+        if self.options.units == 4: # Units in inches
+            self.hatch_spacing_px = 96.0 * self.options.hatchSpacing
+            self.inset_dist_px = 96.0 * self.options.inset_dist
+
+        if self.hatch_spacing_px < 0.1:
+            self.hatch_spacing_px = 0.1 # Hardcode minimum value
 
         ref_count = 0
         pt_last_position_abs = [0, 0]
@@ -1256,14 +1287,14 @@ class Eggbot_Hatch(inkex.Effect):
                 stroke_width = 1.0
 
             # The transform also applies to the hatch spacing we use when searching for end connections
-            transformed_hatch_spacing = stroke_width * self.options.hatchSpacing
+            transformed_hatch_spacing = stroke_width * self.hatch_spacing_px
 
             path = ''  # regardless of whether or not we're reducing pen lifts
             pt_last_position_abs = [0, 0]
             pt_last_position_abs[0] = 0
             pt_last_position_abs[1] = 0
             f_distance_moved_with_pen_up = 0
-            if not self.options.reducePenLifts:
+            if not self.options.connect_bool:
                 for segment in self.hatches[key]:
                     if len(segment) < 2:
                         continue

From b2026e957c1e2833dfc2e47390ebdb5d185eb170 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Mon, 9 Aug 2021 13:55:21 -0700
Subject: [PATCH 14/19] Correct motion control issue

Under some circumstances with long moves, remaining distance to travel could be end up as non-integer, producing a `7 Err:` and Unexpected response from EBB report to the user.
---
 inkscape_driver/eggbot.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py
index 47d6f4b..19dffe1 100755
--- a/inkscape_driver/eggbot.py
+++ b/inkscape_driver/eggbot.py
@@ -1125,8 +1125,8 @@ class EggBot(inkex.Effect):
             n_time = int(math.ceil(1000.0 / self.fSpeed * plot_utils.distance(n_delta_x, n_delta_y)))
 
             while abs(n_delta_x) > 0 or abs(n_delta_y) > 0:
-                xd = n_delta_x
-                yd = n_delta_y
+                xd = int(n_delta_x)
+                yd = int(n_delta_y)
                 td = n_time
                 if td < 1:
                     td = 1  # don't allow zero-time moves.

From 8cc5d08dd99a3652a6c4357291240fe659d5e987 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Mon, 9 Aug 2021 13:56:49 -0700
Subject: [PATCH 15/19] Version bump

---
 inkscape_driver/eggbot.inx | 2 +-
 inkscape_driver/eggbot.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inkscape_driver/eggbot.inx b/inkscape_driver/eggbot.inx
index aa7cb2b..0870516 100755
--- a/inkscape_driver/eggbot.inx
+++ b/inkscape_driver/eggbot.inx
@@ -172,7 +172,7 @@ selected number, which can be up to 100.
       <_param name="instructions_general" type="description"
 	      xml:space="preserve">
 EggBot Control Inkscape extension 
-Release 2.8.4, dated 2021-07-18
+Release 2.8.5, dated 2021-08-09
 
 * EBB Firmware 2.6.3 or newer is recommended.
 
diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py
index 19dffe1..924d5a5 100755
--- a/inkscape_driver/eggbot.py
+++ b/inkscape_driver/eggbot.py
@@ -3,7 +3,7 @@
 # Part of the Eggbot driver for Inkscape
 # https://github.com/evil-mad/EggBot
 #
-# Version 2.8.4, dated July 18, 2021.
+# Version 2.8.5, dated August 9, 2021.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

From a7bcd704cb9f79a3a5adc9173002b117c45a1392 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Sat, 9 Oct 2021 12:49:42 -0700
Subject: [PATCH 16/19] Minor update; change aspect ratio of GUI, wider, but
 shorter

---
 inkscape_driver/eggbot_hatch.inx | 41 ++++++++++++++------------------
 inkscape_driver/eggbot_hatch.py  |  2 +-
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/inkscape_driver/eggbot_hatch.inx b/inkscape_driver/eggbot_hatch.inx
index b24e2f3..b971355 100755
--- a/inkscape_driver/eggbot_hatch.inx
+++ b/inkscape_driver/eggbot_hatch.inx
@@ -22,13 +22,15 @@ drawing with paths consisting of back-and-forth hatch line.
     <_option value="4">inch</_option>
 </param>
 
-<param name="hatchAngle" type="float" min="-360" max="360" indent="4" _gui-text="Hatch Angle (degrees)">45</param>
+<param name="hatchAngle" type="float" min="-360" max="360" indent="4"
+_gui-text="Hatch Angle (degrees)">45</param>
 <param name="crossHatch" type="boolean" indent="4" _gui-text="Crosshatch">false</param>
 
 <separator />
 
 <param name="connect_bool" type="boolean"  indent="2" _gui-text="Connect Nearby Ends">true</param>
-<param name="hatchScope" type="float" min="1.1" max="5.0"  indent="2" _gui-text="Range of end connections (default: 3)">3.0</param>
+<param name="hatchScope" type="float" min="1.1" max="5.0"  indent="2"
+_gui-text="Range of end connections (default: 3)">3.0</param>
 
 <separator />
 <param name="inset_bool" type="boolean"  indent="2" _gui-text="Inset Fill from Edges">true</param>
@@ -41,34 +43,27 @@ drawing with paths consisting of back-and-forth hatch line.
 
 </page>
 <page name="info" _gui-text="More info...">
-<param name="aboutpage" type="description" xml:space="preserve">
-Hatch spacing is the distance between hatch lines, measured in selected
-units. Hatch angle is in degrees from horizontal; e.g., 90 for vertical.
+<param name="aboutpage" type="description" xml:space="preserve"
+>Hatch spacing is the distance between hatch lines, measured in selected units. Hatch angle is in
+degrees from horizontal; e.g., 90 for vertical.
 
-The Crosshatch option will add a second set of hatches, perpendicular
-to the first.
+The Crosshatch option will add a second set of hatches, perpendicular to the first.
 
-The Connect Nearby Ends option will join nearby line ends with a
-smooth curve, giving a differnt appearance and reducing the number of
-pen lifts when using robotic tools like pen plotters. The Range
-parameter sets the distance (in hatch spacing) over which end
-connections may be made. Large values may result in hatches where you
-don't want them.
+The Connect Nearby Ends option will join nearby line ends with a smooth curve, giving a different
+appearance and reducing the number of pen lifts when using robotic tools like pen plotters. The
+Range parameter sets the distance (in hatch spacing) over which end connections may be made. Large
+values may result in hatches where you don't want them.
 
-The Inset Fill from Edges option allows you to hold back the hatches
-away from the edge of your original object. This can allow you to more
-reliably "color inside the lines".
+The Inset Fill from Edges option allows you to hold back the hatches away from the edge of your
+original object. This can allow you to more reliably "color inside the lines".
 
-The Tolerance parameter affects how precisely the hatches try
-to fill the input paths.
+The Tolerance parameter affects how precisely the hatches try to fill the input paths.
 
 
-Hatches will have the same stroke color and width as the original
-object. When filling more than one object, the hatches will be grouped
-with their original (filled) objects.
+Hatches will have the same stroke color and width as the original object. When filling more than one
+object, the hatches will be grouped with their original (filled) objects.
 
-
-v2.4.0, August 8, 2021</_param> 
+v2.4.1, October 9, 2021</_param>
  
   </page>
   </param>
diff --git a/inkscape_driver/eggbot_hatch.py b/inkscape_driver/eggbot_hatch.py
index 12653db..1262936 100644
--- a/inkscape_driver/eggbot_hatch.py
+++ b/inkscape_driver/eggbot_hatch.py
@@ -89,7 +89,7 @@
 # Make inset settable in selected units as well.
 
 # Current software version:
-# (v2.4.0, August 8, 2021)
+# (v2.4.1, October 9, 2021<)
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

From 19ac37642cd6d889ff1ea99d922263db7b4036fa Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Sat, 9 Oct 2021 13:07:59 -0700
Subject: [PATCH 17/19] Further GUI revisions

---
 inkscape_driver/eggbot_hatch.inx | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/inkscape_driver/eggbot_hatch.inx b/inkscape_driver/eggbot_hatch.inx
index b971355..944b152 100755
--- a/inkscape_driver/eggbot_hatch.inx
+++ b/inkscape_driver/eggbot_hatch.inx
@@ -7,9 +7,9 @@
 
 <param name="tab" type="notebook">
   <page name="splash" _gui-text="Hatch Fill">
-  <_param name="Header" type="description" xml:space="preserve">
-Hatch Fill: An extension to fill all or selected closed figures in your
-drawing with paths consisting of back-and-forth hatch line.
+  <_param name="Header" type="description">
+An extension to fill all (or selected) closed figures in your
+drawing with paths consisting of back-and-forth hatch lines.
 </_param>
 
 <param name="hatchSpacing" type="float" min="0.001" max="1000" indent="2"
@@ -42,32 +42,32 @@ _gui-text="Range of end connections (default: 3)">3.0</param>
     _gui-text="Tolerance (default: 2.0)">2.0</param>
 
 </page>
-<page name="info" _gui-text="More info...">
-<param name="aboutpage" type="description" xml:space="preserve"
->Hatch spacing is the distance between hatch lines, measured in selected units. Hatch angle is in
+<page name="info" _gui-text="Help">
+<param name="aboutpage_1" type="description">
+Hatch spacing is the distance between hatch lines, measured in selected units. Hatch angle is in
 degrees from horizontal; e.g., 90 for vertical.
-
+</param><param name="aboutpage_2" type="description">
 The Crosshatch option will add a second set of hatches, perpendicular to the first.
-
+</param><param name="aboutpage_3" type="description">
 The Connect Nearby Ends option will join nearby line ends with a smooth curve, giving a different
 appearance and reducing the number of pen lifts when using robotic tools like pen plotters. The
 Range parameter sets the distance (in hatch spacing) over which end connections may be made. Large
 values may result in hatches where you don't want them.
-
+</param><param name="aboutpage_4" type="description">
 The Inset Fill from Edges option allows you to hold back the hatches away from the edge of your
 original object. This can allow you to more reliably "color inside the lines".
-
+</param><param name="aboutpage_5" type="description">
 The Tolerance parameter affects how precisely the hatches try to fill the input paths.
-
-
+</param><param name="aboutpage_6" type="description">
 Hatches will have the same stroke color and width as the original object. When filling more than one
 object, the hatches will be grouped with their original (filled) objects.
-
-v2.4.1, October 9, 2021</_param>
+</param>
+<separator />
+<param name="aboutpage_7" type="description"  indent="2">
+v2.4.1. Copyright 2021, Evil Mad Scientist</_param>
  
   </page>
   </param>
-
   <effect needs-live-preview="true">
     <object-type>all</object-type>
     <effects-menu>

From 6a47d92f1d67ad41d5699b84221ab1bdeeee5028 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Tue, 12 Apr 2022 12:55:24 -0700
Subject: [PATCH 18/19] Updates for Inkscape 1.2

---
 inkscape_driver/eggbot.inx             | 1 -
 inkscape_driver/eggbot_presethatch.inx | 1 -
 inkscape_driver/eggbot_reorder.inx     | 2 --
 inkscape_driver/empty_eggbot.inx       | 1 -
 4 files changed, 5 deletions(-)

diff --git a/inkscape_driver/eggbot.inx b/inkscape_driver/eggbot.inx
index 0870516..2b4d84c 100755
--- a/inkscape_driver/eggbot.inx
+++ b/inkscape_driver/eggbot.inx
@@ -4,7 +4,6 @@
   <id>command.evilmadscientist.eggbot.rev280b1</id>
   <dependency type="extension">org.inkscape.output.svg.inkscape</dependency>
   <dependency type="executable" location="extensions">eggbot.py</dependency>
-  <dependency type="executable" location="extensions">inkex.py</dependency>
   <param name="tab" type="notebook">
   
     <page name="splash" _gui-text="Plot">
diff --git a/inkscape_driver/eggbot_presethatch.inx b/inkscape_driver/eggbot_presethatch.inx
index dc2c528..16e0fc2 100755
--- a/inkscape_driver/eggbot_presethatch.inx
+++ b/inkscape_driver/eggbot_presethatch.inx
@@ -3,7 +3,6 @@
    <_name>Preset hatch for fills</_name>
    <id>command.evilmadscience.hatch.eggbot</id>
        <dependency type="executable" location="extensions">eggbot_presethatch.py</dependency>
-       <dependency type="executable" location="extensions">inkex.py</dependency>
        <_param name="title" type="description" xml:space="preserve">
 This extension applies a set of eggbot-friendly
 default presets to the live path effect called
diff --git a/inkscape_driver/eggbot_reorder.inx b/inkscape_driver/eggbot_reorder.inx
index 4d9ef33..f454a09 100755
--- a/inkscape_driver/eggbot_reorder.inx
+++ b/inkscape_driver/eggbot_reorder.inx
@@ -3,8 +3,6 @@
   <_name>Reorder Paths for Speed</_name>
   <id>command.evilmadscientist.eggbot.reorder</id>
   <dependency type="executable" location="extensions">axidraw_svg_reorder.py</dependency>
-  <dependency type="executable" location="extensions">inkex.py</dependency>
-
 
 <_param indent="5" name="splashpage" type="description" 
 appearance="header">EggBot Plot Optimization Tool</_param>
diff --git a/inkscape_driver/empty_eggbot.inx b/inkscape_driver/empty_eggbot.inx
index 4bc20bf..a6aabae 100644
--- a/inkscape_driver/empty_eggbot.inx
+++ b/inkscape_driver/empty_eggbot.inx
@@ -3,7 +3,6 @@
     <_name>EggBot Template</_name>
     <id>org.inkscape.render.empty_eggbot</id>
     <dependency type="executable" location="extensions">empty_eggbot.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
     
     <!--
     <param name="layer" type="boolean" _gui-text="Include default layer">true</param>

From eef4679fb0a812bd854bf3904e6dd664f68226b0 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Fri, 20 May 2022 10:32:08 -0700
Subject: [PATCH 19/19] Pull changes from Master

---
 .gitignore | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a16f582..a7b1076 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 
 **/.DS_Store
 **/*.pyc
-
-# vim:
-*.swp
+*.err
+*.o
+*.d
+*.inc