Index: incubator/apertium-eng-cat/apertium-eng-cat.eng-cat.t1x
===================================================================
--- incubator/apertium-eng-cat/apertium-eng-cat.eng-cat.t1x	(revision 81957)
+++ incubator/apertium-eng-cat/apertium-eng-cat.eng-cat.t1x	(revision 81959)
@@ -155,11 +155,15 @@
       <cat-item tags="prn.pos.*"/>
     </def-cat>
 
-    <def-cat n="imperatiu">
-      <cat-item tags="vblex.imp.*"/>
-      <cat-item tags="vblex.sep.imp.*"/>
+    <def-cat n="verbimp">
+      <cat-item tags="vblex.imp"/>
+      <cat-item tags="vblex.sep.imp"/>
     </def-cat>
 
+    <def-cat n="verbdoimp">
+      <cat-item tags="vbdo.imp"/>
+    </def-cat>
+
     <def-cat n="verbcj">
       <!--	  <cat-item tags="vblex.inf"/>-->
       <cat-item tags="vblex.pres"/>
@@ -551,6 +555,10 @@
       <cat-item lemma="never" tags="adv"/>
     </def-cat>
 
+    <def-cat n="not"><!--BCN-->
+      <cat-item lemma="not" tags="adv"/>
+    </def-cat>
+
     <def-cat n="non">
       <cat-item lemma="non" tags="adv"/>
     </def-cat>
@@ -3990,97 +3998,6 @@
       </choose>
     </def-macro>
 
-    <def-macro n="split_verb" npar="1" comment="Splits the verb 'make public'. '''This rule should be ditched in favour of apertium-separable'''">
-      <choose> <!-- Remember to also change output_adj, below -->
-	<when> 
-	  <test>
-	    <equal>
-	      <clip pos="1" side="sl" part="lem"/>
-	      <lit v="make# public"/>
-	    </equal>
-	  </test>
-	  <let>
-	    <clip pos="1" side="tl" part="lem"/>
-	    <lit v="fer"/>
-	  </let>
-	</when>
-      </choose> 
-    </def-macro>
-
-    <def-macro n="output_adj" npar="1">
-      <choose>
-	<when> 
-	  <test>
-	    <equal>
-	      <clip pos="1" side="sl" part="lem"/>
-	      <lit v="make# public"/>
-	    </equal>
-	  </test>
-	  <out>
-	    <b/>
-	    <chunk name="adj_obj">
-	      <tags>
-	        <tag><lit-tag v="SAobj"/></tag>
-	        <tag><lit-tag v="GD"/></tag>
-	        <tag><lit-tag v="ND"/></tag>
-	      </tags>
-	      <lu>
-	        <lit v="públic"/>
-	        <lit-tag v="adj.2.3"/>
-	      </lu>
-            </chunk>
-          </out>
-	</when>
-      </choose> 
-    </def-macro>
-
-    <def-macro n="output_adj2" npar="2">
-      <choose>
-        <when>
-          <test>
-             <equal>
-               <clip pos="2" side="sl" part="nbr"/>
-               <lit-tag v="sp"/>
-             </equal>
-          </test>
-          <let>
-            <var n="nbr_adj"/>
-            <lit-tag v="ND"/>
-          </let>
-        </when>
-        <otherwise>
-          <let>
-            <var n="nbr_adj"/>
-            <clip pos="2" side="sl" part="nbr"/>
-          </let>
-        </otherwise>
-      </choose>
-      <choose>
-	<when> 
-	  <test>
-	    <equal>
-	      <clip pos="1" side="sl" part="lem"/>
-	      <lit v="make# public"/>
-	    </equal>
-	  </test>
-	  <out>
-	    <b/>
-	    <chunk name="adj"> <!-- *not* adj_obj, because we already have the agreement. This is crappy. -->
-	      <tags>
-	        <tag><lit-tag v="SA"/></tag>
-	        <tag><lit-tag v="m"/></tag>
-	        <tag><var n="nbr_adj"/></tag>
-	      </tags>
-	      <lu>
-	        <lit v="públic"/>
-	        <lit-tag v="adj.2.3"/>
-	      </lu>
-            </chunk>
-          </out>
-	</when>
-      </choose> 
-    </def-macro>
-
     <def-macro n="pron" npar="1"><!--Aquesta macro s'ha d'aplicar, en les regles, després de la macro tipus_verbs. Asigna a la variable 'pronom' el valor del pronom que han de dur els verbs pronominals -->
       <let>
 	<var n="pronom"/>
@@ -17098,7 +17015,88 @@
 
 
 
