Index: incubator/apertium-fao-nor/apertium-fao-nor.fao-nob.t1x
===================================================================
--- incubator/apertium-fao-nor/apertium-fao-nor.fao-nob.t1x	(revision 77813)
+++ incubator/apertium-fao-nor/apertium-fao-nor.fao-nob.t1x	(revision 77818)
@@ -19,6 +19,15 @@
     <def-cat n="numeral">
       <cat-item tags="num.*"/>
     </def-cat>
+    <def-cat n="itg_pronoun">
+      <cat-item tags="prn-itg.*"/>
+    </def-cat>
+    <def-cat n="prn-itg">
+      <cat-item tags="prn.itg.*"/>
+    </def-cat>
+    <def-cat n="prn-ref">
+      <cat-item tags="prn.ref.*"/>
+    </def-cat>
     <def-cat n="sent">
       <cat-item tags="sent"/>
     </def-cat>
@@ -81,11 +90,41 @@
       </choose>
     </def-macro>
     
+    <def-macro n="swap_gen_and_ind" npar="1">
+      <let><clip pos="1" side="tl" part="a_cas"/><lit v=""/></let>
+      <let><clip pos="1" side="tl" part="num"/><lit v=""/></let>
+    </def-macro>
+    
     <def-macro n="rm_case_and_num" npar="1">
       <let><clip pos="1" side="tl" part="a_cas"/><lit v=""/></let>
       <let><clip pos="1" side="tl" part="num"/><lit v=""/></let>
     </def-macro>
     
+    <def-macro n="rm_case_num_and_gen" npar="1">
+      <let><clip pos="1" side="tl" part="a_cas"/><lit v=""/></let>
+      <let><clip pos="1" side="tl" part="num"/><lit v=""/></let>
+      <let><clip pos="1" side="tl" part="a_gen"/><lit v=""/></let>
+    </def-macro>
+    
+    <def-macro n="turn_dat_into_acc" npar="1">
+      <choose>
+        <when>
+          <test><equal><clip pos="1" side="tl" part="a_cas"/><lit-tag v="dat"/></equal></test>
+          <let><clip pos="1" side="tl" part="a_cas"/><lit-tag v="acc"/></let>
+        </when>
+      </choose>
+    </def-macro>
+    
+    <def-macro n="rm_gender_from_plurals_and_case" npar="1">
+      <let><clip pos="1" side="tl" part="a_cas"/><lit v=""/></let>
+      <choose>
+        <when>
+          <test><equal><clip pos="1" side="tl" part="num"/><lit-tag v="pl"/></equal></test>
+          <let><clip pos="1" side="tl" part="a_gen"/><lit-tag v="un"/></let>
+        </when>
+      </choose>
+    </def-macro>
+    
     <def-macro n="rm_case" npar="1">
       <choose>
       <when> 
@@ -156,6 +195,16 @@
         <call-macro n="f_default1">
           <with-param pos="1"/>
         </call-macro>
+        <choose>
+          <when>
+            <test>
+              <and><equal><clip pos="1" side="tl" part="a_cas"/><lit-tag v="gen"/></equal>
+                <equal><clip pos="1" side="tl" part="a_def"/><lit-tag v="ind"/></equal></and>
+              </test>
+        	<let><clip pos="1" side="tl" part="a_def"/><lit-tag v="gen"/></let>
+      		<let><clip pos="1" side="tl" part="a_cas"/><lit-tag v="ind"/></let>
+          </when>
+      	</choose>
         <out>
           <chunk name="n" case="caseFirstWord">
             <tags>
@@ -237,7 +286,7 @@
 	  	<pattern-item n="det"/>
 	  </pattern>
 	  <action>
-	    <call-macro n="rm_case">
+	    <call-macro n="rm_gender_from_plurals_and_case">
           <with-param pos="1"/>
         </call-macro>
 	    <out>
@@ -258,7 +307,7 @@
 	  	<pattern-item n="numeral"/>
 	  </pattern>
 	  <action>
-	    <call-macro n="rm_case">
+	    <call-macro n="rm_gender_from_plurals_and_case">
           <with-param pos="1"/>
         </call-macro>
 	    <out>
@@ -273,7 +322,49 @@
 	    </out>
 	  </action>
 	</rule>
-
+	
+	<rule comment="prn-ref stuff">
+	  <pattern>
+	  	<pattern-item n="prn-ref"/>
+	  </pattern>
+	  <action>
+	    <call-macro n="turn_dat_into_acc">
+          <with-param pos="1"/>
+        </call-macro>
+	    <out>
+	      <chunk name="r" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="Refprn"/></tag>
+            </tags>
+	        <lu>
+	      	  <clip pos="1" side="tl" part="whole"/>
+	        </lu>
+		  </chunk>
+	    </out>
+	  </action>
+	</rule>
+	
+	<rule comment="prn-itg stuff">
+	  <pattern>
+	  	<pattern-item n="prn-itg"/>
+	  </pattern>
+	  <action>
+	    <call-macro n="rm_case_num_and_gen">
+          <with-param pos="1"/>
+        </call-macro>
+	    <out>
+	      <chunk name="r" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="Itgprn"/></tag>
+            </tags>
+	        <lu>
+	      	  <clip pos="1" side="tl" part="whole"/>
+	        </lu>
+		  </chunk>
+	    </out>
+	  </action>
+	</rule>
+	
     <rule comment="REGLA: SENT">
       <pattern>
         <pattern-item n="sent"/>
Index: incubator/apertium-fao-nor/apertium-fao-nor.fao-nor.dix
===================================================================
--- incubator/apertium-fao-nor/apertium-fao-nor.fao-nor.dix	(revision 77813)
+++ incubator/apertium-fao-nor/apertium-fao-nor.fao-nor.dix	(revision 77818)
@@ -50,6 +50,7 @@
   <sdef n="det"/>
   <sdef n="np"/>
   <sdef n="part"/>
+  <sdef n="dem"/>
 </sdefs>
 <pardefs>
    <pardef n="adj:adj_sint">
@@ -446,9 +447,9 @@
 <!--<e vr="nno"><p><l>hvør<s n="det"/></l><r>kor<s n="det"/></r></p></e>-->
 <e vr="nob"><p><l>nakar<s n="det"/></l><r>noen<s n="det"/></r></p></e>
 <e vr="nno"><p><l>nakar<s n="det"/></l><r>nokon<s n="det"/></r></p></e>
-<e><p><l>hasin<s n="det"/></l><r>den<s n="det"/></r></p></e>
-<e><p><l>tann<s n="det"/></l><r>den<s n="det"/></r></p></e>
-<e><p><l>tað<s n="det"/></l><r>den<s n="det"/></r></p></e>
+<e><p><l>hasin<s n="det"/></l><r>den<s n="det"/><s n="dem"/></r></p></e>
+<e><p><l>tann<s n="det"/></l><r>den<s n="det"/><s n="dem"/></r></p></e>
+<e><p><l>tað<s n="det"/></l><r>den<s n="det"/><s n="dem"/></r></p></e>
 <e><p><l>sín<s n="det"/></l><r>sin<s n="det"/></r></p></e>