commit 6cd7623f6ed55b83c75b92cede612313a7bcb3d5
Author: hectoralos <hectoralos@gmail.com>
Date:   Sun Jul 21 14:20:06 2019 +0300

    +paraules

diff --git a/apertium-por-cat.cat-por.metalrx b/apertium-por-cat.cat-por.metalrx
index 03a1032..fbd1bde 100644
--- a/apertium-por-cat.cat-por.metalrx
+++ b/apertium-por-cat.cat-por.metalrx
@@ -3,275 +3,275 @@
 <metalrx>
   <def-macros>
     <def-macro name="noms_propis">
-      <rule weight="0.6">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p1}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match lemma="de" tags="pr"/>
-         <or><match tags="np.loc"/><match tags="np.top.*"/></or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="np.ant.*"/>
-         <match lemma="de" tags="pr"/>
-         <or><match tags="np.loc"/><match tags="np.top.*"/></or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="det.*"/>
-         <or>
-           <match tags="adj.*"/>
-           <match lemma="conqueridor" tags="n.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="np.ant.*"/>
-         <match tags="det.*"/>
-         <or>
-           <match tags="adj.*"/>
-           <match lemma="conqueridor" tags="n.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <or>
-           <match tags="num.*"/>
-           <match lemma="I" tags="adj.*"/>
-           <match lemma="II" tags="adj.*"/>
-           <match lemma="III" tags="adj.*"/>
-           <match lemma="IV" tags="adj.*"/>
-           <match lemma="V" tags="adj.*"/>
-           <match lemma="VI" tags="adj.*"/>
-           <match lemma="VII" tags="adj.*"/>
-           <match lemma="VIII" tags="adj.*"/>
-           <match lemma="IX" tags="adj.*"/>
-           <match lemma="X" tags="adj.*"/>
-           <match lemma="XI" tags="adj.*"/>
-           <match lemma="XII" tags="adj.*"/>
-           <match lemma="XIII" tags="adj.*"/>
-           <match lemma="XIV" tags="adj.*"/>
-           <match lemma="XV" tags="adj.*"/>
-           <match lemma="XVI" tags="adj.*"/>
-           <match lemma="XVII" tags="adj.*"/>
-           <match lemma="XVIII" tags="adj.*"/>
-           <match lemma="XIX" tags="adj.*"/>
-           <match lemma="XX" tags="adj.*"/>
-           <match lemma="XXI" tags="adj.*"/>
-           <match lemma="XXII" tags="adj.*"/>
-           <match lemma="XXIII" tags="adj.*"/>
-           <match lemma="XXIV" tags="adj.*"/>
-           <match lemma="XXV" tags="adj.*"/>
-           <match lemma="XXVI" tags="adj.*"/>
-           <match lemma="XXVII" tags="adj.*"/>
-           <match lemma="XXVIII" tags="adj.*"/>
-           <match lemma="XXIX" tags="adj.*"/>
-           <match lemma="XXX" tags="adj.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="np.ant.*"/>
-         <or>
-           <match tags="num.*"/>
-           <match lemma="I" tags="adj.*"/>
-           <match lemma="II" tags="adj.*"/>
-           <match lemma="III" tags="adj.*"/>
-           <match lemma="IV" tags="adj.*"/>
-           <match lemma="V" tags="adj.*"/>
-           <match lemma="VI" tags="adj.*"/>
-           <match lemma="VII" tags="adj.*"/>
-           <match lemma="VIII" tags="adj.*"/>
-           <match lemma="IX" tags="adj.*"/>
-           <match lemma="X" tags="adj.*"/>
-           <match lemma="XI" tags="adj.*"/>
-           <match lemma="XII" tags="adj.*"/>
-           <match lemma="XIII" tags="adj.*"/>
-           <match lemma="XIV" tags="adj.*"/>
-           <match lemma="XV" tags="adj.*"/>
-           <match lemma="XVI" tags="adj.*"/>
-           <match lemma="XVII" tags="adj.*"/>
-           <match lemma="XVIII" tags="adj.*"/>
-           <match lemma="XIX" tags="adj.*"/>
-           <match lemma="XX" tags="adj.*"/>
-           <match lemma="XXI" tags="adj.*"/>
-           <match lemma="XXII" tags="adj.*"/>
-           <match lemma="XXIII" tags="adj.*"/>
-           <match lemma="XXIV" tags="adj.*"/>
-           <match lemma="XXV" tags="adj.*"/>
-           <match lemma="XXVI" tags="adj.*"/>
-           <match lemma="XXVII" tags="adj.*"/>
-           <match lemma="XXVIII" tags="adj.*"/>
-           <match lemma="XXIX" tags="adj.*"/>
-           <match lemma="XXX" tags="adj.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="papa" tags="n.*"/>
-           <match lemma="patriarca" tags="n.*"/>
-           <match lemma="bisbe" tags="n.*"/>
-           <match lemma="arquebisbe" tags="n.*"/>
-           <match lemma="sant" tags="n.*"/>
-           <match lemma="sant" tags="adj.*"/>
-           <match lemma="apòstol" tags="n.*"/>
-           <match lemma="emperador" tags="n.*"/>
-           <match lemma="rei" tags="n.*"/>
-           <match lemma="tsar" tags="n.*"/>
-           <match lemma="virrei" tags="n.*"/>
-           <match lemma="regent" tags="n.*"/>
-           <match lemma="príncep" tags="n.*"/>
-           <match lemma="infant" tags="n.*"/>
-           <match lemma="delfí" tags="n.*"/>
-           <match lemma="comte" tags="n.*"/>
-           <match lemma="vescomte" tags="n.*"/>
-           <match lemma="duc" tags="n.*"/>
-           <match lemma="arxiduc" tags="n.*"/>
-           <match lemma="marquès" tags="n.*"/>
-           <match lemma="baró" tags="n.*"/>
-         </or>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="papa" tags="n.*"/>
-           <match lemma="patriarca" tags="n.*"/>
-           <match lemma="bisbe" tags="n.*"/>
-           <match lemma="arquebisbe" tags="n.*"/>
-           <match lemma="sant" tags="n.*"/>
-           <match lemma="sant" tags="adj.*"/>
-           <match lemma="apòstol" tags="n.*"/>
-           <match lemma="emperador" tags="n.*"/>
-           <match lemma="rei" tags="n.*"/>
-           <match lemma="tsar" tags="n.*"/>
-           <match lemma="virrei" tags="n.*"/>
-           <match lemma="regent" tags="n.*"/>
-           <match lemma="príncep" tags="n.*"/>
-           <match lemma="infant" tags="n.*"/>
-           <match lemma="delfí" tags="n.*"/>
-           <match lemma="comte" tags="n.*"/>
-           <match lemma="vescomte" tags="n.*"/>
-           <match lemma="duc" tags="n.*"/>
-           <match lemma="arxiduc" tags="n.*"/>
-           <match lemma="marquès" tags="n.*"/>
-           <match lemma="baró" tags="n.*"/>
-         </or>
-         <match tags="np.ant.*"/>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="cm"/>
-         <or>
-           <match lemma="papa" tags="n.*"/>
-           <match lemma="patriarca" tags="n.*"/>
-           <match lemma="bisbe" tags="n.*"/>
-           <match lemma="arquebisbe" tags="n.*"/>
-           <match lemma="sant" tags="n.*"/>
-           <match lemma="sant" tags="adj.*"/>
-           <match lemma="apòstol" tags="n.*"/>
-           <match lemma="emperador" tags="n.*"/>
-           <match lemma="rei" tags="n.*"/>
-           <match lemma="tsar" tags="n.*"/>
-           <match lemma="virrei" tags="n.*"/>
-           <match lemma="regent" tags="n.*"/>
-           <match lemma="príncep" tags="n.*"/>
-           <match lemma="infant" tags="n.*"/>
-           <match lemma="delfí" tags="n.*"/>
-           <match lemma="comte" tags="n.*"/>
-           <match lemma="vescomte" tags="n.*"/>
-           <match lemma="duc" tags="n.*"/>
-           <match lemma="arxiduc" tags="n.*"/>
-           <match lemma="marquès" tags="n.*"/>
-           <match lemma="baró" tags="n.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <match tags="np.ant.*"/>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="cm"/>
-         <or>
-           <match lemma="papa" tags="n.*"/>
-           <match lemma="patriarca" tags="n.*"/>
-           <match lemma="bisbe" tags="n.*"/>
-           <match lemma="arquebisbe" tags="n.*"/>
-           <match lemma="sant" tags="n.*"/>
-           <match lemma="sant" tags="adj.*"/>
-           <match lemma="apòstol" tags="n.*"/>
-           <match lemma="emperador" tags="n.*"/>
-           <match lemma="rei" tags="n.*"/>
-           <match lemma="tsar" tags="n.*"/>
-           <match lemma="virrei" tags="n.*"/>
-           <match lemma="regent" tags="n.*"/>
-           <match lemma="príncep" tags="n.*"/>
-           <match lemma="infant" tags="n.*"/>
-           <match lemma="delfí" tags="n.*"/>
-           <match lemma="comte" tags="n.*"/>
-           <match lemma="vescomte" tags="n.*"/>
-           <match lemma="duc" tags="n.*"/>
-           <match lemma="arxiduc" tags="n.*"/>
-           <match lemma="marquès" tags="n.*"/>
-           <match lemma="baró" tags="n.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="papat" tags="n.*"/>
-           <match lemma="pontificat" tags="n.*"/>
-           <match lemma="imperi" tags="n.*"/>
-           <match lemma="regne" tags="n.*"/>
-           <match lemma="regnat" tags="n.*"/>
-           <match lemma="regència" tags="n.*"/>
-           <match lemma="viregnat" tags="n.*"/>
-         </or>
-         <match lemma="de" tags="pr"/>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="papat" tags="n.*"/>
-           <match lemma="pontificat" tags="n.*"/>
-           <match lemma="imperi" tags="n.*"/>
-           <match lemma="regne" tags="n.*"/>
-           <match lemma="regnat" tags="n.*"/>
-           <match lemma="regència" tags="n.*"/>
-           <match lemma="viregnat" tags="n.*"/>
-         </or>
-         <match lemma="de" tags="pr"/>
-         <match tags="np.ant.*"/>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <or>
-           <match lemma="regnar" tags="vblex.*"/>
-           <match lemma="governar" tags="vblex.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="np.ant.*"/>
-         <or>
-           <match lemma="regnar" tags="vblex.*"/>
-           <match lemma="governar" tags="vblex.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="regnar" tags="vblex.ger"/>
-           <match lemma="governar" tags="vblex.ger"/>
-         </or>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="regnar" tags="vblex.ger"/>
-           <match lemma="governar" tags="vblex.ger"/>
-         </or>
-         <match tags="np.ant.*"/>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
+     <rule weight="0.6">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p1}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match lemma="de" tags="pr"/>
+        <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="np.ant.*"/>
+        <match lemma="de" tags="pr"/>
+        <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="det.*"/>
+        <or>
+          <match tags="adj.*"/>
+          <match lemma="conqueridor" tags="n.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="np.ant.*"/>
+        <match tags="det.*"/>
+        <or>
+          <match tags="adj.*"/>
+          <match lemma="conqueridor" tags="n.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <or>
+          <match tags="num.*"/>
+          <match lemma="I" tags="adj.*"/>
+          <match lemma="II" tags="adj.*"/>
+          <match lemma="III" tags="adj.*"/>
+          <match lemma="IV" tags="adj.*"/>
+          <match lemma="V" tags="adj.*"/>
+          <match lemma="VI" tags="adj.*"/>
+          <match lemma="VII" tags="adj.*"/>
+          <match lemma="VIII" tags="adj.*"/>
+          <match lemma="IX" tags="adj.*"/>
+          <match lemma="X" tags="adj.*"/>
+          <match lemma="XI" tags="adj.*"/>
+          <match lemma="XII" tags="adj.*"/>
+          <match lemma="XIII" tags="adj.*"/>
+          <match lemma="XIV" tags="adj.*"/>
+          <match lemma="XV" tags="adj.*"/>
+          <match lemma="XVI" tags="adj.*"/>
+          <match lemma="XVII" tags="adj.*"/>
+          <match lemma="XVIII" tags="adj.*"/>
+          <match lemma="XIX" tags="adj.*"/>
+          <match lemma="XX" tags="adj.*"/>
+          <match lemma="XXI" tags="adj.*"/>
+          <match lemma="XXII" tags="adj.*"/>
+          <match lemma="XXIII" tags="adj.*"/>
+          <match lemma="XXIV" tags="adj.*"/>
+          <match lemma="XXV" tags="adj.*"/>
+          <match lemma="XXVI" tags="adj.*"/>
+          <match lemma="XXVII" tags="adj.*"/>
+          <match lemma="XXVIII" tags="adj.*"/>
+          <match lemma="XXIX" tags="adj.*"/>
+          <match lemma="XXX" tags="adj.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="np.ant.*"/>
+        <or>
+          <match tags="num.*"/>
+          <match lemma="I" tags="adj.*"/>
+          <match lemma="II" tags="adj.*"/>
+          <match lemma="III" tags="adj.*"/>
+          <match lemma="IV" tags="adj.*"/>
+          <match lemma="V" tags="adj.*"/>
+          <match lemma="VI" tags="adj.*"/>
+          <match lemma="VII" tags="adj.*"/>
+          <match lemma="VIII" tags="adj.*"/>
+          <match lemma="IX" tags="adj.*"/>
+          <match lemma="X" tags="adj.*"/>
+          <match lemma="XI" tags="adj.*"/>
+          <match lemma="XII" tags="adj.*"/>
+          <match lemma="XIII" tags="adj.*"/>
+          <match lemma="XIV" tags="adj.*"/>
+          <match lemma="XV" tags="adj.*"/>
+          <match lemma="XVI" tags="adj.*"/>
+          <match lemma="XVII" tags="adj.*"/>
+          <match lemma="XVIII" tags="adj.*"/>
+          <match lemma="XIX" tags="adj.*"/>
+          <match lemma="XX" tags="adj.*"/>
+          <match lemma="XXI" tags="adj.*"/>
+          <match lemma="XXII" tags="adj.*"/>
+          <match lemma="XXIII" tags="adj.*"/>
+          <match lemma="XXIV" tags="adj.*"/>
+          <match lemma="XXV" tags="adj.*"/>
+          <match lemma="XXVI" tags="adj.*"/>
+          <match lemma="XXVII" tags="adj.*"/>
+          <match lemma="XXVIII" tags="adj.*"/>
+          <match lemma="XXIX" tags="adj.*"/>
+          <match lemma="XXX" tags="adj.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="papa" tags="n.*"/>
+          <match lemma="patriarca" tags="n.*"/>
+          <match lemma="bisbe" tags="n.*"/>
+          <match lemma="arquebisbe" tags="n.*"/>
+          <match lemma="sant" tags="n.*"/>
+          <match lemma="sant" tags="adj.*"/>
+          <match lemma="apòstol" tags="n.*"/>
+          <match lemma="emperador" tags="n.*"/>
+          <match lemma="rei" tags="n.*"/>
+          <match lemma="tsar" tags="n.*"/>
+          <match lemma="virrei" tags="n.*"/>
+          <match lemma="regent" tags="n.*"/>
+          <match lemma="príncep" tags="n.*"/>
+          <match lemma="infant" tags="n.*"/>
+          <match lemma="delfí" tags="n.*"/>
+          <match lemma="comte" tags="n.*"/>
+          <match lemma="vescomte" tags="n.*"/>
+          <match lemma="duc" tags="n.*"/>
+          <match lemma="arxiduc" tags="n.*"/>
+          <match lemma="marquès" tags="n.*"/>
+          <match lemma="baró" tags="n.*"/>
+        </or>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="papa" tags="n.*"/>
+          <match lemma="patriarca" tags="n.*"/>
+          <match lemma="bisbe" tags="n.*"/>
+          <match lemma="arquebisbe" tags="n.*"/>
+          <match lemma="sant" tags="n.*"/>
+          <match lemma="sant" tags="adj.*"/>
+          <match lemma="apòstol" tags="n.*"/>
+          <match lemma="emperador" tags="n.*"/>
+          <match lemma="rei" tags="n.*"/>
+          <match lemma="tsar" tags="n.*"/>
+          <match lemma="virrei" tags="n.*"/>
+          <match lemma="regent" tags="n.*"/>
+          <match lemma="príncep" tags="n.*"/>
+          <match lemma="infant" tags="n.*"/>
+          <match lemma="delfí" tags="n.*"/>
+          <match lemma="comte" tags="n.*"/>
+          <match lemma="vescomte" tags="n.*"/>
+          <match lemma="duc" tags="n.*"/>
+          <match lemma="arxiduc" tags="n.*"/>
+          <match lemma="marquès" tags="n.*"/>
+          <match lemma="baró" tags="n.*"/>
+        </or>
+        <match tags="np.ant.*"/>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="cm"/>
+        <or>
+          <match lemma="papa" tags="n.*"/>
+          <match lemma="patriarca" tags="n.*"/>
+          <match lemma="bisbe" tags="n.*"/>
+          <match lemma="arquebisbe" tags="n.*"/>
+          <match lemma="sant" tags="n.*"/>
+          <match lemma="sant" tags="adj.*"/>
+          <match lemma="apòstol" tags="n.*"/>
+          <match lemma="emperador" tags="n.*"/>
+          <match lemma="rei" tags="n.*"/>
+          <match lemma="tsar" tags="n.*"/>
+          <match lemma="virrei" tags="n.*"/>
+          <match lemma="regent" tags="n.*"/>
+          <match lemma="príncep" tags="n.*"/>
+          <match lemma="infant" tags="n.*"/>
+          <match lemma="delfí" tags="n.*"/>
+          <match lemma="comte" tags="n.*"/>
+          <match lemma="vescomte" tags="n.*"/>
+          <match lemma="duc" tags="n.*"/>
+          <match lemma="arxiduc" tags="n.*"/>
+          <match lemma="marquès" tags="n.*"/>
+          <match lemma="baró" tags="n.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <match tags="np.ant.*"/>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="cm"/>
+        <or>
+          <match lemma="papa" tags="n.*"/>
+          <match lemma="patriarca" tags="n.*"/>
+          <match lemma="bisbe" tags="n.*"/>
+          <match lemma="arquebisbe" tags="n.*"/>
+          <match lemma="sant" tags="n.*"/>
+          <match lemma="sant" tags="adj.*"/>
+          <match lemma="apòstol" tags="n.*"/>
+          <match lemma="emperador" tags="n.*"/>
+          <match lemma="rei" tags="n.*"/>
+          <match lemma="tsar" tags="n.*"/>
+          <match lemma="virrei" tags="n.*"/>
+          <match lemma="regent" tags="n.*"/>
+          <match lemma="príncep" tags="n.*"/>
+          <match lemma="infant" tags="n.*"/>
+          <match lemma="delfí" tags="n.*"/>
+          <match lemma="comte" tags="n.*"/>
+          <match lemma="vescomte" tags="n.*"/>
+          <match lemma="duc" tags="n.*"/>
+          <match lemma="arxiduc" tags="n.*"/>
+          <match lemma="marquès" tags="n.*"/>
+          <match lemma="baró" tags="n.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="papat" tags="n.*"/>
+          <match lemma="pontificat" tags="n.*"/>
+          <match lemma="imperi" tags="n.*"/>
+          <match lemma="regne" tags="n.*"/>
+          <match lemma="regnat" tags="n.*"/>
+          <match lemma="regència" tags="n.*"/>
+          <match lemma="viregnat" tags="n.*"/>
+        </or>
+        <match lemma="de" tags="pr"/>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="papat" tags="n.*"/>
+          <match lemma="pontificat" tags="n.*"/>
+          <match lemma="imperi" tags="n.*"/>
+          <match lemma="regne" tags="n.*"/>
+          <match lemma="regnat" tags="n.*"/>
+          <match lemma="regència" tags="n.*"/>
+          <match lemma="viregnat" tags="n.*"/>
+        </or>
+        <match lemma="de" tags="pr"/>
+        <match tags="np.ant.*"/>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <or>
+          <match lemma="regnar" tags="vblex.*"/>
+          <match lemma="governar" tags="vblex.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="np.ant.*"/>
+        <or>
+          <match lemma="regnar" tags="vblex.*"/>
+          <match lemma="governar" tags="vblex.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="regnar" tags="vblex.ger"/>
+          <match lemma="governar" tags="vblex.ger"/>
+        </or>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="regnar" tags="vblex.ger"/>
+          <match lemma="governar" tags="vblex.ger"/>
+        </or>
+        <match tags="np.ant.*"/>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
     </def-macro>
   </def-macros>
 