-    
+
+    <rule comment="Sing -> canta (needs to support verbs with pronouns)">
+      <pattern>
+	<pattern-item n="verbimp"/>
+      </pattern>
+      <action>    
+	<call-macro n="firstWord">
+	  <with-param pos="1"/>
+	</call-macro>
+	<call-macro n="tipus_verbs">
+	  <with-param pos="1"/>
+	</call-macro>
+	<call-macro n="pron">
+	  <with-param pos="1"/>
+	</call-macro>
+	    <out>
+	      <chunk name="SVimp" case="caseFirstWord">
+		<tags>	       
+		  <tag><lit-tag v="SV"/></tag>
+		  <tag><lit-tag v="imp"/></tag>
+		  <tag><lit-tag v="p2"/></tag>
+		  <tag><lit-tag v="sg"/></tag>
+		</tags> 		
+		<lu>
+                  <clip pos="1" side="tl" part="lemh"/> 
+	          <clip pos="1" side="tl" part="a_verb"/>
+	          <lit-tag v="2"/>
+	          <lit-tag v="3"/>
+	          <lit-tag v="4"/>
+	          <clip pos="1" side="tl" part="lemq"/>
+		</lu>
+	      </chunk>
+	    </out>
+      </action>
+    </rule>
+
+    <rule comment="Do not sing -> no canteu (needs to support verbs with pronouns)">
+      <pattern>
+	<pattern-item n="verbdoimp"/>
+	<pattern-item n="not"/>
+	<pattern-item n="inf"/>
+      </pattern>
+      <action>    
+	<call-macro n="firstWord">
+	  <with-param pos="1"/>
+	</call-macro>
+	<call-macro n="tipus_verbs">
+	  <with-param pos="1"/>
+	</call-macro>
+	<call-macro n="pron">
+	  <with-param pos="1"/>
+	</call-macro>
+	    <out>
+	      <chunk name="SVimp" case="caseFirstWord">
+		<tags>	       
+		  <tag><lit-tag v="SV"/></tag>
+		  <tag><lit-tag v="imp"/></tag>
+		  <tag><lit-tag v="p2"/></tag>
+		  <tag><lit-tag v="pl"/></tag>
+		</tags>
+		<lu>
+                  <clip pos="2" side="tl" part="whole"/>
+		</lu>	
+	        <b pos="1"/>	
+		<lu>
+                  <clip pos="3" side="tl" part="lemh"/> 
+	          <clip pos="3" side="tl" part="a_verb"/>
+	          <lit-tag v="2"/>
+	          <lit-tag v="3"/>
+	          <lit-tag v="4"/>
+	          <clip pos="3" side="tl" part="lemq"/>
+		</lu>
+	      </chunk>
+	    </out>
+	<call-macro n="f_bcond">
+	  <with-param pos="2"/>
+	  <with-param pos="3"/>
+	</call-macro>
+      </action>
+    </rule>       
+
+
     <rule comment="REGLA: VERB copulatiu">
       <pattern>
 	<pattern-item n="copulatiu"/>
@@ -17176,9 +17174,6 @@
 	<call-macro n="conj_verb1">
 	  <with-param pos="1"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="2"/>
-	</call-macro>
 	<let>
 	  <var n="lema_SV"/>
 	  <clip pos="1" side="sl" part="lem"/>
@@ -17209,9 +17204,6 @@
 	    </lu>
 	  </chunk>
 	</out>
-	<call-macro n="output_adj">
-	  <with-param pos="2"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -17364,9 +17356,6 @@
 	<call-macro n="pron">
 	  <with-param pos="1"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="1"/>
-	</call-macro>
 	<call-macro n="conj_verb1">
 	  <with-param pos="1"/>
 	</call-macro>
@@ -17385,9 +17374,6 @@
 		</lu>
 	      </chunk>
 	    </out>
-	<call-macro n="output_adj">
-	  <with-param pos="1"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -17410,9 +17396,6 @@
 	<call-macro n="conj_verb1">
 	  <with-param pos="1"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="1"/>
-	</call-macro>
 	<let>
 	  <var n="lema_SV"/><!--anteposa 'pro_' al nom del lema_SV assignat per la marco conj_verb1 -->
 	  <concat>
@@ -17443,10 +17426,6 @@
 		</lu>
 	      </chunk>
 	    </out>
-	<call-macro n="output_adj2">
-	  <with-param pos="1"/>
-	  <with-param pos="2"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -17524,9 +17503,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="1"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="1"/>
-	</call-macro>
 	<choose>
 	  <when>
 	    <test>
@@ -17598,9 +17574,6 @@
 	    </out>
 	  </when>
 	</choose>
