GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-23 01:52:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

ExtraCat fixed

Browse Source
This commit is contained in:
jordi.saludes
2009-09-05 12:55:42 +00:00
parent 366c7faf89
commit e0930e51e2
3 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
lib/src/catalan/ExtraCat.gf
View File

@@ -1,47 +1,49 @@
concrete ExtraCat of ExtraCatAbs = ExtraRomanceCat ** concrete ExtraCat of ExtraCatAbs = ExtraRomanceCat **
open CommonRomance, PhonoCat, MorphoCat, ParadigmsCat, ParamX, ResCat in { open CommonRomance, ParadigmsCat, PhonoCat, MorphoCat, ParamX, ResCat in {
-- lin lin
-- i8fem_Pron = mkPronoun i8fem_Pron = mkPronoun
-- "yo" "me" "me" "mí" "jo" "em" "em" "mi" ("mon"|["el meu"]) ("ma"|["la meva"]) "mes"
-- "mi" "mi" "mis" "mis" Fem Sg P1 ;
-- Fem Sg P1 ;
these8fem_NP = mkNP "aquestes" Fem Pl ; these8fem_NP = makeNP "aquestes" Fem Pl ;
they8fem_Pron = mkPronoun they8fem_Pron = mkPronoun
"elles" "les" "les" "elles" "elles" "les" "les" "elles"
"llur" "llur" "llurs" "llur" "llur" "llurs"
Fem Pl P3 ; Fem Pl P3 ;
-- this8fem_NP = pn2np (mkPN ["esta"] Fem) ; this8fem_NP = pn2np (mkPN ["aquesta"] Fem) ;
-- those8fem_NP = mkNP ["esas"] Fem Pl ; those8fem_NP = makeNP ["aquestes"] Fem Pl ;
-- we8fem_Pron = mkPronoun we8fem_Pron =
-- "nosotras" "nos" "nos" "nosotras" mkPronoun
-- "nuestro" "nuestra" "nuestros" "nuestras" "nosaltres" "ens" "ens" "nosaltres"
-- Fem Pl P1 ; ["el nostre"] ["la nostra"] ["els nostres"]
-- whoPl8fem_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Fem Pl} ; Fem Pl P1 ;
-- whoSg8fem_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Fem Sg} ;
-- youSg8fem_Pron = mkPronoun whoPl8fem_IP = {s = \\c => prepCase c ++ "qui" ; a = aagr Fem Pl} ;
-- "tu" "te" "te" "tí" whoSg8fem_IP = {s = \\c => prepCase c ++ "qui" ; a = aagr Fem Sg} ;
-- "tu" "tu" "tus" "tus"
-- Fem Sg P2 ;
-- youPl8fem_Pron = mkPronoun
-- "vosotras" "vos" "vos" "vosotras"
-- "vuestro" "vuestra" "vuestros" "vuestras"
-- Fem Pl P2 ;
-- youPol8fem_Pron = mkPronoun
-- "usted" "la" "le" "usted"
-- "su" "su" "sus" "sus"
-- Fem Sg P3 ;
-- youPolPl_Pron = mkPronoun youSg8fem_Pron = mkPronoun
-- "ustedes" "las" "les" "usted" "tu" "et" "et" "tu"
-- "su" "su" "sus" "sus" ("ton"|["el teu"]) ("ta"|["la teva"]) ("tes"|["les teves"])
-- Masc Pl P3 ; Fem Sg P2 ;
-- youPolPl8fem_Pron = mkPronoun youPl8fem_Pron = mkPronoun
-- "ustedes" "las" "les" "usted" "vosaltres" "us" "us" "vosaltres"
-- "su" "su" "sus" "sus" ["el vostre"] ["la vostra"] ["els vostres"]
-- Fem Pl P3 ; Fem Pl P2 ;
youPol8fem_Pron = mkPronoun
"vosté" "la" "li" "vosté"
["el seu"] ["la seva"] ["els seus"]
Fem Sg P3 ;
oper
vostePl : ParadigmsCat.Gender -> Pron = \g -> mkPronoun
"vostés" "els" "li" "vostés"
"llur" "llur" "llurs"
g Pl P3 ;
lin
youPolPl_Pron = vostePl Masc;
youPolPl8fem_Pron = vostePl Fem;
} }

28
lib/src/catalan/ExtraCatAbs.gf
View File

@@ -3,26 +3,26 @@
abstract ExtraCatAbs = ExtraRomanceAbs ** { abstract ExtraCatAbs = ExtraRomanceAbs ** {
-- fun fun
-- Feminine variants of pronouns (those in $Structural$ are -- Feminine variants of pronouns (those in $Structural$ are
-- masculine, which is the default when gender is unknown). -- masculine, which is the default when gender is unknown).
-- i8fem_Pron : Pron ; i8fem_Pron : Pron ;
-- these8fem_NP : NP ; these8fem_NP : NP ;
-- they8fem_Pron : Pron ; they8fem_Pron : Pron ;
-- this8fem_NP : NP ; this8fem_NP : NP ;
-- those8fem_NP : NP ; those8fem_NP : NP ;
-- we8fem_Pron : Pron ; -- nosotras we8fem_Pron : Pron ;
-- whoPl8fem_IP : IP ; whoPl8fem_IP : IP ;
-- whoSg8fem_IP : IP ; whoSg8fem_IP : IP ;
-- youSg8fem_Pron : Pron ; youSg8fem_Pron : Pron ;
-- youPl8fem_Pron : Pron ; -- vosotras youPl8fem_Pron : Pron ;
-- youPol8fem_Pron : Pron ; -- usted youPol8fem_Pron : Pron ; -- vosté
-- youPolPl_Pron : Pron ; -- ustedes youPolPl_Pron : Pron ; -- vostés
-- youPolPl8fem_Pron : Pron ; youPolPl8fem_Pron : Pron ;
} }

12
lib/src/catalan/StructuralCat.gf
View File

@@ -149,18 +149,16 @@ lin
youSg_Pron = mkPronoun youSg_Pron = mkPronoun
"tu" "et" "et" "tu" "tu" "et" "et" "tu"
("ton"|["el teu"]) ("ta"|["la teva"]) ("tes"|["les teves"]) ("ton"|["el teu"]) ("ta"|["la teva"]) ("tes"|["les teves"])
Fem Sg P2 ; Masc Sg P2 ;
youPl_Pron = youPl_Pron =
mkPronoun mkPronoun
"vosaltres" "us" "us" "vosaltres" "vosaltres" "us" "us" "vosaltres"
["el vostre"] ["la vostra"] ["els vostres"] ["el vostre"] ["la vostra"] ["els vostres"]
Fem Pl P2 ; Masc Pl P2 ;
youPol_Pron = he_Pron ; youPol_Pron = mkPronoun
{- mkPronoun
"vosté" "el" "li" "vosté" "vosté" "el" "li" "vosté"
["el seu"] ["la seva"] ["els seus"] ["les seves"] ["el seu"] ["la seva"] ["els seus"]
Fem Pl P2 ; Masc Pl P2 ;
-}
not_Predet = {s = \\a,c => prepCase c ++ "no pas" ; c = Nom} ; not_Predet = {s = \\a,c => prepCase c ++ "no pas" ; c = Nom} ;
have_V2 = dirV2 (verbV (tenir_108 "tenir")) ; have_V2 = dirV2 (verbV (tenir_108 "tenir")) ;