@@ -281,47 +281,89 @@
 
   <!-- cardinal > cardeal, cardinal -->
   <rule weight="0.6">
-     <match lemma="cardinal" tags="adj.*"><select lemma="cardeal"/></match>
+    <match lemma="cardinal" tags="adj.*"><select lemma="cardeal"/></match>
   </rule>
   <rule weight="1.0">
-     <or>
-       <match lemma="nombre" tags="n.*"/>
-       <match lemma="número" tags="n.*"/>	<!-- castellanisme, però per si de cas -->
-     </or>
-     <match lemma="cardinal" tags="adj.*"><select lemma="cardinal"/></match>
+    <or>
+      <match lemma="nombre" tags="n.*"/>
+      <match lemma="número" tags="n.*"/>	<!-- castellanisme, però per si de cas -->
+    </or>
+    <match lemma="cardinal" tags="adj.*"><select lemma="cardinal"/></match>
   </rule>
 
   <!-- primer > primeiro, primo -->
   <rule weight="0.6">
-     <match lemma="primer" tags="adj.*"><select lemma="primeiro"/></match>
+    <match lemma="primer" tags="adj.*"><select lemma="primeiro"/></match>
   </rule>
   <rule weight="1.0">
-     <or>
-       <match lemma="nombre" tags="n.*"/>
-       <match lemma="número" tags="n.*"/>	<!-- castellanisme, però per si de cas -->
-     </or>
-     <match lemma="primer" tags="adj.*"><select lemma="primo"/></match>
+    <or>
+      <match lemma="nombre" tags="n.*"/>
+      <match lemma="número" tags="n.*"/>	<!-- castellanisme, però per si de cas -->
+    </or>
+    <match lemma="primer" tags="adj.*"><select lemma="primo"/></match>
   </rule>
 
 <!-- **************** N **************** -->
 
+  <!-- usuari > usuário, utente, utilizador -->
+  <rule weight="0.8">
+    <match lemma="usuari" tags="n.*"><select lemma="utente"/></match>
+  </rule>
+  <rule weight="0.6">
+    <match lemma="usuari" tags="n.*"><select lemma="usuário"/></match>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="usuari" tags="n.*"><select lemma="utilizador"/></match>
+    <match lemma="de" tags="pr"/>
+    <or>
+      <match lemma="internet"/>
+      <match lemma="rede" tags="n.*"/>
+      <match lemma="correio" tags="n.*"/>
+      <match lemma="e-mail" tags="n.*"/>
+    </or>
+  </rule>
+
+  <!-- registre > registo, registro, cadastro -->
+  <rule weight="0.8">
+    <match lemma="registre" tags="n.*"><select lemma="registo"/></match>
+  </rule>
+  <rule weight="0.6">
+    <match lemma="registre" tags="n.*"><select lemma="registro"/></match>
+  </rule>
+
   <!-- habitació > habitação, quarto -->
   <rule weight="0.6">
-     <match lemma="habitació" tags="n.*"><select lemma="habitação"/></match>
+    <match lemma="habitació" tags="n.*"><select lemma="habitação"/></match>
+  </rule>
+
+  <!-- afició > gosto, passatempo, claque -->
+  <rule weight="0.6">
+    <match lemma="afició" tags="n.*"><select lemma="passatempo"/></match>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="afició" tags="n.*"><select lemma="gosto"/></match>
+    <or>
+      <match lemma="per" tags="pr"/>
+      <match lemma="a" tags="pr"/>
+    </or>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="afició" tags="n.*"><select lemma="claque"/></match>
+    <match lemma="de" tags="pr"/>
   </rule>
 
   <!-- estada > estadia, estada -->
   <rule weight="0.6">
-     <match lemma="estada" tags="n.*"><select lemma="estadia"/></match>
+    <match lemma="estada" tags="n.*"><select lemma="estadia"/></match>
   </rule>
 
   <!-- poble > povoação, aldeia -->
   <rule weight="0.6">
-     <match lemma="poble" tags="n.*"><select lemma="povoação"/></match>
+    <match lemma="poble" tags="n.*"><select lemma="povoação"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="poble" tags="n.*"><select lemma="aldeia"/></match>
-     <match tags="adj.*"/>
+    <match lemma="poble" tags="n.*"><select lemma="aldeia"/></match>
+    <match tags="adj.*"/>
   </rule>
 
   <!-- cap > chefe, cabeça, cabo -->
@@ -341,14 +383,14 @@
     <match lemma="cap" tags="n.*"><select lemma="cabeça"/></match>
     <match lemma="de" tags="pr"/>
     <or>
-      <match lemma="comarca" tags="n.*"/>
-
-      <match lemma="animal" tags="n.*"/>
-      <match lemma="peix" tags="n.*"/>
-      <match lemma="gos" tags="n.*"/>
-      <match lemma="gat" tags="n.*"/>
-      <match lemma="bou" tags="n.*"/>
-      <match lemma="vaca" tags="n.*"/>
+     <match lemma="comarca" tags="n.*"/>
+
+     <match lemma="animal" tags="n.*"/>
+     <match lemma="peix" tags="n.*"/>
+     <match lemma="gos" tags="n.*"/>
+     <match lemma="gat" tags="n.*"/>
+     <match lemma="bou" tags="n.*"/>
+     <match lemma="vaca" tags="n.*"/>
     </or>
   </rule>
 
