update input extension generator and INXes

30 files changed, 20 insertions, 471 deletions

diff --git a/bin/gen-input-inx b/bin/gen-input-inx
index 6351d062..ae32b43f 100755
--- a/bin/gen-input-inx
+++ b/bin/gen-input-inx
@@ -2,7 +2,7 @@
 
 import sys, os
 from os.path import dirname
-from libembroidery import *
+import pyembroidery
 from jinja2 import Environment, FileSystemLoader, select_autoescape
 
 
@@ -15,30 +15,21 @@ def build_environment():
     )
 
 
-def libembroidery_input_formats():
-    formatList = embFormatList_create()
-    curFormat = formatList
-    while(curFormat):
-        extension = embFormat_extension(curFormat)
-        description = embFormat_description(curFormat)
-        reader_state = embFormat_readerState(curFormat)
-
-        if reader_state.strip() and embFormat_type(curFormat) != EMBFORMAT_OBJECTONLY:
-            # extension includes the dot, so we'll remove it
-            yield extension[1:], description
-
-        curFormat = curFormat.next
+def pyembroidery_input_formats():
+    for format in pyembroidery.supported_formats():
+        if 'reader' in format and format['category'] == 'embroidery':
+            yield format['extension'], format['description']
 
 
 def main():
     env = build_environment()
     template = env.get_template('embroider_input.inx')
 
-    for format, description in libembroidery_input_formats():
+    for format, description in pyembroidery_input_formats():
         inx = template.render(format=format, description=description)
 
         with open("inx/inkstitch_input_%s.inx" % format.upper(), 'w') as inx_file:
-            inx_file.write(inx)
+            print >> inx_file, inx
 
 
 if __name__ == "__main__":
diff --git a/inx/inkstitch_input_COL.inx b/inx/inkstitch_input_COL.inx
deleted file mode 100644
index 38ebe7bd..00000000
--- a/inx/inkstitch_input_COL.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>COL file input</_name>
-    <id>org.inkstitch.input.col</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.col</extension>
-        <mimetype>application/x-embroidery-col</mimetype>
-        <_filetypename>Ink/Stitch: Embroidery Thread Color Format (.col)</_filetypename>
-        <_filetypetooltip>convert COL file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_CSD.inx b/inx/inkstitch_input_CSD.inx
deleted file mode 100644
index 444270f0..00000000
--- a/inx/inkstitch_input_CSD.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>CSD file input</_name>
-    <id>org.inkstitch.input.csd</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.csd</extension>
-        <mimetype>application/x-embroidery-csd</mimetype>
-        <_filetypename>Ink/Stitch: Singer Embroidery Format (.csd)</_filetypename>
-        <_filetypetooltip>convert CSD file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_CSV.inx b/inx/inkstitch_input_CSV.inx
deleted file mode 100644
index 0c3e2096..00000000
--- a/inx/inkstitch_input_CSV.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>CSV file input</_name>
-    <id>org.inkstitch.input.csv</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.csv</extension>
-        <mimetype>application/x-embroidery-csv</mimetype>
-        <_filetypename>Ink/Stitch: Comma Separated Values Format (.csv)</_filetypename>
-        <_filetypetooltip>convert CSV file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_DAT.inx b/inx/inkstitch_input_DAT.inx
deleted file mode 100644
index e82694b8..00000000
--- a/inx/inkstitch_input_DAT.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>DAT file input</_name>
-    <id>org.inkstitch.input.dat</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.dat</extension>
-        <mimetype>application/x-embroidery-dat</mimetype>
-        <_filetypename>Ink/Stitch: Barudan Embroidery Format (.dat)</_filetypename>
-        <_filetypetooltip>convert DAT file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_DSB.inx b/inx/inkstitch_input_DSB.inx
index 8b7c6b02..c78e1c2d 100644
--- a/inx/inkstitch_input_DSB.inx
+++ b/inx/inkstitch_input_DSB.inx
@@ -7,7 +7,7 @@
     <input>
         <extension>.dsb</extension>
         <mimetype>application/x-embroidery-dsb</mimetype>
