22 files changed, 13 insertions, 307 deletions
diff --git a/bin/gen-output-inx b/bin/gen-output-inx
index f167dbee..fbe2ad55 100755
--- a/bin/gen-output-inx
+++ b/bin/gen-output-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_output_formats():
-    formatList = embFormatList_create()
-    curFormat = formatList
-    while(curFormat):
-        extension = embFormat_extension(curFormat)
-        description = embFormat_description(curFormat)
-        writer_state = embFormat_writerState(curFormat)
-
-        if writer_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_output_formats():
+    for format in pyembroidery.supported_formats():
+        if 'writer' in format and format['category'] == 'embroidery':
+            yield format['extension'], format['description']
 
 
 def main():
     env = build_environment()
     template = env.get_template('embroider_output.inx')
 
-    for format, description in libembroidery_output_formats():
+    for format, description in pyembroidery_output_formats():
         inx = template.render(format=format, description=description)
 
         with open("inx/inkstitch_output_%s.inx" % format.upper(), 'w') as inx_file:
-            inx_file.write(inx)
+            print >> inx_file, inx
 
 
 if __name__ == "__main__":
diff --git a/inx/inkstitch_output_COL.inx b/inx/inkstitch_output_COL.inx
deleted file mode 100644
index 8a240a38..00000000
--- a/inx/inkstitch_output_COL.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>COL file output</_name>
-    <id>org.inkstitch.output.col</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.col</extension>
-        <mimetype>application/x-embroidery-col</mimetype>
-        <_filetypename>Ink/Stitch: Embroidery Thread Color Format (.col)</_filetypename>
-        <_filetypetooltip>Save design in COL format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">col</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_CSV.inx b/inx/inkstitch_output_CSV.inx
deleted file mode 100644
index d2f340cd..00000000
--- a/inx/inkstitch_output_CSV.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>CSV file output</_name>
-    <id>org.inkstitch.output.csv</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.csv</extension>
-        <mimetype>application/x-embroidery-csv</mimetype>
-        <_filetypename>Ink/Stitch: Comma Separated Values Format (.csv)</_filetypename>
-        <_filetypetooltip>Save design in CSV format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">csv</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_DST.inx b/inx/inkstitch_output_DST.inx
index 2230600a..fa034f40 100644
--- a/inx/inkstitch_output_DST.inx
+++ b/inx/inkstitch_output_DST.inx
@@ -16,4 +16,4 @@
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
-</inkscape-extension>
-\ No newline at end of file
+</inkscape-extension>
diff --git a/inx/inkstitch_output_EDR.inx b/inx/inkstitch_output_EDR.inx
deleted file mode 100644
index 0756b37a..00000000
--- a/inx/inkstitch_output_EDR.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>EDR file output</_name>
-    <id>org.inkstitch.output.edr</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.edr</extension>
-        <mimetype>application/x-embroidery-edr</mimetype>
-        <_filetypename>Ink/Stitch: Embird Embroidery Format (.edr)</_filetypename>
-        <_filetypetooltip>Save design in EDR format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">edr</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_EXP.inx b/inx/inkstitch_output_EXP.inx
index ce98dbc0..853bab9f 100644
--- a/inx/inkstitch_output_EXP.inx
+++ b/inx/inkstitch_output_EXP.inx
@@ -16,4 +16,4 @@
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
-</inkscape-extension>
-\ No newline at end of file
+</inkscape-extension>
diff --git a/inx/inkstitch_output_HUS.inx b/inx/inkstitch_output_HUS.inx
deleted file mode 100644
index 44536f2a..00000000
--- a/inx/inkstitch_output_HUS.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>HUS file output</_name>
-    <id>org.inkstitch.output.hus</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.hus</extension>
-        <mimetype>application/x-embroidery-hus</mimetype>
-        <_filetypename>Ink/Stitch: Husqvarna Viking Embroidery Format (.hus)</_filetypename>
-        <_filetypetooltip>Save design in HUS format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">hus</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_INF.inx b/inx/inkstitch_output_INF.inx
deleted file mode 100644
index 47c2b63e..00000000
--- a/inx/inkstitch_output_INF.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>INF file output</_name>
-    <id>org.inkstitch.output.inf</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.inf</extension>
-        <mimetype>application/x-embroidery-inf</mimetype>
-        <_filetypename>Ink/Stitch: Embroidery Color Format (.inf)</_filetypename>
-        <_filetypetooltip>Save design in INF format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">inf</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_JEF.inx b/inx/inkstitch_output_JEF.inx
index af92a836..74b752fc 100644
--- a/inx/inkstitch_output_JEF.inx
+++ b/inx/inkstitch_output_JEF.inx
@@ -16,4 +16,4 @@
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
-</inkscape-extension>
-\ No newline at end of file
+</inkscape-extension>
diff --git a/inx/inkstitch_output_KSM.inx b/inx/inkstitch_output_KSM.inx
deleted file mode 100644
index ad5ae4dd..00000000
--- a/inx/inkstitch_output_KSM.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>KSM file output</_name>
-    <id>org.inkstitch.output.ksm</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.ksm</extension>
-        <mimetype>application/x-embroidery-ksm</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.ksm)</_filetypename>
-        <_filetypetooltip>Save design in KSM format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">ksm</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_MAX.inx b/inx/inkstitch_output_MAX.inx
deleted file mode 100644
index 45a5ba01..00000000
--- a/inx/inkstitch_output_MAX.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>MAX file output</_name>
-    <id>org.inkstitch.output.max</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.max</extension>
-        <mimetype>application/x-embroidery-max</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.max)</_filetypename>
-        <_filetypetooltip>Save design in MAX format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">max</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_PCD.inx b/inx/inkstitch_output_PCD.inx
deleted file mode 100644
index b42f79de..00000000
--- a/inx/inkstitch_output_PCD.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PCD file output</_name>
-    <id>org.inkstitch.output.pcd</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.pcd</extension>
-        <mimetype>application/x-embroidery-pcd</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcd)</_filetypename>
-        <_filetypetooltip>Save design in PCD format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">pcd</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_PCQ.inx b/inx/inkstitch_output_PCQ.inx
deleted file mode 100644
index 1764f670..00000000
--- a/inx/inkstitch_output_PCQ.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PCQ file output</_name>
-    <id>org.inkstitch.output.pcq</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.pcq</extension>
-        <mimetype>application/x-embroidery-pcq</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcq)</_filetypename>
-        <_filetypetooltip>Save design in PCQ format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">pcq</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_PCS.inx b/inx/inkstitch_output_PCS.inx
deleted file mode 100644
index ef07c4bd..00000000
--- a/inx/inkstitch_output_PCS.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PCS file output</_name>
-    <id>org.inkstitch.output.pcs</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.pcs</extension>
-        <mimetype>application/x-embroidery-pcs</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcs)</_filetypename>
-        <_filetypetooltip>Save design in PCS format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">pcs</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_PEC.inx b/inx/inkstitch_output_PEC.inx
index 15880ce6..6d76b165 100644
--- a/inx/inkstitch_output_PEC.inx
+++ b/inx/inkstitch_output_PEC.inx
@@ -16,4 +16,4 @@
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
-</inkscape-extension>
-\ No newline at end of file
+</inkscape-extension>
diff --git a/inx/inkstitch_output_PES.inx b/inx/inkstitch_output_PES.inx
index cd7e7369..b821225a 100644
--- a/inx/inkstitch_output_PES.inx
+++ b/inx/inkstitch_output_PES.inx
@@ -16,4 +16,4 @@
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
-</inkscape-extension>
-\ No newline at end of file
+</inkscape-extension>
diff --git a/inx/inkstitch_output_PLT.inx b/inx/inkstitch_output_PLT.inx
deleted file mode 100644
index 649ef76b..00000000
--- a/inx/inkstitch_output_PLT.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>PLT file output</_name>
-    <id>org.inkstitch.output.plt</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.plt</extension>
-        <mimetype>application/x-embroidery-plt</mimetype>
-        <_filetypename>Ink/Stitch: AutoCAD Plot Drawing Format (.plt)</_filetypename>
-        <_filetypetooltip>Save design in PLT format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">plt</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_RGB.inx b/inx/inkstitch_output_RGB.inx
deleted file mode 100644
index e60d729e..00000000
--- a/inx/inkstitch_output_RGB.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>RGB file output</_name>
-    <id>org.inkstitch.output.rgb</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.rgb</extension>
-        <mimetype>application/x-embroidery-rgb</mimetype>
-        <_filetypename>Ink/Stitch: RGB Embroidery Format (.rgb)</_filetypename>
-        <_filetypetooltip>Save design in RGB format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">rgb</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_THR.inx b/inx/inkstitch_output_THR.inx
deleted file mode 100644
index c460bdfc..00000000
--- a/inx/inkstitch_output_THR.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>THR file output</_name>
-    <id>org.inkstitch.output.thr</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.thr</extension>
-        <mimetype>application/x-embroidery-thr</mimetype>
-        <_filetypename>Ink/Stitch: ThredWorks Embroidery Format (.thr)</_filetypename>
-        <_filetypetooltip>Save design in THR format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">thr</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_TXT.inx b/inx/inkstitch_output_TXT.inx
deleted file mode 100644
index 805deffe..00000000
--- a/inx/inkstitch_output_TXT.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>TXT file output</_name>
-    <id>org.inkstitch.output.txt</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.txt</extension>
-        <mimetype>application/x-embroidery-txt</mimetype>
-        <_filetypename>Ink/Stitch: Text File (.txt)</_filetypename>
-        <_filetypetooltip>Save design in TXT format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">txt</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file
diff --git a/inx/inkstitch_output_VP3.inx b/inx/inkstitch_output_VP3.inx
index dff29de4..11843420 100644
--- a/inx/inkstitch_output_VP3.inx
+++ b/inx/inkstitch_output_VP3.inx
@@ -16,4 +16,4 @@
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
-</inkscape-extension>
-\ No newline at end of file
+</inkscape-extension>
diff --git a/inx/inkstitch_output_XXX.inx b/inx/inkstitch_output_XXX.inx
deleted file mode 100644
index ad4135b0..00000000
--- a/inx/inkstitch_output_XXX.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>XXX file output</_name>
-    <id>org.inkstitch.output.xxx</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.xxx</extension>
-        <mimetype>application/x-embroidery-xxx</mimetype>
-        <_filetypename>Ink/Stitch: Singer Embroidery Format (.xxx)</_filetypename>
-        <_filetypetooltip>Save design in XXX format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">xxx</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
-\ No newline at end of file