Index: incubator/apertium-eng-cat/Makefile.am
===================================================================
--- incubator/apertium-eng-cat/Makefile.am	(revision 81916)
+++ incubator/apertium-eng-cat/Makefile.am	(revision 81917)
@@ -44,6 +44,7 @@
 	$(PREFIX1).t1x.bin	\
 	$(PREFIX1).t2x.bin	\
 	$(PREFIX1).t3x.bin	\
+	$(PREFIX1).autosep.bin	\
 	$(PREFIX2).automorf.bin	\
 	$(PREFIX2).prob		\
 	$(PREFIX2).rlx.bin	\
@@ -183,6 +184,13 @@
 	lrx-comp $< $@
 
 ###############################################################################
+## Reordering separable/discontiguous multiwords
+###############################################################################
+
+$(PREFIX1).autosep.bin: $(BASENAME).$(PREFIX1).lsx
+	lsx-comp $< $@
+
+###############################################################################
 ## Structural transfer rules
 ###############################################################################
 
@@ -215,7 +223,6 @@
 ## Postgeneration dictionaries
 ###############################################################################
 
-
 ###############################################################################
 ## Distribution
 ###############################################################################
Index: incubator/apertium-eng-cat/apertium-eng-cat.eng-cat.lsx
===================================================================
--- incubator/apertium-eng-cat/apertium-eng-cat.eng-cat.lsx	(nonexistent)
+++ incubator/apertium-eng-cat/apertium-eng-cat.eng-cat.lsx	(revision 81917)
@@ -0,0 +1,31 @@
+<dictionary type="separable">
+    <alphabet>ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz</alphabet>
+    <sdefs>
+        <sdef n="adj"/>
+        <sdef n="adv"/>
+        <sdef n="n"/>
+        <sdef n="sep"/>
+        <sdef n="vblex"/>
+    </sdefs>
+    <pardefs>
+        <pardef n="adj">
+            <e><i><w/><s n="adj"/><j/></i></e>
+            <e><i><w/><s n="adj"/><t/><j/></i></e>
+        </pardef>
+        <pardef n="n">
+            <e><i><w/><s n="n"/><t/><j/></i></e>
+        </pardef>
+        <pardef n="SN">
+            <e><par n="n"/></e>
+            <e><par n="adj"/><par n="n"/></e>
+            <e><par n="adj"/><par n="adj"/><par n="n"/></e>
+        </pardef>
+        <pardef n="freq-adv">
+            <e><i>always<s n="adv"/><j/></i></e>
+            <e><i>anually<s n="adv"/><j/></i></e>
+            <e><i>bianually<s n="adv"/><j/></i></e>
+        </pardef>
+    </pardefs>
+    <section id="main" type="standard">
+    </section>
+</dictionary>
Index: incubator/apertium-eng-cat/configure.ac
===================================================================
--- incubator/apertium-eng-cat/configure.ac	(revision 81916)
+++ incubator/apertium-eng-cat/configure.ac	(revision 81917)
@@ -23,6 +23,9 @@
 AC_PATH_PROG([LRXPROC], [lrx-proc], [false], [$PATH$PATH_SEPARATOR$with_lrx_proc/bin])
 AS_IF([test x$LRXPROC = xfalse], [AC_MSG_ERROR([You don't have lrx-proc installed])])
 
+AC_PATH_PROG([LSXCOMP], [lsx-comp], [false], [$PATH$PATH_SEPARATOR$with_lsx_comp/bin])
+AS_IF([test x$LSXCOMP = xfalse], [AC_MSG_ERROR([You don't have lsx-comp installed])])
+
 AC_PATH_PROGS(ZCAT, [gzcat zcat], [false])
 AS_IF([test x$ZCAT = xfalse], [AC_MSG_ERROR([You don't have zcat nor gzcat installed])])
 
Index: incubator/apertium-eng-cat/modes.xml
===================================================================
--- incubator/apertium-eng-cat/modes.xml	(revision 81916)
+++ incubator/apertium-eng-cat/modes.xml	(revision 81917)
@@ -13,9 +13,12 @@
       <program name="cg-proc -w">
         <file name="eng-cat.rlx.bin"/>
       </program>
-      <program name="apertium-tagger -gx $2">
+      <program name="apertium-tagger -gx">
         <file name="eng-cat.prob"/>
       </program>
+      <program name="lsx-proc">
+        <file name="eng-cat.autosep.bin"/>
+      </program>
       <program name="apertium-pretransfer"/>
       <program name="lt-proc -b">
         <file name="eng-cat.autobil.bin"/>
@@ -55,9 +58,12 @@
       <program name="cg-proc -w">
         <file name="eng-cat.rlx.bin"/>
       </program>
-      <program name="apertium-tagger -gx $2">
+      <program name="apertium-tagger -gx">
         <file name="eng-cat.prob"/>
       </program>
+      <program name="lsx-proc">
+        <file name="eng-cat.autosep.bin"/>
+      </program>
       <program name="apertium-pretransfer"/>
       <program name="lt-proc -b">
         <file name="eng-cat.autobil.bin"/>
@@ -110,12 +116,31 @@
       <program name="cg-proc -w">
         <file name="eng-cat.rlx.bin"/>
       </program>
-      <program name="apertium-tagger -gx $2">
+      <program name="apertium-tagger -gx">
         <file name="eng-cat.prob"/>
       </program>
     </pipeline>
   </mode>
 
+  <mode name="eng-cat-separate" install="no">
+    <pipeline>
+      <program name="lt-proc -w">
+        <file name="eng-cat.automorf.bin"/>
+      </program>
+
+
+      <program name="cg-proc -w">
+        <file name="eng-cat.rlx.bin"/>
+      </program>
+      <program name="apertium-tagger -gx">
+        <file name="eng-cat.prob"/>
+      </program>
+      <program name="lsx-proc">
+        <file name="eng-cat.autosep.bin"/>
+      </program>
+    </pipeline>
+  </mode>
+
   <mode name="eng-cat-pretransfer" install="no">
     <pipeline>
       <program name="lt-proc -w">
@@ -126,9 +151,12 @@
       <program name="cg-proc -w">
         <file name="eng-cat.rlx.bin"/>
       </program>
-      <program name="apertium-tagger -gx $2">
+      <program name="apertium-tagger -gx">
         <file name="eng-cat.prob"/>
       </program>
+      <program name="lsx-proc">
+        <file name="eng-cat.autosep.bin"/>
+      </program>
       <program name="apertium-pretransfer"/>
     </pipeline>
   </mode>
@@ -143,9 +171,12 @@
       <program name="cg-proc -w">
         <file name="eng-cat.rlx.bin"/>
       </program>
-      <program name="apertium-tagger -gx $2">
+      <program name="apertium-tagger -gx">
         <file name="eng-cat.prob"/>
       </program>
+      <program name="lsx-proc">
+        <file name="eng-cat.autosep.bin"/>
+      </program>
       <program name="apertium-pretransfer"/>
       <program name="lt-proc -b">
         <file name="eng-cat.autobil.bin"/>
@@ -163,9 +194,12 @@
       <program name="cg-proc -w">
         <file name="eng-cat.rlx.bin"/>
       </program>
-      <program name="apertium-tagger -gx $2">
+      <program name="apertium-tagger -gx">
         <file name="eng-cat.prob"/>
       </program>
+      <program name="lsx-proc">
+        <file name="eng-cat.autosep.bin"/>
+      </program>
       <program name="apertium-pretransfer"/>
       <program name="lt-proc -b">
         <file name="eng-cat.autobil.bin"/>
@@ -186,9 +220,12 @@
       <program name="cg-proc -w">
         <file name="eng-cat.rlx.bin"/>
       </program>
-      <program name="apertium-tagger -gx $2">
+      <program name="apertium-tagger -gx">
         <file name="eng-cat.prob"/>
       </program>
+      <program name="lsx-proc">
+        <file name="eng-cat.autosep.bin"/>
+      </program>
       <program name="apertium-pretransfer"/>
       <program name="lt-proc -b">
         <file name="eng-cat.autobil.bin"/>
@@ -213,9 +250,12 @@
       <program name="cg-proc -w">
         <file name="eng-cat.rlx.bin"/>
       </program>
-      <program name="apertium-tagger -gx $2">
+      <program name="apertium-tagger -gx">
         <file name="eng-cat.prob"/>
       </program>
+      <program name="lsx-proc">
+        <file name="eng-cat.autosep.bin"/>
+      </program>
       <program name="apertium-pretransfer"/>
       <program name="lt-proc -b">
         <file name="eng-cat.autobil.bin"/>
@@ -244,9 +284,12 @@
       <program name="cg-proc -w">
         <file name="eng-cat.rlx.bin"/>
       </program>
-      <program name="apertium-tagger -gx $2">
+      <program name="apertium-tagger -gx">
         <file name="eng-cat.prob"/>
       </program>
+      <program name="lsx-proc">
+        <file name="eng-cat.autosep.bin"/>
+      </program>
       <program name="apertium-pretransfer"/>
       <program name="lt-proc -b">
         <file name="eng-cat.autobil.bin"/>