Index: languages/apertium-srd/apertium-srd.srd.dix
===================================================================
--- languages/apertium-srd/apertium-srd.srd.dix	(revision 68548)
+++ languages/apertium-srd/apertium-srd.srd.dix	(revision 68551)
@@ -104,57 +104,34 @@
 
     <!-- SECTION: Clitics -->
 
-    <pardef n="S__cantende·bos">
+    <pardef n="S__cantende·bi">
       <e>       <p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="sg"/></r></p></e>
       <e>       <p><l>·la</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="sg"/></r></p></e>
       <e>       <p><l>·los</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="pl"/></r></p></e>
       <e>       <p><l>·las</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="pl"/></r></p></e>
       <e r="RL"><p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="nt"/></r></p></e>
-      <e>       <p><l>·nche</l><r>nche<s n="prn"/><s n="enc"/><s n="adv"/></r></p></e>
-      <e>       <p><l>·nde</l><r>nde<s n="prn"/><s n="enc"/><s n="adv"/></r></p></e>
     </pardef>
 
-    <pardef n="S__cantende·nos">
-      <e>       <p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="sg"/></r></p></e>
-      <e>       <p><l>·la</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="sg"/></r></p></e>
-      <e>       <p><l>·los</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="pl"/></r></p></e>
-      <e>       <p><l>·las</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="pl"/></r></p></e>
-      <e r="RL"><p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="nt"/></r></p></e>
-      <e>       <p><l>·nche</l><r>nche<s n="prn"/><s n="enc"/><s n="adv"/></r></p></e>
-      <e>       <p><l>·nde</l><r>nde<s n="prn"/><s n="enc"/><s n="adv"/></r></p></e>
-    </pardef>
-
     <pardef n="S__cantende·mi">
-      <e>       <p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="sg"/></r></p></e>
-      <e>       <p><l>·la</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="sg"/></r></p></e>
-      <e>       <p><l>·los</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="pl"/></r></p></e>
-      <e>       <p><l>·las</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="pl"/></r></p></e>
-      <e r="RL"><p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="nt"/></r></p></e>
+      <e>       <p><l/><r/></p><par n="S__cantende·bi"/></e>
       <e>       <p><l>·nche</l><r>nche<s n="prn"/><s n="enc"/><s n="adv"/></r></p></e>
       <e>       <p><l>·nde</l><r>nde<s n="prn"/><s n="enc"/><s n="adv"/></r></p></e>
     </pardef>
 
     <pardef n="S__cantende·ti">
-      <e>       <p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="sg"/></r></p></e>
-      <e>       <p><l>·la</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="sg"/></r></p></e>
-      <e>       <p><l>·los</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="pl"/></r></p></e>
-      <e>       <p><l>·las</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="pl"/></r></p></e>
-      <e r="RL"><p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="nt"/></r></p></e>
-      <e>       <p><l>·nche</l><r>nche<s n="prn"/><s n="enc"/><s n="adv"/></r></p></e>
-      <e>       <p><l>·nde</l><r>nde<s n="prn"/><s n="enc"/><s n="adv"/></r></p></e>
+      <e>       <p><l/><r/></p><par n="S__cantende·mi"/></e>
     </pardef>
 
-    <pardef n="S__cantende·bi">
-      <e>       <p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="sg"/></r></p></e>
-      <e>       <p><l>·la</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="sg"/></r></p></e>
-      <e>       <p><l>·los</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="pl"/></r></p></e>
-      <e>       <p><l>·las</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="pl"/></r></p></e>
-      <e r="RL"><p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="nt"/></r></p></e>
+    <pardef n="S__cantende·bos">
+      <e>       <p><l/><r/></p><par n="S__cantende·mi"/></e>
     </pardef>
 
+    <pardef n="S__cantende·nos">
+      <e>       <p><l/><r/></p><par n="S__cantende·mi"/></e>
+    </pardef>
+
     <pardef n="S__cantende·si">
-      <e>       <p><l>·nche</l><r>nche<s n="prn"/><s n="enc"/><s n="adv"/></r></p></e>
-      <e>       <p><l>·nde</l><r>nde<s n="prn"/><s n="enc"/><s n="adv"/></r></p></e>
+      <e>       <p><l/><r/></p><par n="S__cantende·mi"/></e>
     </pardef>
 
     <pardef n="S__cantende·nche">
@@ -175,12 +152,9 @@
       <e r="LR"><p><l>·ddi</l><r>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sg"/></r></p></e>
       <e>       <p><l>·lis</l><r>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="pl"/></r></p></e>
       <e r="LR"><p><l>·ddis</l><r>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="pl"/></r></p></e>
