From 29a4ef3172073d10b4dc982b05795c97d0509787 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 20 Jan 2006 23:03:50 +0000 Subject: [PATCH] working towards tram in 4 langs --- examples/tram/TramFre.gf | 2 +- examples/tram/TramGer.gf | 5 ++ lib/resource-1.0/french/LangFre.gf | 6 +-- lib/resource-1.0/french/MathFre.gf | 2 +- lib/resource-1.0/french/PhraseFre.gf | 2 +- lib/resource-1.0/french/QuestionFre.gf | 2 +- lib/resource-1.0/french/StructuralFre.gf | 10 ++-- lib/resource-1.0/french/TensedFre.gf | 2 +- lib/resource-1.0/german/MathGer.gf | 54 ++++++++++--------- .../multimodal/DemonstrativeEng.gf | 4 +- .../multimodal/DemonstrativeFre.gf | 2 + .../multimodal/DemonstrativeGer.gf | 4 ++ lib/resource-1.0/multimodal/DemonstrativeI.gf | 18 +++---- .../multimodal/DemonstrativeSwe.gf | 4 +- lib/resource-1.0/multimodal/MultimodalFre.gf | 19 +++++++ lib/resource-1.0/multimodal/MultimodalGer.gf | 18 +++++++ lib/resource-1.0/romance/MathRomance.gf | 11 ++-- lib/resource-1.0/romance/NounRomance.gf | 6 +-- lib/resource-1.0/romance/PhraseRomance.gf | 16 +++--- lib/resource-1.0/romance/QuestionRomance.gf | 22 ++++---- lib/resource-1.0/romance/ResRomance.gf | 6 +++ lib/resource-1.0/romance/SentenceRomance.gf | 14 ++--- lib/resource-1.0/romance/TensedRomance.gf | 2 +- lib/resource-1.0/scandinavian/MathScand.gf | 2 +- lib/resource-1.0/swedish/MathSwe.gf | 2 +- 25 files changed, 142 insertions(+), 93 deletions(-) create mode 100644 examples/tram/TramGer.gf create mode 100644 lib/resource-1.0/multimodal/DemonstrativeFre.gf create mode 100644 lib/resource-1.0/multimodal/DemonstrativeGer.gf create mode 100644 lib/resource-1.0/multimodal/MultimodalFre.gf create mode 100644 lib/resource-1.0/multimodal/MultimodalGer.gf diff --git a/examples/tram/TramFre.gf b/examples/tram/TramFre.gf index 4d6909640..bf630c6a2 100644 --- a/examples/tram/TramFre.gf +++ b/examples/tram/TramFre.gf @@ -1,4 +1,4 @@ ---# -path=.:resource/abstract:resource/french:resource/romance:prelude +--# -path=.:resource-1.0/abstract:resource-1.0/french:resource-1.0/common:resource-1.0/multimodal:resource-1.0/romance:prelude concrete TramFre of Tram = TramI with (Multimodal = MultimodalFre), diff --git a/examples/tram/TramGer.gf b/examples/tram/TramGer.gf new file mode 100644 index 000000000..1446cfa24 --- /dev/null +++ b/examples/tram/TramGer.gf @@ -0,0 +1,5 @@ +--# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/multimodal:resource-1.0/german:prelude + +concrete TramGer of Tram = TramI with + (Multimodal = MultimodalGer), + (Math = MathGer) ; diff --git a/lib/resource-1.0/french/LangFre.gf b/lib/resource-1.0/french/LangFre.gf index ff089f8c0..1a4def578 100644 --- a/lib/resource-1.0/french/LangFre.gf +++ b/lib/resource-1.0/french/LangFre.gf @@ -7,11 +7,11 @@ concrete LangFre of Lang = AdverbFre, -- NumeralFre, SentenceFre, --- QuestionFre, + QuestionFre, -- RelativeFre, -- ConjunctionFre, --- PhraseFre, --- TensedFre, + PhraseFre, + TensedFre, StructuralFre, BasicFre ** { diff --git a/lib/resource-1.0/french/MathFre.gf b/lib/resource-1.0/french/MathFre.gf index 582b2f9d1..91368b60b 100644 --- a/lib/resource-1.0/french/MathFre.gf +++ b/lib/resource-1.0/french/MathFre.gf @@ -1,2 +1,2 @@ concrete MathFre of Math = CatFre ** MathRomance with - (DiffRomance = DiffFre) ; + (ResRomance = ResFre) ; diff --git a/lib/resource-1.0/french/PhraseFre.gf b/lib/resource-1.0/french/PhraseFre.gf index 6a1ab70dc..02d62ac5f 100644 --- a/lib/resource-1.0/french/PhraseFre.gf +++ b/lib/resource-1.0/french/PhraseFre.gf @@ -1,2 +1,2 @@ concrete PhraseFre of Phrase = CatFre, TenseX ** PhraseRomance with - (DiffRomance = DiffFre) ; + (ResRomance = ResFre) ; diff --git a/lib/resource-1.0/french/QuestionFre.gf b/lib/resource-1.0/french/QuestionFre.gf index 715da09b3..979b7226d 100644 --- a/lib/resource-1.0/french/QuestionFre.gf +++ b/lib/resource-1.0/french/QuestionFre.gf @@ -1,2 +1,2 @@ concrete QuestionFre of Question = CatFre ** QuestionRomance with - (DiffRomance = DiffFre) ; + (ResRomance = ResFre) ; diff --git a/lib/resource-1.0/french/StructuralFre.gf b/lib/resource-1.0/french/StructuralFre.gf index 0d4c418dc..5aad85756 100644 --- a/lib/resource-1.0/french/StructuralFre.gf +++ b/lib/resource-1.0/french/StructuralFre.gf @@ -76,17 +76,17 @@ lin -- some_NDet = mkDeterminerNum "quelques" "quelques" ; -- something_NP = mkNameNounPhrase ["quelque chose"] Masc ; somewhere_Adv = ss ["quelque part"] ; --- ne - pas --- that_Det = mkDeterminer singular (pre {"ce" ; "cet" / voyelle}) "cette" ; --- là --- that_NP = mkNameNounPhrase ["ça"] Masc ; - there7from_Adv = ss "de là" ; + that_Quant = {s = \\g,c => prepCase c ++ genForms "ce" "cette" ! g} ; ---- cet + that_NP = pn2np (mkPN ["ceci"] Masc) ; + there7from_Adv = ss ["de là"] ; there7to_Adv = ss "là" ; --- y there_Adv = ss "là" ; therefore_PConj = ss "donc" ; -- these_NDet = mkDeterminerNum "ces" "ces" ; --- ci -- they_Pron = pronNounPhrase pronIls ; -- they8fem_Pron = pronNounPhrase pronElles ; --- this_Det = mkDeterminer singular (pre {"ce" ; "cet" / voyelle}) "cette" ; --- ci --- this_NP = mkNameNounPhrase ["ceci"] Masc ; + this_Quant = {s = \\g,c => prepCase c ++ genForms "ce" "cette" ! g} ; ---- cet + this_NP = pn2np (mkPN ["ceci"] Masc) ; -- those_NDet = mkDeterminerNum "ces" "ces" ; --- là thou_Pron = mkPronoun "tu" (elision "t") (elision "t") "toi" "ton" (elisPoss "t") "tes" diff --git a/lib/resource-1.0/french/TensedFre.gf b/lib/resource-1.0/french/TensedFre.gf index 7bf2c2730..642a6bea7 100644 --- a/lib/resource-1.0/french/TensedFre.gf +++ b/lib/resource-1.0/french/TensedFre.gf @@ -1,2 +1,2 @@ concrete TensedFre of Tensed = CatFre, TenseX ** TensedRomance with - (DiffRomance = DiffFre) ; + (ResRomance = ResFre) ; diff --git a/lib/resource-1.0/german/MathGer.gf b/lib/resource-1.0/german/MathGer.gf index ad190a54f..2ea3598e4 100644 --- a/lib/resource-1.0/german/MathGer.gf +++ b/lib/resource-1.0/german/MathGer.gf @@ -1,26 +1,28 @@ ---concrete MathGer of Math = CatGer ** open Prelude, ResGer in { --- ---lin --- SymbPN i = {s = \\c => i.s ; a = agrP3 Sg} ; --- c --- IntPN i = {s = \\c => i.s ; a = agrP3 Sg} ; --- c --- CNIntNP cn i = { --- s = \\c => (cn.s ! Sg ! Nom ++ i.s) ; --- a = agrP3 Sg --- } ; --- CNSymbNP det cn xs = { --- s = \\c => det.s ++ cn.s ! det.n ! c ++ xs.s ; --- a = agrP3 det.n --- } ; --- ---lincat --- --- Symb, SymbList = SS ; --- ---lin --- --- MkSymb s = s ; --- --- BaseSymb = infixSS "and" ; --- ConsSymb = infixSS "," ; --- ---} +concrete MathGer of Math = CatGer ** open Prelude, ResGer in { + +lin + SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c + IntPN i = {s = \\c => i.s ; g = Neutr} ; --- c +{- + CNIntNP cn i = { + s = \\c => (cn.s ! Sg ! DIndef ! Nom ++ i.s) ; + a = agrP3 cn.g Sg + } ; + CNSymbNP det cn xs = let g = cn.g in { + s = \\c => det.s ! cn.isMod ! g ++ cn.s ! det.n ! det.det ! caseNP c ++ xs.s ; + a = agrP3 g det.n + } ; +-} +lincat + + Symb, SymbList = SS ; + +lin + + MkSymb s = s ; + + BaseSymb = infixSS "und" ; + ConsSymb = infixSS "," ; + +} + diff --git a/lib/resource-1.0/multimodal/DemonstrativeEng.gf b/lib/resource-1.0/multimodal/DemonstrativeEng.gf index b4b9d5508..510882d16 100644 --- a/lib/resource-1.0/multimodal/DemonstrativeEng.gf +++ b/lib/resource-1.0/multimodal/DemonstrativeEng.gf @@ -1,6 +1,4 @@ --# -path=.:../english/:../abstract:../common:prelude concrete DemonstrativeEng of Demonstrative = CatEng, TenseX ** DemonstrativeI with - (Test = TestEng), - (Structural = StructuralEng) ; - + (Lang = LangEng) ; diff --git a/lib/resource-1.0/multimodal/DemonstrativeFre.gf b/lib/resource-1.0/multimodal/DemonstrativeFre.gf new file mode 100644 index 000000000..c6495e772 --- /dev/null +++ b/lib/resource-1.0/multimodal/DemonstrativeFre.gf @@ -0,0 +1,2 @@ +concrete DemonstrativeFre of Demonstrative = CatFre, TenseX ** DemonstrativeI with + (Lang = LangFre) ; diff --git a/lib/resource-1.0/multimodal/DemonstrativeGer.gf b/lib/resource-1.0/multimodal/DemonstrativeGer.gf new file mode 100644 index 000000000..016cc632c --- /dev/null +++ b/lib/resource-1.0/multimodal/DemonstrativeGer.gf @@ -0,0 +1,4 @@ +--# -path=.:../german/:../abstract:../common:prelude + +concrete DemonstrativeGer of Demonstrative = CatGer, TenseX ** DemonstrativeI with + (Lang = LangGer) ; diff --git a/lib/resource-1.0/multimodal/DemonstrativeI.gf b/lib/resource-1.0/multimodal/DemonstrativeI.gf index 8bac85b34..e29be3845 100644 --- a/lib/resource-1.0/multimodal/DemonstrativeI.gf +++ b/lib/resource-1.0/multimodal/DemonstrativeI.gf @@ -1,5 +1,5 @@ incomplete concrete DemonstrativeI of Demonstrative = Cat, TenseX ** - open Prelude, Test, Structural, ParamX, DemRes in { + open Prelude, Lang, ParamX, DemRes in { lincat @@ -24,8 +24,8 @@ incomplete concrete DemonstrativeI of Demonstrative = Cat, TenseX ** mkDem {s : Polarity => Str} (polCases - (UttS (PosCl cl)) - (UttS (NegCl cl))) + (UttS (UseCl TPres ASimul PPos cl)) + (UttS (UseCl TPres ASimul PNeg cl))) (concatPoint np vp) ; MQPredVP np vp = @@ -34,8 +34,8 @@ incomplete concrete DemonstrativeI of Demonstrative = Cat, TenseX ** mkDem {s : Polarity => Str} (polCases - (UttQS (PosQCl cl)) - (UttQS (NegQCl cl))) + (UttQS (UseQCl TPres ASimul PPos cl)) + (UttQS (UseQCl TPres ASimul PNeg cl))) (concatPoint np vp) ; MQuestVP np vp = @@ -44,8 +44,8 @@ incomplete concrete DemonstrativeI of Demonstrative = Cat, TenseX ** mkDem {s : Polarity => Str} (polCases - (UttQS (PosQCl cl)) - (UttQS (NegQCl cl))) + (UttQS (UseQCl TPres ASimul PPos cl)) + (UttQS (UseQCl TPres ASimul PNeg cl))) vp ; MImpVP vp = @@ -80,9 +80,9 @@ incomplete concrete DemonstrativeI of Demonstrative = Cat, TenseX ** that_MNP = mkDem NP that_NP ; thisDet_MNP cn = - mkDem NP (DetCN (MkDet NoPredet this_Quant NoNum NoOrd) cn) ; + mkDem NP (DetCN (DetSg this_Quant NoOrd) cn) ; thatDet_MNP cn = - mkDem NP (DetCN (MkDet NoPredet that_Quant NoNum NoOrd) cn) ; + mkDem NP (DetCN (DetSg that_Quant NoOrd) cn) ; here_MAdv = mkDem Adv here_Adv ; here7from_MAdv = mkDem Adv here7from_Adv ; diff --git a/lib/resource-1.0/multimodal/DemonstrativeSwe.gf b/lib/resource-1.0/multimodal/DemonstrativeSwe.gf index 3967c5c9a..51813ecbb 100644 --- a/lib/resource-1.0/multimodal/DemonstrativeSwe.gf +++ b/lib/resource-1.0/multimodal/DemonstrativeSwe.gf @@ -1,4 +1,4 @@ concrete DemonstrativeSwe of Demonstrative = CatSwe, TenseX ** DemonstrativeI with - (Test = TestSwe), - (Structural = StructuralSwe) ; + (Lang = LangSwe) ; + diff --git a/lib/resource-1.0/multimodal/MultimodalFre.gf b/lib/resource-1.0/multimodal/MultimodalFre.gf new file mode 100644 index 000000000..08e213d46 --- /dev/null +++ b/lib/resource-1.0/multimodal/MultimodalFre.gf @@ -0,0 +1,19 @@ +--# -path=.:../french/:../romancs:../abstract:../common:prelude + +concrete MultimodalFre of Multimodal = + NounFre, +-- Verb, + AdjectiveFre, + AdverbFre, +-- NumeralFre, +-- Sentence, +-- Question, +-- Relative, +-- Conjunction, +-- Phrase, +-- Tensed, + StructuralFre, + DemonstrativeFre, + BasicFre + ** {} ; + diff --git a/lib/resource-1.0/multimodal/MultimodalGer.gf b/lib/resource-1.0/multimodal/MultimodalGer.gf new file mode 100644 index 000000000..138b9b2c3 --- /dev/null +++ b/lib/resource-1.0/multimodal/MultimodalGer.gf @@ -0,0 +1,18 @@ +--# -path=.:../german/:../abstract:../common:prelude + +concrete MultimodalGer of Multimodal = + NounGer, +-- Verb, + AdjectiveGer, + AdverbGer, + NumeralGer, +-- Sentence, +-- Question, +-- Relative, +-- Conjunction, +-- Phrase, +-- Tensed, + StructuralGer, + DemonstrativeGer, + BasicGer + ** {} ; diff --git a/lib/resource-1.0/romance/MathRomance.gf b/lib/resource-1.0/romance/MathRomance.gf index 73ad4221e..dc7919496 100644 --- a/lib/resource-1.0/romance/MathRomance.gf +++ b/lib/resource-1.0/romance/MathRomance.gf @@ -1,9 +1,11 @@ incomplete concrete MathRomance of Math = - CatRomance ** open Prelude, ResRomance, DiffRomance in { + CatRomance ** open Prelude, CommonRomance, ResRomance in { lin - SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c - IntPN i = {s = \\c => i.s ; g = Neutr} ; --- c + SymbPN i = {s = i.s ; g = Masc} ; + IntPN i = {s = i.s ; g = Masc} ; + +{- CNIntNP cn i = { s = \\c => (cn.s ! Sg ! DIndef ! Nom ++ i.s) ; a = agrP3 cn.g Sg @@ -12,6 +14,7 @@ lin s = \\c => det.s ! g ++ cn.s ! det.n ! det.det ! caseNP c ++ xs.s ; a = agrP3 g det.n } ; +-} lincat @@ -21,7 +24,7 @@ lin MkSymb s = s ; - BaseSymb = infixSS conjAnd ; + BaseSymb = infixSS "et" ; ---- ConsSymb = infixSS "," ; } diff --git a/lib/resource-1.0/romance/NounRomance.gf b/lib/resource-1.0/romance/NounRomance.gf index 66e3f1b8e..b1411a8a0 100644 --- a/lib/resource-1.0/romance/NounRomance.gf +++ b/lib/resource-1.0/romance/NounRomance.gf @@ -14,11 +14,7 @@ incomplete concrete NounRomance of Noun = c = Clit0 } ; - UsePN pn = { - s = \\c => prepCase (npform2case c) ++ pn.s ; - a = agrP3 pn.g Sg ; - c = Clit0 - } ; + UsePN = pn2np ; UsePron p = p ; diff --git a/lib/resource-1.0/romance/PhraseRomance.gf b/lib/resource-1.0/romance/PhraseRomance.gf index 69652ec67..71395768b 100644 --- a/lib/resource-1.0/romance/PhraseRomance.gf +++ b/lib/resource-1.0/romance/PhraseRomance.gf @@ -1,24 +1,24 @@ incomplete concrete PhraseRomance of Phrase = - CatRomance, TenseX ** open DiffRomance, ResRomance, Prelude in { + CatRomance, TenseX ** open CommonRomance, ResRomance, Prelude in { lin PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ; - UttS s = {s = s.s ! Main} ; + UttS s = {s = s.s ! Indic} ; UttQS qs = {s = qs.s ! QDir} ; - UttImpSg pol imp = {s = pol.s ++ imp.s ! pol.p ! Sg} ; - UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p ! Pl} ; + UttImpSg pol imp = {s = pol.s ++ imp.s ! pol.p ! aagr Fem Sg} ; + UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p ! aagr Fem Pl} ; - UttIP ip = {s = ip.s ! nominative} ; --- Acc also + UttIP ip = {s = ip.s ! Nom} ; --- Acc also UttIAdv iadv = iadv ; - UttNP np = {s = np.s ! accusative} ; - UttVP vp = {s = infMark ++ infVP vp (agrP3 Utr Sg)} ; + UttNP np = {s = np.s ! Ton Nom} ; +---- UttVP vp = {s = infVP vp (agrP3 Utr Sg)} ; UttAdv adv = adv ; NoPConj = {s = []} ; PConjConj conj = conj ; NoVoc = {s = []} ; - VocNP np = {s = "," ++ np.s ! nominative} ; + VocNP np = {s = "," ++ np.s ! Ton Nom} ; } diff --git a/lib/resource-1.0/romance/QuestionRomance.gf b/lib/resource-1.0/romance/QuestionRomance.gf index 08a114259..36f2b5f41 100644 --- a/lib/resource-1.0/romance/QuestionRomance.gf +++ b/lib/resource-1.0/romance/QuestionRomance.gf @@ -1,5 +1,5 @@ incomplete concrete QuestionRomance of Question = - CatRomance ** open DiffRomance, ResRomance in { + CatRomance ** open CommonRomance, ResRomance in { flags optimize=all_subs ; @@ -9,23 +9,19 @@ incomplete concrete QuestionRomance of Question = s = \\t,a,p => let cls = cl.s ! t ! a ! p in table { - QDir => cls ! Inv ; - QIndir => subjIf ++ cls ! Sub + QDir => cls ! Indic ; + QIndir => "si" ++ cls ! Indic ---- subjIf } } ; QuestVP qp vp = { - s = \\t,a,b,q => - let - somo = case q of { - QIndir => <"som",Sub> ; - _ => <[], Main> - } ; - cl = mkClause (qp.s ! nominative ++ somo.p1) {gn = qp.gn ; p = P3} vp + s = \\t,a,b,_ => + let + cl = mkClause (qp.s ! Nom) (agrP3 qp.a.g qp.a.n) vp in - cl.s ! t ! a ! b ! somo.p2 + cl.s ! t ! a ! b ! Indic } ; - +{- QuestSlash ip slash = { s = \\t,a,p => let @@ -62,5 +58,5 @@ incomplete concrete QuestionRomance of Question = idet.s ! g ++ num.s ! g ++ ord.s ++ cn.s ! idet.n ! idet.det ! caseNP c ; gn = gennum g idet.n } ; - +-} } diff --git a/lib/resource-1.0/romance/ResRomance.gf b/lib/resource-1.0/romance/ResRomance.gf index d7dce7b65..6605d8b95 100644 --- a/lib/resource-1.0/romance/ResRomance.gf +++ b/lib/resource-1.0/romance/ResRomance.gf @@ -26,6 +26,12 @@ oper complGen : Compl = {s = [] ; c = genitive ; isDir = False} ; complDat : Compl = {s = [] ; c = dative ; isDir = True} ; + pn2np : {s : Str ; g : Gender} -> Pronoun = \pn -> { + s = \\c => prepCase (npform2case c) ++ pn.s ; + a = agrP3 pn.g Sg ; + c = Clit0 + } ; + npform2case : NPForm -> Case = \p -> case p of { Ton x => x ; Aton x => x ; diff --git a/lib/resource-1.0/romance/SentenceRomance.gf b/lib/resource-1.0/romance/SentenceRomance.gf index 09a5ee163..3afb53447 100644 --- a/lib/resource-1.0/romance/SentenceRomance.gf +++ b/lib/resource-1.0/romance/SentenceRomance.gf @@ -5,18 +5,18 @@ incomplete concrete SentenceRomance of Sentence = lin PredVP np vp = mkClause (np.s ! Aton Nom) np.a vp ; -{- - PredSCVP sc vp = mkClause sc.s (agrP3 neutrum Sg) vp ; + +-- PredSCVP sc vp = mkClause sc.s (agrP3 neutrum Sg) vp ; ImpVP vp = { - s = \\pol,n => + s = \\pol,aag => let - agr = {gn = gennum utrum n ; p = P2} ; - verb = vp.s ! VPImperat ; + agr = aag ** {p = P2} ; + verb = (vp.s ! VPImperat).fin ! agr in - verb.fin ++ vp.a1 ! pol ++ verb.inf ++ vp.n2 ! agr ++ vp.a2 ++ vp.ext + verb ++ vp.comp ! agr ++ vp.ext --- neg,clit } ; - +{- SlashV2 np v2 = mkClause (np.s ! nominative) np.a diff --git a/lib/resource-1.0/romance/TensedRomance.gf b/lib/resource-1.0/romance/TensedRomance.gf index a1398ccca..2a9c86296 100644 --- a/lib/resource-1.0/romance/TensedRomance.gf +++ b/lib/resource-1.0/romance/TensedRomance.gf @@ -6,6 +6,6 @@ incomplete concrete TensedRomance of Tensed = CatRomance, TenseX ** lin 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} ; - UseRCl t a p cl = {s = \\r => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! r} ; +-- UseRCl t a p cl = {s = \\r => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! r} ; } diff --git a/lib/resource-1.0/scandinavian/MathScand.gf b/lib/resource-1.0/scandinavian/MathScand.gf index 9a65a79c2..5317418fb 100644 --- a/lib/resource-1.0/scandinavian/MathScand.gf +++ b/lib/resource-1.0/scandinavian/MathScand.gf @@ -9,7 +9,7 @@ lin a = agrP3 cn.g Sg } ; CNSymbNP det cn xs = let g = cn.g in { - s = \\c => det.s ! g ++ cn.s ! det.n ! det.det ! caseNP c ++ xs.s ; + s = \\c => det.s ! cn.isMod ! g ++ cn.s ! det.n ! det.det ! caseNP c ++ xs.s ; a = agrP3 g det.n } ; diff --git a/lib/resource-1.0/swedish/MathSwe.gf b/lib/resource-1.0/swedish/MathSwe.gf index f32947a47..4b81ecf0f 100644 --- a/lib/resource-1.0/swedish/MathSwe.gf +++ b/lib/resource-1.0/swedish/MathSwe.gf @@ -1,2 +1,2 @@ concrete MathSwe of Math = CatSwe ** MathScand with - (DiffScand = DiffSwe) ; + (ResScand = ResSwe) ;