@@ -363,12 +405,12 @@
     <match lemma="conductor" tags="n.*"><select lemma="autista"/></match>
     <match lemma="de" tags="pr"/>
     <or>
-      <match lemma="autobús" tags="n.*"/>
-      <match lemma="autocar" tags="n.*"/>
-      <match lemma="camió" tags="n.*"/>
-      <match lemma="metro" tags="n.*"/>
-      <match lemma="tramvia" tags="n.*"/>
-      <match lemma="troleibús" tags="n.*"/>
+     <match lemma="autobús" tags="n.*"/>
+     <match lemma="autocar" tags="n.*"/>
+     <match lemma="camió" tags="n.*"/>
+     <match lemma="metro" tags="n.*"/>
+     <match lemma="tramvia" tags="n.*"/>
+     <match lemma="troleibús" tags="n.*"/>
     </or>
   </rule>
 
@@ -385,21 +427,21 @@
 
   <!-- població > população, povoação -->
   <rule weight="0.6">
-     <match lemma="població" tags="n.*"><select lemma="população"/></match>
+    <match lemma="població" tags="n.*"><select lemma="população"/></match>
   </rule>
 
   <!-- got > godo, verre -->
   <rule weight="0.6">
-     <match lemma="got" tags="n.*"><select lemma="godo"/></match>
+    <match lemma="got" tags="n.*"><select lemma="godo"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="got" tags="n.*"><select lemma="copo"/></match>
-     <match lemma="de" tags="pr"/>
+    <match lemma="got" tags="n.*"><select lemma="copo"/></match>
+    <match lemma="de" tags="pr"/>
   </rule>
   <rule weight="1.0">
-     <match lemma="got" tags="n.*"><select lemma="copo"/></match>
-     <match lemma="de" tags="pr"/>
-     <or><match tags="np.loc"/><match tags="np.top.*"/><match tags="np.hyd.*"/></or>
+    <match lemma="got" tags="n.*"><select lemma="copo"/></match>
+    <match lemma="de" tags="pr"/>
+    <or><match tags="np.loc"/><match tags="np.top.*"/><match tags="np.hyd.*"/></or>
   </rule>
 
   <!-- caragol > caracol, parafuso -->
@@ -410,57 +452,57 @@
     <match lemma="cargol" tags="n.*"><select lemma="caracol"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="caragol" tags="n.m.*"><select lemma="parafuso"/></match>
-     <or>
-       <match lemma="pla" tags="adj.*"/>
-       <match lemma="quadrat" tags="adj.*"/>
-       <match lemma="hexagonal" tags="adj.*"/>
-     </or>
+    <match lemma="caragol" tags="n.m.*"><select lemma="parafuso"/></match>
+    <or>
+      <match lemma="pla" tags="adj.*"/>
+      <match lemma="quadrat" tags="adj.*"/>
+      <match lemma="hexagonal" tags="adj.*"/>
+    </or>
   </rule>
   <rule weight="1.0">
-     <match lemma="caragol" tags="n.m.*"><select lemma="parafuso"/></match>
-     <match lemma="en" tags="pr"/>
-     <match lemma="estrella" tags="n.*"/>
+    <match lemma="caragol" tags="n.m.*"><select lemma="parafuso"/></match>
+    <match lemma="en" tags="pr"/>
+    <match lemma="estrella" tags="n.*"/>
   </rule>
   <rule weight="1.0">
-     <match lemma="caragol" tags="n.m.*"><select lemma="parafuso"/></match>
-     <match lemma="de" tags="pr"/>
-     <match lemma="pala" tags="n.*"/>
+    <match lemma="caragol" tags="n.m.*"><select lemma="parafuso"/></match>
+    <match lemma="de" tags="pr"/>
+    <match lemma="pala" tags="n.*"/>
   </rule>
   <rule weight="1.0">
-     <match lemma="caragol" tags="n.m.*"><select lemma="parafuso"/></match>
-     <or><match tags="np.cog.*"/><match tags="np.al.*"/></or> <!-- Philips, Allen, etc. -->
+    <match lemma="caragol" tags="n.m.*"><select lemma="parafuso"/></match>
+    <or><match tags="np.cog.*"/><match tags="np.al.*"/></or> <!-- Philips, Allen, etc. -->
   </rule>
   <rule weight="1.0">
-     <match lemma="cargol" tags="n.m.*"><select lemma="parafuso"/></match>
-     <or>
-       <match lemma="pla" tags="adj.*"/>
-       <match lemma="quadrat" tags="adj.*"/>
-       <match lemma="hexagonal" tags="adj.*"/>
-     </or>
+    <match lemma="cargol" tags="n.m.*"><select lemma="parafuso"/></match>
+    <or>
+      <match lemma="pla" tags="adj.*"/>
+      <match lemma="quadrat" tags="adj.*"/>
+      <match lemma="hexagonal" tags="adj.*"/>
+    </or>
   </rule>
   <rule weight="1.0">
-     <match lemma="cargol" tags="n.m.*"><select lemma="parafuso"/></match>
-     <match lemma="en" tags="pr"/>
-     <match lemma="estrella" tags="n.*"/>
+    <match lemma="cargol" tags="n.m.*"><select lemma="parafuso"/></match>
+    <match lemma="en" tags="pr"/>
+    <match lemma="estrella" tags="n.*"/>
   </rule>
   <rule weight="1.0">
-     <match lemma="cargol" tags="n.m.*"><select lemma="parafuso"/></match>
-     <match lemma="de" tags="pr"/>
-     <match lemma="pala" tags="n.*"/>
+    <match lemma="cargol" tags="n.m.*"><select lemma="parafuso"/></match>
+    <match lemma="de" tags="pr"/>
+    <match lemma="pala" tags="n.*"/>
   </rule>
   <rule weight="1.0">
-     <match lemma="cargol" tags="n.m.*"><select lemma="parafuso"/></match>
-     <or><match tags="np.cog.*"/><match tags="np.al.*"/></or> <!-- Philips, Allen, etc. -->
+    <match lemma="cargol" tags="n.m.*"><select lemma="parafuso"/></match>
+    <or><match tags="np.cog.*"/><match tags="np.al.*"/></or> <!-- Philips, Allen, etc. -->
   </rule>
 
   <!-- tret > caratteristica, sparo -->
   <rule weight="0.6">
-     <match lemma="tret" tags="n.*"><select lemma="caratteristica"/></match>
+    <match lemma="tret" tags="n.*"><select lemma="caratteristica"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="tret" tags="n.*"><select lemma="sparo"/></match>
-     <match lemma="a" tags="pr"/>
+    <match lemma="tret" tags="n.*"><select lemma="sparo"/></match>
+    <match lemma="a" tags="pr"/>
   </rule>
 
   <!-- taula > tavola, tavolo, tabella -->
@@ -469,55 +511,69 @@
 
   <!-- traslladar > transladar, mudar -->
   <rule weight="0.6">
-     <match lemma="traslladar" tags="pr"><select lemma="transladar"/></match>
+    <match lemma="traslladar" tags="vblex"><select lemma="transladar"/></match>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="traslladar" tags="vblex.*"><select lemma="mudar"/></match>
+    <match lemma="a" tags="pr"><select lemma="para"/></match>
+  </rule>
+
+  <!-- estar > estar, ser -->
+  <rule weight="0.6">
+    <match lemma="estar" tags="vblex"><select lemma="estar"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="traslladar" tags="vblex.*"><select lemma="mudar"/></match>
-     <match lemma="a" tags="pr"><select lemma="para"/></match>
+    <match lemma="estar" tags="vblex.*"><select lemma="ser"/></match>
+    <or>
+      <match lemma="a favor" tags="adv"/>
+      <match lemma="a favor de" tags="pr"/>
+      <match lemma="en contra" tags="adv"/>
+      <match lemma="contra" tags="pr"/>
+    </or>
   </rule>
 
 <!-- **************** PR **************** -->
 
   <!-- a > a, para -->
   <rule weight="0.6">
-     <match lemma="a" tags="pr"><select lemma="a"/></match>
+    <match lemma="a" tags="pr"><select lemma="a"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="traslladar" tags="vblex.*"><select lemma="mudar"/></match>
-     <match lemma="a" tags="pr"><select lemma="para"/></match>
+    <match lemma="traslladar" tags="vblex.*"><select lemma="mudar"/></match>
+    <match lemma="a" tags="pr"><select lemma="para"/></match>
   </rule>
   <rule weight="1.0">
-     <or>
-       <match lemma="traduir" tags="vblex.*"/>
-       <match lemma="viatjar" tags="vblex.*"/>
-       <match lemma="anar" tags="vblex.*"/>
-     </or>
-     <match lemma="a" tags="pr"><select lemma="para"/></match>
+    <or>
+      <match lemma="traduir" tags="vblex.*"/>
+      <match lemma="viatjar" tags="vblex.*"/>
+      <match lemma="anar" tags="vblex.*"/>
+    </or>
+    <match lemma="a" tags="pr"><select lemma="para"/></match>
   </rule>
 
 <!-- **************** ADV **************** -->
 
   <!-- com > como, quanto -->
   <rule weight="0.6">
-     <match lemma="com" tags="adv"><select lemma="como"/></match>
+    <match lemma="com" tags="adv"><select lemma="como"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="tant"/>
-     <match lemma="com" tags="adv"><select lemma="quanto"/></match>
+    <match lemma="tant"/>
+    <match lemma="com" tags="adv"><select lemma="quanto"/></match>
   </rule>
 
 <!-- **************** PRN **************** -->
 
   <!-- quin > que, qual -->
   <rule weight="0.6">
-     <match lemma="quin" tags="prn.itg.*"><select lemma="qual"/></match>
+    <match lemma="quin" tags="prn.itg.*"><select lemma="qual"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="quin" tags="prn.itg.*"><select lemma="que"/></match>
-     <or>
-       <match tags="n.*"/>
-       <match tags="adj.*"/>
-     </or>
+    <match lemma="quin" tags="prn.itg.*"><select lemma="que"/></match>
+    <or>
+      <match tags="n.*"/>
+      <match tags="adj.*"/>
+    </or>
   </rule>
 
 <!-- **************** NP **************** -->
diff --git a/apertium-por-cat.por-cat.dix b/apertium-por-cat.por-cat.dix
index d55786d..9e66cfd 100644
--- a/apertium-por-cat.por-cat.dix
+++ b/apertium-por-cat.por-cat.dix
@@ -1411,8 +1411,21 @@
 <e a="hector"><p><l>ordinal<s n="adj"/></l><r>ordinal<s n="adj"/></r></p></e>
 <e a="hector"><p><l>cardeal<s n="adj"/></l><r>cardinal<s n="adj"/></r></p></e>
 <e a="hector"><p><l>cardinal<s n="adj"/></l><r>cardinal<s n="adj"/></r></p></e>
+<e a="hector"><p><l>desenvolvido<s n="adj"/></l><r>desenvolupat<s n="adj"/></r></p></e>
+<e r="RL" a="hector"><p><l>desenvolvido<s n="adj"/></l><r>desenrotllat<s n="adj"/></r></p></e>
+<e a="hector"><p><l>subdesenvolvido<s n="adj"/></l><r>subdesenvolupat<s n="adj"/></r></p></e>
+<e r="RL" a="hector"><p><l>subdesenvolvido<s n="adj"/></l><r>subdesenrotllat<s n="adj"/></r></p></e>
+<e r="LR" a="hector"><p><l>este<s n="adj"/></l><r>est<s n="adj"/></r></p></e>
+<e a="hector"><p><l>leste<s n="adj"/></l><r>est<s n="adj"/></r></p></e>
+<e a="hector"><p><l>oeste<s n="adj"/></l><r>oest<s n="adj"/></r></p></e>
+<e a="hector"><p><l>norte<s n="adj"/></l><r>nord<s n="adj"/></r></p></e>
+<e a="hector"><p><l>sul<s n="adj"/></l><r>sud<s n="adj"/></r></p></e>
+<e a="hector"><p><l>nordeste<s n="adj"/></l><r>nord-est<s n="adj"/></r></p></e>
+<e a="hector"><p><l>noroeste<s n="adj"/></l><r>nord-oest<s n="adj"/></r></p></e>
+<e a="hector"><p><l>sudoeste<s n="adj"/></l><r>sud-oest<s n="adj"/></r></p></e>
+<e a="hector"><p><l>sueste<s n="adj"/></l><r>sud-est<s n="adj"/></r></p></e>
 
-<!-- xxxxxx -->
+<!-- xxxxx -->
 
     <!-- ******************************
           group adv_symbol