-        <_filetypename>Ink/Stitch: Barudan Embroidery Format (.dsb)</_filetypename>
+        <_filetypename>Ink/Stitch: Tajima(Barudan) Embroidery Format (.dsb)</_filetypename>
         <_filetypetooltip>convert DSB file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
     <param name="extension" type="string" gui-hidden="true">input</param>
diff --git a/inx/inkstitch_input_EXY.inx b/inx/inkstitch_input_EXY.inx
deleted file mode 100644
index 78de68d8..00000000
--- a/inx/inkstitch_input_EXY.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>EXY file input</_name>
-    <id>org.inkstitch.input.exy</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.exy</extension>
-        <mimetype>application/x-embroidery-exy</mimetype>
-        <_filetypename>Ink/Stitch: Eltac Embroidery Format (.exy)</_filetypename>
-        <_filetypetooltip>convert EXY file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_FXY.inx b/inx/inkstitch_input_FXY.inx
deleted file mode 100644
index c2be8c60..00000000
--- a/inx/inkstitch_input_FXY.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>FXY file input</_name>
-    <id>org.inkstitch.input.fxy</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.fxy</extension>
-        <mimetype>application/x-embroidery-fxy</mimetype>
-        <_filetypename>Ink/Stitch: Fortron Embroidery Format (.fxy)</_filetypename>
-        <_filetypetooltip>convert FXY file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_GT.inx b/inx/inkstitch_input_GT.inx
deleted file mode 100644
index 20a9fda0..00000000
--- a/inx/inkstitch_input_GT.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>GT file input</_name>
-    <id>org.inkstitch.input.gt</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.gt</extension>
-        <mimetype>application/x-embroidery-gt</mimetype>
-        <_filetypename>Ink/Stitch: Gold Thread Embroidery Format (.gt)</_filetypename>
-        <_filetypetooltip>convert GT file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_HUS.inx b/inx/inkstitch_input_HUS.inx
deleted file mode 100644
index bbac96a2..00000000
--- a/inx/inkstitch_input_HUS.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>HUS file input</_name>
-    <id>org.inkstitch.input.hus</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.hus</extension>
-        <mimetype>application/x-embroidery-hus</mimetype>
-        <_filetypename>Ink/Stitch: Husqvarna Viking Embroidery Format (.hus)</_filetypename>
-        <_filetypetooltip>convert HUS file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_INF.inx b/inx/inkstitch_input_INF.inx
deleted file mode 100644
index 9c07ed7f..00000000
--- a/inx/inkstitch_input_INF.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>INF file input</_name>
-    <id>org.inkstitch.input.inf</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.inf</extension>
-        <mimetype>application/x-embroidery-inf</mimetype>
-        <_filetypename>Ink/Stitch: Embroidery Color Format (.inf)</_filetypename>
-        <_filetypetooltip>convert INF file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_MAX.inx b/inx/inkstitch_input_MAX.inx
deleted file mode 100644
index 0f5ed952..00000000
--- a/inx/inkstitch_input_MAX.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>MAX file input</_name>
-    <id>org.inkstitch.input.max</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.max</extension>
-        <mimetype>application/x-embroidery-max</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.max)</_filetypename>
-        <_filetypetooltip>convert MAX file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_MIT.inx b/inx/inkstitch_input_MIT.inx
deleted file mode 100644
index a0181182..00000000
--- a/inx/inkstitch_input_MIT.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>MIT file input</_name>
-    <id>org.inkstitch.input.mit</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.mit</extension>
-        <mimetype>application/x-embroidery-mit</mimetype>
-        <_filetypename>Ink/Stitch: Mitsubishi Embroidery Format (.mit)</_filetypename>
-        <_filetypetooltip>convert MIT file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_NEW.inx b/inx/inkstitch_input_NEW.inx
deleted file mode 100644
index 15d877d8..00000000
--- a/inx/inkstitch_input_NEW.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>NEW file input</_name>
-    <id>org.inkstitch.input.new</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.new</extension>
-        <mimetype>application/x-embroidery-new</mimetype>
-        <_filetypename>Ink/Stitch: Ameco Embroidery Format (.new)</_filetypename>
-        <_filetypetooltip>convert NEW file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_OFM.inx b/inx/inkstitch_input_OFM.inx
deleted file mode 100644
index 3e162355..00000000
--- a/inx/inkstitch_input_OFM.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>OFM file input</_name>
-    <id>org.inkstitch.input.ofm</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.ofm</extension>
-        <mimetype>application/x-embroidery-ofm</mimetype>
-        <_filetypename>Ink/Stitch: Melco Embroidery Format (.ofm)</_filetypename>
-        <_filetypetooltip>convert OFM file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_PCD.inx b/inx/inkstitch_input_PCD.inx
deleted file mode 100644
index eff3c2f7..00000000
--- a/inx/inkstitch_input_PCD.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PCD file input</_name>
-    <id>org.inkstitch.input.pcd</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.pcd</extension>
-        <mimetype>application/x-embroidery-pcd</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcd)</_filetypename>
-        <_filetypetooltip>convert PCD file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_PCM.inx b/inx/inkstitch_input_PCM.inx
deleted file mode 100644
index 684b7e20..00000000
--- a/inx/inkstitch_input_PCM.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PCM file input</_name>
-    <id>org.inkstitch.input.pcm</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.pcm</extension>
-        <mimetype>application/x-embroidery-pcm</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcm)</_filetypename>
-        <_filetypetooltip>convert PCM file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_PCQ.inx b/inx/inkstitch_input_PCQ.inx
deleted file mode 100644
index 44d2d6df..00000000
--- a/inx/inkstitch_input_PCQ.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PCQ file input</_name>
-    <id>org.inkstitch.input.pcq</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.pcq</extension>
-        <mimetype>application/x-embroidery-pcq</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcq)</_filetypename>
-        <_filetypetooltip>convert PCQ file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_PCS.inx b/inx/inkstitch_input_PCS.inx
deleted file mode 100644
index 1a030e53..00000000
--- a/inx/inkstitch_input_PCS.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PCS file input</_name>
-    <id>org.inkstitch.input.pcs</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.pcs</extension>
-        <mimetype>application/x-embroidery-pcs</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcs)</_filetypename>
-        <_filetypetooltip>convert PCS file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_PHB.inx b/inx/inkstitch_input_PHB.inx
deleted file mode 100644
index 0e14f097..00000000
--- a/inx/inkstitch_input_PHB.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PHB file input</_name>
-    <id>org.inkstitch.input.phb</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.phb</extension>
-        <mimetype>application/x-embroidery-phb</mimetype>
-        <_filetypename>Ink/Stitch: Brother Embroidery Format (.phb)</_filetypename>
-        <_filetypetooltip>convert PHB file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_PHC.inx b/inx/inkstitch_input_PHC.inx
deleted file mode 100644
index 3c2d10f5..00000000
--- a/inx/inkstitch_input_PHC.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PHC file input</_name>
-    <id>org.inkstitch.input.phc</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.phc</extension>
-        <mimetype>application/x-embroidery-phc</mimetype>
-        <_filetypename>Ink/Stitch: Brother Embroidery Format (.phc)</_filetypename>
-        <_filetypetooltip>convert PHC file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_PLT.inx b/inx/inkstitch_input_PLT.inx
deleted file mode 100644
index d811ff02..00000000
--- a/inx/inkstitch_input_PLT.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PLT file input</_name>
-    <id>org.inkstitch.input.plt</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.plt</extension>
-        <mimetype>application/x-embroidery-plt</mimetype>
-        <_filetypename>Ink/Stitch: AutoCAD Plot Drawing Format (.plt)</_filetypename>
-        <_filetypetooltip>convert PLT file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_RGB.inx b/inx/inkstitch_input_RGB.inx
deleted file mode 100644
index b64e285b..00000000
--- a/inx/inkstitch_input_RGB.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>RGB file input</_name>
-    <id>org.inkstitch.input.rgb</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.rgb</extension>
-        <mimetype>application/x-embroidery-rgb</mimetype>
-        <_filetypename>Ink/Stitch: RGB Embroidery Format (.rgb)</_filetypename>
-        <_filetypetooltip>convert RGB file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_SST.inx b/inx/inkstitch_input_SST.inx
deleted file mode 100644
index 85533659..00000000
--- a/inx/inkstitch_input_SST.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>SST file input</_name>
-    <id>org.inkstitch.input.sst</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.sst</extension>
-        <mimetype>application/x-embroidery-sst</mimetype>
-        <_filetypename>Ink/Stitch: Sunstar Embroidery Format (.sst)</_filetypename>
-        <_filetypetooltip>convert SST file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_T09.inx b/inx/inkstitch_input_T09.inx
deleted file mode 100644
index eb6ab6d9..00000000
--- a/inx/inkstitch_input_T09.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>T09 file input</_name>
-    <id>org.inkstitch.input.t09</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.t09</extension>
-        <mimetype>application/x-embroidery-t09</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.t09)</_filetypename>
-        <_filetypetooltip>convert T09 file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_EDR.inx b/inx/inkstitch_input_TBF.inx
index 92cf7d14..e2b72ec9 100644
--- a/inx/inkstitch_input_EDR.inx
+++ b/inx/inkstitch_input_TBF.inx
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>EDR file input</_name>
-    <id>org.inkstitch.input.edr</id>
+    <_name>TBF file input</_name>
+    <id>org.inkstitch.input.tbf</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
-        <extension>.edr</extension>
-        <mimetype>application/x-embroidery-edr</mimetype>
-        <_filetypename>Ink/Stitch: Embird Embroidery Format (.edr)</_filetypename>
-        <_filetypetooltip>convert EDR file to Ink/Stitch manual-stitch paths</_filetypetooltip>
+        <extension>.tbf</extension>
+        <mimetype>application/x-embroidery-tbf</mimetype>
+        <_filetypename>Ink/Stitch: Tajima Embroidery Format (.tbf)</_filetypename>
+        <_filetypetooltip>convert TBF file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
     <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
