commit 2bf0b6f7afacebe5b4a61e8d125f6a49078235ff
Author: hectoralos <hectoralos@gmail.com>
Date:   Thu Jul 11 21:18:14 2019 +0300

    al + inf > a + inf

diff --git a/apertium-cat-ita.cat-ita.dix b/apertium-cat-ita.cat-ita.dix
index 19fba6e..70c778e 100644
--- a/apertium-cat-ita.cat-ita.dix
+++ b/apertium-cat-ita.cat-ita.dix
@@ -9829,7 +9829,8 @@
 <e>       <p><l>con<s n="n"/></l>                      <r>cono<s n="n"/></r></p></e>
 <e>       <p><l>conca<s n="n"/></l>                    <r>conca<s n="n"/></r></p></e>
 <e>       <p><l>concentració<s n="n"/></l>             <r>concentrazione<s n="n"/></r></p></e>
-<e>       <p><l>concepció<s n="n"/></l>                <r>concezione<s n="n"/></r></p></e>
+<e r="RL"><p><l>concepció<s n="n"/><s n="f"/></l>      <r>concepimento<s n="n"/><s n="m"/></r></p></e>
+<e>       <p><l>concepció<s n="n"/><s n="f"/></l>      <r>concezione<s n="n"/><s n="f"/></r></p></e>
 <e>       <p><l>concepte<s n="n"/></l>                 <r>concetto<s n="n"/></r></p></e>
 <e>       <p><l>concert<s n="n"/></l>                  <r>concerto<s n="n"/></r></p></e>
 <e>       <p><l>concessió<s n="n"/></l>                <r>concessione<s n="n"/></r></p></e>
diff --git a/apertium-cat-ita.cat-ita.metalrx b/apertium-cat-ita.cat-ita.metalrx
index 33108d1..144784a 100644
--- a/apertium-cat-ita.cat-ita.metalrx
+++ b/apertium-cat-ita.cat-ita.metalrx
@@ -2780,11 +2780,11 @@
     <or><match tags="vblex.inf"/><match tags="vbmod.inf"/><match tags="vbhaver.inf"/><match tags="vbser.inf"/></or>
   </rule>
   <rule weight="1.0">
-    <match lemma="estar" tags="vblex.*"><select lemma="andare"/></match>
+    <match lemma="estar" tags="vblex.*"><select lemma="stare"/></match>
     <repeat from="0" upto="1">
       <match tags="adv"/>
     </repeat>
-    <match tags="vblex.ger"/>
+    <or><match tags="vblex.ger"/><match tags="vbmod.ger"/><match tags="vbhaver.ger"/><match tags="vbser.ger"/></or>
   </rule>
 
   <!-- estimar > amare, stimare -->
diff --git a/apertium-cat-ita.cat-ita.t1x b/apertium-cat-ita.cat-ita.t1x
index 1269639..c43b5cf 100644
--- a/apertium-cat-ita.cat-ita.t1x
+++ b/apertium-cat-ita.cat-ita.t1x
@@ -130,6 +130,9 @@
     <def-cat n="el">          
       <cat-item lemma="el" tags="det.def.*"/>
     </def-cat>
+    <def-cat n="el_m_sg">          
+      <cat-item lemma="el" tags="det.def.m.sg"/>
+    </def-cat>
     <def-cat n="uns_propde">          
       <cat-item lemma="un" tags="det.ind.m.pl"/>
       <cat-item lemma="un" tags="det.ind.f.pl"/>
@@ -175,6 +178,9 @@
     <def-cat n="pr">
       <cat-item tags="pr"/>
     </def-cat>
+    <def-cat n="a">
+      <cat-item lemma="a" tags="pr"/>
+    </def-cat>
     <def-cat n="de">
       <cat-item lemma="de" tags="pr"/>
     </def-cat>
@@ -7840,7 +7846,7 @@
 
     <!-- fi REGLES fa -->
 
-    <rule comment="REGLA: EL PREP (el de > quello di)">
+    <rule comment="REGLA: EL DE (el de > quello di)">
       <pattern>
         <pattern-item n="el"/>
         <pattern-item n="de"/>
@@ -7952,6 +7958,108 @@
       </action>
     </rule>
 
