restored the use of conjunctCase in romance

This commit is contained in:
aarne
2011-08-31 11:56:09 +00:00
parent 38db834a65
commit 40022d7af9
6 changed files with 13 additions and 16 deletions

View File

@@ -32,11 +32,11 @@ incomplete concrete ConjunctionRomance of Conjunction =
ConsAdv = consrSS comma ;
BaseNP x y = {
s1 = \\c => (x.s ! c).ton ;
s2 = \\c => (y.s ! c).ton ; ----e (conjunctCase c) ;
s2 = \\c => (y.s ! conjunctCase c).ton ; ----e (conjunctCase c) ;
a = conjAgr x.a y.a
} ;
ConsNP x xs = {
s1 = \\c => (x.s ! c).ton ++ comma ++ xs.s1 ! c ; ----e (conjunctCase c) ;
s1 = \\c => (x.s ! c).ton ++ comma ++ xs.s1 ! conjunctCase c ; ----e (conjunctCase c) ;
s2 = \\c => xs.s2 ! c ; ----e (conjunctCase c) ;
a = conjAgr x.a xs.a
} ;

View File

@@ -34,7 +34,7 @@ interface DiffRomance = open CommonRomance, Prelude in {
-- Whether a preposition is repeated in conjunction
-- (Fre "la somme de 3 et de 4", Ita "la somma di 3 e 4").
oper conjunctCase : NPForm -> NPForm ;
oper conjunctCase : Case -> Case ;
-- How infinitives and clitics are placed relative to each other
-- (Fre "la voir", Ita "vederla"). The $Bool$ is used for indicating