forked from GitHub/gf-core
Spanish partitive; German VP conj zu
This commit is contained in:
@@ -42,4 +42,5 @@ concrete ExtraFin of ExtraFinAbs = CatFin ** open ResFin, MorphoFin, Coordinatio
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
vai_Conj = {s = "vai" ; n = Sg} ;
|
vai_Conj = {s = "vai" ; n = Sg} ;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,4 +10,5 @@ abstract ExtraFinAbs = Extra [
|
|||||||
|
|
||||||
vai_Conj : Conj ; -- minä vai sinä? ("or" in question)
|
vai_Conj : Conj ; -- minä vai sinä? ("or" in question)
|
||||||
|
|
||||||
|
vai_Conj : Conj ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,18 @@
|
|||||||
concrete ExtraGer of ExtraGerAbs = CatGer ** open ResGer, Coordination in {
|
concrete ExtraGer of ExtraGerAbs = CatGer **
|
||||||
|
open ResGer, Coordination, Prelude in {
|
||||||
|
|
||||||
lincat
|
lincat
|
||||||
VPI = {s : Str} ;
|
VPI = {s : Bool => Str} ;
|
||||||
[VPI] = {s1,s2 : Str} ;
|
[VPI] = {s1,s2 : Bool => Str} ;
|
||||||
lin
|
lin
|
||||||
BaseVPI = twoSS ;
|
BaseVPI = twoTable Bool ;
|
||||||
ConsVPI = consrSS comma ;
|
ConsVPI = consrTable Bool comma ;
|
||||||
|
|
||||||
MkVPI vp = {s = useInfVP vp} ; ----
|
MkVPI vp = {s = \\b => useInfVP b vp} ;
|
||||||
ConjVPI = conjunctSS ;
|
ConjVPI = conjunctTable Bool ;
|
||||||
|
|
||||||
ComplVPIVV v vpi =
|
ComplVPIVV v vpi =
|
||||||
insertInf vpi.s (
|
insertInf (vpi.s ! v.isAux) (
|
||||||
predVGen v.isAux v) ; ----
|
predVGen v.isAux v) ; ----
|
||||||
{-
|
{-
|
||||||
insertExtrapos vpi.p3 (
|
insertExtrapos vpi.p3 (
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ concrete PhraseGer of Phrase = CatGer ** open Prelude, ResGer in {
|
|||||||
UttIP ip = {s = ip.s ! Nom} ; --- Acc also
|
UttIP ip = {s = ip.s ! Nom} ; --- Acc also
|
||||||
UttIAdv iadv = iadv ;
|
UttIAdv iadv = iadv ;
|
||||||
UttNP np = {s = np.s ! Acc} ;
|
UttNP np = {s = np.s ! Acc} ;
|
||||||
UttVP vp = {s = useInfVP vp} ;
|
UttVP vp = {s = useInfVP False vp} ;
|
||||||
UttAdv adv = adv ;
|
UttAdv adv = adv ;
|
||||||
|
|
||||||
NoPConj = {s = []} ;
|
NoPConj = {s = []} ;
|
||||||
|
|||||||
@@ -530,8 +530,8 @@ resource ResGer = ParamX ** open Prelude in {
|
|||||||
vp.inf ++ vp.ext
|
vp.inf ++ vp.ext
|
||||||
> ;
|
> ;
|
||||||
|
|
||||||
useInfVP : VP -> Str = \vp ->
|
useInfVP : Bool -> VP -> Str = \isAux,vp ->
|
||||||
let vpi = infVP False vp in
|
let vpi = infVP isAux vp in
|
||||||
vpi.p1 ! agrP3 Sg ++ vpi.p3 ++ vpi.p2 ;
|
vpi.p1 ! agrP3 Sg ++ vpi.p3 ++ vpi.p2 ;
|
||||||
|
|
||||||
-- The nominative case is not used as reflexive, but defined here
|
-- The nominative case is not used as reflexive, but defined here
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ concrete SentenceGer of Sentence = CatGer ** open ResGer, Prelude in {
|
|||||||
|
|
||||||
EmbedS s = {s = conjThat ++ s.s ! Sub} ;
|
EmbedS s = {s = conjThat ++ s.s ! Sub} ;
|
||||||
EmbedQS qs = {s = qs.s ! QIndir} ;
|
EmbedQS qs = {s = qs.s ! QIndir} ;
|
||||||
EmbedVP vp = {s = useInfVP vp} ;
|
EmbedVP vp = {s = useInfVP False vp} ;
|
||||||
|
|
||||||
UseCl t a p cl = {s = \\o => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! o} ;
|
UseCl t a p cl = {s = \\o => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! o} ;
|
||||||
UseQCl t a p cl = {s = \\q => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! q} ;
|
UseQCl t a p cl = {s = \\q => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! q} ;
|
||||||
|
|||||||
@@ -38,10 +38,14 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
|
|||||||
|
|
||||||
possCase = \_,_,c -> prepCase c ;
|
possCase = \_,_,c -> prepCase c ;
|
||||||
|
|
||||||
|
partitive = \_,c -> prepCase c ;
|
||||||
|
|
||||||
|
{-
|
||||||
partitive = \g,c -> case c of {
|
partitive = \g,c -> case c of {
|
||||||
CPrep P_de => "de" ;
|
CPrep P_de => "de" ;
|
||||||
_ => prepCase c ++ artDef g Sg (CPrep P_de)
|
_ => prepCase c ++ artDef g Sg (CPrep P_de)
|
||||||
} ;
|
} ;
|
||||||
|
-}
|
||||||
|
|
||||||
conjunctCase : NPForm -> NPForm = \c -> case c of {
|
conjunctCase : NPForm -> NPForm = \c -> case c of {
|
||||||
Ton Nom | Aton Nom => Ton Nom ;
|
Ton Nom | Aton Nom => Ton Nom ;
|
||||||
|
|||||||
Reference in New Issue
Block a user