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

Add InvQuestCl in ExtraSpa; fix convertir in LexiconSpa; add phonetic changes to feminine article in PhonoSpa

Browse Source
This commit is contained in:
inari
2014-04-10 13:41:53 +00:00
parent f0f56eeed6
commit 73f1ab6e36
5 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/src/spanish/DiffSpa.gf
View File

@@ -20,12 +20,15 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
CPrep P_a => "a"
} ;
artDef : Gender -> Number -> Case -> Str = \g,n,c ->
case <g,n,c> of {
<Masc,Sg, CPrep P_de> => "del" ;
<Masc,Sg, CPrep P_a> => "al" ;
<Masc,Sg, _> => prepCase c ++ "el" ;
<Fem ,Sg, _> => prepCase c ++ "la" ;
<Fem ,Sg, CPrep P_de> => chooseDeLa ;
<Fem ,Sg, CPrep P_a> => chooseALa ;
<Fem, Sg, _> => prepCase c ++ chooseLa ;
<Masc,Pl, _> => prepCase c ++ "los" ;
<Fem ,Pl, _> => prepCase c ++ "las"
} ;

10
lib/src/spanish/ExtraSpa.gf
View File

@@ -45,12 +45,20 @@ concrete ExtraSpa of ExtraSpaAbs = ExtraRomanceSpa **
"su" "su" "sus" "sus"
Fem Pl P3 ;
--IL 2012-10-12
ImpNeg np vp = lin Utt{
s = (mkClause (np.s ! Nom).comp np.hasClit False np.a vp).s
! DInv ! RPres ! Simul ! RNeg False ! Conjunct
} ;
InvQuestCl cl = {
s = \\t,a,p =>
let cls = cl.s ! DInv ! t ! a ! p
in table {
QDir => cls ! Indic ;
QIndir => subjIf ++ cls ! Indic
}
} ;
-- ExtraRomance.PassVPSlash uses estar
PassVPSlash_ser vps =
let auxvp = predV copula

4
lib/src/spanish/ExtraSpaAbs.gf
View File

@@ -26,7 +26,9 @@ abstract ExtraSpaAbs = ExtraRomanceAbs ** {
youPolPl8fem_Pron : Pron ;
ImpNeg : NP -> VP -> Utt ; --IL 2012-10-12
ImpNeg : NP -> VP -> Utt ; --"no fumes"
InvQuestCl : Cl -> QCl ;
PassVPSlash_ser : VPSlash -> VP ;

4
lib/src/spanish/LexiconSpa.gf
View File

@@ -18,7 +18,7 @@ lin
bad_A = prefA (mkADeg (regA "malo") (regA "peor")) ;
bank_N = regN "banco" ;
beautiful_A = prefA (regADeg "bello") ; -- bella
become_VA = reflV (regV "convertir") ; --- convertirse en, volverse, ponerse
become_VA = reflV (mkV "convertir" "convierto") ; --- convertirse en, volverse, ponerse
beer_N = regN "cerveza" ;
beg_V2V = mkV2V (mkV "rogar" "ruego") accusative dative ; -- pedir
big_A = prefA (regADeg "grande") ;
@@ -205,7 +205,7 @@ lin
warm_A = regADeg "caliente" ;
war_N = mkN "guerra" ;
watch_V2 = dirV2 (regV "mirar") ; -- ver
water_N = mkN "agua" ; ---- feminine, but uses masculine article "el". TODO defArt pre {} thingy for the nouns (limited set) that behave like this.
water_N = mkN "agua" ;
white_A = compADeg (regA "blanco") ;
window_N = regN "ventana" ;
wine_N = regN "vino" ;

24
lib/src/spanish/PhonoSpa.gf
View File

@@ -10,5 +10,29 @@ oper
"a" ; "e" ; "h" ; "i" ; "o" ; "u"
} ;
--Feminine nouns that start with stressed a use the masculine article el for phonetic reasons:
--e.g. "el agua pura" but "la pura agua".
--To prevent "el aguamarina", we list explicitly words that begin with these words
falseAWords : pattern Str = #("aguam"|"aguaf"|"almac"|"alab"|"alac"|"alam"|"alan"|"alar") ;
aWords : pattern Str = #("agua" | "alma" | "ala") ;
chooseLa = pre {
falseAWords => "la" ;
aWords => "el" ;
"á" => "el" ;
_ => "la"
} ;
chooseDeLa = pre {
falseAWords => "de la" ;
aWords => "del" ;
"á" => "del" ;
_ => "de la"
} ;
chooseALa = pre {
falseAWords => "a la" ;
aWords => "al" ;
"á" => "al" ;
_ => "a la"
} ;
}