@@ -1683,7 +1696,6 @@
 <e>       <p><l>em<b/>matéria<b/>de<s n="pr"/></l>     <r>en<b/>qüestió<b/>de<s n="pr"/></r></p></e>
 <e>       <p><l>em<b/>media<s n="adv"/></l>            <r>de<b/>mitjana<s n="adv"/></r></p></e>
 <e>       <p><l>em<b/>mãos<s n="adv"/></l>             <r>en<b/>mà<s n="adv"/></r></p></e>
-<e r="LR"><p><l>em<b/>mãos<s n="adv"/></l>             <r>en<b/>mà<s n="adv"/></r></p></e>
 <e>       <p><l>em<b/>médio<b/>prazo<s n="adv"/></l>   <r>a<b/>mig<b/>termini<s n="adv"/></r></p></e>
 <e r="RL"><p><l>em<b/>médio<b/>prazo<s n="adv"/></l>   <r>a<b/>mig<b/>plaç<s n="adv"/></r></p></e>
 <e>       <p><l>em<b/>potencial<s n="adv"/></l>        <r>en<b/>potència<s n="adv"/></r></p></e>
@@ -1860,7 +1872,7 @@
 <e r="RL"><p><l>mão<b/>de<b/>ferro<s n="adv"/></l>     <r>mà<b/>dura<s n="adv"/></r></p></e>
 <e>       <p><l>mãos<b/>ao<b/>alto<s n="adv"/></l>     <r>manos<b/>enlaire<s n="adv"/></r></p></e>
 <e r="LR"><p><l>na<b/>bucha<s n="adv"/></l>            <r>en<b/>el<b/>blanc<s n="adv"/></r></p></e>
-<e>       <p><l>na<b/>contramão<s n="adv"/></l>        <r>en<b/>contra<s n="adv"/></r></p></e>
+<e r="LR"><p><l>na<b/>contramão<s n="adv"/></l>        <r>en<b/>contra<s n="adv"/></r></p></e>
 <e>       <p><l>na<b/>largura<s n="adv"/></l>          <r>d'ample<s n="adv"/></r></p></e>
 <e>       <p><l>na<b/>mosca<s n="adv"/></l>            <r>en<b/>el<b/>blanc<s n="adv"/></r></p></e>
 <e>       <p><l>na<b/>praça<s n="adv"/></l>            <r>a<b/>la<b/>plaça<s n="adv"/></r></p></e>
@@ -2091,6 +2103,29 @@
 <e><p><l>ao<b/>lado<s n="adv"/></l><r>al<b/>costat<s n="adv"/></r></p></e>
 <e><p><l>de<b/>um<b/>lado<b/>para<b/>o<b/>outro<s n="adv"/></l><r>d'un<b/>costat<b/>a<b/>l'altre<s n="adv"/></r></p></e>
 <e><p><l>para<b/>um<b/>lado<s n="adv"/></l><r>cap<b/>a<b/>un<b/>costat<s n="adv"/></r></p></e>
+<e a="hector"><p><l>a<b/>leste<s n="adv"/></l><r>a<b/>l'est<s n="adv"/></r></p></e>
+<e a="hector"><p><l>a<b/>oeste<s n="adv"/></l><r>a<b/>l'oest<s n="adv"/></r></p></e>
+<e a="hector"><p><l>a<b/>norte<s n="adv"/></l><r>al<b/>nord<s n="adv"/></r></p></e>
+<e a="hector"><p><l>a<b/>sul<s n="adv"/></l><r>al<b/>sud<s n="adv"/></r></p></e>
+<e a="hector"><p><l>a<b/>nordeste<s n="adv"/></l><r>al<b/>nord-est<s n="adv"/></r></p></e>
+<e a="hector"><p><l>a<b/>noroeste<s n="adv"/></l><r>al<b/>nord-oest<s n="adv"/></r></p></e>
+<e a="hector"><p><l>a<b/>sudoeste<s n="adv"/></l><r>al<b/>sud-oest<s n="adv"/></r></p></e>
+<e a="hector"><p><l>a<b/>sueste<s n="adv"/></l><r>al<b/>sud-est<s n="adv"/></r></p></e>
+<e a="hector"><p><l>para<b/>leste<s n="adv"/></l><r>cap<b/>a<b/>l'est<s n="adv"/></r></p></e>
+<e a="hector"><p><l>para<b/>oeste<s n="adv"/></l><r>cap<b/>a<b/>l'oest<s n="adv"/></r></p></e>
+<e a="hector"><p><l>para<b/>norte<s n="adv"/></l><r>cap<b/>al<b/>nord<s n="adv"/></r></p></e>
+<e a="hector"><p><l>para<b/>sul<s n="adv"/></l><r>cap<b/>al<b/>sud<s n="adv"/></r></p></e>
+<e a="hector"><p><l>para<b/>nordeste<s n="adv"/></l><r>cap<b/>al<b/>nord-est<s n="adv"/></r></p></e>
+<e a="hector"><p><l>para<b/>noroeste<s n="adv"/></l><r>cap<b/>al<b/>nord-oest<s n="adv"/></r></p></e>
+<e a="hector"><p><l>para<b/>sudoeste<s n="adv"/></l><r>cap<b/>al<b/>sud-oest<s n="adv"/></r></p></e>
+<e a="hector"><p><l>para<b/>sueste<s n="adv"/></l><r>cap<b/>al<b/>sud-est<s n="adv"/></r></p></e>
+<e a="hector"><p><l>a<b/>favor<s n="adv"/></l><r>a<b/>favor<s n="adv"/></r></p></e>
+<e r="LR" a="hector"><p><l>ao<b/>contrário<s n="adv"/></l><r>al<b/>contrari<s n="adv"/></r></p></e>
+<e a="hector"><p><l>do<b/>avesso<s n="adv"/></l><r>a<b/>l'inrevés<s n="adv"/></r></p></e>
+<e r="LR" a="hector"><p><l>ás<b/>avessas<s n="adv"/></l><r>a<b/>l'inrevés<s n="adv"/></r></p></e>
+<e a="hector"><p><l>contra<s n="adv"/></l><r>en<b/>contra<s n="adv"/></r></p></e>
+
+<!-- xxxxx -->
 
     <!-- ******************************
           group cnjadv_symbol
@@ -2140,8 +2175,8 @@
 <e>       <p><l>mesmo<b/>assim<s n="cnjadv"/></l>      <r>tot<b/>i<b/>així<s n="cnjadv"/></r></p></e>
 <e r="RL"><p><l>mesmo<b/>assim<s n="cnjadv"/></l>      <r>tot<b/>i<b/>això<s n="cnjadv"/></r></p></e>
 <e r="LR"><p><l>mesmo<b/>que<s n="cnjadv"/></l>        <r>encara<b/>que<s n="cnjadv"/></r></p></e>
-<e r="RL"><p><l>muito<b/>pelo<b/>contrário<s n="cnjadv"/></l><r>per<b/>contra<s n="cnjadv"/></r></p></e>
-<e>       <p><l>muito<b/>pelo<b/>contrário<s n="cnjadv"/></l><r>ben<b/>al<b/>contrari<s n="cnjadv"/></r></p></e>
+<e r="RL"><p><l>muito<b/>pelo<b/>contrário<s n="adv"/></l><r>ans<b/>al<b/>contrari<s n="adv"/></r></p></e>
+<e>       <p><l>muito<b/>pelo<b/>contrário<s n="adv"/></l><r>ben<b/>al<b/>contrari<s n="adv"/></r></p></e>
 <e>       <p><l>naquele<b/>tempo<s n="cnjadv"/></l>    <r>en<b/>aquells<b/>temps<s n="cnjadv"/></r></p></e>
 <e r="RL"><p><l>naquele<b/>tempo<s n="cnjadv"/></l>    <r>en<b/>aquell<b/>temps<s n="cnjadv"/></r></p></e>
 <e r="RL"><p><l>naquele<b/>tempo<s n="cnjadv"/></l>    <r>en<b/>aquella<b/>època<s n="cnjadv"/></r></p></e>
@@ -2151,7 +2186,8 @@
 <e>       <p><l>os<b/>prós<b/>e<b/>os<b/>contras<s n="cnjadv"/></l><r>els<b/>pros<b/>i<b/>contres<s n="cnjadv"/></r></p></e>
 <e r="RL"><p><l>os<b/>prós<b/>e<b/>os<b/>contras<s n="cnjadv"/></l><r>els<b/>pros<b/>i<b/>els<b/>contres<s n="cnjadv"/></r></p></e>
 <e>       <p><l>para<b/>o<b/>qual<s n="cnjadv"/></l>   <r>per<b/>a<b/>això<s n="cnjadv"/></r></p></e>
-<e>       <p><l>pelo<b/>contrário<s n="cnjadv"/></l>   <r>al<b/>contrari<s n="cnjadv"/></r></p></e>
+<e>       <p><l>pelo<b/>contrário<s n="adv"/></l>      <r>al<b/>contrari<s n="adv"/></r></p></e>
+<e r="RL"><p><l>pelo<b/>contrário<s n="adv"/></l>      <r>per<b/>contra<s n="adv"/></r></p></e>
 <e r="LR"><p><l>pelo<b/>jeito<s n="cnjadv"/></l>       <r>pel<b/>que<b/>sembla<s n="cnjadv"/></r></p></e>
 <e>       <p><l>pelo<b/>jeito<b/>que<s n="cnjadv"/></l><r>por<b/>la<b/>manera<b/>com<s n="cnjadv"/></r></p></e>
 <e r="LR"><p><l>pelo<b/>menos<s n="adv"/></l>          <r>almenys<s n="adv"/></r></p></e>
@@ -2287,7 +2323,7 @@
 <e>       <p><l>PSC<s n="n"/></l>                      <r>PSC<s n="n"/></r></p></e>
 <e>       <p><l>PSOE<s n="n"/></l>                     <r>PSOE<s n="n"/></r></p></e>
 <e>       <p><l>RG<s n="n"/></l>                       <r>DNI<s n="n"/></r></p></e>
-<e>       <p><l>Sr<s n="n"/></l>                       <r>Sr<s n="n"/></r></p></e>
+<!--<e>       <p><l>Sr<s n="n"/></l>                       <r>Sr<s n="n"/></r></p></e> -->
 <e>       <p><l>UE<s n="n"/></l>                       <r>UE<s n="n"/></r></p></e>
 <e r="LR"><p><l>a<b/>internet<s n="n"/></l>            <r>internet<s n="n"/></r></p></e>
 <e r="LR"><p><l>a_internet<s n="n"/></l>               <r>internet<s n="n"/></r></p></e>
@@ -3294,6 +3330,7 @@
 <e r="RL"><p><l>desenho<s n="n"/></l>                  <r>disseny<s n="n"/></r></p></e>
 <e r="RL"><p><l>desenvolvimento<s n="n"/></l>          <r>desenrotllament<s n="n"/></r></p></e>
 <e>       <p><l>desenvolvimento<s n="n"/></l>          <r>desenvolupament<s n="n"/></r></p></e>
+<e>       <p><l>subdesenvolvimento<s n="n"/></l>       <r>subdesenvolupament<s n="n"/></r></p></e>
 <e>       <p><l>desequilíbrio<s n="n"/></l>            <r>desequilibri<s n="n"/></r></p></e>
 <e>       <p><l>deserto<s n="n"/></l>                  <r>desert<s n="n"/></r></p></e>
 <e>       <p><l>desespero<s n="n"/><s n="m"/></l>      <r>desesperació<s n="n"/><s n="f"/></r></p></e>
@@ -4315,7 +4352,8 @@
 <e>       <p><l>madeira<s n="n"/></l>                  <r>fusta<s n="n"/></r></p></e>
 <e>       <p><l>madrileno<s n="n"/></l>                <r>madrileny<s n="n"/></r></p></e>
 <e>       <p><l>madrugada<s n="n"/></l>                <r>matinada<s n="n"/></r></p></e>
-<e>       <p><l>maestro<s n="n"/></l><r>mestre<s n="n"/></r></p><par n="outro_altre"/></e>
+<e r="LR"><p><l>maestro<s n="n"/></l>                  <r>mestre<s n="n"/></r></p><par n="outro_altre"/></e>
+<e>       <p><l>mestre<s n="n"/></l>                   <r>mestre<s n="n"/></r></p><par n="outro_altre"/></e>
 <e>       <p><l>magia<s n="n"/></l>                    <r>màgia<s n="n"/></r></p></e>
 <e>       <p><l>magistrado<s n="n"/></l>               <r>magistrat<s n="n"/></r></p></e>
 <e>       <p><l>magnata<s n="n"/></l>                  <r>magnat<s n="n"/></r></p></e>
@@ -4950,6 +4988,7 @@
 <e>       <p><l>prodígio<s n="n"/></l>                 <r>prodigi<s n="n"/></r></p></e>
 <e>       <p><l>profesor<s n="n"/></l>                 <r>profesor<s n="n"/></r></p></e>
 <e>       <p><l>professor<s n="n"/></l>                <r>professor<s n="n"/></r></p></e>
