commit f31c675545388da942adaeb564b1d5e5819f911d
Author: hectoralos <hectoralos@gmail.com>
Date:   Tue Jun 18 18:42:47 2019 +0300

    vi si trova > s'hi trova

diff --git a/apertium-cat-ita.ita-cat.t1x b/apertium-cat-ita.ita-cat.t1x
index 0880feb..5d84f50 100644
--- a/apertium-cat-ita.ita-cat.t1x
+++ b/apertium-cat-ita.ita-cat.t1x
@@ -171,6 +171,10 @@
     </def-cat>
     <def-cat n="ci">
       <cat-item lemma="ci" tags="prn.pro.adv"/>
+      <cat-item lemma="vi" tags="prn.pro.adv"/>
+    </def-cat>
+    <def-cat n="si">
+      <cat-item lemma="si" tags="prn.pro.ref.p3.mf.sp"/>
     </def-cat>
     <def-cat n="tutto_prn">
       <cat-item lemma="tutto" tags="prn.*"/>
@@ -6390,6 +6394,95 @@
       </action>
     </rule>
 
+
+    <rule comment="REGLA: prnpro si vfin (no ifi): vi si trova > s'hi trova">
+      <pattern>
+        <pattern-item n="prnpro"/>
+        <pattern-item n="si"/>
+        <pattern-item n="vfin_no_ifi"/>
+      </pattern>
+      <action>
+        <call-macro n="firstWord">
+          <with-param pos="1"/>
+        </call-macro>
+        <out>
+          <chunk name="prnpro_prnpro_verbcj1" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="SV"/></tag>
+              <tag><clip pos="3" side="tl" part="a_verb"/></tag>
+              <tag><clip pos="3" side="sl" part="temps"/></tag>
+            </tags>
+            <lu>
+              <get-case-from pos="1">
+                <clip pos="2" side="tl" part="lem"/>
+              </get-case-from>
+              <clip pos="2" side="tl" part="tags"/>
+            </lu>
+            <b pos="1"/>
+            <lu>
+              <get-case-from pos="2">
+                <clip pos="1" side="tl" part="lem"/>
+              </get-case-from>
+              <clip pos="1" side="tl" part="tags"/>
+            </lu>
+            <b pos="2"/>
+            <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="pers"/>
+              <clip pos="3" side="tl" part="nbr"/>
+              <clip pos="3" side="tl" part="lemq"/>
+            </lu>
+          </chunk>
+        </out>
+      </action>
+    </rule>
+
+    <rule comment="REGLA: prnpro si PRETIND: vi si trovò > s'hi va trovar">
+      <pattern>
+        <pattern-item n="prnpro"/>
+        <pattern-item n="si"/>
+        <pattern-item n="pretind"/>
+      </pattern>
+      <action>
+        <call-macro n="firstWord">
+          <with-param pos="1"/>
+        </call-macro>
+        <call-macro n="f_pretind">
+          <with-param pos="3"/>
+          <with-param pos="3"/>
+        </call-macro>
+        <out>
+          <chunk name="prnpro_prnpro_verbcj2" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="SV"/></tag>
+              <tag><clip pos="3" side="tl" part="a_verb"/></tag>
+              <tag><clip pos="3" side="sl" part="temps"/></tag>
+            </tags>
+            <lu>
+              <get-case-from pos="1">
+                <clip pos="2" side="tl" part="lem"/>
+              </get-case-from>
+              <clip pos="2" side="tl" part="tags"/>
+            </lu>
+            <b pos="1"/>
+            <lu>
+              <get-case-from pos="2">
+                <clip pos="1" side="tl" part="lem"/>
+              </get-case-from>
+              <clip pos="1" side="tl" part="tags"/>
+            </lu>
+            <b pos="2"/>
+            <lu>
+              <var n="verbfinal"/>
+            </lu>
+          </chunk>
+        </out>
+      </action>
+    </rule>
+
+
   <rule comment="REGLA: vbser + pp (sono andata > he anat)">
       <pattern>
         <pattern-item n="vbser"/>
@@ -6635,7 +6728,66 @@
       </action>
     </rule>
 