diff --git a/inx/inkstitch_input_THR.inx b/inx/inkstitch_input_THR.inx
deleted file mode 100644
index e6a6e09e..00000000
--- a/inx/inkstitch_input_THR.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>THR file input</_name>
-    <id>org.inkstitch.input.thr</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.thr</extension>
-        <mimetype>application/x-embroidery-thr</mimetype>
-        <_filetypename>Ink/Stitch: ThredWorks Embroidery Format (.thr)</_filetypename>
-        <_filetypetooltip>convert THR file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_U00.inx b/inx/inkstitch_input_U01.inx
index b28da66d..befadd5b 100644
--- a/inx/inkstitch_input_U00.inx
+++ b/inx/inkstitch_input_U01.inx
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>U00 file input</_name>
-    <id>org.inkstitch.input.u00</id>
+    <_name>U01 file input</_name>
+    <id>org.inkstitch.input.u01</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
-        <extension>.u00</extension>
-        <mimetype>application/x-embroidery-u00</mimetype>
-        <_filetypename>Ink/Stitch: Barudan Embroidery Format (.u00)</_filetypename>
-        <_filetypetooltip>convert U00 file to Ink/Stitch manual-stitch paths</_filetypetooltip>
+        <extension>.u01</extension>
+        <mimetype>application/x-embroidery-u01</mimetype>
+        <_filetypename>Ink/Stitch: Barudan Embroidery Format (.u01)</_filetypename>
+        <_filetypetooltip>convert U01 file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
     <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
diff --git a/inx/inkstitch_input_VIP.inx b/inx/inkstitch_input_VIP.inx
deleted file mode 100644
index 3723285c..00000000
--- a/inx/inkstitch_input_VIP.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>VIP file input</_name>
-    <id>org.inkstitch.input.vip</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.vip</extension>
-        <mimetype>application/x-embroidery-vip</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.vip)</_filetypename>
-        <_filetypetooltip>convert VIP file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/inkstitch_input_ZSK.inx b/inx/inkstitch_input_ZSK.inx
deleted file mode 100644
index 4178126f..00000000
--- a/inx/inkstitch_input_ZSK.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>ZSK file input</_name>
-    <id>org.inkstitch.input.zsk</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.zsk</extension>
-        <mimetype>application/x-embroidery-zsk</mimetype>
-        <_filetypename>Ink/Stitch: ZSK USA Embroidery Format (.zsk)</_filetypename>
-        <_filetypetooltip>convert ZSK file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>