GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed A's in Cat phrasebook nationalities

Browse Source
This commit is contained in:
jordi.saludes
2011-06-01 15:50:21 +00:00
parent 3a20957aaa
commit 7445a5fda6
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
examples/phrasebook/WordsCat.gf
View File

@@ -39,7 +39,7 @@ lin
Expensive = expensive_A ; Expensive = expensive_A ;
Fresh = mkA "fresc" ; Fresh = mkA "fresc" ;
Good = L.good_A ; Good = L.good_A ;
Suspect = mkA "sospitós" ; Suspect = mkA "sospitós" "sospitosa" "sospitosos" "sospitoses" "sospitosament" ;
Warm = L.warm_A ; Warm = L.warm_A ;
-- places -- places
@@ -92,24 +92,24 @@ lin
-- nationalities -- nationalities
Belgian = mkA "belga" ; Belgian = mkA "belga" "belga" "belgues" "belgues" "a la Belga" ;
Belgium = mkNP (mkPN "Bèlgica") ; Belgium = mkNP (mkPN "Bèlgica") ;
Bulgarian = mkNat "búlgar" "Bulgària" ; Bulgarian = mkNat3 "búlgar" "búlgara" "búlgars" "búlgueres" "Bulgària" ;
Catalan = mkNat "català" "Catalunya" ; -- "catalana" "catalans" "catalanes" "a la catalana" ; Catalan = mkNat5 "catal" "Catalunya" ;
Danish = mkNat "danès" "Dinamarca" ; -- mkA "danès" "danesa" "danesos" "daneses" "a la danesa" ; Danish = mkNat4 "dan" "Dinamarca" ;
Dutch = mkNat "holandès" "Holanda" ; Dutch = mkNat4 "holand" "Holanda" ;
English = mkNat "anglès" "Anglaterra" ; English = mkNat4 "angl" "Anglaterra" ;
Finnish = mkNat "finès" "Finlàndia" ; Finnish = mkNat4 "fin" "Finlàndia" ;
Flemish = mkNP (mkPN "flamenc") ; Flemish = mkNP (mkPN "flamenc") ;
French = mkNat "francès" "França" ; French = mkNat4 "franc" "França" ;
German = mkNat "alemany" "Alemania" ; German = mkNat3 "alemany" "alemenya" "alemanys" "alemanyes" "Alemania" ;
Italian = mkNat "italià" "Itàlia" ; Italian = mkNat5 "itali" "Itàlia" ;
Norwegian = mkNat "noruec" "Noruega" ; -- mkA "noruec" "noruega" "noruecs" "noruegues" "a la noruega" ; Norwegian = mkNat3 "noruec" "noruega" "noruecs" "noruegues" "Noruega" ;
Polish = mkNat "polonès" "Polònia" ; Polish = mkNat4 "polon" "Polònia" ;
Romanian = mkNat "romanès" "Romania" ; Romanian = mkNat4 "roman" "Romania" ;
Russian = mkNat "rus" "Rússia" ; Russian = mkNat3 "rus" "russa" "russos" "russes" "Rússia" ;
Spanish = mkNat "espanyol" "Espanya" ; Spanish = mkNat3 "espanyol" "espanyola" "espanyols" "espanyoles" "Espanya" ;
Swedish = mkNat "suec" "Suècia" ; Swedish = mkNat3 "suec" "sueca" "suecs" "sueques" "Suècia" ;
-- means of transportation -- means of transportation
@@ -251,6 +251,18 @@ lin
mkNat : Str -> Str -> NPNationality = \nat,co -> mkNat : Str -> Str -> NPNationality = \nat,co ->
mkNPNationality (mkNP (mkPN nat)) (mkNP (mkPN co)) (mkA nat) ; mkNPNationality (mkNP (mkPN nat)) (mkNP (mkPN co)) (mkA nat) ;
mkNat2 : A -> Str -> Str -> NPNationality = \adj,nat,co ->
mkNPNationality (mkNP (mkPN nat)) (mkNP (mkPN co)) adj ;
mkNat3 : (_,_,_,_:Str) -> Str -> NPNationality = \ms,fs,mp,fp,co ->
mkNPNationality (mkNP (mkPN ms)) (mkNP (mkPN co)) (mkA ms fs mp fp ("a la" ++ fs)) ;
mkNat4 : Str -> Str -> NPNationality = \angl,co ->
mkNat3 (angl+"ès") (angl+"esa") (angl+"esos") (angl+"eses") co ;
mkNat5 : Str -> Str -> NPNationality = \catal,co ->
mkNat3 (catal+"à") (catal+"ana") (catal+"ans") (catal+"anes") co ;
mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d -> mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d ->
let day = mkNP (mkPN d) let day = mkNP (mkPN d)
in mkNPDay day (P.mkAdv ("el" ++ d)) (P.mkAdv ("el" ++ d)) ; ---- ? in mkNPDay day (P.mkAdv ("el" ++ d)) (P.mkAdv ("el" ++ d)) ; ---- ?

2
lib/src/catalan/LexiconCat.gf
View File

@@ -206,7 +206,7 @@ lin
village_N = regMN "poble" ; village_N = regMN "poble" ;
wait_V2 = mkV2 (regV "esperar") dative ; wait_V2 = mkV2 (regV "esperar") dative ;
walk_V = regV "caminar" ; walk_V = regV "caminar" ;
warm_A = regADeg "tebi" ; warm_A = compADeg (mkA "tebi" "tèbia" "tebis" "tèbies" "tèbiament") ;
war_N = regFN "guerra" ; war_N = regFN "guerra" ;
watch_V2 = dirV2 (regV "mirar") ; watch_V2 = dirV2 (regV "mirar") ;
water_N = regFN "aigua" ; water_N = regFN "aigua" ;