Merge remote-tracking branch 'upstream/master' into por-passive

src/catalan/MorphoCat.gf

@@ -17,13 +17,7 @@ resource MorphoCat = CommonRomance, ResCat **
 
 --2 Nouns
 --
--- The following macro is useful for creating the forms of number-dependent
--- tables, such as common nouns.
--- gcc M2.3
 oper
-  numForms : (_,_ : Str) -> Number => Str = \vi, vins ->
-    table {Sg => vi ; Pl => vins} ; 
-
   nomCep : Str -> Number => Str = \cep ->
     numForms cep (cep + "s") ;
 

src/french/MorphoFre.gf

@@ -24,15 +24,8 @@ oper
 
 
 --2 Nouns
---
--- The following macro is useful for creating the forms of number-dependent
--- tables, such as common nouns.
-
-  numForms : Str -> Str -> Number => Str = \bon,bons ->
-    table {Sg => bon ; Pl => bons} ; 
-
--- For example, the regular noun forms are defined as follows:
 
+-- regular noun forms are defined as follows:
   nomReg : Str -> Number => Str = \bu -> numForms bu (bu + "s") ;
 
 -- Common nouns are inflected in number and have an inherent gender.

src/italian/MorphoIta.gf

@@ -18,15 +18,7 @@ resource MorphoIta = CommonRomance, ResIta **
 
 --2 Nouns
 --
--- The following macro is useful for creating the forms of number-dependent
--- tables, such as common nouns.
-
 oper
-  numForms : (_,_ : Str) -> Number => Str = \vino, vini ->
-    table {Sg => vino ; Pl => vini} ;
-
--- For example:
-
   nomVino : Str -> Number => Str = \vino -> let {vin = Predef.tk 1 vino} in
     numForms vino (vin + "i") ;
 

src/portuguese/MorphoPor.gf

@@ -19,9 +19,6 @@ resource MorphoPor = CommonRomance, ResPor **
 -- number-dependent tables, such as common nouns.
 
 oper
-  numForms : (_,_ : Str) -> Number => Str = \campus, campi ->
-    table {Sg => campus ; Pl => campi} ;
-
 -- For example:
   nomVinho : Str -> Number => Str = \vinho ->
     numForms vinho (vinho + "s") ;

src/romance/CommonRomance.gf

@@ -205,6 +205,11 @@ oper
         Fem => bonne
       } ;
 
+    -- The following macro is useful for creating the forms of
+    -- number-dependent tables, such as common nouns.
+    numForms : (_,_ : Str) -> Number => Str = \campus, campi ->
+      table {Sg => campus ; Pl => campi} ;
+
     aagrForms : (x1,_,_,x4 : Str) -> (AAgr => Str) = \tout,toute,tous,toutes ->
       table {
         {g = g ; n = Sg} => genForms tout toute ! g ;
@@ -241,4 +246,3 @@ oper
   param RPolarity = RPos | RNeg Bool ; -- RNeg True = "ne", RNeg False = "ne - pas"
 
 }
-

src/spanish/MorphoSpa.gf

@@ -17,16 +17,8 @@ resource MorphoSpa = CommonRomance, ResSpa **
 
 
 --2 Nouns
---
--- The following macro is useful for creating the forms of number-dependent
--- tables, such as common nouns.
 
 oper
-  numForms : (_,_ : Str) -> Number => Str = \vino, vini ->
-    table {Sg => vino ; Pl => vini} ; 
-
--- For example:
-
   nomVino : Str -> Number => Str = \vino ->
     numForms vino (vino + "s") ;