+<e r="RL"><p><l>professor<s n="n"/></l>                <r>mestre<g><b/>d'escola</g><s n="n"/></r></p><par n="outro_altre"/></e>
 <e>       <p><l>profeta<s n="n"/></l>                  <r>profeta<s n="n"/></r></p></e>
 <e>       <p><l>profissional<s n="n"/></l>             <r>professional<s n="n"/></r></p></e>
 <e>       <p><l>profissão<s n="n"/></l>                <r>professió<s n="n"/></r></p></e>
@@ -5132,8 +5171,8 @@
 <e>       <p><l>refúgio<s n="n"/></l>                  <r>refugi<s n="n"/></r></p></e>
 <e r="RL"><p><l>refúgio<s n="n"/></l>                  <r>recer<s n="n"/></r></p></e>
 <e>       <p><l>regime<s n="n"/></l>                   <r>règim<s n="n"/></r></p></e>
-<e vl="pt pt_pre1990"><p><l>registo<s n="n"/></l>                  <r>registre<s n="n"/></r></p></e>
-<e>       <p><l>registro<s n="n"/></l>                 <r>registre<s n="n"/></r></p></e>
+<e vl="pt pt_pre1990"><p><l>registo<s n="n"/><s n="m"/></l><r>registre<s n="n"/><s n="m"/></r></p><par n="sp_sp"/></e>
+<e>       <p><l>registro<s n="n"/><s n="m"/></l>       <r>registre<s n="n"/><s n="m"/></r></p><par n="sp_sp"/></e>
 <e r="RL"><p><l>registro<s n="n"/></l>                 <r>empadronament<s n="n"/></r></p></e>
 <e>       <p><l>região<s n="n"/></l>                   <r>regió<s n="n"/></r></p></e>
 <e>       <p><l>regra<s n="n"/></l>                    <r>regla<s n="n"/></r></p></e>
@@ -5653,8 +5692,9 @@
 <e>       <p><l>urânio<s n="n"/></l>                   <r>urani<s n="n"/></r></p></e>
 <e r="LR"><p><l>usina<s n="n"/></l>                    <r>fàbrica<s n="n"/></r></p></e>
 <e>       <p><l>uso<s n="n"/></l>                      <r>ús<s n="n"/></r></p></e>
-<e vl="br"><p><l>usuário<s n="n"/></l>                  <r>usuari<s n="n"/></r></p></e>
-<e vl="pt pt_pre1990"><p><l>utente<s n="n"/></l><r>usuari<s n="n"/></r></p><par n="mf_GD"/></e>
+<e vl="br"><p><l>usuário<s n="n"/></l>                 <r>usuari<s n="n"/></r></p><par n="mf_mf"/></e>
+<e vl="pt pt_pre1990"><p><l>utente<s n="n"/></l>       <r>usuari<s n="n"/></r></p><par n="mf_GD"/></e>
+<e>       <p><l>utilizador<s n="n"/></l>               <r>usuari<s n="n"/></r></p><par n="mf_mf"/></e>
 <e>       <p><l>utilidade<s n="n"/></l>                <r>utilitat<s n="n"/></r></p></e>
 <e>       <p><l>utilização<s n="n"/></l>               <r>utilització<s n="n"/></r></p></e>
 <e>       <p><l>utopia<s n="n"/></l>                   <r>utopia<s n="n"/></r></p></e>
@@ -5835,8 +5875,21 @@
 <e a="hector"><p><l>próton<s n="n"/><s n="m"/></l><r>protó<s n="n"/><s n="m"/></r></p></e>
 <e a="hector"><p><l>elétron<s n="n"/><s n="m"/></l><r>electró<s n="n"/><s n="m"/></r></p></e>
 <e a="hector"><p><l>primo<s n="n"/></l><r>cosí<s n="n"/></r></p></e>
+<e a="hector"><p><l>primo<b/>direito<s n="n"/></l><r>cosí<b/>germà<s n="n"/></r></p></e>
+<e a="hector"><p><l>fan<s n="n"/></l><r>fan<s n="n"/></r></p></e>
+<e vl="br" a="hector"><p><l>torcida<s n="n"/><s n="f"/></l><r>afició<s n="n"/><s n="f"/></r></p></e>
+<e vl="pt pt_pre1990" a="hector"><p><l>claque<s n="n"/><s n="f"/></l><r>afició<s n="n"/><s n="f"/></r></p></e>
+<e vl="pt pt_pre1990" a="hector"><p><l>claquista<s n="n"/></l><r>aficionat<s n="n"/></r></p><par n="mf_GD"/></e>
+<e vl="br" a="hector"><p><l>torcedor<s n="n"/></l><r>aficionat<s n="n"/></r></p></e>
+<e a="hector"><p><l>gosto<s n="n"/><s n="m"/></l><r>afició<s n="n"/><s n="f"/></r></p></e>
+<e a="hector"><p><l>passatempo<s n="n"/><s n="m"/></l><r>afició<s n="n"/><s n="f"/></r></p></e>
+<e a="hector"><p><l>passatempo<s n="n"/><s n="m"/></l><r>passatemps<s n="n"/><s n="m"/></r></p><par n="ND_sp"/></e>
+<e a="hector"><p><l>hobby<s n="n"/><s n="m"/></l><r>hobby<s n="n"/><s n="m"/></r></p></e>
+<e a="hector"><p><l>cadastro<s n="n"/><s n="m"/><s n="sg"/></l><r>antecedents<b/>penals<s n="n"/><s n="m"/><s n="pl"/></r></p></e>
+<e a="hector"><p><l>cadastro<s n="n"/><s n="m"/></l><r>cadastre<s n="n"/><s n="m"/></r></p><par n="sp_sp"/></e>
+<e a="hector"><p><l>cadastro<s n="n"/><s n="m"/></l><r>registre<s n="n"/><s n="m"/></r></p><par n="sp_sp"/></e>
 
-<!-- xxxxxx -->
+<!-- xxxxx -->
 
     <!-- ******************************
           group np_symbol
@@ -20979,6 +21032,7 @@
 <e>       <p><l>vinte<b/>e<b/>nove<s n="num"/></l>     <r>vint-i-nou<s n="num"/></r></p></e>
 <e>       <re>[0-9]+([.,][0-9]+)?</re><p><l><s n="num"/></l><r><s n="num"/></r></p></e>
 <e>       <re>[0-9]+([.,][0-9]+)?%</re><p><l><s n="num"/><s n="percent"/></l><r><s n="num"/></r></p></e>
+
     <!-- ******************************
           group pr_symbol
       ****************************** -->
@@ -21008,6 +21062,7 @@
 <e r="RL"><p><l>como<s n="pr"/></l>                    <r>com<b/>a<s n="pr"/></r></p></e>
 <e>       <p><l>como<b/>prova<b/>de<s n="pr"/></l>     <r>com<b/>a<b/>prova<b/>de<s n="pr"/></r></p></e>
 <e>       <p><l>contra<s n="pr"/></l>                  <r>contra<s n="pr"/></r></p></e>
+<e r="RL"><p><l>contra<s n="pr"/></l>                  <r>en<b/>contra<b/>de<s n="pr"/></r></p></e>
 <e r="RL"><p><l>contra<s n="pr"/></l>                  <r>versus<s n="pr"/></r></p></e>
 <e>       <p><l>de<s n="pr"/></l>                      <r>de<s n="pr"/></r></p></e>
 <e r="LR"><p><l>debaixo<b/>de<s n="pr"/></l>           <r>sota<s n="pr"/></r></p></e>
@@ -21019,7 +21074,8 @@
 <e>       <p><l>em<s n="pr"/></l>                      <r>en<s n="pr"/></r></p></e>
 <e>       <p><l>em<b/>consequência<b/>de<s n="pr"/></l><r>a<b/>conseqüència<b/>de<s n="pr"/></r></p></e>
 <e>       <p><l>em<b/>decorrência<b/>de<s n="pr"/></l> <r>en<b/>el<b/>transcurs<b/>de<s n="pr"/></r></p></e>
-<e>       <p><l>em<b/>frente<b/>a<s n="pr"/></l>       <r>enfront<b/>de<s n="pr"/></r></p></e>
+<e r="LR"><p><l>em<b/>frente<b/>a<s n="pr"/></l>       <r>davant<b/>de<s n="pr"/></r></p></e>
+<e r="RL"><p><l>em<b/>frente<b/>a<s n="pr"/></l>       <r>enfront<b/>de<s n="pr"/></r></p></e>
 <e r="RL"><p><l>em<b/>meados<b/>de<s n="pr"/></l>      <r>a<b/>mitjan<s n="pr"/></r></p></e>
 <e r="RL"><p><l>em<b/>meados<b/>de<s n="pr"/></l>      <r>a<b/>mitjan<b/>de<s n="pr"/></r></p></e>
 <e>       <p><l>em<b/>meados<b/>de<s n="pr"/></l>      <r>a<b/>mitjans<b/>de<s n="pr"/></r></p></e>
@@ -21105,6 +21161,18 @@
 <e r="RL"><p><l>a<b/>començos<b/>de<s n="pr"/></l><r>a<b/>començaments<b/>de<s n="pr"/></r></p></e>
 <e r="RL"><p><l>a<b/>començos<b/>de<s n="pr"/></l><r>al<b/>principi<b/>de<s n="pr"/></r></p></e>
 <e r="RL"><p><l>a<b/>començos<b/>de<s n="pr"/></l><r>al<b/>començament<b/>de<s n="pr"/></r></p></e>
+<e r="LR" a="hector"><p><l>a<b/>este<b/>de<s n="pr"/></l><r>a<b/>l'est<b/>de<s n="pr"/></r></p></e>
+<e a="hector"><p><l>a<b/>leste<b/>de<s n="pr"/></l><r>a<b/>l'est<b/>de<s n="pr"/></r></p></e>
+<e a="hector"><p><l>a<b/>oeste<b/>de<s n="pr"/></l><r>a<b/>l'oest<b/>de<s n="pr"/></r></p></e>
+<e a="hector"><p><l>a<b/>norte<b/>de<s n="pr"/></l><r>al<b/>nord<b/>de<s n="pr"/></r></p></e>
+<e a="hector"><p><l>a<b/>sul<b/>de<s n="pr"/></l><r>al<b/>sud<b/>de<s n="pr"/></r></p></e>
+<e a="hector"><p><l>a<b/>nordeste<b/>de<s n="pr"/></l><r>al<b/>nord-est<b/>de<s n="pr"/></r></p></e>
+<e a="hector"><p><l>a<b/>noroeste<b/>de<s n="pr"/></l><r>al<b/>nord-oest<b/>de<s n="pr"/></r></p></e>
+<e a="hector"><p><l>a<b/>sudoeste<b/>de<s n="pr"/></l><r>al<b/>sud-oest<b/>de<s n="pr"/></r></p></e>
+<e a="hector"><p><l>a<b/>sueste<b/>de<s n="pr"/></l><r>al<b/>sud-est<b/>de<s n="pr"/></r></p></e>
+<e a="hector"><p><l>a<b/>favor<b/>de<s n="pr"/></l><r>al<b/>favor<b/>de<s n="pr"/></r></p></e>
+<e r="LR" a="hector"><p><l>en<b/>prol<b/>de<s n="pr"/></l><r>al<b/>favor<b/>de<s n="pr"/></r></p></e>
+<e a="hector"><p><l>ao<b/>contrário<b/>de<s n="pr"/></l><r>al<b/>contrari<b/>de<s n="pr"/></r></p></e>
 
     <!-- ******************************
           group preadv_symbol
@@ -22551,6 +22619,7 @@
 <e>       <p><l>retirar<s n="vblex"/></l>              <r>retirar<s n="vblex"/></r></p></e>
 <e>       <p><l>retomar<s n="vblex"/></l>              <r>reprendre<s n="vblex"/></r></p></e>
 <e>       <p><l>retorcer<s n="vblex"/></l>             <r>retorçar<s n="vblex"/></r></p></e>
+<e r="RL"><p><l>retorcer<s n="vblex"/></l>             <r>retòrcer<s n="vblex"/></r></p></e>
 <e r="LR"><p><l>retornar<s n="vblex"/></l>             <r>retornar<s n="vblex"/></r></p></e>
 <e>       <p><l>retroceder<s n="vblex"/></l>           <r>retrocedir<s n="vblex"/></r></p></e>
 <e r="RL"><p><l>reunir<s n="vblex"/></l>               <r>aplegar<s n="vblex"/></r></p></e>
@@ -22673,6 +22742,8 @@
 <e>       <p><l>tomar<s n="vblex"/></l>                <r>prendre<s n="vblex"/></r></p></e>
 <e>       <p><l>torcer<s n="vblex"/></l>               <r>torçar<s n="vblex"/></r></p></e>
 <e r="RL"><p><l>torcer<s n="vblex"/></l>               <r>tòrcer<s n="vblex"/></r></p></e>
