move NumeralX.inc to ParamX since it is used in many places

src/albanian/NumeralSqi.gf

@@ -84,10 +84,4 @@ oper
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
 }

src/amharic/NumeralAmh.gf

@@ -109,11 +109,6 @@ lin pot3plus n m = {
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
 ------------------ :) what a releif 
 
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o  ;

src/ancient_greek/ResGrc.gf

@@ -18,7 +18,7 @@
 -- Author: Hans Leiß, LMU Munich, CIS
 
 
-resource ResGrc = ParamX - [Number,Sg,Pl,ImpForm,numImp,Tense,ImpF] 
+resource ResGrc = ParamX - [Number,Sg,Pl,ImpForm,numImp,Tense,ImpF,inc,DTail]
                   ** open Prelude, PhonoGrc, Predef in {
 flags 
   optimize = noexpand ;  -- optimize=all is impossible with addAccent

src/bulgarian/NumeralBul.gf

@@ -200,12 +200,6 @@ lin pot5decimal d = {
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c (c+"ма") o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c (c + "ти") ;
 

src/catalan/NumeralCat.gf

@@ -179,12 +179,6 @@ param
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
   oper
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c (c + ":o") ;

src/common/ParamX.gf

@@ -64,5 +64,11 @@ resource ParamX = open Prelude in {
   param
     DTail = T1 | T2 | T3 ;
 
+  oper
+    inc : DTail -> DTail = \t -> case t of {
+      T1 => T2 ;
+      T2 => T3 ;
+      T3 => T1
+      } ;
 
 }

src/english/NumeralEng.gf

@@ -134,12 +134,6 @@ lin PosDecimal d = d ** {hasDot=False} ;
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c (c + "th") ;
 

src/french/NumeralFre.gf

@@ -192,12 +192,6 @@ oper hyphen = BIND ++ "-" ++ BIND ;
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
   oper
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c (c + "ème") ;

src/interlingua/NumeralIna.gf

@@ -86,12 +86,6 @@ concrete NumeralIna of Numeral = CatIna [Numeral,Digits,Decimal] ** open ResIna,
       _ => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c (c + "e") ;
 

src/italian/NumeralIta.gf

@@ -159,12 +159,6 @@ param Pred = pred | indip ;
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
   oper
     mkDig : Str -> TDigit = \c -> mk2Dig c Pl ;
     

src/japanese/NumeralJpn.gf

@@ -224,10 +224,4 @@ flags coding = utf8 ;
       T3 => "," ;
       _ => []
       } ;
-
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
 }

src/japanese/ResJpn.gf

@@ -1,9 +1,8 @@
-resource ResJpn = open Prelude in {
+resource ResJpn = ParamX [Number,Sg,Pl,DTail,T1,T2,T3,inc] ** open Prelude in {
 
 flags coding = utf8 ;
 
 param
-  Number      = Sg | Pl ;
   Style       = Plain | Resp ;
   Animateness = Anim | Inanim ;
   Mood        = Ind | Con ;
@@ -15,7 +14,6 @@ param
   Particle    = Wa | Ga ;
   Anteriority = Simul | Anter ;
   NumeralType = EndZero | EndNotZero | SingleDigit ;
-  DTail       = T1 | T2 | T3 ;
   ConjType    = And | Or | Both | IfConj ;
   SubjType    = That | If | OtherSubj ;
   VocType     = VocPres | Please | VocAbs ;

src/latin/CatLat.gf

@@ -1,4 +1,4 @@
-concrete CatLat of Cat = CommonX-[Adv] ** open ResLat, ParamX, Prelude in {
+concrete CatLat of Cat = CommonX-[Adv] ** open ResLat, Prelude in {
 
   flags optimize=all_subs ;
 

src/latin/MorphoLat.gf

@@ -8,7 +8,7 @@
 -- syntax. To build a lexicon, it is better to use $ParadigmsLat$, which
 -- gives a higher-level access to this module.
 
-resource MorphoLat = ParamX, ResLat ** open Prelude, Predef in {
+resource MorphoLat = ResLat ** open Prelude, Predef in {
 --
 --  flags optimize=all ;
 --

src/latin/NumeralLat.gf

@@ -1,4 +1,4 @@
-concrete NumeralLat of Numeral = CatLat, ParamX[Number] ** open ParadigmsLat, Prelude, ResLat, Predef in {
+concrete NumeralLat of Numeral = CatLat ** open ParadigmsLat, Prelude, ResLat, Predef in {
   lincat 
     Digit      = TDigit ;
     Sub10      = TNumeral ;

src/latin/ResLat.gf

@@ -2,7 +2,7 @@
 
 --1 Latin auxiliary operations.
 
-resource ResLat = ParamX ** open Prelude, Predef, (C=CommonX) in {
+resource ResLat = ParamX - [DTail,T1,T2,T3,inc] ** open Prelude, Predef, (C=CommonX) in {
 
 param
   Case = Nom | Acc | Gen | Dat | Abl | Voc ;

src/maltese/NumeralMlt.gf

@@ -388,11 +388,6 @@ concrete NumeralMlt of Numeral = CatMlt [Numeral,Digits,Decimal] ** open Prelude
       T3 => BIND++","++BIND ;
       _  => BIND
     } ;
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-    } ;
 
   lin
     -- Dig

src/persian/NumeralPes.gf

@@ -105,12 +105,6 @@ lin pot3plus n m = {
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c (c + "م") ;
 

src/portuguese/NumeralPor.gf

@@ -228,12 +228,6 @@ concrete NumeralPor of Numeral = CatPor [Numeral,Digits,Decimal] **
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
   oper
     mk4Dig : Str -> Str -> Str -> Number -> TDigit = \c,o,a,n -> {
       s = table {

src/rukiga/NumeralCgg.gf

@@ -116,12 +116,6 @@ lin pot3plus n m = let
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      };
-
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c c;
 

src/russian/NumeralRus.gf

@@ -455,12 +455,6 @@ lincat
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
   oper
 
   mk3Dig : Str -> Str -> NumSize -> TDigit = \c,o,size -> mk4Dig c o Pl size ;
@@ -476,4 +470,4 @@ lincat
     s : Str ;
     size : NumSize
   } ;
-}
+}

src/scots/NumeralSco.gf

@@ -134,12 +134,6 @@ lin PosDecimal d = d ** {hasDot=False} ;
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c (c + "th") ;
 

src/spanish/NumeralSpa.gf

@@ -153,12 +153,6 @@ param
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
   oper
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c (c + ":o") ;

src/telugu/NumeralTel.gf

@@ -73,12 +73,6 @@
 ----      _  => BIND
 ----      } ;
 ----
-----    inc : DTail -> DTail = \t -> case t of {
-----      T1 => T2 ;
-----      T2 => T3 ;
-----      T3 => T1
-----      } ;
-----
 ----    mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
 ----    mkDig : Str -> TDigit = \c -> mk2Dig c (c + "th") ;
 ----

src/turkish/NumeralTur.gf

@@ -92,10 +92,4 @@ oper
 				   T3 => BIND++","++BIND ;
 				   _  => BIND
 	                         } ;
-
-  inc : DTail -> DTail = \t -> case t of {
-				 T1 => T2 ;
-				 T2 => T3 ;
-				 T3 => T1
-			       } ;
 }