commit e857d641e27f7c553a110f48c76e0eaa23045784
Author: hectoralos <hectoralos@gmail.com>
Date:   Fri Jul 5 12:21:02 2019 +0300

    +expressions de temps amb fa

diff --git a/apertium-cat-ita.cat-ita.t1x b/apertium-cat-ita.cat-ita.t1x
index 4d4813c..fb49e86 100644
--- a/apertium-cat-ita.cat-ita.t1x
+++ b/apertium-cat-ita.cat-ita.t1x
@@ -97,6 +97,11 @@
     <def-cat n="el">          
       <cat-item lemma="el" tags="det.def.*"/>
     </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"/>
+      <cat-item lemma="prop de" tags="pr"/>
+    </def-cat>
     <def-cat n="predet">          
       <cat-item tags="predet.*"/>
     </def-cat>
@@ -112,6 +117,13 @@
       <cat-item tags="num"/>
     </def-cat>
 
+    <def-cat n="num_det_adj">
+      <cat-item tags="num.*"/>
+      <cat-item tags="num"/>
+      <cat-item tags="det.*"/>
+      <cat-item tags="adj.*"/>
+    </def-cat>
+
     <def-cat n="cnjadv">
       <cat-item tags="cnjadv"/>
     </def-cat>
@@ -222,6 +234,9 @@
     <def-cat n="anar_pri">
        <cat-item lemma="anar" tags="vblex.pri.*"/>
     </def-cat>
+    <def-cat n="fa">
+      <cat-item lemma="fer" tags="vblex.pri.p3.sg"/>
+    </def-cat>
 
     <def-cat n="mes">
        <cat-item lemma="gener" tags="n.*"/>
@@ -274,8 +289,16 @@
        <cat-item lemma="segle" tags="n.m.sg"/>
     </def-cat>
     <def-cat n="periode">
-       <cat-item lemma="segle" tags="n.*"/>
+       <cat-item lemma="segon" tags="n.*"/>
+       <cat-item lemma="minut" tags="n.*"/>
+       <cat-item lemma="hora" tags="n.*"/>
+       <cat-item lemma="dia" tags="n.*"/>
+       <cat-item lemma="setmana" tags="n.*"/>
+       <cat-item lemma="mes" tags="n.*"/>
        <cat-item lemma="any" tags="n.*"/>
+       <cat-item lemma="lustre" tags="n.*"/>
+       <cat-item lemma="segle" tags="n.*"/>
+       <cat-item lemma="mil·lenni" tags="n.*"/>
     </def-cat>
 
     <def-cat n="sent">
@@ -449,6 +472,8 @@
     <def-var n="numero" v="&lt;sg&gt;"/>
     <def-var n="numero_sl" v="&lt;sg&gt;"/>
     <def-var n="genero_sl" v="&lt;m&gt;"/>
+    <def-var n="numero_aux" v="&lt;sg&gt;"/>
+    <def-var n="genero_aux" v="&lt;m&gt;"/>
     <def-var n="lemma"/>
     <def-var n="aux1"/>
     <def-var n="aux2"/>
@@ -3422,6 +3447,18 @@
     </def-macro>      
 -->
 