+<e r="LR" vl="br"><p><l>torcer<g><b/>para</g><s n="vblex"/></l><r>ser<g><b/>aficionat<b/>de</g><s n="vblex"/></r></p></e>
+<e r="LR" vl="br"><p><l>torcer<g><b/>por</g><s n="vblex"/></l><r>ser<g><b/>aficionat<b/>de</g><s n="vblex"/></r></p></e>
 <e r="LR"><p><l>tornar<s n="vblex"/></l>               <r>fer<s n="vblex"/></r></p></e>
 <e>       <p><l>torturar<s n="vblex"/></l>             <r>torturar<s n="vblex"/></r></p></e>
 <e>       <p><l>trabalhar<s n="vblex"/></l>            <r>treballar<s n="vblex"/></r></p></e>
@@ -22752,8 +22823,27 @@
           group vbmod_symbol
       ****************************** -->
 <e r="LR"><p><l>deber<s n="vbmod"/></l>                <r>haver<g><b/>de</g><s n="vbmod"/></r></p></e>
-<e r="RL"><p><l>dever<s n="vbmod"/></l>                <r>deure<s n="vbmod"/></r></p></e>
-<e r="LR"><p><l>dever<s n="vbmod"/></l>                <r>haver<g><b/>de</g><s n="vbmod"/></r></p></e>
+<e r="LR"><p><l>dever<s n="vbmod"/><s n="pp"/></l><r>haver<g><b/>de</g><s n="vbmod"/><s n="pp"/></r></p></e>
+<e r="LR"><p><l>dever<s n="vbmod"/><s n="ger"/></l><r>haver<g><b/>de</g><s n="vbmod"/><s n="ger"/></r></p></e>
+<e r="LR"><p><l>dever<s n="vbmod"/><s n="inf"/></l><r>haver<g><b/>de</g><s n="vbmod"/><s n="inf"/></r></p></e>
+<e r="LR"><p><l>dever<s n="vbmod"/><s n="cni"/></l><r>haver<g><b/>de</g><s n="vbmod"/><s n="cni"/></r></p></e>
+<e r="LR"><p><l>dever<s n="vbmod"/><s n="fts"/></l><r>haver<g><b/>de</g><s n="vbmod"/><s n="fts"/></r></p></e>
+<e r="LR"><p><l>dever<s n="vbmod"/><s n="fti"/></l><r>haver<g><b/>de</g><s n="vbmod"/><s n="fti"/></r></p></e>
+<e r="LR"><p><l>dever<s n="vbmod"/><s n="pii"/></l><r>haver<g><b/>de</g><s n="vbmod"/><s n="pii"/></r></p></e>
+<e r="LR"><p><l>dever<s n="vbmod"/><s n="pri"/></l><r>haver<g><b/>de</g><s n="vbmod"/><s n="pri"/></r></p></e>
+<e r="LR"><p><l>dever<s n="vbmod"/><s n="pis"/></l><r>haver<g><b/>de</g><s n="vbmod"/><s n="pis"/></r></p></e>
+<e r="LR"><p><l>dever<s n="vbmod"/><s n="prs"/></l><r>haver<g><b/>de</g><s n="vbmod"/><s n="prs"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="pp"/></l><r>deure<s n="vbmod"/><s n="pp"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="ger"/></l><r>deure<s n="vbmod"/><s n="ger"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="inf"/></l><r>deure<s n="vbmod"/><s n="inf"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="cni"/></l><r>deure<s n="vbmod"/><s n="cni"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="fts"/></l><r>deure<s n="vbmod"/><s n="fts"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="fti"/></l><r>deure<s n="vbmod"/><s n="fti"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="pii"/></l><r>deure<s n="vbmod"/><s n="pii"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="pri"/></l><r>deure<s n="vbmod"/><s n="pri"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="pis"/></l><r>deure<s n="vbmod"/><s n="pis"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="prs"/></l><r>deure<s n="vbmod"/><s n="prs"/></r></p></e>
+<e r="RL"><p><l>dever<s n="vbmod"/><s n="ifi"/></l><r>deure<s n="vbmod"/><s n="ifi"/></r></p></e>
 <e>       <p><l>fazer<g><b/>falta</g><s n="vblex"/></l><r>caldre<s n="vbmod"/></r></p></e>
 <e r="LR"><p><l>haver<g><b/>de</g><s n="vbmod"/></l>   <r>haver<g><b/>de</g><s n="vbmod"/></r></p></e>
 <e>       <p><l>poder<s n="vbmod"/></l>                <r>poder<s n="vbmod"/></r></p></e>
@@ -22773,6 +22863,7 @@
 <e>       <re>[.\?;:!]</re><p><l><s n="sent"/></l>     <r><s n="sent"/></r></p></e>
 <e>       <p><l>ter<s n="vbhaver"/></l>                <r>haver<s n="vbhaver"/></r></p></e>
 <e>       <p><l>ser<s n="vbser"/></l>                  <r>ser<s n="vbser"/></r></p></e>
+<e>       <p><l>ser<s n="vbser"/></l>                  <r>estar<s n="vblex"/></r></p></e>
 
 <e a="hector"><p><l>província<s n="n"/><s n="f"/></l><r>província<s n="n"/><s n="f"/></r></p></e>
 <e a="hector"><p><l>era<s n="n"/><s n="f"/></l><r>era<s n="n"/><s n="f"/></r></p></e>
@@ -22788,7 +22879,8 @@
 <e vl="pt_pre1990" a="hector"><p><l>asteróide<s n="n"/><s n="m"/></l><r>asteroide<s n="n"/><s n="m"/></r></p></e>
 <e a="hector"><p><l>vila<s n="n"/><s n="f"/></l><r>vila<s n="n"/><s n="f"/></r></p></e>
 <e a="hector"><p><l>revestir<s n="vblex"/></l><r>revestir<s n="vblex"/></r></p></e>
-<e a="hector"><p><l>leste<s n="n"/><s n="m"/></l><r>est<s n="n"/><s n="m"/></r></p></e>
+<e a="hector"><p><l>leste<s n="n"/><s n="m"/><s n="sg"/></l><r>est<s n="n"/><s n="m"/><s n="sg"/></r></p></e>
+<e r="LR" a="hector"><p><l>este<s n="n"/><s n="m"/><s n="sg"/></l><r>est<s n="n"/><s n="m"/><s n="sg"/></r></p></e>
 <e a="hector"><p><l>influenciar<s n="vblex"/></l><r>influenciar<s n="vblex"/></r></p></e>
 <e a="hector"><p><l>serra<s n="n"/><s n="f"/></l><r>serra<s n="n"/><s n="f"/></r></p></e>
 <e a="hector"><p><l>classificar<s n="vblex"/></l><r>classificar<s n="vblex"/></r></p></e>
@@ -22831,7 +22923,7 @@
 <e a="hector"><p><l>bronze<s n="n"/><s n="m"/></l><r>bronze<s n="n"/><s n="m"/></r></p></e>
 <e a="hector"><p><l>suar<s n="vblex"/></l><r>suar<s n="vblex"/></r></p></e>
 <e a="hector"><p><l>primário<s n="adj"/></l><r>primari<s n="adj"/></r></p></e>
-<e a="hector"><p><l>predominantemente<s n="adv"/></l><r>predominantmente<s n="adv"/></r></p></e>
+<e a="hector"><p><l>predominantemente<s n="adv"/></l><r>predominantment<s n="adv"/></r></p></e>
 <e vl="br" a="hector"><p><l>planejar<s n="vblex"/></l><r>planejar<s n="vblex"/></r></p></e>
 <e a="hector"><p><l>matriz<s n="n"/><s n="f"/></l><r>matriu<s n="n"/><s n="f"/></r></p></e>
 <e a="hector"><p><l>localizar<s n="vblex"/></l><r>localitzar<s n="vblex"/></r></p></e>
diff --git a/apertium-por-cat.por-cat.metalrx b/apertium-por-cat.por-cat.metalrx
index de9a314..57f5033 100644
--- a/apertium-por-cat.por-cat.metalrx
+++ b/apertium-por-cat.por-cat.metalrx
@@ -3,287 +3,287 @@
 <metalrx>
   <def-macros>
     <def-macro name="noms_propis">
