Index: incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.dix
===================================================================
--- incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.dix	(revision 71339)
+++ incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.dix	(revision 71341)
@@ -11330,6 +11330,7 @@
       <e><p><l>Salih<s n="np"/><s n="ant"/><s n="m"/></l><r>Salih<s n="np"/><s n="ant"/></r></p></e>
       <e><p><l>Mesûd<s n="np"/><s n="ant"/><s n="m"/></l><r>Masoud<s n="np"/><s n="ant"/></r></p></e>
       <e><p><l>Barzanî<s n="np"/><s n="ant"/><s n="m"/></l><r>Barzani<s n="np"/><s n="ant"/></r></p></e>
+      <e><p><l>Xanî<s n="np"/><s n="ant"/><s n="m"/></l><r>Xani<s n="np"/><s n="ant"/></r></p></e>
       <e><p><l>Wanlî<s n="np"/><s n="ant"/><s n="m"/></l><r>Wanli<s n="np"/><s n="ant"/></r></p></e>
       <e><p><l>Tîrêj<s n="np"/><s n="al"/><s n="f"/></l><r>Tîrêj<s n="np"/><s n="al"/></r></p></e>
 
@@ -15618,6 +15619,7 @@
      <e><p><l>—<s n="guio"/></l><r>—<s n="guio"/></r></p></e>
      <e><re>[.\?;:!"]+</re><p><l><s n="sent"/></l><r><s n="sent"/></r></p></e>
      <e><re>%?[0-9]+([.,][0-9]+)*[.,]*</re><p><l><s n="num"/></l><r><s n="num"/></r></p></e> 
+     <e><re>[0-9]+'?</re><p><l><s n="num"/></l><r><s n="num"/></r></p></e> 
 
    </section>
 
Index: incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.t1x
===================================================================
--- incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.t1x	(revision 71339)
+++ incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.t1x	(revision 71341)
@@ -40,6 +40,9 @@
     <def-cat n="nom-con">
       <cat-item tags="n.*.*.con.*"/>
     </def-cat>
+    <def-cat n="nom-obl">
+      <cat-item tags="n.*.*.obl.*"/>
+    </def-cat>
     <def-cat n="pron-obl">
       <cat-item tags="prn.pers.*.*.*.obl"/>
       <cat-item lemma="xwe" tags="prn.ref.*"/>
@@ -72,6 +75,9 @@
     <def-cat n="vaux">
 	    <cat-item tags="vaux.*"/>
     </def-cat>
+    <def-cat n="narr">
+	    <cat-item tags="vblex.*.narr.*"/>
+    </def-cat>
     <def-cat n="past">
 	    <cat-item tags="vblex.*.past.*"/>
     </def-cat>
@@ -116,6 +122,9 @@
       <attr-item tags="np.top"/>
       <attr-item tags="np.cog"/>
     </def-attr>
+    <def-attr n="a_narr">
+      <attr-item tags="narr"/>
+    </def-attr>
     <def-attr n="a_verb">
       <attr-item tags="vbser"/>
       <attr-item tags="vbhaver"/>
@@ -142,8 +151,10 @@
     </def-attr>
     <def-attr n="a_syn">
       <attr-item tags="@dobj"/>
+      <attr-item tags="@nmod:dat"/>
       <attr-item tags="@nsubj"/>
     </def-attr>
+
     <def-attr n="a_prn">
       <attr-item tags="prn.pers"/>
     </def-attr>
@@ -157,6 +168,7 @@
 
   <section-def-vars>
     <def-var n="number"/>
+    <def-var n="prep"/>
     <def-var n="last-subj"/>
   </section-def-vars>
 
@@ -307,7 +319,29 @@
         </out>
       </action>
     </rule>
+    <rule comment="REGLA: narr">
+      <pattern>
+        <pattern-item n="narr"/>
+      </pattern>
+      <action>
+        <let><clip pos="1" side="tl" part="a_prs"/><lit v=""/></let>
+        <let><clip pos="1" side="tl" part="a_nbr"/><lit v=""/></let>
+        <let><clip pos="1" side="tl" part="a_narr"/><lit v="past"/></let>
+        <out>
+          <chunk name="v" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="SV"/></tag>
+            </tags>
+            <b/>
+            <lu>
+              <clip pos="1" side="tl" part="whole"/>
+            </lu>
+          </chunk>
+        </out>
+      </action>
+    </rule>
 
+
     <rule comment="REGLA: past">
       <pattern>
         <pattern-item n="past"/>
@@ -378,6 +412,8 @@
       </action>
     </rule>
 
+<!--    <rule comment="REGLA: nom-obl">
+    </rule> -->
 
     
     <rule comment="REGLA: pron-pers">
@@ -530,7 +566,43 @@
       </action>
     </rule>
 
+    <rule comment="REGLA: obl">
+      <pattern>
+        <pattern-item n="nom-obl"/>
+      </pattern>
+      <action>
+        <choose>
+          <when>
+            <test><equal><clip pos="1" side="tl" part="a_syn"/><lit-tag v="@nmod:dat"/></equal></test>
+            <let><clip pos="1" side="tl" part="a_func"/><lit-tag v="subj"/></let>
+            <let><clip pos="1" side="tl" part="a_case"/><lit v=""/></let>
+            <let><var n="prep"/><lit v="to"/></let>
+          </when>
+        </choose>
+        <out>
+          <chunk name="n" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="SN"/></tag>
+            </tags>
+            <lu>
+		<var n="prep"/>
+            </lu>
+            <lu>
+              <lit v="the"/><lit-tag v="det.def.sp"/>
+            </lu>
+            <lu>
+              <clip pos="1" side="tl" part="lemh"/>
+              <clip pos="1" side="tl" part="a_nom"/>
+              <clip pos="1" side="tl" part="a_nbr"/>
+              <clip pos="1" side="tl" part="lemq"/>
+            </lu>
+          </chunk>
+        </out>
+      </action>
+    </rule>
 
+
+
     <rule comment="REGLA: nom">
       <pattern>
         <pattern-item n="nom"/>
Index: incubator/apertium-kmr/apertium-kmr.kmr.dix
===================================================================
--- incubator/apertium-kmr/apertium-kmr.kmr.dix	(revision 71339)
+++ incubator/apertium-kmr/apertium-kmr.kmr.dix	(revision 71341)
@@ -94,7 +94,13 @@
 
     <pardef n="numeros">
       <e><re>[0-9]+([.,][0-9]+)?</re><p><l/><r><s n="num"/></r></p></e>
-      <e><re>[0-9]+</re><p><l>an</l><r><s n="num"/><s n="pl"/><s n="obl"/></r></p></e>
+      <e><re>[0-9]+'?</re><p><l>an</l><r><s n="num"/><s n="pl"/><s n="obl"/></r></p></e>
+      <e><re>[0-9]+'?</re><p><l>yan</l><r><s n="num"/><s n="pl"/><s n="obl"/></r></p></e>
+      <e><re>[0-9]+'?</re><p><l>î</l><r><s n="num"/></r></p></e>
+      <e><re>[0-9]+'?</re><p><l>ê</l><r><s n="num"/></r></p></e>
+      <e><re>[0-9]+'?</re><p><l>yê</l><r><s n="num"/></r></p></e>
+      <e><re>[0-9]+'?</re><p><l>a</l><r><s n="num"/></r></p></e>
+<!-- FIX ME: grammatical info -->
     </pardef>
 
     <pardef n="separa">
@@ -1356,6 +1362,9 @@
         <e><p><l>hatî</l><r><s n="vblex"/><s n="iv"/><s n="past"/><s n="p2"/><s n="sg"/></r></p></e>
         <e><p><l>hat</l><r><s n="vblex"/><s n="iv"/><s n="past"/><s n="p3"/><s n="sg"/></r></p></e>
         <e><p><l>hatibû</l><r><s n="vblex"/><s n="iv"/><s n="plu"/><s n="p3"/><s n="sg"/></r></p></e>
+        <e r="LR"><p><l>hatîye</l><r><s n="vblex"/><s n="iv"/><s n="narr"/><s n="p3"/><s n="sg"/></r></p></e>
+        <e r="LR"><p><l>hatîye</l><r><s n="vblex"/><s n="iv"/><s n="narr"/><s n="p2"/><s n="sg"/></r></p></e>
+        <e r="LR"><p><l>hatîme</l><r><s n="vblex"/><s n="iv"/><s n="narr"/><s n="p1"/><s n="sg"/></r></p></e>
         <e><p><l>hatin</l><r><s n="vblex"/><s n="iv"/><s n="past"/><s n="p1"/><s n="pl"/></r></p></e>
         <e><p><l>hatin</l><r><s n="vblex"/><s n="iv"/><s n="past"/><s n="p2"/><s n="pl"/></r></p></e>
         <e><p><l>hatin</l><r><s n="vblex"/><s n="iv"/><s n="past"/><s n="p3"/><s n="pl"/></r></p></e>
@@ -13861,6 +13870,7 @@
     <e lm="Walter"><i>Walter</i><par n="Salih__np"/></e>
     <e lm="Williams"><i>Williams</i><par n="Salih__np"/></e>
     <e lm="Xelîlî"><i>Xelîl</i><par n="Barzan/î__np"/></e>
+    <e lm="Xanî"><i>Xan</i><par n="Barzan/î__np"/></e>
     <e lm="Yang"><i>Yang</i><par n="Salih__np"/></e>
     <e lm="Yasîn"><i>Yasîn</i><par n="Salih__np"/></e>
     <e lm="Yewnanîstan"><i>Yewnanîstan</i><par n="Kurdistan__np"/></e>
Index: incubator/apertium-kmr/apertium-kmr.kmr.rlx
===================================================================
--- incubator/apertium-kmr/apertium-kmr.kmr.rlx	(revision 71339)
+++ incubator/apertium-kmr/apertium-kmr.kmr.rlx	(revision 71341)
@@ -41,6 +41,7 @@
 LIST Pers = pers ;
 LIST Rel = rel ;
 
+LIST Comma = cm ;
 LIST Past = past ;
 LIST Fut = fut ;
 LIST Prs = prs ; 
@@ -106,11 +107,13 @@
 
 SELECT Cop IF (0 Cop OR Eza) (1 EOS) (NOT -1 PrfPrc) ;
 
+SELECT Ant IF (0 N OR Ant) (-1 Ant + Eza);
+
 REMOVE N + Dem IF (NOT -1 Det) ; 
 
 SELECT V IF (1 EOS) (NEGATE -1* V) ; 
 
-REMOVE NOMEN + Obl IF (Not -1 Dash) (NOT -1 Eza) (NOT -1 Pr) (NOT 1 Post)  (NOT 1* TV) ;
+REMOVE NOMEN + Obl IF (Not -1 Dash) (NOT -1 Eza) (NOT -1 Pr) (NOT 1 Post)  (NOT 1* TV) (NOT -1 V);
 
 SELECT BI IF (0 BI) ;
 
@@ -176,6 +179,8 @@
 
 SELECT Prs IF (-1* CS LINK -1* Fin);
 
+REMOVE Voc IF (NOT -1 Comma) (1 EOS);
+
 SECTION
 
 LIST @nsubj = @nsubj ;
@@ -182,11 +187,15 @@
 LIST @dobj = @dobj ;
 LIST @csubj = @csubj ;
 LIST @qst = @qst ;
+LIST @nmod:dat = @nmod:dat ;
 
+
 MAP @nsubj TARGET Pron + Obl IF (0C Obl) (1* TV + Past BARRIER CLB OR Pers + Obl) (NOT -1 Pr) (NOT 1 Post) (NOT -1 Eza) ;
 
 #ADD (@qst) FV IF (*1 Pirs) ;
 
+MAP @nmod:dat TARGET NOMEN + Obl IF (NOT -1* Pr BARRIER V) (NOT 1 Post) (NOT -0* TV BARRIER V) (NOT -1 Eza);
+
 SECTION
 
 SELECT CS IF (0 Gelo) (-1 BOS);