-  <rule comment="REGLA: vbaux + adv + pp"> <!-- "sono già andate. hanno già mangiato. sono già fatte: ja han anat. ja han menjat. ja sn fetes-->
+    <rule comment="REGLA: prnpro si vbaux pp: vi si ha trovato > s'hi ha trovat">
+      <pattern>
+        <pattern-item n="prnpro"/>
+        <pattern-item n="si"/>
+        <pattern-item n="vbaux"/>
+        <pattern-item n="pp"/>
+      </pattern>
+      <action>
+        <call-macro n="firstWord">
+          <with-param pos="1"/>
+        </call-macro>
+        <call-macro n="f_vauxiliar_pron">
+          <with-param pos="1"/>
+          <with-param pos="3"/>
+          <with-param pos="4"/>
+        </call-macro>
+        <call-macro n="f_pretind">
+          <with-param pos="3"/>
+          <with-param pos="3"/>
+        </call-macro>
+        <out>
+          <chunk name="prnpro_prnpro_verbcj3" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="SV"/></tag>
+              <tag><clip pos="3" side="tl" part="a_verb"/></tag>
+              <tag><clip pos="3" side="sl" part="temps"/></tag>
+            </tags>
+            <lu>
+              <get-case-from pos="1">
+                <clip pos="2" side="tl" part="lem"/>
+              </get-case-from>
+              <clip pos="2" side="tl" part="tags"/>
+            </lu>
+            <b pos="1"/>
+            <lu>
+              <get-case-from pos="2">
+                <clip pos="1" side="tl" part="lem"/>
+              </get-case-from>
+              <clip pos="1" side="tl" part="tags"/>
+            </lu>
+            <b pos="2"/>
+            <lu>
+              <var n="verbfinal"/>
+            </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: vbaux + adv + pp"> <!-- "sono già andate. hanno già mangiato. sono già fatte: ja han anat. ja han menjat. ja són fetes-->
       <pattern>
         <pattern-item n="vbaux"/>
         <pattern-item n="adv_preadv"/>
@@ -6784,6 +6936,70 @@
       </action>
     </rule>
 
+    <rule comment="REGLA: prnpro si vbaux adv pp: vi si ha sempre trovato > s'hi ha sempre trovat">
+      <pattern>
+        <pattern-item n="prnpro"/>
+        <pattern-item n="si"/>
+        <pattern-item n="vbaux"/>
+        <pattern-item n="adv"/>
+        <pattern-item n="pp"/>
+      </pattern>
+      <action>
+        <call-macro n="firstWord">
+          <with-param pos="1"/>
+        </call-macro>
+        <call-macro n="f_vauxiliar_pron">
+          <with-param pos="1"/>
+          <with-param pos="3"/>
+          <with-param pos="5"/>
+        </call-macro>
+        <call-macro n="f_pretind">
+          <with-param pos="3"/>
+          <with-param pos="3"/>
+        </call-macro>
+        <out>
+          <chunk name="prnpro_prnpro_verbcj4" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="SV"/></tag>
+              <tag><clip pos="3" side="tl" part="a_verb"/></tag>
+              <tag><clip pos="3" side="sl" part="temps"/></tag>
+            </tags>
+            <lu>
+              <get-case-from pos="1">
+                <clip pos="2" side="tl" part="lem"/>
+              </get-case-from>
+              <clip pos="2" side="tl" part="tags"/>
+            </lu>
+            <b pos="1"/>
+            <lu>
+              <get-case-from pos="2">
+                <clip pos="1" side="tl" part="lem"/>
+              </get-case-from>
+              <clip pos="1" side="tl" part="tags"/>
+            </lu>
+            <b pos="2"/>
+            <lu>
+              <var n="verbfinal"/>
+            </lu>
+            <b pos="3"/>
+            <lu>
+              <clip pos="4" side="tl" part="whole"/> 
+            </lu>
+            <b pos="4"/>
+            <lu>
+              <clip pos="5" side="tl" part="lemh"/> 
+              <clip pos="5" side="tl" part="a_verb"/>
+              <clip pos="5" side="tl" part="temps"/>
+              <clip pos="5" side="tl" part="gen"/>
+              <clip pos="5" side="tl" part="nbr"/>
+              <clip pos="5" side="tl" part="lemq"/>
+            </lu>
+
+          </chunk>
+        </out>
+      </action>
+    </rule>
+
  
     <rule comment="REGLA: vfin (no ifi)">
       <pattern>