(Por) Numeral: add spacing and handle case of millions (not in RGL, only in ParseExtend)

src/portuguese/MorphoPor.gf

@@ -8,8 +8,7 @@
 -- $ParadigmsPor$, which gives a higher-level access to this module.
 
 resource MorphoPor = CommonRomance, ResPor **
-  open PhonoPor, Prelude, Predef,
-  CatPor in {
+  open PhonoPor, Prelude, Predef, CatPor in {
 
   flags optimize=all ;
         coding=utf8 ;

src/portuguese/NumeralPor.gf

@@ -126,8 +126,12 @@ concrete NumeralPor of Numeral = CatPor [Numeral,Digits] **
          }
       } ;
 
-    regCard : Str -> Gender -> Number -> Str = \vigesimo ->
-      pronForms (adjPreto vigesimo) ;
+    regCard : Str -> Gender -> Number -> Str ;
+    regCard vigesimo = case vigesimo of {
+      -- to handle milhão case (in ParseExtend module)
+      milh + "ão" => \g, n -> genNumForms vigesimo vigesimo (milh + "ões") vigesimo ! g ! n;
+      _ => pronForms (adjPreto vigesimo)
+      } ;
 
     spl : (CardOrd => Str) -> {s : CardOrd => Str ; n : Number} = \s -> {
       s = s ;