-      <e r="RL"><p><l>·bi</l><r>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sg"/><j/></r></p><par n="S__cantende·bi"/></e>	<!-- Hack for italian :( -->
-      <e r="RL"><p><l>·si</l><r>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sg"/><j/></r></p><par n="S__cantende·si"/></e>	<!-- Hack for italian :( -->
-      <e r="RL"><p><l>·bi</l><r>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="pl"/><j/></r></p><par n="S__cantende·bi"/></e>	<!-- Hack for italian :( -->
-      <e r="RL"><p><l>·si</l><r>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="pl"/><j/></r></p><par n="S__cantende·si"/></e>	<!-- Hack for italian :( -->
-      <e>       <p><l>·bi</l><r>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sp"/><j/></r></p><par n="S__cantende·bi"/></e>
-      <e>       <p><l>·si</l><r>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sp"/><j/></r></p><par n="S__cantende·si"/></e>
+      <e r="RL"><p><l>·bi</l><r>bi<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sg"/><j/></r></p><par n="S__cantende·mi"/></e>	<!-- Hack for italian :( -->
+      <e r="RL"><p><l>·bi</l><r>bi<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="pl"/><j/></r></p><par n="S__cantende·mi"/></e>	<!-- Hack for italian :( -->
+      <e>       <p><l>·bi</l><r>bi<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sp"/><j/></r></p><par n="S__cantende·mi"/></e>
 
       <e>       <p><l>·lu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="sg"/></r></p></e>
       <e r="LR"><p><l>·ddu</l><r>lu<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="sg"/></r></p></e>
@@ -203,6 +177,8 @@
 
     <pardef n="S__cantende">
       <e>       <p><l/><r/></p><par n="S__canta"/></e>
+      <e>       <p><l>·si</l><r>si<s n="prn"/><s n="enc"/><s n="ref"/><s n="p3"/><s n="mf"/><s n="sp"/></r></p></e>
+      <e>       <p><l>·si</l><r>si<s n="prn"/><s n="enc"/><s n="ref"/><s n="p3"/><s n="mf"/><s n="sp"/><j/></r></p><par n="S__cantende·si"/></e>
     </pardef>
 
     <!-- SECTION: Abbreviations -->
@@ -341,6 +317,9 @@
 
     <pardef n="bi__prn" c="">
       <e>       <p><l></l><r><s n="prn"/><s n="pro"/><s n="p3"/><s n="mf"/><s n="sp"/></r></p></e>
+      <e r="RL"><p><l></l><r><s n="prn"/><s n="pro"/><s n="p3"/><s n="mf"/><s n="sg"/></r></p></e>
+      <e r="RL"><p><l></l><r><s n="prn"/><s n="pro"/><s n="p3"/><s n="mf"/><s n="pl"/></r></p></e>
+
     </pardef>
 
     <pardef n="li__prn" c="p.18 / 105">
@@ -3301,7 +3280,7 @@
     <e lm="si"><i></i><par n="si__prn"/></e>
     <e lm="sese"><i>sese</i><par n="sese__prn"/></e>
 
-    <!-- <e lm="bi"><i>bi</i><par n="bi__prn"/></e> -->
+    <e lm="bi"><i>bi</i><par n="bi__prn"/></e>
 
     <e lm="li"><i>li</i><par n="li__prn"/></e>
     <e lm="li" r="LR"><p><l>ddi</l><r>li</r></p><par n="li__prn"/></e>
Index: incubator/apertium-srd-ita/apertium-srd-ita.ita-srd.t1x
===================================================================
--- incubator/apertium-srd-ita/apertium-srd-ita.ita-srd.t1x	(revision 68548)
+++ incubator/apertium-srd-ita/apertium-srd-ita.ita-srd.t1x	(revision 68551)
@@ -2121,45 +2121,19 @@
       </choose>
     </def-macro>
 
-    <def-macro n="firstWord" npar="1">
-      <choose>
-	<when>
+    <def-macro n="f_li2bi" npar="1">
+      
+      <choose>	<!--To change "li" to "bi" when there is a second enclitic -->
+	<when> 
 	  <test>
 	    <equal>
-	      <clip pos="1" side="sl" part="a_np_acr"/>
-	      <lit v=""/>
+	      <clip pos="1" side="tl" part="lemh"/>
+	      <lit v="li"/>
 	    </equal>
 	  </test>
-	  <choose>
-	    <when>
-	      <test>
-		<equal>
-		  <var n="EOS"/>
-		  <lit v="true"/>
-		</equal>
-	      </test>
-	      <modify-case>
-		<clip pos="1" side="tl" part="lem"/>
-		<lit v="aa"/>
-	      </modify-case>
-	      <let>
-		<var n="caseFirstWord"/>
-		<lit v="Aa"/>
-	      </let>
+	  <let><clip pos="1" side="tl" part="lemh"/><lit v="bi"/></let>
 	    </when>
 	  </choose>
-	</when>
-	<otherwise>
-	  <let>
-	    <var n="caseFirstWord"/>
-	    <lit v="aa"/>
-	  </let>
-	</otherwise>
-      </choose>
-      <let>
-	<var n="EOS"/>
-	<lit v="false"/>
-      </let>
     </def-macro>
 
   </section-def-macros>
@@ -2420,12 +2394,15 @@
     </rule>
     
 
-    <rule comment="regla: gli enc-p3">
+    <rule comment="regla: gli pro">
        <pattern>
          <pattern-item n="gli"/>
-         <pattern-item n="enc-p3"/>
+         <pattern-item n="enc"/>
        </pattern>
        <action>
+         <call-macro n="f_li2bi">
+           <with-param pos="1"/>
+         </call-macro>     
          <let><clip pos="2" side="tl" part="a_prn"/><lit-tag v="prn.pro"/></let>
          <out>
            <chunk name="prn">
@@ -2441,7 +2418,7 @@
            <b/>
            <chunk name="prn">
              <tags>
-               <tag><lit-tag v="enc-p3"/></tag>
+               <tag><lit-tag v="enc"/></tag>
              </tags>
                <lu>
                  <clip pos="2" side="tl" part="lemh"/>
@@ -2489,6 +2466,9 @@
          <pattern-item n="enc"/>
        </pattern>
        <action>
+         <call-macro n="f_li2bi">
+           <with-param pos="2"/>
+         </call-macro>     
          <out>
            <chunk name="verb_enc">
              <tags>
@@ -2553,6 +2533,9 @@
          <pattern-item n="enc"/>
        </pattern>
        <action>
+         <call-macro n="f_li2bi">
+           <with-param pos="2"/>
+         </call-macro>     
          <let><clip pos="2" side="tl" part="a_prn"/><lit-tag v="prn.pro"/></let>
          <let><clip pos="3" side="tl" part="a_prn"/><lit-tag v="prn.pro"/></let>
          <modify-case><clip pos="2" side="tl" part="lemh"/><case-of pos="1" side="sl" part="lemh"/></modify-case>
@@ -2629,6 +2612,9 @@
          <pattern-item n="enc"/>
        </pattern>
        <action>
+         <call-macro n="f_li2bi">
+           <with-param pos="3"/>
+         </call-macro>     
          <let><clip pos="3" side="tl" part="a_prn"/><lit-tag v="prn.pro"/></let>
          <let><clip pos="4" side="tl" part="a_prn"/><lit-tag v="prn.pro"/></let>
          <out>
@@ -2641,19 +2627,19 @@
                <clip pos="3" side="tl" part="tags"/>
                <clip pos="3" side="tl" part="lemq"/>
              </lu>
-             <b pos="1"/>
+             <b/>
              <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="2"/>
+             <b/>
              <lu>
                <clip pos="1" side="tl" part="lemh"/>
                <clip pos="1" side="tl" part="tags"/>
                <clip pos="1" side="tl" part="lemq"/>
              </lu>
-             <b pos="3"/>
+             <b pos="1"/>
              <lu>
                <clip pos="2" side="tl" part="lemh"/>
                <clip pos="2" side="tl" part="tags"/>
Index: incubator/apertium-srd-ita/apertium-srd-ita.srd-ita.dix
===================================================================
--- incubator/apertium-srd-ita/apertium-srd-ita.srd-ita.dix	(revision 68548)
+++ incubator/apertium-srd-ita/apertium-srd-ita.srd-ita.dix	(revision 68551)
@@ -52,6 +52,7 @@
     <sdef n="sp"      c=""/>
     <sdef n="ND"      c=""/>
     <sdef n="GD"      c=""/>
+    <sdef n="mfSG"    c="m or f to be defined in singular (otherwise mf)"/>
 
     <sdef n="cm"      c="Coma"/>
     <sdef n="sent"    c="Sentence marker"/>
@@ -230,6 +231,19 @@
       <e r="LR"><p><l>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sg"/></l><r>gli<s n="prn"/><s n="enc"/><s n="p3"/><s n="GD"/><s n="sg"/></r></p></e>
       <e><p><l>li<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="pl"/></l><r>gli<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="pl"/></r></p></e>
 
+<!--
+      <e r="RL"><p><l>bi<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sp"/></l><r>gli<s n="prn"/><s n="enc"/><s n="p3"/><s n="m"/><s n="sg"/></r></p></e>
+      <e r="RL"><p><l>bi<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sp"/></l><r>gli<s n="prn"/><s n="enc"/><s n="p3"/><s n="f"/><s n="sg"/></r></p></e>
+      <e r="RL"><p><l>bi<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sp"/></l><r>gli<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="pl"/></r></p></e>
+-->
+      <e r="LR"><p><l>bi<s n="prn"/><s n="enc"/><s n="p3"/><s n="mf"/><s n="sp"/></l><r>gli<s n="prn"/><s n="enc"/><s n="p3"/><s n="mfSG"/><s n="ND"/></r></p></e>
+<!--
+      <e r="RL"><p><l>bi<s n="prn"/><s n="pro"/><s n="p3"/><s n="mf"/><s n="sp"/></l><r>gli<s n="prn"/><s n="pro"/><s n="p3"/><s n="m"/><s n="sg"/></r></p></e>
+      <e r="RL"><p><l>bi<s n="prn"/><s n="pro"/><s n="p3"/><s n="mf"/><s n="sp"/></l><r>gli<s n="prn"/><s n="pro"/><s n="p3"/><s n="f"/><s n="sg"/></r></p></e>
+      <e r="RL"><p><l>bi<s n="prn"/><s n="pro"/><s n="p3"/><s n="mf"/><s n="sp"/></l><r>gli<s n="prn"/><s n="pro"/><s n="p3"/><s n="mf"/><s n="pl"/></r></p></e>
+-->
+      <e r="LR"><p><l>bi<s n="prn"/><s n="pro"/><s n="p3"/><s n="mf"/><s n="sp"/></l><r>gli<s n="prn"/><s n="pro"/><s n="p3"/><s n="mfSG"/><s n="ND"/></r></p></e>
+
       <e><p><l>nudda<s n="prn"/><s n="tn"/><s n="nt"/></l><r>nulla<s n="prn"/><s n="tn"/><s n="nt"/><s n="sg"/></r></p></e>
       <e><p><l>nudda<s n="prn"/><s n="tn"/><s n="nt"/></l><r>niente<s n="prn"/><s n="tn"/><s n="nt"/><s n="sg"/></r></p></e>
       <e><p><l>totu<s n="prn"/><s n="tn"/></l><r>tutto<s n="prn"/><s n="tn"/></r></p><par n="mf_GD"/></e>
Index: incubator/apertium-srd-ita/apertium-srd-ita.srd-ita.t1x
===================================================================
--- incubator/apertium-srd-ita/apertium-srd-ita.srd-ita.t1x	(revision 68548)
+++ incubator/apertium-srd-ita/apertium-srd-ita.srd-ita.t1x	(revision 68551)
@@ -68,6 +68,7 @@
      <attr-item tags="nt"/>
      <attr-item tags="mf"/>
      <attr-item tags="GD"/>
+     <attr-item tags="mfSG"/> <!-- si el nombre és sg és com GD, sinó és mf; va acompanyat sempre de ND -->
   </def-attr>
   <def-attr n="nbr">
      <attr-item tags="ND"/>
@@ -197,6 +198,43 @@
 	  </choose>
 	</when>
       </choose>    
+      <choose>
+	<when>
+	  <test>
+	    <equal>
+	      <clip pos="1" side="tl" part="gen"/>
+	      <lit-tag v="mfSG"/>
+	    </equal>
+	  </test>
+	  <choose> 
+	    <when>
+	      <test>
+	        <equal>
+	          <clip pos="1" side="tl" part="nbr"/>
+	          <lit-tag v="sg"/>
+	        </equal>
+	      </test>
+	      <choose> 
+	        <when>
+	          <test>
+		    <equal>
+		      <var n="genero"/>
+		      <lit-tag v="f"/>
+		    </equal>
+	          </test>
+	          <let><clip pos="1" side="tl" part="gen"/><lit-tag v="f"/></let>
+	        </when>
+	        <otherwise>
+	          <let><clip pos="1" side="tl" part="gen"/><lit-tag v="m"/></let>
+	        </otherwise>
+	      </choose>
+	    </when>
+	    <otherwise>
+	      <let><clip pos="1" side="tl" part="gen"/><lit-tag v="mf"/></let>
+	    </otherwise>
+	  </choose>
+	</when>
+      </choose>
     </def-macro>