diff --git a/src/portuguese/ConstructionPor.gf b/src/portuguese/ConstructionPor.gf index 1a1cad140..691978bb3 100644 --- a/src/portuguese/ConstructionPor.gf +++ b/src/portuguese/ConstructionPor.gf @@ -30,7 +30,9 @@ lin is_wrong_VP = mkVP (mkVA B.estar_V) (mkAP (mkA "errado")) ; n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP (lin CN cn)))) (lin A a) ; - + -- n_units_of_NP card cn np = variants {} ; + -- n_unit_CN card cn cn = variants {} ; + bottle_of_CN np = mkCN (lin N2 (mkN2 (mkN "garrafa" feminine) part_Prep)) np ; cup_of_CN np = mkCN (lin N2 (mkN2 (mkN "copo") part_Prep)) np ; glass_of_CN np = mkCN (lin N2 (mkN2 (mkN "taça") part_Prep)) np ; @@ -52,7 +54,7 @@ lin lincat Timeunit = N ; - Hour = {s : Str ; pe : Period ; n : Number} ; + Hour = {s : Str ; pe : Period ; n : ParadigmsPor.Number} ; Weekday = N ; Monthday = NP ; Month = N ; @@ -97,15 +99,15 @@ lin twentyThreeHour = mkHour "23" Noite Pl ; twentyFourHour = {s = "meia-noite" ; pe = None ; n = Sg} ; - timeHour h = mkAdv (R.a ! Fem ! h.n ++ h.s ++ period ! h.pe) ; + timeHour h = ParadigmsPor.mkAdv (R.a ! Fem ! h.n ++ h.s ++ period ! h.pe) ; timeHourMinute h m = let min = m.s ! Masc in - mkAdv (R.a ! Fem ! h.n ++ h.s ++ "e" ++ min ++ period ! h.pe) ; + ParadigmsPor.mkAdv (R.a ! Fem ! h.n ++ h.s ++ "e" ++ min ++ period ! h.pe) ; oper - mkHour : Str -> Period -> Number -> {s : Str ; pe : Period ; n : Number} ; + mkHour : Str -> Period -> ParadigmsPor.Number -> {s : Str ; pe : Period ; n : ParadigmsPor.Number} ; mkHour num pe n = S.mkUtt (S.mkCard num) ** {pe = pe ; n = n} ; period : Period => Str ; diff --git a/src/portuguese/DocumentationPorFunctor.gf b/src/portuguese/DocumentationPorFunctor.gf index 84d945438..8e550541e 100644 --- a/src/portuguese/DocumentationPorFunctor.gf +++ b/src/portuguese/DocumentationPorFunctor.gf @@ -27,7 +27,7 @@ oper heading : N -> Str = \n -> (nounHeading n).s ; lin - InflectionN, InflectionN3, InflectionN3 = \noun -> { + InflectionN, InflectionN2, InflectionN3 = \noun -> { t = "n" ; s1 = heading1 (heading noun_Category ++ case noun.g of { @@ -111,8 +111,8 @@ lin InflectionVV v = { t = "v" ; s1 = heading1 (heading verb_Category) ++ - paragraph (verbExample (S.mkCl S.she_NP v (S.mkVP (L.sleep_V)))) ; - s2 = inflVerb v + paragraph (verbExample (S.mkCl S.she_NP (lin VV v) (S.mkVP L.sleep_V))) ; + s2 = inflVerb (lin VV v) } ; InflectionVS v = { @@ -223,4 +223,4 @@ oper {- --# notpresent -} -} +} ;