-	<call-macro n="output_adj">
-	  <with-param pos="1"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -17616,9 +17589,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="1"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="1"/>
-	</call-macro>
 	<choose>
 	  <when>
 	    <test><!-- si és un d'aquests tres, no s'envia res-->
@@ -17700,10 +17670,6 @@
 	    </out>
 	  </when> 
 	</choose>
-	<call-macro n="output_adj2">
-	  <with-param pos="1"/>
-	  <with-param pos="2"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -17720,9 +17686,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="2"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="2"/>
-	</call-macro>
 	<let>				<!-- canvi de preposició-->
 	  <clip pos="1" side="tl" part="lem"/>
 	  <lit v ="per"/>
@@ -17809,9 +17772,6 @@
 	    </out>
 	  </when>
 	</choose>
-	<call-macro n="output_adj">
-	  <with-param pos="2"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -17828,9 +17788,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="2"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="2"/>
-	</call-macro>
 	<let>				<!-- canvi de preposició-->
 	  <clip pos="1" side="tl" part="lem"/>
 	  <lit v="per"/>
@@ -17926,10 +17883,6 @@
 	    </out>
 	  </when>
 	</choose>
-	<call-macro n="output_adj2">
-	  <with-param pos="2"/>
-	  <with-param pos="3"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -17945,9 +17898,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="1"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="1"/>
-	</call-macro>
 	<choose>
 	  <when>
 	    <test>
@@ -17997,9 +17947,6 @@
 	    </lu>
 	  </chunk>
 	</out>
-	<call-macro n="output_adj">
-	  <with-param pos="1"/>
-	</call-macro>
       </action>
     </rule>
     
@@ -18015,9 +17962,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="1"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="1"/>
-	</call-macro>
 	<choose>
 	  <when>
 	    <test>
@@ -18075,10 +18019,6 @@
 	    </lu>	
 	  </chunk>
 	</out>
-	<call-macro n="output_adj2">
-	  <with-param pos="1"/>
-	  <with-param pos="2"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -18094,9 +18034,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="1"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="1"/>
-	</call-macro>
 	<choose>
 	  <when>
 	    <test>
@@ -18146,9 +18083,6 @@
 	    </lu>
 	  </chunk>
 	</out>
-	<call-macro n="output_adj">
-	  <with-param pos="1"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -18167,9 +18101,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="1"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="1"/>
-	</call-macro>
 	<choose>
 	  <when>
 	    <test>
@@ -18227,10 +18158,6 @@
 	    </lu>	
 	  </chunk>
 	</out>
-	<call-macro n="output_adj2">
-	  <with-param pos="1"/>
-	  <with-param pos="2"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -18248,9 +18175,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="2"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="2"/>
-	</call-macro>
 	<let>
 	  <clip pos="2" side="tl" part="temps"/>
 	  <lit-tag v="inf"/>
@@ -18351,9 +18275,6 @@
 	    </lu>
 	  </chunk>
 	</out>
-	<call-macro n="output_adj">
-	  <with-param pos="2"/>
-	</call-macro>
       </action>
     </rule>
     
@@ -18370,9 +18291,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="2"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="2"/>
-	</call-macro>
 	<let>
 	  <clip pos="2" side="tl" part="temps"/>
 	  <lit-tag v="inf"/>
@@ -18471,10 +18389,6 @@
 	  <!--  </mlu>		-->
 	  </chunk>
 	</out>
-	<call-macro n="output_adj2">
-	  <with-param pos="2"/>
-	  <with-param pos="3"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -18492,9 +18406,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="3"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="3"/>
-	</call-macro>
 	<let>
 	  <clip pos="2" side="tl" part="temps"/>
 	  <lit-tag v="inf"/>
@@ -18592,9 +18503,6 @@
 	    </lu>
 	  </chunk>
 	</out>
-	<call-macro n="output_adj">
-	  <with-param pos="3"/>
-	</call-macro>
       </action>
     </rule>
 
@@ -18612,9 +18520,6 @@
 	<call-macro n="tipus_verbs">
 	  <with-param pos="3"/>
 	</call-macro>
-	<call-macro n="split_verb">
-	  <with-param pos="3"/>
-	</call-macro>
 	<let>
 	  <clip pos="2" side="tl" part="temps"/>
 	  <lit-tag v="inf"/>
@@ -18724,10 +18629,6 @@
 	  <with-param pos="3"/>
 	  <with-param pos="4"/>
 	</call-macro>
-	<call-macro n="output_adj2">
-	  <with-param pos="3"/>
-	  <with-param pos="4"/>
-	</call-macro>
       </action>
     </rule>