+    <def-macro n="f_salvar_gen_num" npar="0"> <!-- Per conservar les var genero i numero per restaurar-les després (per no expandir a l'esquerra aquests valors) -->
+      <let><var n="genero_aux"/><var n="genero"/></let>
+      <let><var n="numero_aux"/><var n="numero"/></let>
+    </def-macro>
+
+
+    <def-macro n="f_restaurar_gen_num" npar="0"> <!-- Per restaurar les var genero i numero i no expandir-ne a l'esquerra els valors -->
+      <let><var n="genero"/><var n="genero_aux"/></let>
+      <let><var n="numero"/><var n="numero_aux"/></let>
+    </def-macro>
+
+
   </section-def-macros>
 
   <section-rules>
@@ -6896,6 +6933,290 @@
 
     <!-- fi REGLES data -->
 
+    <rule comment="regla: fa num periode: fa tres anys > tre anni fa, fa alguns anys > alcuni anni fa, fa pocs anys > pochi anni fa">
+      <pattern>
+        <pattern-item n="fa"/>
+        <pattern-item n="num_det_adj"/>
+        <pattern-item n="periode"/>
+      </pattern>
+      <action>
+        <call-macro n="f_salvar_gen_num"></call-macro>
+        <call-macro n="f_concord2"><with-param pos="3"/><with-param pos="2"/></call-macro>
+        <call-macro n="firstWord"><with-param pos="1"/></call-macro>
+        <choose>
+          <when>
+            <test>
+              <and>
+                <equal caseless="yes"><clip pos="2" side="sl" part="lem"/><lit v="un"/></equal>
+                <equal><clip pos="2" side="sl" part="nbr"/><lit-tag v="pl"/></equal>
+              </and>
+            </test>
+            <let><clip pos="2" side="tl" part="lem"/><lit v="alcun"/></let>
+            <let><clip pos="2" side="tl" part="a_det"/><lit-tag v="det.ind"/></let>
+          </when>
+        </choose>
+        <out>
+          <chunk name="num-n-fa">
+            <tags>
+              <tag><lit-tag v="SAdv"/></tag>
+            </tags>
+            <lu>
+              <get-case-from pos="1">
+                <clip pos="2" side="tl" part="lemh"/>
+              </get-case-from>
+              <clip pos="2" side="tl" part="tags"/>
+              <clip pos="2" side="tl" part="lemq"/>
+            </lu>
+            <b pos="1"/>
+            <lu>
+              <clip pos="3" side="tl" part="lemh"/>
+              <clip pos="3" side="tl" part="tags"/>
+              <clip pos="3" side="tl" part="lemq"/>
+            </lu>
+            <b pos="2"/>
+            <lu>
+              <get-case-from pos="3">
+                <clip pos="1" side="tl" part="lemh"/>
+              </get-case-from>
+              <clip pos="1" side="tl" part="tags"/>
+              <clip pos="1" side="tl" part="lemq"/>
+            </lu>
+          </chunk>
+        </out>
+        <call-macro n="f_restaurar_gen_num"></call-macro>
+      </action>
+    </rule>
+
+    <rule comment="regla: fa uns num periode: fa uns tres anys > circa tre anni fa">
+      <pattern>
+        <pattern-item n="fa"/>
+        <pattern-item n="uns_propde"/>
+        <pattern-item n="num"/>
+        <pattern-item n="periode"/>
+      </pattern>
+      <action>
+        <call-macro n="f_salvar_gen_num"></call-macro>
+        <call-macro n="f_concord3"><with-param pos="4"/><with-param pos="3"/><with-param pos="2"/></call-macro>
+        <call-macro n="firstWord"><with-param pos="1"/></call-macro>
+        <out>
+          <chunk name="adv-num-n-fa">
+            <tags>
+              <tag><lit-tag v="SAdv"/></tag>
+            </tags>
+            <lu>
+              <get-case-from pos="1">
+                <lit v="circa"/>
+              </get-case-from>
+              <lit-tag v="adv"/>
+            </lu>
+            <b pos="1"/>
+            <lu>
+              <clip pos="3" side="tl" part="lemh"/>
+              <clip pos="3" side="tl" part="tags"/>
+              <clip pos="3" side="tl" part="lemq"/>
+            </lu>
+            <b pos="2"/>
+            <lu>
+              <clip pos="4" side="tl" part="lemh"/>
+              <clip pos="4" side="tl" part="tags"/>
+              <clip pos="4" side="tl" part="lemq"/>
+            </lu>
+            <b pos="3"/>
+            <lu>
+              <get-case-from pos="4">
+                <clip pos="1" side="tl" part="lemh"/>
+              </get-case-from>
+              <clip pos="1" side="tl" part="tags"/>
+              <clip pos="1" side="tl" part="lemq"/>
+            </lu>
+          </chunk>
+        </out>
+        <call-macro n="f_restaurar_gen_num"></call-macro>
+      </action>
+    </rule>
+
+    <rule comment="regla: fa nom de periode: fa milions d'anys > milioni di anni fa">
+      <pattern>
+        <pattern-item n="fa"/>
+        <pattern-item n="nom"/>
+        <pattern-item n="de"/>
+        <pattern-item n="periode"/>
+      </pattern>
+      <action>
+        <call-macro n="f_salvar_gen_num"></call-macro>
+        <call-macro n="f_concord1"><with-param pos="2"/></call-macro>
+        <call-macro n="f_concord1"><with-param pos="4"/></call-macro>
+        <call-macro n="firstWord"><with-param pos="1"/></call-macro>
+        <out>
+          <chunk name="n-di-n-fa">
+            <tags>
+              <tag><lit-tag v="SAdv"/></tag>
+            </tags>
+            <lu>
+              <get-case-from pos="1">
+                <clip pos="2" side="tl" part="lemh"/>
+              </get-case-from>
+              <clip pos="2" side="tl" part="tags"/>
+              <clip pos="2" side="tl" part="lemq"/>
+            </lu>
+            <b pos="1"/>
+            <lu>
+              <clip pos="3" side="tl" part="lemh"/>
+              <clip pos="3" side="tl" part="tags"/>
+              <clip pos="3" side="tl" part="lemq"/>
+            </lu>
+            <b pos="2"/>
+            <lu>
+              <clip pos="4" side="tl" part="lemh"/>
+              <clip pos="4" side="tl" part="tags"/>
+              <clip pos="4" side="tl" part="lemq"/>
+            </lu>
+            <b pos="3"/>
+            <lu>
+              <get-case-from pos="4">
+                <clip pos="1" side="tl" part="lemh"/>
+              </get-case-from>
+              <clip pos="1" side="tl" part="tags"/>
+              <clip pos="1" side="tl" part="lemq"/>
+            </lu>
+          </chunk>
+        </out>
+        <call-macro n="f_restaurar_gen_num"></call-macro>
+      </action>
+    </rule>
+
+    <rule comment="regla: fa num nom de periode: fa tres milions d'anys > tre milioni di anni fa, fa alguns milions d'anys > alcuni milioni di anni fa, fa pocs milions d'anys > pochi milioni di anni fa">
+      <pattern>
+        <pattern-item n="fa"/>
+        <pattern-item n="num_det_adj"/>
+        <pattern-item n="nom"/>
+        <pattern-item n="de"/>
+        <pattern-item n="periode"/>
+      </pattern>
+      <action>
+        <call-macro n="f_salvar_gen_num"></call-macro>
+        <call-macro n="f_concord2"><with-param pos="3"/><with-param pos="2"/></call-macro>
+        <call-macro n="firstWord"><with-param pos="1"/></call-macro>
+        <choose>
+          <when>
+            <test>
+              <and>
+                <equal caseless="yes"><clip pos="2" side="sl" part="lem"/><lit v="un"/></equal>
+                <equal><clip pos="2" side="sl" part="nbr"/><lit-tag v="pl"/></equal>
+              </and>
+            </test>
+            <let><clip pos="2" side="tl" part="lem"/><lit v="alcun"/></let>
+            <let><clip pos="2" side="tl" part="a_det"/><lit-tag v="det.ind"/></let>
+          </when>
+        </choose>
+        <out>
+          <chunk name="num-n-di-n-fa">
+            <tags>
+              <tag><lit-tag v="SAdv"/></tag>
+            </tags>
+            <lu>
+              <get-case-from pos="1">
+                <clip pos="2" side="tl" part="lemh"/>
+              </get-case-from>
+              <clip pos="2" side="tl" part="tags"/>
+              <clip pos="2" side="tl" part="lemq"/>
+            </lu>
+            <b pos="1"/>
+            <lu>
+              <clip pos="3" side="tl" part="lemh"/>
+              <clip pos="3" side="tl" part="tags"/>
+              <clip pos="3" side="tl" part="lemq"/>
+            </lu>
+            <b pos="2"/>
+            <lu>
+              <clip pos="4" side="tl" part="lemh"/>
+              <clip pos="4" side="tl" part="tags"/>
+              <clip pos="4" side="tl" part="lemq"/>
+            </lu>
+            <b pos="3"/>
+            <lu>
+              <clip pos="5" side="tl" part="lemh"/>
+              <clip pos="5" side="tl" part="tags"/>
+              <clip pos="5" side="tl" part="lemq"/>
+            </lu>
+            <b pos="4"/>
+            <lu>
+              <get-case-from pos="5">
+                <clip pos="1" side="tl" part="lemh"/>
+              </get-case-from>
+              <clip pos="1" side="tl" part="tags"/>
+              <clip pos="1" side="tl" part="lemq"/>
+            </lu>
+          </chunk>
+        </out>
+        <call-macro n="f_restaurar_gen_num"></call-macro>
+      </action>
+    </rule>
+
+    <rule comment="regla: fa uns num nom de periode: fa uns tres milions d'anys > circa tre milioni di anni fa">
+      <pattern>
+        <pattern-item n="fa"/>
+        <pattern-item n="uns_propde"/>
+        <pattern-item n="num_det_adj"/>
+        <pattern-item n="nom"/>
+        <pattern-item n="de"/>
+        <pattern-item n="periode"/>
+      </pattern>
+      <action>
+        <call-macro n="f_salvar_gen_num"></call-macro>
+        <call-macro n="f_concord3"><with-param pos="4"/><with-param pos="3"/><with-param pos="2"/></call-macro>
+        <call-macro n="firstWord"><with-param pos="1"/></call-macro>
+        <out>
+          <chunk name="adv-num-n-di-n-fa">
+            <tags>
+              <tag><lit-tag v="SAdv"/></tag>
+            </tags>
+            <lu>
+              <get-case-from pos="1">
+                <lit v="circa"/>
+              </get-case-from>
+              <lit-tag v="adv"/>
+            </lu>
+            <b pos="1"/>
+            <lu>
+              <clip pos="3" side="tl" part="lemh"/>
+              <clip pos="3" side="tl" part="tags"/>
+              <clip pos="3" side="tl" part="lemq"/>
+            </lu>
+            <b pos="2"/>
+            <lu>
+              <clip pos="4" side="tl" part="lemh"/>
+              <clip pos="4" side="tl" part="tags"/>
+              <clip pos="4" side="tl" part="lemq"/>
+            </lu>
+            <b pos="3"/>
+            <lu>
+              <clip pos="5" side="tl" part="lemh"/>
+              <clip pos="5" side="tl" part="tags"/>
+              <clip pos="5" side="tl" part="lemq"/>
+            </lu>
+            <b pos="4"/>
+            <lu>
+              <clip pos="6" side="tl" part="lemh"/>
+              <clip pos="6" side="tl" part="tags"/>
+              <clip pos="6" side="tl" part="lemq"/>
+            </lu>
+            <b pos="5"/>
+            <lu>
+              <get-case-from pos="6">
+                <clip pos="1" side="tl" part="lemh"/>
+              </get-case-from>
+              <clip pos="1" side="tl" part="tags"/>
+              <clip pos="1" side="tl" part="lemq"/>
+            </lu>
+          </chunk>
+        </out>
+        <call-macro n="f_restaurar_gen_num"></call-macro>
+      </action>
+    </rule>
+
+    <!-- fi REGLES fa -->
+
     <rule comment="REGLA: EL PREP (el de > quello di)">
       <pattern>
         <pattern-item n="el"/>
diff --git a/apertium-cat-ita.ita-cat.t1x b/apertium-cat-ita.ita-cat.t1x
index 7305f79..d7d160a 100644
--- a/apertium-cat-ita.ita-cat.t1x
+++ b/apertium-cat-ita.ita-cat.t1x
@@ -25,6 +25,10 @@
       <cat-item tags="vblex.pp.*"/>
       <cat-item tags="adv"/>
     </def-cat>
+    <def-cat n="soli">
+      <cat-item lemma="solo" tags="adj.m.pl"/>
+      <cat-item lemma="solo" tags="adj.f.pl"/>
+    </def-cat>
     <def-cat n="solito">
       <cat-item lemma="solito" tags="adj.*"/>
     </def-cat>
@@ -39,6 +43,8 @@
     <def-cat n="piu_meno">
       <cat-item lemma="più" tags="adv"/>
       <cat-item lemma="meno" tags="adv"/>
+      <cat-item lemma="molto più" tags="adv"/>
+      <cat-item lemma="molto meno" tags="adv"/>
     </def-cat>
 
     <def-cat n="pp">
@@ -277,6 +283,13 @@
       <cat-item tags="num"/>
     </def-cat>
 
+    <def-cat n="num_det_adj">
+      <cat-item tags="num.*"/>
+      <cat-item tags="num"/>
+      <cat-item tags="det.*"/>
+      <cat-item tags="adj.*"/>
+    </def-cat>
+
     <def-cat n="cnjcoo">
       <cat-item tags="cnjcoo"/>
     </def-cat>
@@ -376,6 +389,7 @@
        <cat-item lemma="mese" tags="n.*"/>
        <cat-item lemma="anno" tags="n.*"/>
        <cat-item lemma="secolo" tags="n.*"/>
+       <cat-item lemma="millennio" tags="n.*"/>
     </def-cat>
 
     <def-cat n="sent">
@@ -1004,11 +1018,14 @@
       <list-item v="Aquitania"/>
       <list-item v="Guascogna"/>
       <list-item v="Normandia"/>
+      <list-item v="Corsica"/>
+<!--      <list-item v="Rossiglione"/> -->
       <list-item v="Scozia"/>
       <list-item v="Galles"/>
       <list-item v="Devon"/>
       <list-item v="Fiandra"/>
       <list-item v="Fiandre"/>
+      <list-item v="Baden-Württemberg"/>
       <list-item v="Baviera"/>
       <list-item v="Brandeburgo"/>
       <list-item v="Renania"/>
@@ -1022,6 +1039,7 @@
       <list-item v="Moravia"/>
       <list-item v="Slesia"/>
       <list-item v="Crimea"/>
+<!--      <list-item v="Tibet"/> -->
       <list-item v="Alabama"/>
       <list-item v="Alaska"/>
       <list-item v="Arizona"/>
@@ -1052,11 +1070,12 @@
       <list-item v="Wyoming"/>
       <list-item v="Wisconsin"/>
       <list-item v="Alberta"/>
+      <list-item v="Labrador"/>
       <list-item v="Manitoba"/>
       <list-item v="Ontario"/>
 <!--      <list-item v="Quebec"/> -->
       <list-item v="Saskatchewan"/>
-      <list-item v="Terranova"/>
+<!--      <list-item v="Terranova"/> -->
       <list-item v="Rio Grande do Sul"/>
       <list-item v="Prussia"/>
       <list-item v="Persia"/>
@@ -4778,6 +4797,55 @@
       </action>
     </rule>
 
+    <rule comment="REGLA: soli NUM">
+      <pattern>
+        <pattern-item n="soli"/>
+        <pattern-item n="num"/>
+      </pattern>
+      <action>
+        <call-macro n="firstWord">
+          <with-param pos="1"/>
+        </call-macro>
+        <call-macro n="f_chunk_tags">
+          <with-param pos="2"/>
+        </call-macro>
+        <call-macro n="f_concord1">
+          <with-param pos="1"/>
+        </call-macro>
+        <out>
+          <chunk name="adv" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="SV"/></tag>
+            </tags>
+            <lu>
+              <get-case-from pos="1">
+                <lit v="només"/>
+              </get-case-from>
+              <lit-tag v="adv"/>
+            </lu> 
+          </chunk>
+          <b pos="1"/>
+          <chunk name="det_num">
+            <tags>
+              <tag><lit-tag v="SN"/></tag>
+              <tag><var n="genero"/></tag>
+              <tag><var n="numero"/></tag>
+              <tag><var n="genero_sl"/></tag>
+              <tag><var n="numero_sl"/></tag>
+            </tags>
+            <lu>
+              <clip pos="2" side="tl" part="lem"/> 
+              <clip pos="2" side="tl" part="a_num"/>
+              <clip pos="2" side="tl" part="gen_sense_mf" link-to="2"/>
+              <clip pos="2" side="tl" part="gen_mf"/>
+              <clip pos="2" side="tl" part="nbr_sense_sp" link-to="3"/>
+              <clip pos="2" side="tl" part="nbr_sp"/>
+            </lu>
+          </chunk>
+        </out>
+      </action>
+    </rule>
+
     <rule comment="regla: giorno mese: 26 maggio > 26 de maig ">
       <pattern>
         <pattern-item n="giorno"/>
@@ -4831,7 +4899,7 @@
           <with-param pos="2"/>
           <with-param pos="1"/>
         </call-macro>
-        <choose> <!-- 1,158 millione > 1,158 milions -->
+        <choose> <!-- 1,158 milione > 1,158 milions -->
           <when>
             <test>
               <and>
@@ -6160,7 +6228,7 @@
           <with-param pos="1"/>
           <with-param pos="3"/>
         </call-macro>        
-        <choose> <!-- 1,158 millione > 1,158 milions -->
+        <choose> <!-- 1,158 milione > 1,158 milions -->
           <when>
             <test>
               <and>
@@ -6352,7 +6420,7 @@
           <with-param pos="1"/>
           <with-param pos="4"/>
         </call-macro>
-        <choose> <!-- 1,158 millione > 1,158 milions -->
+        <choose> <!-- 1,158 milione > 1,158 milions -->
           <when>
             <test>
               <and>
@@ -7026,7 +7094,7 @@
 
     <rule comment="regla: num periodo fa: tre anni fa > fa tres anys">
       <pattern>
-        <pattern-item n="num"/>
+        <pattern-item n="num_det_adj"/>
         <pattern-item n="periodo"/>
         <pattern-item n="fa"/>
       </pattern>
@@ -7034,11 +7102,10 @@
         <call-macro n="f_salvar_gen_num"></call-macro>
         <call-macro n="f_concord2"><with-param pos="2"/><with-param pos="1"/></call-macro>
         <call-macro n="firstWord"><with-param pos="1"/></call-macro>
-        <call-macro n="f_bcond"><with-param pos="1"/><with-param pos="2"/></call-macro>
         <out>
-          <chunk name="det-any">
+          <chunk name="fa-num-nom">
             <tags>
-              <tag><lit-tag v="adv"/></tag>
+              <tag><lit-tag v="SAdv"/></tag>
             </tags>
             <lu>
               <get-case-from pos="1">