From eb83ed37439aa12470f8c0caa942c5c8ef4a5614 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 27 Aug 2004 15:21:09 +0000 Subject: [PATCH] parad fixes --- lib/resource-0.6/english/ParadigmsEng.gf | 2 +- lib/resource-0.6/swedish/ParadigmsSwe.gf | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/resource-0.6/english/ParadigmsEng.gf b/lib/resource-0.6/english/ParadigmsEng.gf index 0dd76b906..8bdddfa5e 100644 --- a/lib/resource-0.6/english/ParadigmsEng.gf +++ b/lib/resource-0.6/english/ParadigmsEng.gf @@ -237,7 +237,7 @@ oper apReg = \s -> AdjP1 (mkAdj1 s) ; aGen : Str -> AdjDeg = \s -> case last s of { - "y" => mkAdjDeg s (init s ++ "ier") (init s + "iest") ; + "y" => mkAdjDeg s (init s + "ier") (init s + "iest") ; "e" => mkAdjDeg s (s + "r") (s + "st") ; _ => aReg s } ; diff --git a/lib/resource-0.6/swedish/ParadigmsSwe.gf b/lib/resource-0.6/swedish/ParadigmsSwe.gf index 2c7e0c9df..9c6293d73 100644 --- a/lib/resource-0.6/swedish/ParadigmsSwe.gf +++ b/lib/resource-0.6/swedish/ParadigmsSwe.gf @@ -185,6 +185,17 @@ oper v3Dir : V -> Str -> V3 ; -- ge,_,till v3DirDir : V -> V3 ; -- ge,_,_ +-- Sentence complement verbs. + + mkVS : V -> VS ; -- säga (att ...) + +-- Verb phrase complement verbs. + + vvInf : V -> VV ; -- orka (spela) + vvAtt : V -> VV ; -- gilla (att spela) + vvBoth : V -> VV ; -- försöka (spela | att spela) + + -- The definitions should not bother the user of the API. So they are -- hidden from the document. --. @@ -325,4 +336,9 @@ oper v3Dir x y = mkV3 x [] y ; v3DirDir x = v3Dir x [] ; + mkVS v = v ** {lock_VS = <>} ; + vvInf v = v ** {isAux = True ; lock_VV = <>} ; + vvAtt v = v ** {isAux = False ; lock_VV = <>} ; + vvBoth v = v ** {isAux = variants {False ; True} ; lock_VV = <>} ; + } ;