From 7e8270381d0b7a79a76994e4e931a9654720ea58 Mon Sep 17 00:00:00 2001
From: odanoburu <bcclaro@gmail.com>
Date: Thu, 21 Feb 2019 11:59:53 -0300
Subject: [PATCH] (Por) more mkN paradigms - add compN and compNN as mkN
 paradigms

- rm tossir_V from Irreg since it is very wrong
- fix oper `a` (contraction of preposition a + definite articles)
---
 src/portuguese/DiffPor.gf      |  2 +-
 src/portuguese/IrregPor.gf     |  1 -
 src/portuguese/ParadigmsPor.gf | 16 +++++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/portuguese/DiffPor.gf b/src/portuguese/DiffPor.gf
index 4835c1e4..8ccb77f3 100644
--- a/src/portuguese/DiffPor.gf
+++ b/src/portuguese/DiffPor.gf
@@ -129,7 +129,7 @@ instance DiffPor of DiffRomance - [iAdvQuestionInv,chooseTA,otherInv,partAgr,sta
 
   oper
     a : Gender => Number => Str ;
-    a = genNumForms "a" "à" "aos" "às" ;
+    a = genNumForms "ao" "à" "aos" "às" ;
 
     de : Gender => Number => Str ;
     de = genNumForms "do" "da" "dos" "das" ;
diff --git a/src/portuguese/IrregPor.gf b/src/portuguese/IrregPor.gf
index 2027e330..ad279c77 100644
--- a/src/portuguese/IrregPor.gf
+++ b/src/portuguese/IrregPor.gf
@@ -281,7 +281,6 @@ lin encobrir_V = mkV (dormir_Besch "encobrir") ;
 lin recobrir_V = mkV (dormir_Besch "recobrir") ;
 lin explodir_V = mkV (dormir_Besch "explodir") ;
 lin engolir_V = mkV (dormir_Besch "engolir") ;
-lin tossir_V = mkV (dormir_Besch "tossir") ;
 lin erguer_V = mkV (erguer_Besch "erguer") ;
 lin soerguer_V = mkV (erguer_Besch "soerguer") ;
 lin estar_V = mkV (estar_Besch "estar") ;
diff --git a/src/portuguese/ParadigmsPor.gf b/src/portuguese/ParadigmsPor.gf
index ead1f633..8677cd79 100644
--- a/src/portuguese/ParadigmsPor.gf
+++ b/src/portuguese/ParadigmsPor.gf
@@ -114,8 +114,14 @@ oper
     mkN : (mapa : Str) -> Gender -> N -- force gender, guess plural
       = \s,g -> regN s ** {g = g} ;
 
-    mkN : (mão,mãos : Str) -> Gender -> N -- the worst case demands two forms (singular + plural) and the gender.
-      = mk2N
+    mkN : (mão, mãos : Str) -> Gender -> N -- the worst case demands two forms (singular + plural) and the gender.
+      = mk2N ;
+
+    mkN : (número : N) -> (de_telefone : Str) -> N -- compound noun with non-inflecting second art, e.g. "número" + "de telefone"
+      = compN ;
+
+    mkN : (forma, finita : N) -> N -- compound with inflecting second part, e.g. "forma" + "finita"
+      = compNN
     } ;
 
 --3 Compound nouns
@@ -125,10 +131,10 @@ oper
 -- could be formed in syntax, but we give a shortcut here since they
 -- are frequent in lexica.
 
-  compN : N -> Str -> N ; -- compound with non-inflecting second part, e.g. "número" + "de telefone"
-  compN x y = {s = \\n => x.s ! n ++ y ; g = x.g ; lock_N = <>} ;
+  compN : N -> Str -> N ; --%
+  compN x y = x ** {s = \\n => x.s ! n ++ y} ;
 
-  compNN : N -> N -> N ; -- compound with inflecting second part, e.g. "forma" + "finita"
+  compNN : N -> N -> N ; --%
   compNN x y = x ** {s = \\n => x.s ! n ++ y.s ! n} ;
 
 --3 Relational nouns