commit 0100d57486a0259535efecb95db43a8f4ba54047
Author: hectoralos <hectoralos@gmail.com>
Date:   Thu Jul 11 01:05:11 2019 +0300

    millores en la concordança

diff --git a/apertium-cat-ita.cat-ita.t1x b/apertium-cat-ita.cat-ita.t1x
index 498b718..1269639 100644
--- a/apertium-cat-ita.cat-ita.t1x
+++ b/apertium-cat-ita.cat-ita.t1x
@@ -3665,6 +3665,34 @@
       <call-macro n="f_chunk_tags_nbr"><with-param pos="1"/></call-macro>
     </def-macro>
 
+    <def-macro n="f_chunk_tags2" npar="2">
+      <let><var n="genero_sl"/><lit-tag v=""/></let>
+      <call-macro n="f_chunk_tags_gen"><with-param pos="1"/></call-macro>
+      <let><var n="numero_sl"/><lit-tag v=""/></let>
+      <call-macro n="f_chunk_tags_nbr"><with-param pos="1"/></call-macro>
+      <!-- si el primer paràmetre no assigna gènere o nombre, provem amb el següent -->
+      <choose>
+        <when>
+          <test>
+            <equal><var n="genero_sl"/><lit-tag v=""/></equal>
+          </test>
+          <call-macro n="f_chunk_tags_gen">
+            <with-param pos="2"/>
+          </call-macro>
+        </when>
+      </choose>
+      <choose>
+        <when>
+          <test>
+            <equal><var n="numero_sl"/><lit-tag v=""/></equal>
+          </test>
+          <call-macro n="f_chunk_tags_nbr">
+            <with-param pos="2"/>
+          </call-macro>
+        </when>
+      </choose>
+    </def-macro>
+
 <!--
     <def-macro n="f_set_sg1" npar="1">
       <choose>
@@ -4603,8 +4631,9 @@
         <call-macro n="firstWord">
           <with-param pos="1"/>
         </call-macro>
-        <call-macro n="f_chunk_tags">
+        <call-macro n="f_chunk_tags2">
           <with-param pos="2"/>
+          <with-param pos="1"/>
         </call-macro>
         <call-macro n="f_concord2">
           <with-param pos="2"/>
@@ -4885,8 +4914,9 @@
         <call-macro n="firstWord">
           <with-param pos="1"/>
         </call-macro>
-        <call-macro n="f_chunk_tags">
+        <call-macro n="f_chunk_tags2">
           <with-param pos="2"/>
+          <with-param pos="1"/>
         </call-macro>
         <call-macro n="f_concord2">
           <with-param pos="2"/>
diff --git a/apertium-cat-ita.cat-ita.t2x b/apertium-cat-ita.cat-ita.t2x
index ddb46c9..4aa6d0d 100644
--- a/apertium-cat-ita.cat-ita.t2x
+++ b/apertium-cat-ita.cat-ita.t2x
@@ -223,6 +223,124 @@
 </action>
 </rule>
 
