commit 908c243b6229d1b01f3663118fbe4c53dc57825d
Author: Hèctor Alòs i Font <hectoralos@gmail.com>
Date:   Sat Apr 13 22:02:52 2019 +0300

    gènere i nombre per defecte

diff --git a/apertium-cat-ita.cat-ita.t2x b/apertium-cat-ita.cat-ita.t2x
index 42a70ff..1343e23 100644
--- a/apertium-cat-ita.cat-ita.t2x
+++ b/apertium-cat-ita.cat-ita.t2x
@@ -8,11 +8,18 @@
   </section-def-cats>
 
   <section-def-attrs>
+   <def-attr n="gen">
+      <attr-item tags="m"/>
+      <attr-item tags="f"/>
+      <attr-item tags="mf"/>
+      <attr-item tags="GD"/>
+      <attr-item tags="nt"/>
+   </def-attr>
    <def-attr n="nbr">
-          <attr-item tags="sg"/>
-	  <attr-item tags="pl"/>
-	  <attr-item tags="sp"/>
-	  <attr-item tags="ND"/>
+      <attr-item tags="sg"/>
+      <attr-item tags="pl"/>
+      <attr-item tags="sp"/>
+      <attr-item tags="ND"/>
     <attr-item tags="NN"/>
    </def-attr>
   </section-def-attrs>
@@ -21,23 +28,57 @@
     <def-var n="uno"/>
   </section-def-vars>
 
+  <section-def-macros>
+    <def-macro n="assigna_gen_nbr" npar="1">
+	<choose>
+	  <when>
+	    <test>
+	      <equal>
+		<clip pos="1" part="gen"/>
+		<lit-tag v="GD"/>
+	      </equal>
+	    </test>
+	    <let>
+	      <clip pos="1" part="gen"/>
+	      <lit-tag v="m"/>
+	    </let>
+	  </when>
+	</choose>
+	<choose>
+	  <when>
+	    <test>
+	      <equal>
+		<clip pos="1" part="nbr"/>
+		<lit-tag v="ND"/>
+	      </equal>
+	    </test>
+	    <let>
+	      <clip pos="1" part="nbr"/>
+	      <lit-tag v="sg"/>
+	    </let>
+	  </when>
+	</choose>
+    </def-macro>
+  </section-def-macros>
+
 <section-rules>
+
 <rule comment="REGLA: SN">
-	<pattern>
-		<pattern-item n="SN"/>
-	</pattern>
-	<action>
-<!--	<call-macro n="assigna_gen_nbr">
-		<with-param pos="1"/>
-	</call-macro>-->
-			<out>
-				<chunk>
-					<clip pos="1" part="lem"/>
-					<clip pos="1" part="tags"/>
-					<clip pos="1" part="chcontent"/>
-				</chunk>
-			</out>
-</action>
+    <pattern>
+        <pattern-item n="SN"/>
+    </pattern>
+    <action>
+      <call-macro n="assigna_gen_nbr">
+        <with-param pos="1"/>
+      </call-macro>
+      <out>
+        <chunk>
+          <clip pos="1" part="lem"/>
+          <clip pos="1" part="tags"/>
+          <clip pos="1" part="chcontent"/>
+        </chunk>
+      </out>
+    </action>
 </rule>
 </section-rules>
-</interchunk>
\ No newline at end of file
+</interchunk>
diff --git a/apertium-cat-ita.ita-cat.t2x b/apertium-cat-ita.ita-cat.t2x
index 120a677..5366357 100644
--- a/apertium-cat-ita.ita-cat.t2x
+++ b/apertium-cat-ita.ita-cat.t2x
@@ -14,7 +14,7 @@
 
   <section-def-attrs>
 
- <def-attr n="pers">
+    <def-attr n="pers">
       <attr-item tags="p1"/>
       <attr-item tags="p2"/>
       <attr-item tags="p3"/>
@@ -29,12 +29,11 @@
       <attr-item tags="nt"/>
     </def-attr>
 
-
    <def-attr n="nbr">
           <attr-item tags="sg"/>
-	  <attr-item tags="pl"/>
-	  <attr-item tags="sp"/>
-	  <attr-item tags="ND"/>
+      <attr-item tags="pl"/>
+      <attr-item tags="sp"/>
+      <attr-item tags="ND"/>
     <attr-item tags="NN"/>
    </def-attr>
   </section-def-attrs>
@@ -43,30 +42,8 @@
     <def-var n="uno"/>
   </section-def-vars>
 
-<section-rules>
-<rule comment="REGLA: SN">
-	<pattern>
-		<pattern-item n="SN"/>
-	</pattern>
-	<action>
-<!--	<call-macro n="assigna_gen_nbr">
-		<with-param pos="1"/>
-	</call-macro>-->
-			<out>
-				<chunk>
-					<clip pos="1" part="lem"/>
-					<clip pos="1" part="tags"/>
-					<clip pos="1" part="chcontent"/>
-				</chunk>
-			</out>
-</action>
-</rule>
-
-<rule comment="REGLA: NUM (per assignar gènere si hi ha GD)">
-      <pattern>
-	<pattern-item n="NUM"/>
-      </pattern>
-      <action>
+  <section-def-macros>
+    <def-macro n="assigna_gen_nbr" npar="1">
 	<choose>
 	  <when>
 	    <test>
@@ -94,15 +71,43 @@
 	      <lit-tag v="sg"/>
 	    </let>
 	  </when>
-	</choose>	
-	<out>
-	  <chunk>
-	    <clip pos="1" part="whole"/>
-	  </chunk>
-	</out>
-      </action>
-    </rule>
+	</choose>
+    </def-macro>
+  </section-def-macros>
 
+<section-rules>
+<rule comment="REGLA: SN">
+    <pattern>
+        <pattern-item n="SN"/>
+    </pattern>
+    <action>
+      <call-macro n="assigna_gen_nbr">
+        <with-param pos="1"/>
+      </call-macro>
+      <out>
+        <chunk>
+          <clip pos="1" part="lem"/>
+          <clip pos="1" part="tags"/>
+          <clip pos="1" part="chcontent"/>
+        </chunk>
+      </out>
+</action>
+</rule>
 
+<rule comment="REGLA: NUM (per assignar gènere si hi ha GD)">
+    <pattern>
+       <pattern-item n="NUM"/>
+    </pattern>
+    <action>
+    <call-macro n="assigna_gen_nbr">
+      <with-param pos="1"/>
+    </call-macro>
+    <out>
+      <chunk>
+        <clip pos="1" part="whole"/>
+      </chunk>
+    </out>
+    </action>
+</rule>
 </section-rules>
-</interchunk>
\ No newline at end of file
+</interchunk>