-      <rule weight="0.6">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p1}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match lemma="de" tags="pr"/>
-         <or><match tags="np.loc"/><match tags="np.top.*"/></or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="np.ant.*"/>
-         <match lemma="de" tags="pr"/>
-         <or><match tags="np.loc"/><match tags="np.top.*"/></or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="det.*"/>
-         <or>
-           <match tags="adj.*"/>
-           <match lemma="conqueridor" tags="n.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="np.ant.*"/>
-         <match tags="det.*"/>
-         <or>
-           <match tags="adj.*"/>
-           <match lemma="conqueridor" tags="n.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <or>
-           <match tags="num.*"/>
-           <match lemma="I" tags="adj.*"/>
-           <match lemma="II" tags="adj.*"/>
-           <match lemma="III" tags="adj.*"/>
-           <match lemma="IV" tags="adj.*"/>
-           <match lemma="V" tags="adj.*"/>
-           <match lemma="VI" tags="adj.*"/>
-           <match lemma="VII" tags="adj.*"/>
-           <match lemma="VIII" tags="adj.*"/>
-           <match lemma="IX" tags="adj.*"/>
-           <match lemma="X" tags="adj.*"/>
-           <match lemma="XI" tags="adj.*"/>
-           <match lemma="XII" tags="adj.*"/>
-           <match lemma="XIII" tags="adj.*"/>
-           <match lemma="XIV" tags="adj.*"/>
-           <match lemma="XV" tags="adj.*"/>
-           <match lemma="XVI" tags="adj.*"/>
-           <match lemma="XVII" tags="adj.*"/>
-           <match lemma="XVIII" tags="adj.*"/>
-           <match lemma="XIX" tags="adj.*"/>
-           <match lemma="XX" tags="adj.*"/>
-           <match lemma="XXI" tags="adj.*"/>
-           <match lemma="XXII" tags="adj.*"/>
-           <match lemma="XXIII" tags="adj.*"/>
-           <match lemma="XXIV" tags="adj.*"/>
-           <match lemma="XXV" tags="adj.*"/>
-           <match lemma="XXVI" tags="adj.*"/>
-           <match lemma="XXVII" tags="adj.*"/>
-           <match lemma="XXVIII" tags="adj.*"/>
-           <match lemma="XXIX" tags="adj.*"/>
-           <match lemma="XXX" tags="adj.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="np.ant.*"/>
-         <or>
-           <match tags="num.*"/>
-           <match lemma="I" tags="adj.*"/>
-           <match lemma="II" tags="adj.*"/>
-           <match lemma="III" tags="adj.*"/>
-           <match lemma="IV" tags="adj.*"/>
-           <match lemma="V" tags="adj.*"/>
-           <match lemma="VI" tags="adj.*"/>
-           <match lemma="VII" tags="adj.*"/>
-           <match lemma="VIII" tags="adj.*"/>
-           <match lemma="IX" tags="adj.*"/>
-           <match lemma="X" tags="adj.*"/>
-           <match lemma="XI" tags="adj.*"/>
-           <match lemma="XII" tags="adj.*"/>
-           <match lemma="XIII" tags="adj.*"/>
-           <match lemma="XIV" tags="adj.*"/>
-           <match lemma="XV" tags="adj.*"/>
-           <match lemma="XVI" tags="adj.*"/>
-           <match lemma="XVII" tags="adj.*"/>
-           <match lemma="XVIII" tags="adj.*"/>
-           <match lemma="XIX" tags="adj.*"/>
-           <match lemma="XX" tags="adj.*"/>
-           <match lemma="XXI" tags="adj.*"/>
-           <match lemma="XXII" tags="adj.*"/>
-           <match lemma="XXIII" tags="adj.*"/>
-           <match lemma="XXIV" tags="adj.*"/>
-           <match lemma="XXV" tags="adj.*"/>
-           <match lemma="XXVI" tags="adj.*"/>
-           <match lemma="XXVII" tags="adj.*"/>
-           <match lemma="XXVIII" tags="adj.*"/>
-           <match lemma="XXIX" tags="adj.*"/>
-           <match lemma="XXX" tags="adj.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="papa" tags="n.*"/>
-           <match lemma="patriarca" tags="n.*"/>
-           <match lemma="bispo" tags="n.*"/>
-           <match lemma="arcebispo" tags="n.*"/>
-           <match lemma="apòstol" tags="n.*"/>
-           <match lemma="imperador" tags="n.*"/>
-           <match lemma="imperatriz" tags="n.*"/>
-           <match lemma="rei" tags="n.*"/>
-           <match lemma="rainha" tags="n.*"/>
-           <match lemma="tsar" tags="n.*"/>
-           <match lemma="virrei" tags="n.*"/>
-           <match lemma="regent" tags="n.*"/>
-           <match lemma="príncipe" tags="n.*"/>
-           <match lemma="princesa" tags="n.*"/>
-           <match lemma="infant" tags="n.*"/>
-           <match lemma="delfí" tags="n.*"/>
-           <match lemma="conde" tags="n.*"/>
-           <match lemma="visconde" tags="n.*"/>
-           <match lemma="duque" tags="n.*"/>
-           <match lemma="arquiduque" tags="n.*"/>
-           <match lemma="marquês" tags="n.*"/>
-           <match lemma="barão" tags="n.*"/>
-         </or>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="100.0">
-         <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="papa" tags="n.*"/>
-           <match lemma="patriarca" tags="n.*"/>
-           <match lemma="bispo" tags="n.*"/>
-           <match lemma="arcebispo" tags="n.*"/>
-           <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
-           <match lemma="apòstol" tags="n.*"/>
-           <match lemma="imperador" tags="n.*"/>
-           <match lemma="imperatriz" tags="n.*"/>
-           <match lemma="rei" tags="n.*"/>
-           <match lemma="rainha" tags="n.*"/>
-           <match lemma="tsar" tags="n.*"/>
-           <match lemma="virrei" tags="n.*"/>
-           <match lemma="regent" tags="n.*"/>
-           <match lemma="príncipe" tags="n.*"/>
-           <match lemma="princesa" tags="n.*"/>
-           <match lemma="infant" tags="n.*"/>
-           <match lemma="delfí" tags="n.*"/>
-           <match lemma="conde" tags="n.*"/>
-           <match lemma="visconde" tags="n.*"/>
-           <match lemma="duque" tags="n.*"/>
-           <match lemma="arquiduque" tags="n.*"/>
-           <match lemma="marquês" tags="n.*"/>
-           <match lemma="barão" tags="n.*"/>
-         </or>
-         <match tags="np.ant.*"/>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="cm"/>
-         <or>
-           <match lemma="papa" tags="n.*"/>
-           <match lemma="patriarca" tags="n.*"/>
-           <match lemma="bispo" tags="n.*"/>
-           <match lemma="arcebispo" tags="n.*"/>
-           <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
-           <match lemma="apòstol" tags="n.*"/>
-           <match lemma="imperador" tags="n.*"/>
-           <match lemma="imperatriz" tags="n.*"/>
-           <match lemma="rei" tags="n.*"/>
-           <match lemma="rainha" tags="n.*"/>
-           <match lemma="tsar" tags="n.*"/>
-           <match lemma="virrei" tags="n.*"/>
-           <match lemma="regent" tags="n.*"/>
-           <match lemma="príncipe" tags="n.*"/>
-           <match lemma="princesa" tags="n.*"/>
-           <match lemma="infant" tags="n.*"/>
-           <match lemma="delfí" tags="n.*"/>
-           <match lemma="conde" tags="n.*"/>
-           <match lemma="visconde" tags="n.*"/>
-           <match lemma="duque" tags="n.*"/>
-           <match lemma="arquiduque" tags="n.*"/>
-           <match lemma="marquês" tags="n.*"/>
-           <match lemma="barão" tags="n.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <match tags="np.ant.*"/>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="cm"/>
-         <or>
-           <match lemma="papa" tags="n.*"/>
-           <match lemma="patriarca" tags="n.*"/>
-           <match lemma="bispo" tags="n.*"/>
-           <match lemma="arcebispo" tags="n.*"/>
-           <match lemma="santo" tags="n.*"/>
-           <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
-           <match lemma="apòstol" tags="n.*"/>
-           <match lemma="imperador" tags="n.*"/>
-           <match lemma="imperatriz" tags="n.*"/>
-           <match lemma="rei" tags="n.*"/>
-           <match lemma="rainha" tags="n.*"/>
-           <match lemma="tsar" tags="n.*"/>
-           <match lemma="virrei" tags="n.*"/>
-           <match lemma="regent" tags="n.*"/>
-           <match lemma="príncipe" tags="n.*"/>
-           <match lemma="princesa" tags="n.*"/>
-           <match lemma="infant" tags="n.*"/>
-           <match lemma="delfí" tags="n.*"/>
-           <match lemma="conde" tags="n.*"/>
-           <match lemma="visconde" tags="n.*"/>
-           <match lemma="duque" tags="n.*"/>
-           <match lemma="arquiduque" tags="n.*"/>
-           <match lemma="marquês" tags="n.*"/>
-           <match lemma="barão" tags="n.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="papat" tags="n.*"/>
-           <match lemma="pontificat" tags="n.*"/>
-           <match lemma="imperi" tags="n.*"/>
-           <match lemma="reino" tags="n.*"/>
-           <match lemma="regnat" tags="n.*"/>
-           <match lemma="regència" tags="n.*"/>
-           <match lemma="viregnat" tags="n.*"/>
-         </or>
-         <match lemma="de" tags="pr"/>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="papat" tags="n.*"/>
-           <match lemma="pontificat" tags="n.*"/>
-           <match lemma="imperi" tags="n.*"/>
-           <match lemma="regne" tags="n.*"/>
-           <match lemma="regnat" tags="n.*"/>
-           <match lemma="regència" tags="n.*"/>
-           <match lemma="viregnat" tags="n.*"/>
-         </or>
-         <match lemma="de" tags="pr"/>
-         <match tags="np.ant.*"/>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <or>
-           <match lemma="regnar" tags="vblex.*"/>
-           <match lemma="governar" tags="vblex.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-         <match tags="np.ant.*"/>
-         <or>
-           <match lemma="regnar" tags="vblex.*"/>
-           <match lemma="governar" tags="vblex.*"/>
-         </or>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="regnar" tags="vblex.ger"/>
-           <match lemma="governar" tags="vblex.ger"/>
-         </or>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
-      <rule weight="1.0">
-         <or>
-           <match lemma="regnar" tags="vblex.ger"/>
-           <match lemma="governar" tags="vblex.ger"/>
-         </or>
-         <match tags="np.ant.*"/>
-         <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-      </rule>
+     <rule weight="0.6">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p1}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match lemma="de" tags="pr"/>
+        <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="np.ant.*"/>
+        <match lemma="de" tags="pr"/>
+        <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="det.*"/>
+        <or>
+          <match tags="adj.*"/>
+          <match lemma="conqueridor" tags="n.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="np.ant.*"/>
+        <match tags="det.*"/>
+        <or>
+          <match tags="adj.*"/>
+          <match lemma="conqueridor" tags="n.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <or>
+          <match tags="num.*"/>
+          <match lemma="I" tags="adj.*"/>
+          <match lemma="II" tags="adj.*"/>
+          <match lemma="III" tags="adj.*"/>
+          <match lemma="IV" tags="adj.*"/>
+          <match lemma="V" tags="adj.*"/>
+          <match lemma="VI" tags="adj.*"/>
+          <match lemma="VII" tags="adj.*"/>
+          <match lemma="VIII" tags="adj.*"/>
+          <match lemma="IX" tags="adj.*"/>
+          <match lemma="X" tags="adj.*"/>
+          <match lemma="XI" tags="adj.*"/>
+          <match lemma="XII" tags="adj.*"/>
+          <match lemma="XIII" tags="adj.*"/>
+          <match lemma="XIV" tags="adj.*"/>
+          <match lemma="XV" tags="adj.*"/>
+          <match lemma="XVI" tags="adj.*"/>
+          <match lemma="XVII" tags="adj.*"/>
+          <match lemma="XVIII" tags="adj.*"/>
+          <match lemma="XIX" tags="adj.*"/>
+          <match lemma="XX" tags="adj.*"/>
+          <match lemma="XXI" tags="adj.*"/>
+          <match lemma="XXII" tags="adj.*"/>
+          <match lemma="XXIII" tags="adj.*"/>
+          <match lemma="XXIV" tags="adj.*"/>
+          <match lemma="XXV" tags="adj.*"/>
+          <match lemma="XXVI" tags="adj.*"/>
+          <match lemma="XXVII" tags="adj.*"/>
+          <match lemma="XXVIII" tags="adj.*"/>
+          <match lemma="XXIX" tags="adj.*"/>
+          <match lemma="XXX" tags="adj.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="np.ant.*"/>
+        <or>
+          <match tags="num.*"/>
+          <match lemma="I" tags="adj.*"/>
+          <match lemma="II" tags="adj.*"/>
+          <match lemma="III" tags="adj.*"/>
+          <match lemma="IV" tags="adj.*"/>
+          <match lemma="V" tags="adj.*"/>
+          <match lemma="VI" tags="adj.*"/>
+          <match lemma="VII" tags="adj.*"/>
+          <match lemma="VIII" tags="adj.*"/>
+          <match lemma="IX" tags="adj.*"/>
+          <match lemma="X" tags="adj.*"/>
+          <match lemma="XI" tags="adj.*"/>
+          <match lemma="XII" tags="adj.*"/>
+          <match lemma="XIII" tags="adj.*"/>
+          <match lemma="XIV" tags="adj.*"/>
+          <match lemma="XV" tags="adj.*"/>
+          <match lemma="XVI" tags="adj.*"/>
+          <match lemma="XVII" tags="adj.*"/>
+          <match lemma="XVIII" tags="adj.*"/>
+          <match lemma="XIX" tags="adj.*"/>
+          <match lemma="XX" tags="adj.*"/>
+          <match lemma="XXI" tags="adj.*"/>
+          <match lemma="XXII" tags="adj.*"/>
+          <match lemma="XXIII" tags="adj.*"/>
+          <match lemma="XXIV" tags="adj.*"/>
+          <match lemma="XXV" tags="adj.*"/>
+          <match lemma="XXVI" tags="adj.*"/>
+          <match lemma="XXVII" tags="adj.*"/>
+          <match lemma="XXVIII" tags="adj.*"/>
+          <match lemma="XXIX" tags="adj.*"/>
+          <match lemma="XXX" tags="adj.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="papa" tags="n.*"/>
+          <match lemma="patriarca" tags="n.*"/>
+          <match lemma="bispo" tags="n.*"/>
+          <match lemma="arcebispo" tags="n.*"/>
+          <match lemma="apòstol" tags="n.*"/>
+          <match lemma="imperador" tags="n.*"/>
+          <match lemma="imperatriz" tags="n.*"/>
+          <match lemma="rei" tags="n.*"/>
+          <match lemma="rainha" tags="n.*"/>
+          <match lemma="tsar" tags="n.*"/>
+          <match lemma="virrei" tags="n.*"/>
+          <match lemma="regent" tags="n.*"/>
+          <match lemma="príncipe" tags="n.*"/>
+          <match lemma="princesa" tags="n.*"/>
+          <match lemma="infant" tags="n.*"/>
+          <match lemma="delfí" tags="n.*"/>
+          <match lemma="conde" tags="n.*"/>
+          <match lemma="visconde" tags="n.*"/>
+          <match lemma="duque" tags="n.*"/>
+          <match lemma="arquiduque" tags="n.*"/>
+          <match lemma="marquês" tags="n.*"/>
+          <match lemma="barão" tags="n.*"/>
+        </or>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="100.0">
+        <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="papa" tags="n.*"/>
+          <match lemma="patriarca" tags="n.*"/>
+          <match lemma="bispo" tags="n.*"/>
+          <match lemma="arcebispo" tags="n.*"/>
+          <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
+          <match lemma="apòstol" tags="n.*"/>
+          <match lemma="imperador" tags="n.*"/>
+          <match lemma="imperatriz" tags="n.*"/>
+          <match lemma="rei" tags="n.*"/>
+          <match lemma="rainha" tags="n.*"/>
+          <match lemma="tsar" tags="n.*"/>
+          <match lemma="virrei" tags="n.*"/>
+          <match lemma="regent" tags="n.*"/>
+          <match lemma="príncipe" tags="n.*"/>
+          <match lemma="princesa" tags="n.*"/>
+          <match lemma="infant" tags="n.*"/>
+          <match lemma="delfí" tags="n.*"/>
+          <match lemma="conde" tags="n.*"/>
+          <match lemma="visconde" tags="n.*"/>
+          <match lemma="duque" tags="n.*"/>
+          <match lemma="arquiduque" tags="n.*"/>
+          <match lemma="marquês" tags="n.*"/>
+          <match lemma="barão" tags="n.*"/>
+        </or>
+        <match tags="np.ant.*"/>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="cm"/>
+        <or>
+          <match lemma="papa" tags="n.*"/>
+          <match lemma="patriarca" tags="n.*"/>
+          <match lemma="bispo" tags="n.*"/>
+          <match lemma="arcebispo" tags="n.*"/>
+          <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
+          <match lemma="apòstol" tags="n.*"/>
+          <match lemma="imperador" tags="n.*"/>
+          <match lemma="imperatriz" tags="n.*"/>
+          <match lemma="rei" tags="n.*"/>
+          <match lemma="rainha" tags="n.*"/>
+          <match lemma="tsar" tags="n.*"/>
+          <match lemma="virrei" tags="n.*"/>
+          <match lemma="regent" tags="n.*"/>
+          <match lemma="príncipe" tags="n.*"/>
+          <match lemma="princesa" tags="n.*"/>
+          <match lemma="infant" tags="n.*"/>
+          <match lemma="delfí" tags="n.*"/>
+          <match lemma="conde" tags="n.*"/>
+          <match lemma="visconde" tags="n.*"/>
+          <match lemma="duque" tags="n.*"/>
+          <match lemma="arquiduque" tags="n.*"/>
+          <match lemma="marquês" tags="n.*"/>
+          <match lemma="barão" tags="n.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <match tags="np.ant.*"/>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="cm"/>
+        <or>
+          <match lemma="papa" tags="n.*"/>
+          <match lemma="patriarca" tags="n.*"/>
+          <match lemma="bispo" tags="n.*"/>
+          <match lemma="arcebispo" tags="n.*"/>
+          <match lemma="santo" tags="n.*"/>
+          <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
+          <match lemma="apòstol" tags="n.*"/>
+          <match lemma="imperador" tags="n.*"/>
+          <match lemma="imperatriz" tags="n.*"/>
+          <match lemma="rei" tags="n.*"/>
+          <match lemma="rainha" tags="n.*"/>
+          <match lemma="tsar" tags="n.*"/>
+          <match lemma="virrei" tags="n.*"/>
+          <match lemma="regent" tags="n.*"/>
+          <match lemma="príncipe" tags="n.*"/>
+          <match lemma="princesa" tags="n.*"/>
+          <match lemma="infant" tags="n.*"/>
+          <match lemma="delfí" tags="n.*"/>
+          <match lemma="conde" tags="n.*"/>
+          <match lemma="visconde" tags="n.*"/>
+          <match lemma="duque" tags="n.*"/>
+          <match lemma="arquiduque" tags="n.*"/>
+          <match lemma="marquês" tags="n.*"/>
+          <match lemma="barão" tags="n.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="papat" tags="n.*"/>
+          <match lemma="pontificat" tags="n.*"/>
+          <match lemma="imperi" tags="n.*"/>
+          <match lemma="reino" tags="n.*"/>
+          <match lemma="regnat" tags="n.*"/>
+          <match lemma="regència" tags="n.*"/>
+          <match lemma="viregnat" tags="n.*"/>
+        </or>
+        <match lemma="de" tags="pr"/>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="papat" tags="n.*"/>
+          <match lemma="pontificat" tags="n.*"/>
+          <match lemma="imperi" tags="n.*"/>
+          <match lemma="regne" tags="n.*"/>
+          <match lemma="regnat" tags="n.*"/>
+          <match lemma="regència" tags="n.*"/>
+          <match lemma="viregnat" tags="n.*"/>
+        </or>
+        <match lemma="de" tags="pr"/>
+        <match tags="np.ant.*"/>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <or>
+          <match lemma="regnar" tags="vblex.*"/>
+          <match lemma="governar" tags="vblex.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+        <match tags="np.ant.*"/>
+        <or>
+          <match lemma="regnar" tags="vblex.*"/>
+          <match lemma="governar" tags="vblex.*"/>
+        </or>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="regnar" tags="vblex.ger"/>
+          <match lemma="governar" tags="vblex.ger"/>
+        </or>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
+     <rule weight="1.0">
+        <or>
+          <match lemma="regnar" tags="vblex.ger"/>
+          <match lemma="governar" tags="vblex.ger"/>
+        </or>
+        <match tags="np.ant.*"/>
+        <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+     </rule>
     </def-macro>
   </def-macros>
 