+    <!-- REGLES CONCORDANÇA PRÒXIMA -->
+
+    <rule comment="REGLA: SN SA">
+      <pattern>
+        <pattern-item n="SN"/>
+        <pattern-item n="SA"/>
+      </pattern>
+      <action>
+      <choose>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="gen"/><lit-tag v="m"/></equal>
+              <equal><clip pos="1" part="sl_gen"/><lit-tag v="sl_f"/></equal>
+            </and>
+          </test>
+          <let><clip pos="2" part="gen"/><lit-tag v="m"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="gen"/><lit-tag v="f"/></equal>
+              <equal><clip pos="1" part="sl_gen"/><lit-tag v="sl_m"/></equal>
+            </and>
+          </test>
+          <let><clip pos="2" part="gen"/><lit-tag v="f"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="gen"/><lit-tag v="GD"/></equal>
+              <or>
+                <equal><clip pos="2" part="gen"/><lit-tag v="m"/></equal>
+                <equal><clip pos="2" part="gen"/><lit-tag v="f"/></equal>
+              </or>
+            </and>
+          </test>
+          <let><clip pos="1" part="gen"/><clip pos="2" part="gen"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="2" part="gen"/><lit-tag v="GD"/></equal>
+              <or>
+                <equal><clip pos="1" part="gen"/><lit-tag v="m"/></equal>
+                <equal><clip pos="1" part="gen"/><lit-tag v="f"/></equal>
+              </or>
+            </and>
+          </test>
+          <let><clip pos="2" part="gen"/><clip pos="1" part="gen"/></let>
+        </when>
+      </choose>
+      <choose>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="nbr"/><lit-tag v="sg"/></equal>
+              <equal><clip pos="1" part="sl_nbr"/><lit-tag v="sl_pl"/></equal>
+            </and>
+          </test>
+          <let><clip pos="2" part="nbr"/><lit-tag v="sg"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="nbr"/><lit-tag v="pl"/></equal>
+              <equal><clip pos="1" part="sl_nbr"/><lit-tag v="sl_sg"/></equal>
+            </and>
+          </test>
+          <let><clip pos="2" part="nbr"/><lit-tag v="pl"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="nbr"/><lit-tag v="ND"/></equal>
+              <or>
+                <equal><clip pos="2" part="nbr"/><lit-tag v="sg"/></equal>
+                <equal><clip pos="2" part="nbr"/><lit-tag v="pl"/></equal>
+              </or>
+            </and>
+          </test>
+          <let><clip pos="1" part="nbr"/><clip pos="2" part="nbr"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="2" part="nbr"/><lit-tag v="ND"/></equal>
+              <or>
+                <equal><clip pos="1" part="nbr"/><lit-tag v="sg"/></equal>
+                <equal><clip pos="1" part="nbr"/><lit-tag v="pl"/></equal>
+              </or>
+            </and>
+          </test>
+          <let><clip pos="2" part="nbr"/><clip pos="1" part="nbr"/></let>
+        </when>
+      </choose>
+      <call-macro n="assigna_gen_nbr">
+        <with-param pos="1"/>
+      </call-macro>
+      <call-macro n="assigna_gen_nbr">
+        <with-param pos="2"/>
+      </call-macro>
+        <out>
+          <chunk>
+            <clip pos="1" part="lem"/>
+            <clip pos="1" part="tags"/>
+            <clip pos="1" part="chcontent"/>
+          </chunk>
+          <b pos="1"/>
+          <chunk>
+            <clip pos="2" part="lem"/>
+            <clip pos="2" part="tags"/>
+            <clip pos="2" part="chcontent"/>
+          </chunk>
+        </out>
+      </action>
+    </rule>
+
     <!-- REGLAS PER L'ATRIBUT -->
 
     <rule comment="REGLA: PREP SN SV_vbser SA: aquesta regla inhibeix la concordança de les regles que segueixen si hi ha una prep al davant del subjecte putatiu">
diff --git a/apertium-cat-ita.ita-cat.t1x b/apertium-cat-ita.ita-cat.t1x
index 12ca39f..fecbf0e 100644
--- a/apertium-cat-ita.ita-cat.t1x
+++ b/apertium-cat-ita.ita-cat.t1x
@@ -3861,7 +3861,7 @@
       <call-macro n="f_chunk_tags_nbr"><with-param pos="1"/></call-macro>
     </def-macro>
 
-    <def-macro n="f_chunk_tags2" npar="2"> <!-- no sembla que calgui: al final no la crido, ni he provat la macro -->
+    <def-macro n="f_chunk_tags2" npar="2">
       <let><var n="genero_sl"/><lit-tag v=""/></let>
       <call-macro n="f_chunk_tags_gen"><with-param pos="1"/></call-macro>
       <let><var n="numero_sl"/><lit-tag v=""/></let>
@@ -4665,8 +4665,9 @@
         <call-macro n="firstWord">
           <with-param pos="1"/>
         </call-macro>
-        <call-macro n="f_chunk_tags">
+        <call-macro n="f_chunk_tags2">
           <with-param pos="2"/>
+          <with-param pos="1"/>
         </call-macro>
         <call-macro n="f_concord2">
           <with-param pos="2"/>
@@ -4904,8 +4905,9 @@
         <call-macro n="firstWord">
           <with-param pos="1"/>
         </call-macro>
-        <call-macro n="f_chunk_tags">
+        <call-macro n="f_chunk_tags2">
           <with-param pos="2"/>
+          <with-param pos="1"/>
         </call-macro>
         <call-macro n="f_concord2">
           <with-param pos="2"/>
