diff --git a/src/urdu/ParadigmsUrd.gf b/src/urdu/ParadigmsUrd.gf
index 2ce707386..19d20ed3d 100644
--- a/src/urdu/ParadigmsUrd.gf
+++ b/src/urdu/ParadigmsUrd.gf
@@ -1,207 +1,216 @@
---# -path=.:../abstract:../../prelude:../common
---
-----1 Urdu Lexical Paradigms
-
-resource ParadigmsUrd = open 
-  Predef, 
-  Prelude, 
-  MorphoUrd,
-  CatUrd,
-  CommonHindustani,
-  ParamX
-  in {
-
---2 Parameters 
-
-oper
-  masculine : Gender ;
-  feminine : Gender ;
-  singular : Number;
-  plural : Number;
-  
-  singular = Sg ; plural = Pl;
-
-  masculine = Masc ; feminine = Fem ; --i
-
-
---2 Nouns
-
-  mkN = overload {
-    mkN : Str -> N -- Regular nouns like lRka, gender is judged from noun ending 
-      = \s -> regNoun s ** {lock_N = <>} ;
-    mkN : Str -> Gender -> N -- nouns whose gender is irregular like Admy
-      = \s,g -> reggNoun s g ** {lock_N = <>} ;
-    mkN : (x1,_,_,_,_,x6 : Str) -> Gender -> N -- worst case 
-      = \sd,so,sv,pd,po,pv,g -> mkNoun sd so sv pd po pv g ** {lock_N = <>} ;
-    } ;
-  mkN2 : N -> Prep -> Str -> N2; -- e.g maN ky
-  mkN2 = \n,p,c -> n ** {lock_N2 = <> ; c2 = p.s ! n.g ; c3 = c } ; 
-  
-  mkN3 : N -> Prep -> Str -> Str-> N3 ; -- e.g faSlh - sE - ka
-  mkN3 = \n,p,q,r -> n ** {lock_N3 = <> ; c2 = p.s ! n.g ; c3 = q ; c4 = r} ;
-  
-
-  
--- Compound Nouns  
-
-    mkCmpdNoun : Str -> N -> N -- e.g t-alb elm
-     = \s,noun -> {s =\\n,c => s ++ noun.s ! n ! c ; g = noun.g ; lock_N = <>};
- 
-
--- Proper names     
-  mkPN : Str -> PN = \s -> let n = regNoun s in {s = n.s ! Sg ; g = n.g ; lock_PN = <>} ;
-  personalPN : Str -> Str -> Str -> Str -> Str -> Str -> Str -> Number -> Gender -> UPerson -> Pron =
-    \s1,s2,s3,smp,sfp,pmp,pfp,nn,g,p -> let n = mkPron s1 s2 s3 in
-      {s = n.s ;
-       a = toAgr nn p g ;
-       ps = \\n,g => case <n,g> of {
-                        <Sg,Masc> =>smp ;
-			<Sg,Fem> => sfp ;
-			<Pl,Masc> => pmp ;
-			<Pl,Fem> => pfp } ; lock_Pron = <>};
-  demoPN : Str -> Str -> Str -> Quant = \s1,s2,s3 -> let n = makeDemonPronForm s1 s2 s3 in {s = n.s ; a = defaultAgr ; lock_Quant = <>};
-  mkDet : Str -> Str -> Str -> Str -> Number -> Det = \s1,s2,s3,s4,nb -> let dt = makeDet s1 s2 s3 s4 nb in {s = dt.s ; n = nb ; lock_Det = <>};
-  mkIP : (x1,x2,x3:Str) -> Number -> Gender -> IP = \s1,s2,s3,n,g -> let p = mkIntPronForm s1 s2 s3 in { s = p.s ; n = n ; g = g ;  lock_IP = <>}; 
-
--- AdN
-  mkAdN : Str -> AdN = \s -> {s = s ; p = False ; lock_AdN = <>} ; 
---2 Adjectives
-
-  mkA = overload {
-    mkA : Str-> A -- e.g ach'a
-      = \s -> regAdjective s ** {lock_A = <>} ;
-	mkA : Str -> Str -> A2 -- e.g sE Xady krna
-	  = \a,c -> let n = regAdjective a in {s = n.s; c2 = c} ** {lock_A2 = <>} ;
-    } ;
-  mkA2 : A -> Str -> A2 ;
-  mkA2 a str = a ** {c2=str ; lock_A2 = <>} ;
-  
--- compound Adjectives
-  mkCompoundA : Str -> Str -> A ; -- e.g dra hwa
-  mkCompoundA s1 s2 = compoundAdj s1 s2 ;
-
---2 Verbs
-
-  mkV : Str -> V -- regular verbs like swna
-      = \s -> mkVerb s ** {lock_V = <>} ;
-
-  mkV2 = overload {
-    mkV2 : Str -> V2 -- e.g pyna
-      = \s -> mkVerb s **  {c2 = {s = [] ; c = VTrans} ; lock_V2 = <>} ;
-    mkV2 : V -> V2 -- e.g pyna
-      = \v -> v ** {c2 = {s = [] ; c = VTrans} ; lock_V2 = <>} ;
-    mkV2 : V -> Str -> V2 -- e.g bnd krna
-      = \v,p -> v ** {c2 = {s = p ; c = VTrans} ; lock_V2 = <>} ;
-    } ;
-  dirV2 : V -> V2 = \v -> v ** {c2 = {s = [] ; c = VTrans} ; lock_V2 = <>} ;
-  
-  mkV3 : V -> Str -> Str -> V3; -- e.g bycna
-    mkV3 v p q = v ** { c2 = p ; c3 = q ; lock_V3 = <>} ;
-  mkV2V : V -> Str -> Str -> Bool -> V2V ; -- e.g eltja krna - sE - kw
-    mkV2V v s1 s2 b = v ** {isAux = b ; c1 = s1 ; c2 = s2 ; lock_V2V = <>} ;
-  dirdirV3 : V -> V3 ;
-  dirdirV3 v = v ** { c2 = [] ; c3 = [] ; lock_V3 = <>} ;
-  
--- compund verbs
-   compoundV = overload {
-   compoundV : Str -> V -> V -- e.g barX hwna
-      = \s,v -> {s = \\vf => v.s ! vf ; cvp = s ; lock_V = <>} ;     
-   compoundV : Str -> V2 -> V -- e.g bnd krna
-     = \s,v -> {s = \\vf => v.s ! vf ; cvp = s ; lock_V = <>} ;
-   };
- 
-
-----2 Adverbs
-mkAdv = overload {
-  mkAdv : Str -> Adv -- e.g yhaN
-    = \str -> {s = \\_ => str ; lock_Adv = <>};
-  mkAdv : Str -> Str -> Adv
-    = \m,f -> {s = table {Masc => m ; Fem => f} ; lock_Adv = <>};
-    };
-
-----2 Prepositions
-
-  mkPrep : Str -> Str -> Prep ; -- e.g ka - ky
-    mkPrep s1 s2 = makePrep s1 s2 ** {lock_Prep = <>};
-    
---3 Determiners and quantifiers
-
---  mkQuant : overload {
---    mkQuant : Pron -> Quant ;
---    mkQuant : (no_sg, no_pl, none_sg, non_pl : Str) -> Quant ;
---  } ;
-  
---  mkQuant = overload {
---    mkQuant : Pron -> Quant = \p -> {s = \\_,_,c => p.s!c ;a = p.a ; lock_Quant = <>};
---    mkQuant : (no_sg, no_pl, none_sg, non_pl : Str) -> Quant = mkQuantifier;
---  } ;
-  mkIQuant : Str -> IQuant = \s -> makeIQuant s ;
-  
-
---2 Conjunctions
-  mkConj : overload {
-    mkConj : Str -> Conj ;                  -- and (plural agreement)
-    mkConj : Str -> Number -> Conj ;        -- or (agrement number given as argument)
-    mkConj : Str -> Str -> Conj ;           -- both ... and (plural)
-    mkConj : Str -> Str -> Number -> Conj ; -- either ... or (agrement number given as argument)
-  } ;
- mkConj = overload {
-    mkConj : Str -> Conj = \y -> mk2Conj [] y plural ;
-    mkConj : Str -> Number -> Conj = \y,n -> mk2Conj [] y n ;
-    mkConj : Str -> Str -> Conj = \x,y -> mk2Conj x y plural ;
-    mkConj : Str -> Str -> Number -> Conj = mk2Conj ;
-  } ;
-
-  mk2Conj : Str -> Str -> Number -> Conj = \x,y,n -> 
-    lin Conj (sd2 x y ** {n = n}) ;  
-
---  mkV0  : V -> V0 ;
-  mkVS  : V -> VS; -- e.g drna
-  mkVS v = v ;
---  mkV2S : V -> Prep -> V2S ;
-  mkVV  : V -> VV = -- e.g cahna
-     \v ->  lin VV (v ** {isAux = False});
-    
-  mkAdA : Str -> AdA ;
---  mkAdv x = lin Adv (ss x) ;
---  mkAdV x = lin AdV (ss x) ;
-  mkAdA x = lin AdA (ss x) ;
---  mkAdN x = lin AdN (ss x) ;
-
---  mkV2V : V -> Prep -> Prep -> V2V ;
---  mkVA  : V -> VA ;
---  mkV2A : V -> Prep -> V2A ;
-  mkVQ  : V -> VQ ; -- e.g janna
-  mkVQ v = v ;
---  mkV2Q : V -> Prep -> V2Q ;
---
---  mkAS  : A -> AS ;
---  mkA2S : A -> Prep -> A2S ;
---  mkAV  : A -> AV ;
---  mkA2V : A -> Prep -> A2V ;
---
----- Notice: Categories $V0, AS, A2S, AV, A2V$ are just $A$.
----- $V0$ is just $V$; the second argument is treated as adverb.
---
---  V0 : Type ;
---  AS, A2S, AV, A2V : Type ;
---
-----.
-----2 Definitions of paradigms
-----
----- The definitions should not bother the user of the API. So they are
----- hidden from the document.
---
---  Gender = MorphoHin.Gender ; 
---  Number = MorphoHin.Number ;
---  Case = MorphoHin.Case ;
---  human = Masc ; 
---  nonhuman = Neutr ;
---  masculine = Masc ;
---  feminine = Fem ;
---  singular = Sg ;
---  plural = Pl ;
---  nominative = Nom ;
---  genitive = Gen ;
-  
-}
+--# -path=.:../abstract:../../prelude:../common
+--
+----1 Urdu Lexical Paradigms
+
+resource ParadigmsUrd = open 
+  Predef, 
+  Prelude, 
+  MorphoUrd,
+  CatUrd,
+  CommonHindustani,
+  ParamX
+  in {
+
+--2 Parameters 
+
+oper
+  masculine : Gender ;
+  feminine : Gender ;
+  singular : Number;
+  plural : Number;
+  
+  singular = Sg ; plural = Pl;
+
+  masculine = Masc ; feminine = Fem ; --i
+
+
+--2 Nouns
+
+  mkN = overload {
+    mkN : Str -> N -- Regular nouns like lRka, gender is judged from noun ending 
+      = \s -> regNoun s ** {lock_N = <>} ;
+    mkN : Str -> Gender -> N -- nouns whose gender is irregular like Admy
+      = \s,g -> reggNoun s g ** {lock_N = <>} ;
+    mkN : (x1,_,_,_,_,x6 : Str) -> Gender -> N -- worst case 
+      = \sd,so,sv,pd,po,pv,g -> mkNoun sd so sv pd po pv g ** {lock_N = <>} ;
+    } ;
+  mkN2 : N -> Prep -> Str -> N2; -- e.g maN ky
+  mkN2 = \n,p,c -> n ** {lock_N2 = <> ; c2 = p.s ! n.g ; c3 = c } ; 
+  
+  mkN3 : N -> Prep -> Str -> Str-> N3 ; -- e.g faSlh - sE - ka
+  mkN3 = \n,p,q,r -> n ** {lock_N3 = <> ; c2 = p.s ! n.g ; c3 = q ; c4 = r} ;
+  
+
+  
+-- Compound Nouns  
+
+    mkCmpdNoun : Str -> N -> N -- e.g t-alb elm
+     = \s,noun -> {s =\\n,c => s ++ noun.s ! n ! c ; g = noun.g ; lock_N = <>};
+ 
+
+-- Proper names     
+  mkPN : Str -> PN = \s -> let n = regNoun s in {s = n.s ! Sg ; g = n.g ; lock_PN = <>} ;
+  personalPN : Str -> Str -> Str -> Str -> Str -> Str -> Str -> Number -> Gender -> UPerson -> Pron =
+    \s1,s2,s3,smp,sfp,pmp,pfp,nn,g,p -> let n = mkPron s1 s2 s3 in
+      {s = n.s ;
+       a = toAgr nn p g ;
+       ps = \\n,g => case <n,g> of {
+                        <Sg,Masc> =>smp ;
+			<Sg,Fem> => sfp ;
+			<Pl,Masc> => pmp ;
+			<Pl,Fem> => pfp } ; lock_Pron = <>};
+  demoPN : Str -> Str -> Str -> Quant = \s1,s2,s3 -> let n = makeDemonPronForm s1 s2 s3 in {s = n.s ; a = defaultAgr ; lock_Quant = <>};
+
+  mkLN : Str -> LN = \s -> lin LN {s=s} ;
+  mkSN : Str -> SN = \s -> lin SN {s=s} ;
+  mkGN : Str -> GN = \s -> lin GN {s=s} ;
+
+  mkDet : Str -> Str -> Str -> Str -> Number -> Det = \s1,s2,s3,s4,nb -> let dt = makeDet s1 s2 s3 s4 nb in {s = dt.s ; n = nb ; lock_Det = <>};
+  mkIP : (x1,x2,x3:Str) -> Number -> Gender -> IP = \s1,s2,s3,n,g -> let p = mkIntPronForm s1 s2 s3 in { s = p.s ; n = n ; g = g ;  lock_IP = <>}; 
+
+-- AdN
+  mkAdN : Str -> AdN = \s -> {s = s ; p = False ; lock_AdN = <>} ; 
+--2 Adjectives
+
+  mkA = overload {
+    mkA : Str-> A -- e.g ach'a
+      = \s -> regAdjective s ** {lock_A = <>} ;
+	mkA : Str -> Str -> A2 -- e.g sE Xady krna
+	  = \a,c -> let n = regAdjective a in {s = n.s; c2 = c} ** {lock_A2 = <>} ;
+    } ;
+  mkA2 : A -> Str -> A2 ;
+  mkA2 a str = a ** {c2=str ; lock_A2 = <>} ;
+  
+-- compound Adjectives
+  mkCompoundA : Str -> Str -> A ; -- e.g dra hwa
+  mkCompoundA s1 s2 = compoundAdj s1 s2 ;
+
+--2 Verbs
+
+  mkV : Str -> V -- regular verbs like swna
+      = \s -> mkVerb s ** {lock_V = <>} ;
+
+  mkV2 = overload {
+    mkV2 : Str -> V2 -- e.g pyna
+      = \s -> mkVerb s **  {c2 = {s = [] ; c = VTrans} ; lock_V2 = <>} ;
+    mkV2 : V -> V2 -- e.g pyna
+      = \v -> v ** {c2 = {s = [] ; c = VTrans} ; lock_V2 = <>} ;
+    mkV2 : V -> Str -> V2 -- e.g bnd krna
+      = \v,p -> v ** {c2 = {s = p ; c = VTrans} ; lock_V2 = <>} ;
+    } ;
+  dirV2 : V -> V2 = \v -> v ** {c2 = {s = [] ; c = VTrans} ; lock_V2 = <>} ;
+  
+  mkV3 : V -> Str -> Str -> V3; -- e.g bycna
+    mkV3 v p q = v ** { c2 = p ; c3 = q ; lock_V3 = <>} ;
+  mkV2V : V -> Str -> Str -> Bool -> V2V ; -- e.g eltja krna - sE - kw
+    mkV2V v s1 s2 b = v ** {isAux = b ; c1 = s1 ; c2 = s2 ; lock_V2V = <>} ;
+  dirdirV3 : V -> V3 ;
+  dirdirV3 v = v ** { c2 = [] ; c3 = [] ; lock_V3 = <>} ;
+  
+-- compund verbs
+   compoundV = overload {
+   compoundV : Str -> V -> V -- e.g barX hwna
+      = \s,v -> {s = \\vf => v.s ! vf ; cvp = s ; lock_V = <>} ;     
+   compoundV : Str -> V2 -> V -- e.g bnd krna
+     = \s,v -> {s = \\vf => v.s ! vf ; cvp = s ; lock_V = <>} ;
+   };
+ 
+oper mkVA  : V -> VA = \v -> lin VA v ;
+oper mkV2S  : V -> V2S = \v -> lin V2S v ** {c2={s = [] ; c = VTrans}} ;
+
+----2 Adverbs
+mkAdv = overload {
+  mkAdv : Str -> Adv -- e.g yhaN
+    = \str -> {s = \\_ => str ; lock_Adv = <>};
+  mkAdv : Str -> Str -> Adv
+    = \m,f -> {s = table {Masc => m ; Fem => f} ; lock_Adv = <>};
+    };
+
+mkAdV : Str -> AdV = \s -> lin AdV {s=s} ;
+
+----2 Prepositions
+
+  mkPrep : Str -> Str -> Prep ; -- e.g ka - ky
+    mkPrep s1 s2 = makePrep s1 s2 ** {lock_Prep = <>};
+    
+--3 Determiners and quantifiers
+
+--  mkQuant : overload {
+--    mkQuant : Pron -> Quant ;
+--    mkQuant : (no_sg, no_pl, none_sg, non_pl : Str) -> Quant ;
+--  } ;
+  
+--  mkQuant = overload {
+--    mkQuant : Pron -> Quant = \p -> {s = \\_,_,c => p.s!c ;a = p.a ; lock_Quant = <>};
+--    mkQuant : (no_sg, no_pl, none_sg, non_pl : Str) -> Quant = mkQuantifier;
+--  } ;
+  mkIQuant : Str -> IQuant = \s -> makeIQuant s ;
+  
+
+--2 Conjunctions
+  mkConj : overload {
+    mkConj : Str -> Conj ;                  -- and (plural agreement)
+    mkConj : Str -> Number -> Conj ;        -- or (agrement number given as argument)
+    mkConj : Str -> Str -> Conj ;           -- both ... and (plural)
+    mkConj : Str -> Str -> Number -> Conj ; -- either ... or (agrement number given as argument)
+  } ;
+ mkConj = overload {
+    mkConj : Str -> Conj = \y -> mk2Conj [] y plural ;
+    mkConj : Str -> Number -> Conj = \y,n -> mk2Conj [] y n ;
+    mkConj : Str -> Str -> Conj = \x,y -> mk2Conj x y plural ;
+    mkConj : Str -> Str -> Number -> Conj = mk2Conj ;
+  } ;
+
+  mk2Conj : Str -> Str -> Number -> Conj = \x,y,n -> 
+    lin Conj (sd2 x y ** {n = n}) ;  
+
+--  mkV0  : V -> V0 ;
+  mkVS  : V -> VS; -- e.g drna
+  mkVS v = v ;
+--  mkV2S : V -> Prep -> V2S ;
+  mkVV  : V -> VV = -- e.g cahna
+     \v ->  lin VV (v ** {isAux = False});
+    
+  mkAdA : Str -> AdA ;
+--  mkAdv x = lin Adv (ss x) ;
+--  mkAdV x = lin AdV (ss x) ;
+  mkAdA x = lin AdA (ss x) ;
+--  mkAdN x = lin AdN (ss x) ;
+
+--  mkV2V : V -> Prep -> Prep -> V2V ;
+--  mkVA  : V -> VA ;
+--  mkV2A : V -> Prep -> V2A ;
+  mkVQ  : V -> VQ ; -- e.g janna
+  mkVQ v = v ;
+--  mkV2Q : V -> Prep -> V2Q ;
+--
+--  mkAS  : A -> AS ;
+--  mkA2S : A -> Prep -> A2S ;
+--  mkAV  : A -> AV ;
+--  mkA2V : A -> Prep -> A2V ;
+--
+---- Notice: Categories $V0, AS, A2S, AV, A2V$ are just $A$.
+---- $V0$ is just $V$; the second argument is treated as adverb.
+--
+--  V0 : Type ;
+--  AS, A2S, AV, A2V : Type ;
+--
+----.
+----2 Definitions of paradigms
+----
+---- The definitions should not bother the user of the API. So they are
+---- hidden from the document.
+--
+--  Gender = MorphoHin.Gender ; 
+--  Number = MorphoHin.Number ;
+--  Case = MorphoHin.Case ;
+--  human = Masc ; 
+--  nonhuman = Neutr ;
+--  masculine = Masc ;
+--  feminine = Fem ;
+--  singular = Sg ;
+--  plural = Pl ;
+--  nominative = Nom ;
+--  genitive = Gen ;
+  
+}