@@ -293,57 +293,75 @@
 
   <!-- além de > més enllà de, a més de -->
   <rule weight="0.6">
-     <match lemma="além de" tags="pr"><select lemma="més enllà de"/></match>
+    <match lemma="além de" tags="pr"><select lemma="més enllà de"/></match>
   </rule>
 
   <!-- para > per a, cap a, a -->
   <rule weight="0.6">
-     <match lemma="para" tags="pr"><select lemma="per a"/></match>
+    <match lemma="para" tags="pr"><select lemma="per a"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="mudar" tags="vblex.*"><select lemma="traslladar"/></match>
-     <match lemma="para" tags="pr"><select lemma="a"/></match>
+    <match lemma="mudar" tags="vblex.*"><select lemma="traslladar"/></match>
+    <match lemma="para" tags="pr"><select lemma="a"/></match>
   </rule>
   <rule weight="1.0">
-     <or>
-       <match lemma="traduzir" tags="vblex.*"/>
-       <match lemma="viajar" tags="vblex.*"/>
-       <!--       <match lemma="ir" tags="vblex.*"/> -->
-     </or>
-     <match lemma="para" tags="pr"><select lemma="a"/></match>
+    <or>
+      <match lemma="traduzir" tags="vblex.*"/>
+      <match lemma="viajar" tags="vblex.*"/>
+      <!--       <match lemma="ir" tags="vblex.*"/> -->
+    </or>
+    <match lemma="para" tags="pr"><select lemma="a"/></match>
   </rule>
 
 <!-- **************** ADJ **************** -->
 
   <!-- são > sa, sant -->
   <rule weight="0.6">
-     <match lemma="são" tags="adj.*"><select lemma="sa"/></match>
+    <match lemma="são" tags="adj.*"><select lemma="sa"/></match>
   </rule>
   <rule weight="0.8">
-     <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
-     <match tags="np.ant.*"/>
+    <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
+    <match tags="np.ant.*"/>
   </rule>
   <rule weight="1.0">
-     <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
-     <match tags=""/>
+    <match lemma="são" tags="adj.*"><select lemma="sant"/></match>
+    <match tags=""/>
   </rule>
 
   <!-- inteiro > sencer, enter -->
   <rule weight="0.6">
-     <match lemma="inteiro" tags="adj.*"><select lemma="sencer"/></match>
+    <match lemma="inteiro" tags="adj.*"><select lemma="sencer"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="número" tags="n.*"/>
-     <match lemma="inteiro" tags="adj.*"><select lemma="enter"/></match>
+    <match lemma="número" tags="n.*"/>
+    <match lemma="inteiro" tags="adj.*"><select lemma="enter"/></match>
   </rule>
 
 <!-- **************** N **************** -->
 
+  <!-- cadastro > cadastre, antecedents penals, registre -->
+  <rule weight="0.6">
+    <match lemma="cadastro" tags="n.*"><select lemma="cadastre"/></match>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="ter" tags="vblex.*"/>
+    <match lemma="cadastro" tags="n.*"><select lemma="antecedents penals"/></match>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="cadastro" tags="n.*"><select lemma="registre"/></match>
+    <match lemma="de" tags="pr"/>
+    <or>
+      <match lemma="usuário" tags="n.*"/>
+      <match lemma="utente" tags="n.*"/>
+      <match lemma="utilizador" tags="n.*"/>
+    </or>
+  </rule>
+
   <!-- direção/direcção > direcció, adreça -->
   <rule weight="0.6">
     <or>
-      <match lemma="direção" tags="n.*"><select lemma="direcció"/></match>
-      <match lemma="direcção" tags="n.*"><select lemma="direcció"/></match>
+     <match lemma="direção" tags="n.*"><select lemma="direcció"/></match>
+     <match lemma="direcção" tags="n.*"><select lemma="direcció"/></match>
     </or>
   </rule>
 
@@ -354,93 +372,108 @@
   <rule weight="1.0">
     <match lemma="número" tags="n.*"><select lemma="número"/></match>
     <or>
-      <match lemma="uno"/>
-      <match lemma="pi"/>
-      <match lemma="e"/>
+     <match lemma="uno"/>
+     <match lemma="pi"/>
+     <match lemma="e"/>
     </or>
   </rule>
 
   <!-- quarto > habitació, quart -->
   <rule weight="0.6">
-     <match lemma="quarto" tags="n.*"><select lemma="habitació"/></match>
+    <match lemma="quarto" tags="n.*"><select lemma="habitació"/></match>
   </rule>
   <rule weight="1.0">
-     <or><match tags="num.*"/><match tags="num"/></or>
-     <match tags="cnjcoo"/>
-     <match lemma="quarto" tags="n.*"><select lemma="quart"/></match>
+    <or><match tags="num.*"/><match tags="num"/></or>
+    <match tags="cnjcoo"/>
+    <match lemma="quarto" tags="n.*"><select lemma="quart"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="quarto" tags="n.*"><select lemma="quart"/></match>
-     <or>
-       <match lemma="crescente" tags="adj.*"/>
-       <match lemma="minguante" tags="adj.*"/>
-     </or>
+    <match lemma="quarto" tags="n.*"><select lemma="quart"/></match>
+    <or>
+      <match lemma="crescente" tags="adj.*"/>
+      <match lemma="minguante" tags="adj.*"/>
+    </or>
   </rule>
   <rule weight="1.0">
-     <match lemma="quarto" tags="n.*"><select lemma="quart"/></match>
-     <match lemma="de" tags="pr"/>
-     <or>
-       <match lemma="hora" tags="n.*"/>
-       <match lemma="quilo" tags="n.*"/>
-       <match lemma="quilograma" tags="n.*"/>
-       <match lemma="litro" tags="n.*"/>
-     </or>
+    <match lemma="quarto" tags="n.*"><select lemma="quart"/></match>
+    <match lemma="de" tags="pr"/>
+    <or>
+      <match lemma="hora" tags="n.*"/>
+      <match lemma="quilo" tags="n.*"/>
+      <match lemma="quilograma" tags="n.*"/>
+      <match lemma="litro" tags="n.*"/>
+    </or>
   </rule>
 
   <!-- câmara > cambra, càmera -->
   <rule weight="0.6">
-     <match lemma="câmara" tags="n.*"><select lemma="cambra"/></match>
+    <match lemma="câmara" tags="n.*"><select lemma="cambra"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="câmara" tags="n.*"><select lemma="càmera"/></match>
-     <match lemma="fotográfico" tags="adj.*"/>
+    <match lemma="câmara" tags="n.*"><select lemma="càmera"/></match>
+    <match lemma="fotográfico" tags="adj.*"/>
   </rule>
 
   <!-- dirección > direcció, adreça -->
   <rule weight="0.6">
-     <match lemma="dirección" tags="n.*"><select lemma="direcció"/></match>
+    <match lemma="dirección" tags="n.*"><select lemma="direcció"/></match>
   </rule>
 
   <!-- freguesia > parròquia, clientela -->
   <rule weight="0.6">
-     <match lemma="freguesia" tags="n.*"><select lemma="parròquia"/></match>
+    <match lemma="freguesia" tags="n.*"><select lemma="parròquia"/></match>
   </rule>
 
 <!-- **************** ADV **************** -->
 
   <!-- além > més enllà, a més -->
   <rule weight="0.6">
-     <match lemma="além" tags="adv"><select lemma="més enllà"/></match>
+    <match lemma="além" tags="adv"><select lemma="més enllà"/></match>
   </rule>
 
 <!-- **************** V **************** -->
 
   <!-- afastar > apartar, allunyar -->
   <rule weight="0.6">
-     <match lemma="afastar" tags="vblex.*"><select lemma="apartar"/></match>
+    <match lemma="afastar" tags="vblex.*"><select lemma="apartar"/></match>
   </rule>
 
   <!-- mudar > canviar, traslladar, mudar -->
   <rule weight="0.6">
-     <match lemma="mudar" tags="vblex.*"><select lemma="canviar"/></match>
+    <match lemma="mudar" tags="vblex.*"><select lemma="canviar"/></match>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="mudar" tags="vblex.*"><select lemma="traslladar"/></match>
+    <match lemma="para" tags="pr"><select lemma="a"/></match>
+  </rule>
+
+  <!-- ser > ser, estar -->
+  <rule weight="0.6">
+    <match lemma="ser" tags="vbser.*"><select lemma="ser"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="mudar" tags="vblex.*"><select lemma="traslladar"/></match>
-     <match lemma="para" tags="pr"><select lemma="a"/></match>
+    <match lemma="ser" tags="vbser.*"><select lemma="estar"/></match>
+    <or>
+      <match lemma="a favor" tags="adv"/>
+      <match lemma="a favor de" tags="pr"/>
+      <match lemma="en prol de" tags="pr"/>
+      <match lemma="en contra" tags="adv"/>
+      <match lemma="contra" tags="pr"/>
+    </or>
   </rule>
 
 <!-- **************** PRN **************** -->
 
   <!-- que > què, quin -->
   <rule weight="0.6">
-     <match lemma="que" tags="prn.itg.*"><select lemma="què"/></match>
+    <match lemma="que" tags="prn.itg.*"><select lemma="què"/></match>
   </rule>
   <rule weight="1.0">
-     <match lemma="que" tags="prn.itg.*"><select lemma="quin"/></match>
-     <or>
-       <match tags="n.*"/>
-       <match tags="adj.*"/>
-     </or>
+    <match lemma="que" tags="prn.itg.*"><select lemma="quin"/></match>
+    <or>
+      <match tags="n.*"/>
+      <match tags="adj.*"/>
+    </or>
   </rule>
 
 <!-- **************** NP **************** -->