diff --git a/apertium-cat-ita.ita-cat.t2x b/apertium-cat-ita.ita-cat.t2x
index f7e1f0f..68cad07 100644
--- a/apertium-cat-ita.ita-cat.t2x
+++ b/apertium-cat-ita.ita-cat.t2x
@@ -222,6 +222,124 @@
       </action>
     </rule>
 
+    <!-- REGLES CONCORDANÇA PRÒXIMA -->
+
+    <rule comment="REGLA: SN SA">
+      <pattern>
+        <pattern-item n="SN"/>
+        <pattern-item n="SA"/>
+      </pattern>
+      <action>
+      <choose>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="gen"/><lit-tag v="m"/></equal>
+              <equal><clip pos="1" part="sl_gen"/><lit-tag v="sl_f"/></equal>
+            </and>
+          </test>
+          <let><clip pos="2" part="gen"/><lit-tag v="m"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="gen"/><lit-tag v="f"/></equal>
+              <equal><clip pos="1" part="sl_gen"/><lit-tag v="sl_m"/></equal>
+            </and>
+          </test>
+          <let><clip pos="2" part="gen"/><lit-tag v="f"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="gen"/><lit-tag v="GD"/></equal>
+              <or>
+                <equal><clip pos="2" part="gen"/><lit-tag v="m"/></equal>
+                <equal><clip pos="2" part="gen"/><lit-tag v="f"/></equal>
+              </or>
+            </and>
+          </test>
+          <let><clip pos="1" part="gen"/><clip pos="2" part="gen"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="2" part="gen"/><lit-tag v="GD"/></equal>
+              <or>
+                <equal><clip pos="1" part="gen"/><lit-tag v="m"/></equal>
+                <equal><clip pos="1" part="gen"/><lit-tag v="f"/></equal>
+              </or>
+            </and>
+          </test>
+          <let><clip pos="2" part="gen"/><clip pos="1" part="gen"/></let>
+        </when>
+      </choose>
+      <choose>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="nbr"/><lit-tag v="sg"/></equal>
+              <equal><clip pos="1" part="sl_nbr"/><lit-tag v="sl_pl"/></equal>
+            </and>
+          </test>
+          <let><clip pos="2" part="nbr"/><lit-tag v="sg"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="nbr"/><lit-tag v="pl"/></equal>
+              <equal><clip pos="1" part="sl_nbr"/><lit-tag v="sl_sg"/></equal>
+            </and>
+          </test>
+          <let><clip pos="2" part="nbr"/><lit-tag v="pl"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="1" part="nbr"/><lit-tag v="ND"/></equal>
+              <or>
+                <equal><clip pos="2" part="nbr"/><lit-tag v="sg"/></equal>
+                <equal><clip pos="2" part="nbr"/><lit-tag v="pl"/></equal>
+              </or>
+            </and>
+          </test>
+          <let><clip pos="1" part="nbr"/><clip pos="2" part="nbr"/></let>
+        </when>
+        <when>
+          <test>
+            <and>
+              <equal><clip pos="2" part="nbr"/><lit-tag v="ND"/></equal>
+              <or>
+                <equal><clip pos="1" part="nbr"/><lit-tag v="sg"/></equal>
+                <equal><clip pos="1" part="nbr"/><lit-tag v="pl"/></equal>
+              </or>
+            </and>
+          </test>
+          <let><clip pos="2" part="nbr"/><clip pos="1" part="nbr"/></let>
+        </when>
+      </choose>
+      <call-macro n="assigna_gen_nbr">
+        <with-param pos="1"/>
+      </call-macro>
+      <call-macro n="assigna_gen_nbr">
+        <with-param pos="2"/>
+      </call-macro>
+        <out>
+          <chunk>
+            <clip pos="1" part="lem"/>
+            <clip pos="1" part="tags"/>
+            <clip pos="1" part="chcontent"/>
+          </chunk>
+          <b pos="1"/>
+          <chunk>
+            <clip pos="2" part="lem"/>
+            <clip pos="2" part="tags"/>
+            <clip pos="2" part="chcontent"/>
+          </chunk>
+        </out>
+      </action>
+    </rule>
+
     <!-- REGLAS PER L'ATRIBUT -->
 
     <rule comment="REGLA: PREP SN SV_vbser SA: aquesta regla inhibeix la concordança de les regles que segueixen si hi ha una prep al davant del subjecte putatiu">