+    <rule comment="REGLA: al + inf > a + inf">
+      <pattern>
+        <pattern-item n="a"/>
+        <pattern-item n="el_m_sg"/>
+        <pattern-item n="inf"/>
+      </pattern>
+      <action>
+        <call-macro n="firstWord">
+          <with-param pos="1"/>
+        </call-macro>
+        <let><var n="lemma"/><clip pos="1" side="tl" part="lem"/></let>
+        <out>
+          <chunk namefrom="lemma" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="pr"/></tag>
+            </tags>
+            <lu>
+              <clip pos="1" side="tl" part="whole"/> 
+            </lu>
+          </chunk>
+          <b pos="1"/>
+        </out>
+        <call-macro n="f_bcond"><with-param pos="2"/><with-param pos="3"/></call-macro>
+        <let><var n="lemma"/><clip pos="3" side="tl" part="lem"/></let>
+        <out>
+          <chunk namefrom="lemma">
+            <tags>
+              <tag><lit-tag v="SV"/></tag>
+              <tag><clip pos="3" side="tl" part="a_verb"/></tag>
+              <tag><clip pos="3" side="tl" part="temps"/></tag>
+            </tags>
+            <lu>
+              <clip pos="3" side="tl" part="lemh"/>
+              <clip pos="3" side="tl" part="a_verb"/>
+              <clip pos="3" side="tl" part="temps"/>
+              <clip pos="3" side="tl" part="lemq"/>
+            </lu>
+          </chunk>
+        </out>
+      </action>
+    </rule>
+
+   <rule comment="al + vbhaver + pp > a + aux + pp">
+     <pattern>
+        <pattern-item n="a"/>
+        <pattern-item n="el_m_sg"/>
+        <pattern-item n="vbhaver"/>
+        <pattern-item n="pp"/>
+     </pattern>
+     <action>
+       <call-macro n="vauxiliar">
+         <with-param pos="3"/>
+         <with-param pos="4"/>
+       </call-macro>
+       <call-macro n="firstWord">
+         <with-param pos="1"/>
+       </call-macro>
+        <let><var n="lemma"/><clip pos="1" side="tl" part="lem"/></let>
+        <out>
+          <chunk namefrom="lemma" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="pr"/></tag>
+            </tags>
+            <lu>
+              <clip pos="1" side="tl" part="whole"/> 
+            </lu>
+          </chunk>
+          <b pos="1"/>
+        </out>
+        <call-macro n="f_bcond"><with-param pos="2"/><with-param pos="3"/></call-macro>
+        <let><var n="lemma"/><clip pos="4" side="tl" part="lem"/></let>
+        <out>
+          <chunk namefrom="lemma" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="SV"/></tag>
+              <tag><clip pos="4" side="tl" part="a_verb"/></tag>
+              <tag><clip pos="3" side="tl" part="temps"/></tag>
+              <tag><clip pos="3" side="tl" part="pers"/></tag>
+              <tag><clip pos="4" side="tl" part="gen"/></tag>
+              <tag><clip pos="3" side="tl" part="nbr"/></tag>
+            </tags>
+            <lu>
+              <clip pos="3" side="tl" part="lem"/> 
+              <clip pos="3" side="tl" part="a_verb"/>
+              <clip pos="3" side="tl" part="temps"/>
+              <clip pos="3" side="tl" part="pers"/>         
+              <clip pos="3" side="tl" part="nbr"/>
+            </lu> 
+            <b pos="3"/>
+            <lu>
+              <clip pos="4" side="tl" part="lemh"/> 
+              <clip pos="4" side="tl" part="a_verb"/>
+              <clip pos="4" side="tl" part="temps"/>
+              <clip pos="4" side="tl" part="gen"/>
+              <clip pos="4" side="tl" part="nbr"/>
+              <clip pos="4" side="tl" part="lemq"/>
+            </lu>
+          </chunk>
+        </out>
+      </action>
+    </rule>
+
     <rule comment="REGLA: ger">
       <pattern>
         <pattern-item n="ger"/>
diff --git a/apertium-cat-ita.ita-cat.metalrx b/apertium-cat-ita.ita-cat.metalrx
index 091dccb..d4be494 100644
--- a/apertium-cat-ita.ita-cat.metalrx
+++ b/apertium-cat-ita.ita-cat.metalrx
@@ -1903,6 +1903,11 @@
 
 <!-- **************** V **************** -->
 
+  <!-- stare > estar, etc. -->
+  <rule weight="0.6">
+    <match lemma="stare" tags="vblex.*"><select lemma="estar"/></match>
+  </rule>
+
   <!-- spalleggiare > donar# suport, donar# suport a -->
   <rule weight="0.6">
     <match lemma="spalleggiare" tags="vblex.*"><select lemma="donar# suport"/></match>