From be301d8a5e5ac5b9a9f171e770abd96979e6b98d Mon Sep 17 00:00:00 2001 From: hallgren Date: Tue, 19 Aug 2014 19:42:05 +0000 Subject: [PATCH] Convert many RGL modules from Latin-1 to UTF-8 to speed up compilation Also add flags coding=utf8 to silence warnings. --- lib/src/abstract/Construction.gf | 1 + lib/src/afrikaans/LexiconAfr.gf | 16 +- lib/src/afrikaans/MorphoAfr.gf | 13 +- lib/src/afrikaans/NumeralAfr.gf | 6 +- lib/src/afrikaans/ResAfr.gf | 32 +- lib/src/bulgarian/DocumentationBul.gf | 1 + lib/src/catalan/DiffCat.gf | 6 +- lib/src/catalan/IrregCat.gf | 582 ++++++++++----------- lib/src/catalan/IrregCatAbs.gf | 88 ++-- lib/src/catalan/LexiconCat.gf | 90 ++-- lib/src/catalan/NumeralCat.gf | 6 +- lib/src/catalan/ParadigmsCat.gf | 35 +- lib/src/chinese/ConstructionChi.gf | 1 + lib/src/chinese/QuestionChi.gf | 1 + lib/src/danish/DiffDan.gf | 6 +- lib/src/danish/IdiomDan.gf | 4 +- lib/src/danish/IrregDan.gf | 46 +- lib/src/danish/IrregDanAbs.gf | 36 +- lib/src/danish/LexiconDan.gf | 210 ++++---- lib/src/danish/MorphoDan.gf | 7 +- lib/src/danish/NumeralDan.gf | 4 +- lib/src/danish/ParadigmsDan.gf | 8 +- lib/src/danish/StructuralDan.gf | 22 +- lib/src/dutch/ExtraDut.gf | 6 +- lib/src/dutch/IrregDutAbs.gf | 4 +- lib/src/dutch/LexiconDut.gf | 4 +- lib/src/dutch/MorphoDut.gf | 14 +- lib/src/dutch/NumeralDut.gf | 6 +- lib/src/dutch/ResDut.gf | 6 +- lib/src/estonian/ExtraEstAbs.gf | 16 +- lib/src/finnish/AdjectiveFin.gf | 4 +- lib/src/finnish/AdverbFin.gf | 4 +- lib/src/finnish/CatFin.gf | 8 +- lib/src/finnish/ConstructionFin.gf | 1 + lib/src/finnish/ExtraFin.gf | 32 +- lib/src/finnish/ExtraFinAbs.gf | 16 +- lib/src/finnish/Kotus.gf | 180 +++---- lib/src/finnish/LexiconFin.gf | 258 ++++----- lib/src/finnish/MorphoFin.gf | 98 ++-- lib/src/finnish/NounFin.gf | 22 +- lib/src/finnish/NumeralFin.gf | 38 +- lib/src/finnish/ParadigmsFin.gf | 174 +++--- lib/src/finnish/QuestionFin.gf | 10 +- lib/src/finnish/RelativeFin.gf | 4 +- lib/src/finnish/ResFin.gf | 28 +- lib/src/finnish/SentenceFin.gf | 6 +- lib/src/finnish/StructuralFin.gf | 142 ++--- lib/src/finnish/TerminologyFin.gf | 1 + lib/src/finnish/VerbFin.gf | 20 +- lib/src/finnish/stemmed/WNKotus.gf | 184 +++---- lib/src/french/BeschFre.gf | 218 ++++---- lib/src/french/ConstructionFre.gf | 1 + lib/src/french/DiffFre.gf | 21 +- lib/src/french/DocumentationFreFunctor.gf | 1 + lib/src/french/ExtraFre.gf | 6 +- lib/src/french/ExtraFreAbs.gf | 4 +- lib/src/french/IdiomFre.gf | 1 + lib/src/french/IrregFre.gf | 214 ++++---- lib/src/french/IrregFreAbs.gf | 214 ++++---- lib/src/french/LexiconFre.gf | 98 ++-- lib/src/french/MorphoFre.gf | 34 +- lib/src/french/NumeralFre.gf | 32 +- lib/src/french/ParadigmsFre.gf | 46 +- lib/src/french/TerminologyFre.gf | 1 + lib/src/german/ConstructionGer.gf | 1 + lib/src/german/DocumentationGerFunctor.gf | 1 + lib/src/german/ExtraGer.gf | 6 +- lib/src/german/IdiomGer.gf | 4 +- lib/src/german/IrregGer.gf | 294 +++++------ lib/src/german/IrregGerAbs.gf | 60 +-- lib/src/german/LexiconGer.gf | 256 ++++----- lib/src/german/MorphoGer.gf | 14 +- lib/src/german/NumeralGer.gf | 6 +- lib/src/german/ParadigmsGer.gf | 16 +- lib/src/german/ResGer.gf | 14 +- lib/src/german/StructuralGer.gf | 26 +- lib/src/german/TerminologyGer.gf | 1 + lib/src/hindi/ConstructionHin.gf | 1 + lib/src/italian/ConstructionIta.gf | 1 + lib/src/italian/DiffIta.gf | 4 +- lib/src/italian/DocumentationItaFunctor.gf | 1 + lib/src/italian/MorphoIta.gf | 4 +- lib/src/italian/ParadigmsIta.gf | 12 +- lib/src/italian/PhonoIta.gf | 4 +- lib/src/italian/TerminologyIta.gf | 1 + lib/src/norwegian/DiffNor.gf | 8 +- lib/src/norwegian/IdiomNor.gf | 4 +- lib/src/norwegian/IrregNor.gf | 40 +- lib/src/norwegian/IrregNorAbs.gf | 28 +- lib/src/norwegian/LexiconNor.gf | 166 +++--- lib/src/norwegian/MorphoNor.gf | 6 +- lib/src/norwegian/NumeralNor.gf | 8 +- lib/src/norwegian/ParadigmsNor.gf | 12 +- lib/src/norwegian/StructuralNor.gf | 22 +- lib/src/romance/CatRomance.gf | 6 +- lib/src/romance/CommonRomance.gf | 4 +- lib/src/romance/DiffRomance.gf | 10 +- lib/src/romance/ResRomance.gf | 8 +- lib/src/romance/SentenceRomance.gf | 10 +- lib/src/romanian/BeschRon.gf | 4 +- lib/src/romanian/IdiomRon.gf | 6 +- lib/src/romanian/PhraseRon.gf | 4 +- lib/src/romanian/QuestionRon.gf | 4 +- lib/src/romanian/RelativeRon.gf | 8 +- lib/src/romanian/SentenceRon.gf | 8 +- lib/src/romanian/VerbRon.gf | 10 +- lib/src/scandinavian/CatScand.gf | 4 +- lib/src/scandinavian/CommonScand.gf | 8 +- lib/src/scandinavian/DiffScand.gf | 6 +- lib/src/scandinavian/ExtraScand.gf | 6 +- lib/src/spanish/ConstructionSpa.gf | 1 + lib/src/spanish/DiffSpa.gf | 14 +- lib/src/spanish/DocumentationSpaFunctor.gf | 1 + lib/src/spanish/ExtraSpa.gf | 10 +- lib/src/spanish/IrregSpaAbs.gf | 90 ++-- lib/src/spanish/LexiconSpa.gf | 96 ++-- lib/src/spanish/MorphoSpa.gf | 38 +- lib/src/spanish/NumeralSpa.gf | 30 +- lib/src/spanish/ParadigmsSpa.gf | 12 +- lib/src/spanish/PhonoSpa.gf | 1 + lib/src/spanish/StructuralSpa.gf | 58 +- lib/src/spanish/TerminologySpa.gf | 1 + lib/src/spanish/TextSpa.gf | 6 +- lib/src/swedish/ConstructionSwe.gf | 1 + lib/src/swedish/DiffSwe.gf | 10 +- lib/src/swedish/DocumentationSwe.gf | 2 +- lib/src/swedish/ExtraSwe.gf | 18 +- lib/src/swedish/IdiomSwe.gf | 12 +- lib/src/swedish/IrregSwe.gf | 182 +++---- lib/src/swedish/IrregSweAbs.gf | 84 +-- lib/src/swedish/LexiconSwe.gf | 268 +++++----- lib/src/swedish/MorphoSwe.gf | 6 +- lib/src/swedish/NumeralSwe.gf | 12 +- lib/src/swedish/ParadigmsSwe.gf | 82 +-- lib/src/swedish/StructuralSwe.gf | 78 +-- 135 files changed, 2828 insertions(+), 2810 deletions(-) diff --git a/lib/src/abstract/Construction.gf b/lib/src/abstract/Construction.gf index 4ae91f231..5fbb8e82d 100644 --- a/lib/src/abstract/Construction.gf +++ b/lib/src/abstract/Construction.gf @@ -1,4 +1,5 @@ abstract Construction = Cat ** { +flags coding=utf8 ; -- started by AR 6/12/2013. (c) Aarne Ranta under LGPL and BSD diff --git a/lib/src/afrikaans/LexiconAfr.gf b/lib/src/afrikaans/LexiconAfr.gf index 25061fa44..2708ffa7d 100644 --- a/lib/src/afrikaans/LexiconAfr.gf +++ b/lib/src/afrikaans/LexiconAfr.gf @@ -1,4 +1,3 @@ ---# -coding=latin1 --# -path=.:../common:../abstract:../../prelude -- work by Aarne Ranta @@ -7,6 +6,7 @@ concrete LexiconAfr of Lexicon = CatAfr ** open Prelude, ParadigmsAfr, IrregAfr in { flags + coding=utf8 ; optimize=all_subs ; lin @@ -50,7 +50,7 @@ lin paint_V2A = mkV2A (mkV "skilder") noPrep ; paris_PN = mkPN "Parys" ; red_A = mkA "rooi" ; - say_VS = mkVS (mkV "sê") ; + say_VS = mkVS (mkV "sê") ; see_V2 = mkV2 (mkV "sien") ; sell_V3 = mkV3 (mkV "verkoop") ; send_V3 = mkV3 (mkV "stuur") (mkPrep "na") ; @@ -77,7 +77,7 @@ back_N = mkN "agterkant" neuter ; bank_N = mkN "bank" neuter ; bark_N = mkN "blaf" neuter ; belly_N = mkN "maag" neuter ; -bird_N = mkN "voël" "voëls" neuter ; +bird_N = mkN "voël" "voëls" neuter ; bite_V2 = mkV2 (mkV "byt") ; black_A = mkA "swart" ; blood_N = mkN "bloed" neuter ; @@ -188,7 +188,7 @@ hunt_V2 = mkV2 "jag" ; husband_N = mkN "man" "mans" neuter ; ice_N = mkN "ys" neuter ; important_A = mkA "belangrik" ; -industry_N = mkN "industrie" "industrieë" neuter ; +industry_N = mkN "industrie" "industrieë" neuter ; iron_N = mkN "yster" neuter ; jump_V = mkV "spring" ; kill_V2 = mkV2 "dood" ; @@ -205,7 +205,7 @@ learn_V2 = mkV2 "leer" ; leather_N = mkN "leer" neuter ; leave_V2 = mkV2 (mkV "verlaat") ; leg_N = mkN "been" neuter ; -lie_V = mkV "lê" ; +lie_V = mkV "lê" ; like_V2 = mkV2 (mkV "hou") van_Prep ; listen_V2 = mkV2 "luister" ; live_V = mkV "leef" ; @@ -251,8 +251,8 @@ put_V2 = mkV2 "sit" ; queen_N = mkN "koningin" neuter ; question_N = mkN "vraag" neuter ; radio_N = mkN "radio" neuter ; -rain_N = mkN "reën" "reëns" neuter ; -rain_V0 = mkV "reën" ; +rain_N = mkN "reën" "reëns" neuter ; +rain_V0 = mkV "reën" ; read_V2 = mkV2 (mkV "lees") ; ready_A = mkA "reg" ; reason_N = mkN "rede" neuter ; @@ -269,7 +269,7 @@ rotten_A = mkA "vrot" ; round_A = mkA "rond" ; rub_V2 = mkV2 (mkV "vryf") ; rubber_N = mkN "rubber" neuter ; -rule_N = mkN "reël" "reël" neuter ; +rule_N = mkN "reël" "reël" neuter ; run_V = zijnV (mkV "hardloop") ; salt_N = mkN "sout" neuter ; sand_N = mkN "sand" neuter ; diff --git a/lib/src/afrikaans/MorphoAfr.gf b/lib/src/afrikaans/MorphoAfr.gf index 978a56f2c..a0d9e8801 100644 --- a/lib/src/afrikaans/MorphoAfr.gf +++ b/lib/src/afrikaans/MorphoAfr.gf @@ -1,9 +1,8 @@ ---# -coding=latin1 --# -path=.:../common:../../prelude -- ----1 A Simple Afrman Resource Morphology ---- ----- Aarne Ranta & Harald Hammarström 2002 -- 2006 +---- Aarne Ranta & Harald Hammarström 2002 -- 2006 ---- ---- This resource morphology contains definitions needed in the resource ---- syntax. To build a lexicon, it is better to use $ParadigmsAfr$, which @@ -36,7 +35,7 @@ resource MorphoAfr = ResAfr ** open Prelude, (Predef=Predef) in -- -- genitS : Str -> Str = \hund -> case hund of { -- _ + ("el" | "en" | "er") => hund + "s" ; --- _ + ("s" | "ß" | "sch" | "st" | "x" | "z") => hund + "es" ; +-- _ + ("s" | "ß" | "sch" | "st" | "x" | "z") => hund + "es" ; -- _ => hund + variants {"s" ; "es"} -- } ; -- pluralN : Str -> Str = \hund -> case hund of { @@ -52,14 +51,14 @@ resource MorphoAfr = ResAfr ** open Prelude, (Predef=Predef) in ---- Duden, p. 119 -- -- verbT : Str -> Str = \v -> case v of { --- _ + ("t" | "d") => v + "et" ; -- gründen, reden, betten +-- _ + ("t" | "d") => v + "et" ; -- gründen, reden, betten -- _ + ("ch" | "k" | "p" | "t" | "g" | "b" | "d" | "f" | "s") + --- ("m" | "n") => v + "et" ; -- atmen, widmen, öffnen, rechnen --- _ => v + "t" -- lernen, lärmen, qualmen etc +-- ("m" | "n") => v + "et" ; -- atmen, widmen, öffnen, rechnen +-- _ => v + "t" -- lernen, lärmen, qualmen etc -- } ; -- -- verbST : Str -> Str = \v -> case v of { --- _ + ("s" | "ss" | "ß" | "sch" | "x" | "z") => v + "t" ; +-- _ + ("s" | "ss" | "ß" | "sch" | "x" | "z") => v + "t" ; -- _ => v + "st" -- } ; -- diff --git a/lib/src/afrikaans/NumeralAfr.gf b/lib/src/afrikaans/NumeralAfr.gf index 47df1a957..e851a50c2 100644 --- a/lib/src/afrikaans/NumeralAfr.gf +++ b/lib/src/afrikaans/NumeralAfr.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 concrete NumeralAfr of Numeral = CatAfr ** open ResAfr, Prelude in { flags optimize = all_subs ; + coding=utf8 ; lincat Digit = {s : DForm => CardOrd => Str ; en : Str} ; @@ -24,7 +24,7 @@ lin pot01 = { s = \\f => table { - NCard g _ => "een" ; ---- "één" ; + NCard g _ => "een" ; ---- "één" ; NOrd af => (regAdjective "eerste").s ! Posit ! af } ; n = Sg ; @@ -103,7 +103,7 @@ lin DTeen => cardOrd dreizehn (dreizehn + "de") ; DTen => cardOrd dreissig (dreissig + "ste") } ; - en = case drei of {_ + "e" => "ën" ; _ => "en"} + en = case drei of {_ + "e" => "ën" ; _ => "en"} } ; invNum : CardOrd = NCard Neutr Nom ; diff --git a/lib/src/afrikaans/ResAfr.gf b/lib/src/afrikaans/ResAfr.gf index 494d50cab..560a17c53 100644 --- a/lib/src/afrikaans/ResAfr.gf +++ b/lib/src/afrikaans/ResAfr.gf @@ -1,4 +1,3 @@ ---# -coding=latin1 --# -path=.:../abstract:../common --1 Afrch auxiliary operations. @@ -8,6 +7,7 @@ resource ResAfr = ParamX ** open Prelude in { flags optimize=all ; + coding=utf8 ; --2 For $Noun$ @@ -33,36 +33,36 @@ resource ResAfr = ParamX ** open Prelude in { g = g } ; ---Volgens Afrikaanse Woordelys & Spelreëls, 2009 +--Volgens Afrikaanse Woordelys & Spelreëls, 2009 -- -- Uitsonderings wat in die leksikon hanteer moet word: -- -- * enige uitsonderings wat in die AWS vermeld word -- * enige woord wat in die mv. "te" kry, soos lig, ligte --- * enige meerlettergrepige woord wat met "ie","ël","el","em","en","ng","ior","er","êr","erd","aar","aard","ier" +-- * enige meerlettergrepige woord wat met "ie","ël","el","em","en","ng","ior","er","êr","erd","aar","aard","ier" -- eindig wat nie 'n "s" in die mv. kry nie --- * eiename wat nie reëlmatig verbuig +-- * eiename wat nie reëlmatig verbuig -- * woorde met wisselvorme in die mv. moet as sinonieme in die leksikon hanteer word -- regNoun : Str -> Noun = \s -> case s of { _ + #cons + ("i" | "o" | "u" ) => mkNoun s (s + "'s") Neutr ; --ski, ski's --R13.7 - #cons* + ("ie" | "oe") =>mkNoun s (s + "ë") Neutr ; --knie, knieë --R13.10 - #cons* + ("ee") =>mkNoun s (init s + "ë") Neutr ; --fee, feë --R13.10 + #cons* + ("ie" | "oe") =>mkNoun s (s + "ë") Neutr ; --knie, knieë --R13.10 + #cons* + ("ee") =>mkNoun s (init s + "ë") Neutr ; --fee, feë --R13.10 #cons* + "a" => mkNoun s (s + "'s") Neutr ; --ma, ma's R13.7 - _ + ("a" | "e" | "ie" | "ee" | "é" | "ê" | "ô") => mkNoun s (s + "s") Neutr ; --gogga, goggas --R13.5 + _ + ("a" | "e" | "ie" | "ee" | "é" | "ê" | "ô") => mkNoun s (s + "s") Neutr ; --gogga, goggas --R13.5 - b + v@("oo") + "g" => mkNoun s (b + init v + "ë") Neutr ; --boog, boë --R13.11 - b + v@("e"|"ie"|"o"|"oe") + "g" => mkNoun s (b + v + "ë") Neutr ; --kroeg, kroeë --R13.11 + b + v@("oo") + "g" => mkNoun s (b + init v + "ë") Neutr ; --boog, boë --R13.11 + b + v@("e"|"ie"|"o"|"oe") + "g" => mkNoun s (b + v + "ë") Neutr ; --kroeg, kroeë --R13.11 b + v@("aa") + "g" => mkNoun s (b + init v + "e") Neutr ; --kraag, krae --R13.11 b + v@("a") + "g" => mkNoun s (b + v + "e") Neutr ; --dag, dae --R13.11 b + v@("ei"|"eu"|"oe"|"ou"|"ie"|"y"|"ui") + "g" => mkNoun s (b + v + "e") Neutr ; --tuig, tuie --R13.1 - _ + ("oir" | "ion" | "je") => mkNoun s (s + "s") Neutr ; --uit Nederlandse reël + _ + ("oir" | "ion" | "je") => mkNoun s (s + "s") Neutr ; --uit Nederlandse reël _ + ("rm" | "lm") => mkNoun s (s + "s") Neutr ; --R13.3 ? + ? + ? + _ + - ("ël" |"el" | "em" | "um" | "ing" | "or" | "ior" | "er" | "êr" | "erd" | "aar" | "aard" | "ier") => -- unstressed + ("ël" |"el" | "em" | "um" | "ing" | "or" | "ior" | "er" | "êr" | "erd" | "aar" | "aard" | "ier") => -- unstressed mkNoun s (s + "s") Neutr ; --R13.3 ? + ? + _ + (#cons + "en") => mkNoun s (s + "s") Neutr ; --R13.3 @@ -118,15 +118,15 @@ resource ResAfr = ParamX ** open Prelude in { let se : Str = case s of { b + v@("aal"|"baar"|"eel"|"loos") => b + init (init v) + last v + "e" ; --p288 - _ + ("agtig"|"ant"|"ent"|"êr"|"ies"|"ig"|"lik"|"matig"|"s") => s + "e" ; --p288 + _ + ("agtig"|"ant"|"ent"|"êr"|"ies"|"ig"|"lik"|"matig"|"s") => s + "e" ; --p288 b + "ief" => b + "iewe" ; --p288 --b + ("ei"|"eu"|"oe"|"ou"|"ie"|"y"|"ui") + ? => endCons s + "e" ; b + v@("ou"|"y") + "d" => b + v + "e" ; --koud, koue / wyd, wye - --b + v@("oo"|"ee") + "d" => b + init v + "ë" ; --leeg, leë - b + v@("oo"|"ee") + ("g"|"d") => b + init v + "ë" ; --leeg, leë - b + v@("e"|"ie"|"o"|"oe") + "g" => b + v + "ë" ; --moeg, moeë + --b + v@("oo"|"ee") + "d" => b + init v + "ë" ; --leeg, leë + b + v@("oo"|"ee") + ("g"|"d") => b + init v + "ë" ; --leeg, leë + b + v@("e"|"ie"|"o"|"oe") + "g" => b + v + "ë" ; --moeg, moeë b + v@("aa") + "g" => b + init v + "e" ; --vaag, vae b + v@("a") + "g" => b + v + "e" ; --kan nog nie aan 'n voorbeeld dink nie @@ -141,7 +141,7 @@ resource ResAfr = ParamX ** open Prelude in { b + v@("aa"|"ee"|"oo"|"uu") + "r" => se + "der" ; b + v@("a"|"i"|"o"|"u" ) + c@#cons => b + v + c + c + "er" ; --dom, dommer _ + "r" => se + "der" ; - _ + "ë" => se + "r" ; + _ + "ë" => se + "r" ; _ + "e" => se + "r" ; _ => se + "er" } ; diff --git a/lib/src/bulgarian/DocumentationBul.gf b/lib/src/bulgarian/DocumentationBul.gf index 2ad55392f..2fe390fff 100644 --- a/lib/src/bulgarian/DocumentationBul.gf +++ b/lib/src/bulgarian/DocumentationBul.gf @@ -2,6 +2,7 @@ concrete DocumentationBul of Documentation = CatBul ** open ResBul, HTML in { +flags coding=utf8 ; lincat Inflection = {t : Str; s1,s2,s3 : Str} ; diff --git a/lib/src/catalan/DiffCat.gf b/lib/src/catalan/DiffCat.gf index 05d9ee064..de5689215 100644 --- a/lib/src/catalan/DiffCat.gf +++ b/lib/src/catalan/DiffCat.gf @@ -1,8 +1,8 @@ --# -path=.:../romance:../abstract:../common:prelude ---# -coding=latin1 instance DiffCat of DiffRomance = open CommonRomance, PhonoCat, BeschCat, Prelude in { flags optimize=noexpand ; + coding=utf8 ; param Prepos = P_de | P_a ; @@ -162,8 +162,8 @@ oper } ; in \g,n,p -> case of { - <_,Sg,P1> => cases "em" "mí" ; - <_,Sg,P2> => cases "et" "tú" ; + <_,Sg,P1> => cases "em" "mí" ; + <_,Sg,P2> => cases "et" "tú" ; <_,Pl,P1> => cases "ens" "nosaltres" ; --- nosotros <_,Pl,P2> => cases "us" "vosaltres" ; --- vosotros => cases3 "la" "li" "ella" ; diff --git a/lib/src/catalan/IrregCat.gf b/lib/src/catalan/IrregCat.gf index 6b13eaf5e..f4def5752 100644 --- a/lib/src/catalan/IrregCat.gf +++ b/lib/src/catalan/IrregCat.gf @@ -1,9 +1,9 @@ --# -path=.:../romance:../abstract:../common:prelude ---# -coding=latin1 --- machine-generated GF file from Andersson & Söderberg's MSc work +-- machine-generated GF file from Andersson & Söderberg's MSc work concrete IrregCat of IrregCatAbs = CatCat ** open CommonRomance, ParadigmsCat, BeschCat in { flags optimize=values ; + coding=utf8 ; lin haver_V = verbV {s = table (BeschCat.VFB) [ @@ -19,38 +19,38 @@ lin haver_V = verbV {-VP (Pres Subj Sg P1) =>-} "hagi" ; {-VP (Pres Subj Sg P2) =>-} "hagis" ; {-VP (Pres Subj Sg P3) =>-} "hagi" ; - {-VP (Pres Subj Pl P1) =>-} "hàgim" ; - {-VP (Pres Subj Pl P2) =>-} "hàgiu" ; + {-VP (Pres Subj Pl P1) =>-} "hàgim" ; + {-VP (Pres Subj Pl P2) =>-} "hàgiu" ; {-VP (Pres Subj Pl P3) =>-} "hagin" ; {-VP (Impf Ind Sg P1) =>-} "havia" ; --# notpresent {-VP (Impf Ind Sg P2) =>-} "havies" ; --# notpresent {-VP (Impf Ind Sg P3) =>-} "havia" ; --# notpresent - {-VP (Impf Ind Pl P1) =>-} "havíem" ; --# notpresent - {-VP (Impf Ind Pl P2) =>-} "havíeu" ; --# notpresent + {-VP (Impf Ind Pl P1) =>-} "havíem" ; --# notpresent + {-VP (Impf Ind Pl P2) =>-} "havíeu" ; --# notpresent {-VP (Impf Ind Pl P3) =>-} "havien" ; --# notpresent - {-VP (Impf Subj Sg P1) =>-} "hagués" ; --# notpresent + {-VP (Impf Subj Sg P1) =>-} "hagués" ; --# notpresent {-VP (Impf Subj Sg P2) =>-} "haguessis" ; --# notpresent - {-VP (Impf Subj Sg P3) =>-} "hagués" ; --# notpresent - {-VP (Impf Subj Pl P1) =>-} "haguéssim" ; --# notpresent - {-VP (Impf Subj Pl P2) =>-} "haguéssiu" ; --# notpresent + {-VP (Impf Subj Sg P3) =>-} "hagués" ; --# notpresent + {-VP (Impf Subj Pl P1) =>-} "haguéssim" ; --# notpresent + {-VP (Impf Subj Pl P2) =>-} "haguéssiu" ; --# notpresent {-VP (Impf Subj Pl P3) =>-} "haguessin" ; --# notpresent - {-VP (Pret Sg P1) =>-} "haguí" ; --# notpresent + {-VP (Pret Sg P1) =>-} "haguí" ; --# notpresent {-VP (Pret Sg P2) =>-} "hagueres" ; --# notpresent - {-VP (Pret Sg P3) =>-} "hagué" ; --# notpresent - {-VP (Pret Pl P1) =>-} "haguérem" ; --# notpresent - {-VP (Pret Pl P2) =>-} "haguéreu" ; --# notpresent + {-VP (Pret Sg P3) =>-} "hagué" ; --# notpresent + {-VP (Pret Pl P1) =>-} "haguérem" ; --# notpresent + {-VP (Pret Pl P2) =>-} "haguéreu" ; --# notpresent {-VP (Pret Pl P3) =>-} "hagueren" ; --# notpresent - {-VP (Fut Sg P1) =>-} "hauré" ; --# notpresent - {-VP (Fut Sg P2) =>-} "hauràs" ; --# notpresent - {-VP (Fut Sg P3) =>-} "haurà" ; --# notpresent + {-VP (Fut Sg P1) =>-} "hauré" ; --# notpresent + {-VP (Fut Sg P2) =>-} "hauràs" ; --# notpresent + {-VP (Fut Sg P3) =>-} "haurà" ; --# notpresent {-VP (Fut Pl P1) =>-} "haurem" ; --# notpresent {-VP (Fut Pl P2) =>-} "haureu" ; --# notpresent {-VP (Fut Pl P3) =>-} "hauran" ; --# notpresent {-VP (Cond Sg P1) =>-} "hauria" ; --# notpresent {-VP (Cond Sg P2) =>-} "hauries" ; --# notpresent {-VP (Cond Sg P3) =>-} "hauria" ; --# notpresent - {-VP (Cond Pl P1) =>-} "hauríem" ; --# notpresent - {-VP (Cond Pl P2) =>-} "hauríeu" ; --# notpresent + {-VP (Cond Pl P1) =>-} "hauríem" ; --# notpresent + {-VP (Cond Pl P2) =>-} "hauríeu" ; --# notpresent {-VP (Cond Pl P3) =>-} "haurien" ; --# notpresent {-VP (Imp Sg P1) =>-} variants {} ; {-VP (Imp Sg P2) =>-} variants {} ; @@ -73,42 +73,42 @@ lin estar_V = verbV {-VP (Pres Ind Pl P1) =>-} "estem" ; {-VP (Pres Ind Sg P1) =>-} "estic" ; {-VP (Pres Ind Pl P2) =>-} "esteu" ; -{-VP (Pres Ind Sg P2) =>-} "estàs" ; +{-VP (Pres Ind Sg P2) =>-} "estàs" ; {-VP (Pres Ind Pl P3) =>-} "estan" ; -{-VP (Pres Ind Sg P3) =>-} "està" ; +{-VP (Pres Ind Sg P3) =>-} "està" ; {-VP (Pres Subj Pl P1) =>-} "estiguem" ; {-VP (Pres Subj Sg P1) =>-} "estigui" ; {-VP (Pres Subj Pl P2) =>-} "estigueu" ; {-VP (Pres Subj Sg P2) =>-} "estiguis" ; {-VP (Pres Subj Pl P3) =>-} "estiguin" ; {-VP (Pres Subj Sg P3) =>-} "estigui" ; -{-VP (Impf Ind Pl P1) =>-} "estàvem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "estàvem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "estava" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "estàveu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "estàveu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "estaves" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "estaven" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "estava" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "estiguéssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "estigués" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "estiguéssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "estiguéssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "estigués" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "estiguéssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "estiguessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "estiguessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "estigués" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "estigués" ;--# notpresent {-VP (Fut Pl P1) =>-} "estarem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "estaré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "estaré" ;--# notpresent {-VP (Fut Pl P2) =>-} "estareu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "estaràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "estaràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "estaran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "estarà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "estiguéssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "estigués" ;--# notpresent -{-VP (Pret Pl P2) =>-} "estiguéssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "estarà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "estiguéssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "estigués" ;--# notpresent +{-VP (Pret Pl P2) =>-} "estiguéssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "estiguessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "estiguessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "estigués" ;--# notpresent -{-VP (Cond Pl P1) =>-} "estaríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "estigués" ;--# notpresent +{-VP (Cond Pl P1) =>-} "estaríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "estaria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "estaríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "estaríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "estaries" ;--# notpresent {-VP (Cond Pl P3) =>-} "estarien" ;--# notpresent {-VP (Cond Sg P3) =>-} "estaria" ;--# notpresent @@ -127,15 +127,15 @@ lin estar_V = verbV lin ser_V = verbV {s = table (BeschCat.VFB) [ - {-VI Infn=>-} variants {"ésser" ; "ser" } ; - {-VI Ger =>-} "éssent" ; + {-VI Infn=>-} variants {"ésser" ; "ser" } ; + {-VI Ger =>-} "éssent" ; {-VI Part =>-} "estat" ; - {-VP (Pres Ind Sg P1) =>-} "sóc" ; + {-VP (Pres Ind Sg P1) =>-} "sóc" ; {-VP (Pres Ind Sg P2) =>-} "ets" ; - {-VP (Pres Ind Sg P3) =>-} "és" ; + {-VP (Pres Ind Sg P3) =>-} "és" ; {-VP (Pres Ind Pl P1) =>-} "som" ; {-VP (Pres Ind Pl P2) =>-} "sou" ; - {-VP (Pres Ind Pl P3) =>-} "són" ; + {-VP (Pres Ind Pl P3) =>-} "són" ; {-VP (Pres Subj Sg P1) =>-} "sigui" ; {-VP (Pres Subj Sg P2) =>-} "sigui" ; {-VP (Pres Subj Sg P3) =>-} "sigui" ; @@ -145,32 +145,32 @@ lin ser_V = verbV {-VP (Impf Ind Sg P1) =>-} "era" ; --# notpresent {-VP (Impf Ind Sg P2) =>-} "eres" ; --# notpresent {-VP (Impf Ind Sg P3) =>-} "era" ; --# notpresent - {-VP (Impf Ind Pl P1) =>-} "érem" ; --# notpresent - {-VP (Impf Ind Pl P2) =>-} "éreu" ; --# notpresent + {-VP (Impf Ind Pl P1) =>-} "érem" ; --# notpresent + {-VP (Impf Ind Pl P2) =>-} "éreu" ; --# notpresent {-VP (Impf Ind Pl P3) =>-} "eren" ; --# notpresent {-VP (Impf Subj Sg P1) =>-} "fos" ; --# notpresent {-VP (Impf Subj Sg P2) =>-} "fossis" ; --# notpresent {-VP (Impf Subj Sg P3) =>-} "fos" ; --# notpresent - {-VP (Impf Subj Pl P1) =>-} "fóssim" ; --# notpresent - {-VP (Impf Subj Pl P2) =>-} "fóssiu" ; --# notpresent + {-VP (Impf Subj Pl P1) =>-} "fóssim" ; --# notpresent + {-VP (Impf Subj Pl P2) =>-} "fóssiu" ; --# notpresent {-VP (Impf Subj Pl P3) =>-} "fossin" ; --# notpresent {-VP (Pret Sg P1) =>-} "fui" ; --# notpresent {-VP (Pret Sg P2) =>-} "fores" ; --# notpresent {-VP (Pret Sg P3) =>-} "fou" ; --# notpresent - {-VP (Pret Pl P1) =>-} "fórem" ; --# notpresent - {-VP (Pret Pl P2) =>-} "fóreu" ; --# notpresent + {-VP (Pret Pl P1) =>-} "fórem" ; --# notpresent + {-VP (Pret Pl P2) =>-} "fóreu" ; --# notpresent {-VP (Pret Pl P3) =>-} "foren" ; --# notpresent - {-VP (Fut Sg P1) =>-} "seré" ; --# notpresent - {-VP (Fut Sg P2) =>-} "seràs" ; --# notpresent - {-VP (Fut Sg P3) =>-} "serà" ; --# notpresent + {-VP (Fut Sg P1) =>-} "seré" ; --# notpresent + {-VP (Fut Sg P2) =>-} "seràs" ; --# notpresent + {-VP (Fut Sg P3) =>-} "serà" ; --# notpresent {-VP (Fut Pl P1) =>-} "serem" ; --# notpresent {-VP (Fut Pl P2) =>-} "sereu" ; --# notpresent {-VP (Fut Pl P3) =>-} "seran" ; --# notpresent - {-VP (Cond Sg P1) =>-} variants {"sería" ; "fóra"} ; --# notpresent + {-VP (Cond Sg P1) =>-} variants {"sería" ; "fóra"} ; --# notpresent {-VP (Cond Sg P2) =>-} variants {"series" ; "fores"} ; --# notpresent - {-VP (Cond Sg P3) =>-} variants {"seria" ; "fóra"} ; --# notpresent - {-VP (Cond Pl P1) =>-} variants {"seríem" ; "fórem"} ; --# notpresent - {-VP (Cond Pl P2) =>-} variants {"seríeu" ; "fóreu"} ; --# notpresent + {-VP (Cond Sg P3) =>-} variants {"seria" ; "fóra"} ; --# notpresent + {-VP (Cond Pl P1) =>-} variants {"seríem" ; "fórem"} ; --# notpresent + {-VP (Cond Pl P2) =>-} variants {"seríeu" ; "fóreu"} ; --# notpresent {-VP (Cond Pl P3) =>-} variants {"serien" ; "foren"} ; --# notpresent {-VP (Imp Sg P1) =>-} variants {} ; {-VP (Imp Sg P2) =>-} "sigues" ; @@ -203,33 +203,33 @@ lin callar_V = verbV {-VP (Pres Subj Sg P2) =>-} "callis" ; {-VP (Pres Subj Pl P3) =>-} "callin" ; {-VP (Pres Subj Sg P3) =>-} "calli" ; -{-VP (Impf Ind Pl P1) =>-} "callàvem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "callàvem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "callava" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "callàveu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "callàveu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "callaves" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "callaven" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "callava" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "calléssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "callés" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "calléssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "calléssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "callés" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "calléssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "callessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "callessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "callés" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "callés" ;--# notpresent {-VP (Fut Pl P1) =>-} "callarem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "callaré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "callaré" ;--# notpresent {-VP (Fut Pl P2) =>-} "callareu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "callaràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "callaràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "callaran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "callarà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "calléssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "callés" ;--# notpresent -{-VP (Pret Pl P2) =>-} "calléssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "callarà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "calléssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "callés" ;--# notpresent +{-VP (Pret Pl P2) =>-} "calléssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "callessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "callessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "callés" ;--# notpresent -{-VP (Cond Pl P1) =>-} "callaríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "callés" ;--# notpresent +{-VP (Cond Pl P1) =>-} "callaríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "callaria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "callaríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "callaríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "callaries" ;--# notpresent {-VP (Cond Pl P3) =>-} "callarien" ;--# notpresent {-VP (Cond Sg P3) =>-} "callaria" ;--# notpresent @@ -263,33 +263,33 @@ lin caure_V = verbV {-VP (Pres Subj Sg P2) =>-} "caiguis" ; {-VP (Pres Subj Pl P3) =>-} "caiguin" ; {-VP (Pres Subj Sg P3) =>-} "caigui" ; -{-VP (Impf Ind Pl P1) =>-} "quèiem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "quèiem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "queia" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "quèieu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "quèieu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "queies" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "queien" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "queia" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "caiguéssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "caigués" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "caiguéssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "caiguéssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "caigués" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "caiguéssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "caiguessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "caiguessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "caigués" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "caigués" ;--# notpresent {-VP (Fut Pl P1) =>-} "caurem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "cauré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "cauré" ;--# notpresent {-VP (Fut Pl P2) =>-} "caureu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "cauràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "cauràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "cauran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "caurà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "caiguéssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "caigués" ;--# notpresent -{-VP (Pret Pl P2) =>-} "caiguéssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "caurà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "caiguéssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "caigués" ;--# notpresent +{-VP (Pret Pl P2) =>-} "caiguéssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "caiguessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "caiguessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "caigués" ;--# notpresent -{-VP (Cond Pl P1) =>-} "cauríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "caigués" ;--# notpresent +{-VP (Cond Pl P1) =>-} "cauríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "cauria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "cauríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "cauríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "cauries" ;--# notpresent {-VP (Cond Pl P3) =>-} "caurien" ;--# notpresent {-VP (Cond Sg P3) =>-} "cauria" ;--# notpresent @@ -323,33 +323,33 @@ lin cloure_V = verbV {-VP (Pres Subj Sg P2) =>-} "cloguis" ; {-VP (Pres Subj Pl P3) =>-} "cloguin" ; {-VP (Pres Subj Sg P3) =>-} "clogui" ; -{-VP (Impf Ind Pl P1) =>-} "cloíem" ;--# notpresent -{-VP (Impf Ind Sg P1) =>-} "cloïa" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "cloíeu" ;--# notpresent -{-VP (Impf Ind Sg P2) =>-} "cloïes" ;--# notpresent -{-VP (Impf Ind Pl P3) =>-} "cloïen" ;--# notpresent -{-VP (Impf Ind Sg P3) =>-} "cloïa" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "cloguéssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "clogués" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "cloguéssiu" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "cloíem" ;--# notpresent +{-VP (Impf Ind Sg P1) =>-} "cloïa" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "cloíeu" ;--# notpresent +{-VP (Impf Ind Sg P2) =>-} "cloïes" ;--# notpresent +{-VP (Impf Ind Pl P3) =>-} "cloïen" ;--# notpresent +{-VP (Impf Ind Sg P3) =>-} "cloïa" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "cloguéssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "clogués" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "cloguéssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "cloguessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "cloguessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "clogués" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "clogués" ;--# notpresent {-VP (Fut Pl P1) =>-} "clourem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "clouré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "clouré" ;--# notpresent {-VP (Fut Pl P2) =>-} "cloureu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "clouràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "clouràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "clouran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "clourà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "cloguéssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "clogués" ;--# notpresent -{-VP (Pret Pl P2) =>-} "cloguéssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "clourà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "cloguéssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "clogués" ;--# notpresent +{-VP (Pret Pl P2) =>-} "cloguéssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "cloguessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "cloguessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "clogués" ;--# notpresent -{-VP (Cond Pl P1) =>-} "clouríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "clogués" ;--# notpresent +{-VP (Cond Pl P1) =>-} "clouríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "clouria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "clouríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "clouríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "clouries" ;--# notpresent {-VP (Cond Pl P3) =>-} "clourien" ;--# notpresent {-VP (Cond Sg P3) =>-} "clouria" ;--# notpresent @@ -383,33 +383,33 @@ lin complaure_V = verbV {-VP (Pres Subj Sg P2) =>-} "complaguis" ; {-VP (Pres Subj Pl P3) =>-} "complaguin" ; {-VP (Pres Subj Sg P3) =>-} "complagui" ; -{-VP (Impf Ind Pl P1) =>-} "complaíem" ;--# notpresent -{-VP (Impf Ind Sg P1) =>-} "complaïa" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "complaíeu" ;--# notpresent -{-VP (Impf Ind Sg P2) =>-} "complaïes" ;--# notpresent -{-VP (Impf Ind Pl P3) =>-} "complaïen" ;--# notpresent -{-VP (Impf Ind Sg P3) =>-} "complaïa" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "complaguéssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "complagués" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "complaguéssiu" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "complaíem" ;--# notpresent +{-VP (Impf Ind Sg P1) =>-} "complaïa" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "complaíeu" ;--# notpresent +{-VP (Impf Ind Sg P2) =>-} "complaïes" ;--# notpresent +{-VP (Impf Ind Pl P3) =>-} "complaïen" ;--# notpresent +{-VP (Impf Ind Sg P3) =>-} "complaïa" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "complaguéssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "complagués" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "complaguéssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "complaguessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "complaguessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "complagués" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "complagués" ;--# notpresent {-VP (Fut Pl P1) =>-} "complaurem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "complauré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "complauré" ;--# notpresent {-VP (Fut Pl P2) =>-} "complaureu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "complauràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "complauràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "complauran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "complaurà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "complaguéssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "complagués" ;--# notpresent -{-VP (Pret Pl P2) =>-} "complaguéssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "complaurà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "complaguéssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "complagués" ;--# notpresent +{-VP (Pret Pl P2) =>-} "complaguéssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "complaguessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "complaguessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "complagués" ;--# notpresent -{-VP (Cond Pl P1) =>-} "complauríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "complagués" ;--# notpresent +{-VP (Cond Pl P1) =>-} "complauríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "complauria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "complauríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "complauríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "complauries" ;--# notpresent {-VP (Cond Pl P3) =>-} "complaurien" ;--# notpresent {-VP (Cond Sg P3) =>-} "complauria" ;--# notpresent @@ -443,33 +443,33 @@ lin contradir_V = verbV {-VP (Pres Subj Sg P2) =>-} "contradiguis" ; {-VP (Pres Subj Pl P3) =>-} "contradiguin" ; {-VP (Pres Subj Sg P3) =>-} "contradigui" ; -{-VP (Impf Ind Pl P1) =>-} "contradèiem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "contradèiem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "contradeia" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "contradèieu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "contradèieu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "contradeies" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "contradeien" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "contradeia" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "contradiguéssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "contradigués" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "contradiguéssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "contradiguéssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "contradigués" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "contradiguéssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "contradiguessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "contradiguessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "contradigués" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "contradigués" ;--# notpresent {-VP (Fut Pl P1) =>-} "contradirem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "contradiré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "contradiré" ;--# notpresent {-VP (Fut Pl P2) =>-} "contradireu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "contradiràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "contradiràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "contradiran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "contradirà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "contradiguéssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "contradigués" ;--# notpresent -{-VP (Pret Pl P2) =>-} "contradiguéssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "contradirà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "contradiguéssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "contradigués" ;--# notpresent +{-VP (Pret Pl P2) =>-} "contradiguéssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "contradiguessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "contradiguessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "contradigués" ;--# notpresent -{-VP (Cond Pl P1) =>-} "contradiríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "contradigués" ;--# notpresent +{-VP (Cond Pl P1) =>-} "contradiríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "contradiria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "contradiríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "contradiríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "contradiries" ;--# notpresent {-VP (Cond Pl P3) =>-} "contradirien" ;--# notpresent {-VP (Cond Sg P3) =>-} "contradiria" ;--# notpresent @@ -503,33 +503,33 @@ lin cosir_V = verbV {-VP (Pres Subj Sg P2) =>-} "cusis" ; {-VP (Pres Subj Pl P3) =>-} "cusin" ; {-VP (Pres Subj Sg P3) =>-} "cusi" ; -{-VP (Impf Ind Pl P1) =>-} "cosíem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "cosíem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "cosia" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "cosíeu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "cosíeu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "cosies" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "cosien" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "cosia" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "cosíssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "cosís" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "cosíssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "cosíssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "cosís" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "cosíssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "cosissis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "cosissin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "cosís" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "cosís" ;--# notpresent {-VP (Fut Pl P1) =>-} "cosirem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "cosiré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "cosiré" ;--# notpresent {-VP (Fut Pl P2) =>-} "cosireu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "cosiràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "cosiràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "cosiran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "cosirà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "cosíssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "cosís" ;--# notpresent -{-VP (Pret Pl P2) =>-} "cosíssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "cosirà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "cosíssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "cosís" ;--# notpresent +{-VP (Pret Pl P2) =>-} "cosíssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "cosissis" ;--# notpresent {-VP (Pret Pl P3) =>-} "cosissin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "cosís" ;--# notpresent -{-VP (Cond Pl P1) =>-} "cosiríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "cosís" ;--# notpresent +{-VP (Cond Pl P1) =>-} "cosiríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "cosiria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "cosiríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "cosiríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "cosiries" ;--# notpresent {-VP (Cond Pl P3) =>-} "cosirien" ;--# notpresent {-VP (Cond Sg P3) =>-} "cosiria" ;--# notpresent @@ -563,33 +563,33 @@ lin dir_V = verbV {-VP (Pres Subj Sg P2) =>-} "diguis" ; {-VP (Pres Subj Pl P3) =>-} "diguin" ; {-VP (Pres Subj Sg P3) =>-} "digui" ; -{-VP (Impf Ind Pl P1) =>-} "dèiem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "dèiem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "deia" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "dèieu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "dèieu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "deies" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "deien" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "deia" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "diguéssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "digués" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "diguéssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "diguéssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "digués" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "diguéssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "diguessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "diguessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "digués" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "digués" ;--# notpresent {-VP (Fut Pl P1) =>-} "direm" ;--# notpresent -{-VP (Fut Sg P1) =>-} "diré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "diré" ;--# notpresent {-VP (Fut Pl P2) =>-} "direu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "diràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "diràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "diran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "dirà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "diguéssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "digués" ;--# notpresent -{-VP (Pret Pl P2) =>-} "diguéssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "dirà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "diguéssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "digués" ;--# notpresent +{-VP (Pret Pl P2) =>-} "diguéssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "diguessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "diguessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "digués" ;--# notpresent -{-VP (Cond Pl P1) =>-} "diríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "digués" ;--# notpresent +{-VP (Cond Pl P1) =>-} "diríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "diria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "diríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "diríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "diries" ;--# notpresent {-VP (Cond Pl P3) =>-} "dirien" ;--# notpresent {-VP (Cond Sg P3) =>-} "diria" ;--# notpresent @@ -623,33 +623,33 @@ lin doldre_V = verbV {-VP (Pres Subj Sg P2) =>-} "dolguis" ; {-VP (Pres Subj Pl P3) =>-} "dolguin" ; {-VP (Pres Subj Sg P3) =>-} "dolgui" ; -{-VP (Impf Ind Pl P1) =>-} "dolíem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "dolíem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "dolia" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "dolíeu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "dolíeu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "dolies" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "dolien" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "dolia" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "dolguéssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "dolgués" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "dolguéssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "dolguéssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "dolgués" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "dolguéssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "dolguessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "dolguessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "dolgués" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "dolgués" ;--# notpresent {-VP (Fut Pl P1) =>-} "doldrem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "doldré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "doldré" ;--# notpresent {-VP (Fut Pl P2) =>-} "doldreu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "doldràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "doldràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "doldran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "doldrà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "dolguéssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "dolgués" ;--# notpresent -{-VP (Pret Pl P2) =>-} "dolguéssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "doldrà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "dolguéssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "dolgués" ;--# notpresent +{-VP (Pret Pl P2) =>-} "dolguéssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "dolguessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "dolguessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "dolgués" ;--# notpresent -{-VP (Cond Pl P1) =>-} "doldríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "dolgués" ;--# notpresent +{-VP (Cond Pl P1) =>-} "doldríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "doldria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "doldríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "doldríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "doldries" ;--# notpresent {-VP (Cond Pl P3) =>-} "doldrien" ;--# notpresent {-VP (Cond Sg P3) =>-} "doldria" ;--# notpresent @@ -682,33 +682,33 @@ lin doldre_V = verbV --{-VP (Pres Subj Sg P2) =>-} "donis" ; --{-VP (Pres Subj Pl P3) =>-} "donin" ; --{-VP (Pres Subj Sg P3) =>-} "doni" ; ---{-VP (Impf Ind Pl P1) =>-} "donàvem" ;--# notpresent +--{-VP (Impf Ind Pl P1) =>-} "donàvem" ;--# notpresent --{-VP (Impf Ind Sg P1) =>-} "donava" ;--# notpresent ---{-VP (Impf Ind Pl P2) =>-} "donàveu" ;--# notpresent +--{-VP (Impf Ind Pl P2) =>-} "donàveu" ;--# notpresent --{-VP (Impf Ind Sg P2) =>-} "donaves" ;--# notpresent --{-VP (Impf Ind Pl P3) =>-} "donaven" ;--# notpresent --{-VP (Impf Ind Sg P3) =>-} "donava" ;--# notpresent ---{-VP (Impf Subj Pl P1) =>-} "donéssim" ;--# notpresent ---{-VP (Impf Subj Sg P1) =>-} "donés" ;--# notpresent ---{-VP (Impf Subj Pl P2) =>-} "donéssiu" ;--# notpresent +--{-VP (Impf Subj Pl P1) =>-} "donéssim" ;--# notpresent +--{-VP (Impf Subj Sg P1) =>-} "donés" ;--# notpresent +--{-VP (Impf Subj Pl P2) =>-} "donéssiu" ;--# notpresent --{-VP (Impf Subj Sg P2) =>-} "donessis" ;--# notpresent --{-VP (Impf Subj Pl P3) =>-} "donessin" ;--# notpresent ---{-VP (Impf Subj Sg P3) =>-} "donés" ;--# notpresent +--{-VP (Impf Subj Sg P3) =>-} "donés" ;--# notpresent --{-VP (Fut Pl P1) =>-} "donarem" ;--# notpresent ---{-VP (Fut Sg P1) =>-} "donaré" ;--# notpresent +--{-VP (Fut Sg P1) =>-} "donaré" ;--# notpresent --{-VP (Fut Pl P2) =>-} "donareu" ;--# notpresent ---{-VP (Fut Sg P2) =>-} "donaràs" ;--# notpresent +--{-VP (Fut Sg P2) =>-} "donaràs" ;--# notpresent --{-VP (Fut Pl P3) =>-} "donaran" ;--# notpresent ---{-VP (Fut Sg P3) =>-} "donarà" ;--# notpresent ---{-VP (Pret Pl P1) =>-} "donéssim" ;--# notpresent ---{-VP (Pret Sg P1) =>-} "donés" ;--# notpresent ---{-VP (Pret Pl P2) =>-} "donéssiu" ;--# notpresent +--{-VP (Fut Sg P3) =>-} "donarà" ;--# notpresent +--{-VP (Pret Pl P1) =>-} "donéssim" ;--# notpresent +--{-VP (Pret Sg P1) =>-} "donés" ;--# notpresent +--{-VP (Pret Pl P2) =>-} "donéssiu" ;--# notpresent --{-VP (Pret Sg P2) =>-} "donessis" ;--# notpresent --{-VP (Pret Pl P3) =>-} "donessin" ;--# notpresent ---{-VP (Pret Sg P3) =>-} "donés" ;--# notpresent ---{-VP (Cond Pl P1) =>-} "donaríem" ;--# notpresent +--{-VP (Pret Sg P3) =>-} "donés" ;--# notpresent +--{-VP (Cond Pl P1) =>-} "donaríem" ;--# notpresent --{-VP (Cond Sg P1) =>-} "donaria" ;--# notpresent ---{-VP (Cond Pl P2) =>-} "donaríeu" ;--# notpresent +--{-VP (Cond Pl P2) =>-} "donaríeu" ;--# notpresent --{-VP (Cond Sg P2) =>-} "donaries" ;--# notpresent --{-VP (Cond Pl P3) =>-} "donarien" ;--# notpresent --{-VP (Cond Sg P3) =>-} "donaria" ;--# notpresent @@ -756,35 +756,35 @@ lin doldre_V = verbV --{-VP (Impf Ind Sg P2) =>-} "enduies" ;--# notpresent --{-VP (Impf Ind Pl P3) =>-} "enduien" ;--# notpresent --{-VP (Impf Ind Sg P3) =>-} "enduia" ;--# notpresent ---{-VP (Impf Ind Pl P1) =>-} "endúiem" ;--# notpresent ---{-VP (Impf Ind Pl P2) =>-} "endúieu" ;--# notpresent ---{-VP (Impf Subj Pl P1) =>-} "enduguérem" ;--# notpresent ---{-VP (Impf Subj Pl P1) =>-} "enduguéssim" ;--# notpresent +--{-VP (Impf Ind Pl P1) =>-} "endúiem" ;--# notpresent +--{-VP (Impf Ind Pl P2) =>-} "endúieu" ;--# notpresent +--{-VP (Impf Subj Pl P1) =>-} "enduguérem" ;--# notpresent +--{-VP (Impf Subj Pl P1) =>-} "enduguéssim" ;--# notpresent --{-VP (Impf Subj Sg P1) =>-} "enduguera" ;--# notpresent ---{-VP (Impf Subj Sg P1) =>-} "endugués" ;--# notpresent ---{-VP (Impf Subj Pl P2) =>-} "enduguéreu" ;--# notpresent ---{-VP (Impf Subj Pl P2) =>-} "enduguéssiu" ;--# notpresent +--{-VP (Impf Subj Sg P1) =>-} "endugués" ;--# notpresent +--{-VP (Impf Subj Pl P2) =>-} "enduguéreu" ;--# notpresent +--{-VP (Impf Subj Pl P2) =>-} "enduguéssiu" ;--# notpresent --{-VP (Impf Subj Sg P2) =>-} "endugueres" ;--# notpresent --{-VP (Impf Subj Sg P2) =>-} "enduguessis" ;--# notpresent --{-VP (Impf Subj Pl P3) =>-} "endugueren" ;--# notpresent --{-VP (Impf Subj Pl P3) =>-} "enduguessin" ;--# notpresent --{-VP (Impf Subj Sg P3) =>-} "enduguera" ;--# notpresent ---{-VP (Impf Subj Sg P3) =>-} "endugués" ;--# notpresent ---{-VP (Pret Pl P1) =>-} "enduguérem" ;--# notpresent ---{-VP (Pret Sg P1) =>-} "enduguí" ;--# notpresent ---{-VP (Pret Pl P2) =>-} "enduguéreu" ;--# notpresent +--{-VP (Impf Subj Sg P3) =>-} "endugués" ;--# notpresent +--{-VP (Pret Pl P1) =>-} "enduguérem" ;--# notpresent +--{-VP (Pret Sg P1) =>-} "enduguí" ;--# notpresent +--{-VP (Pret Pl P2) =>-} "enduguéreu" ;--# notpresent --{-VP (Pret Sg P2) =>-} "endugueres" ;--# notpresent --{-VP (Pret Pl P3) =>-} "endugueren" ;--# notpresent ---{-VP (Pret Sg P3) =>-} "endugué" ;--# notpresent +--{-VP (Pret Sg P3) =>-} "endugué" ;--# notpresent --{-VP (Fut Pl P1) =>-} "endurem" ;--# notpresent ---{-VP (Fut Sg P1) =>-} "enduré" ;--# notpresent +--{-VP (Fut Sg P1) =>-} "enduré" ;--# notpresent --{-VP (Fut Pl P2) =>-} "endureu" ;--# notpresent ---{-VP (Fut Sg P2) =>-} "enduràs" ;--# notpresent +--{-VP (Fut Sg P2) =>-} "enduràs" ;--# notpresent --{-VP (Fut Pl P3) =>-} "enduran" ;--# notpresent ---{-VP (Fut Sg P3) =>-} "endurà" ;--# notpresent ---{-VP (Cond Pl P1) =>-} "enduríem" ;--# notpresent +--{-VP (Fut Sg P3) =>-} "endurà" ;--# notpresent +--{-VP (Cond Pl P1) =>-} "enduríem" ;--# notpresent --{-VP (Cond Sg P1) =>-} "enduria" ;--# notpresent ---{-VP (Cond Pl P2) =>-} "enduríeu" ;--# notpresent +--{-VP (Cond Pl P2) =>-} "enduríeu" ;--# notpresent --{-VP (Cond Sg P2) =>-} "enduries" ;--# notpresent --{-VP (Cond Pl P3) =>-} "endurien" ;--# notpresent --{-VP (Cond Sg P3) =>-} "enduria" ;--# notpresent @@ -823,33 +823,33 @@ lin escopir_V = verbV {-VP (Pres Subj Sg P2) =>-} "escupis" ; {-VP (Pres Subj Pl P3) =>-} "escupin" ; {-VP (Pres Subj Sg P3) =>-} "escupi" ; -{-VP (Impf Ind Pl P1) =>-} "escopíem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "escopíem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "escopia" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "escopíeu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "escopíeu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "escopies" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "escopien" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "escopia" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "escopíssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "escopís" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "escopíssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "escopíssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "escopís" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "escopíssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "escopissis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "escopissin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "escopís" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "escopís" ;--# notpresent {-VP (Fut Pl P1) =>-} "escopirem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "escopiré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "escopiré" ;--# notpresent {-VP (Fut Pl P2) =>-} "escopireu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "escopiràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "escopiràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "escopiran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "escopirà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "escopíssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "escopís" ;--# notpresent -{-VP (Pret Pl P2) =>-} "escopíssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "escopirà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "escopíssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "escopís" ;--# notpresent +{-VP (Pret Pl P2) =>-} "escopíssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "escopissis" ;--# notpresent {-VP (Pret Pl P3) =>-} "escopissin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "escopís" ;--# notpresent -{-VP (Cond Pl P1) =>-} "escopiríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "escopís" ;--# notpresent +{-VP (Cond Pl P1) =>-} "escopiríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "escopiria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "escopiríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "escopiríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "escopiries" ;--# notpresent {-VP (Cond Pl P3) =>-} "escopirien" ;--# notpresent {-VP (Cond Sg P3) =>-} "escopiria" ;--# notpresent @@ -883,33 +883,33 @@ lin fondre_V = verbV {-VP (Pres Subj Sg P2) =>-} "fonguis" ; {-VP (Pres Subj Pl P3) =>-} "fonguin" ; {-VP (Pres Subj Sg P3) =>-} "fongui" ; -{-VP (Impf Ind Pl P1) =>-} "foníem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "foníem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "fonia" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "foníeu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "foníeu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "fonies" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "fonien" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "fonia" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "fonguéssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "fongués" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "fonguéssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "fonguéssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "fongués" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "fonguéssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "fonguessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "fonguessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "fongués" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "fongués" ;--# notpresent {-VP (Fut Pl P1) =>-} "fondrem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "fondré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "fondré" ;--# notpresent {-VP (Fut Pl P2) =>-} "fondreu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "fondràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "fondràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "fondran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "fondrà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "fonguéssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "fongués" ;--# notpresent -{-VP (Pret Pl P2) =>-} "fonguéssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "fondrà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "fonguéssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "fongués" ;--# notpresent +{-VP (Pret Pl P2) =>-} "fonguéssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "fonguessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "fonguessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "fongués" ;--# notpresent -{-VP (Cond Pl P1) =>-} "fondríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "fongués" ;--# notpresent +{-VP (Cond Pl P1) =>-} "fondríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "fondria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "fondríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "fondríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "fondries" ;--# notpresent {-VP (Cond Pl P3) =>-} "fondrien" ;--# notpresent {-VP (Cond Sg P3) =>-} "fondria" ;--# notpresent @@ -946,33 +946,33 @@ lin jeure_V = verbV {-VP (Pres Subj Sg P2) =>-} "jeguis" ; {-VP (Pres Subj Pl P3) =>-} "jeguin" ; {-VP (Pres Subj Sg P3) =>-} "jegui" ; -{-VP (Impf Ind Pl P1) =>-} "jèiem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "jèiem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "jeia" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "jèieu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "jèieu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "jeies" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "jeien" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "jeia" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "jaguéssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "jagués" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "jaguéssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "jaguéssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "jagués" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "jaguéssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "jaguessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "jaguessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "jagués" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "jagués" ;--# notpresent {-VP (Fut Pl P1) =>-} "jaurem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "jauré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "jauré" ;--# notpresent {-VP (Fut Pl P2) =>-} "jaureu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "jauràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "jauràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "jauran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "jaurà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "jaguéssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "jagués" ;--# notpresent -{-VP (Pret Pl P2) =>-} "jaguéssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "jaurà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "jaguéssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "jagués" ;--# notpresent +{-VP (Pret Pl P2) =>-} "jaguéssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "jaguessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "jaguessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "jagués" ;--# notpresent -{-VP (Cond Pl P1) =>-} "jauríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "jagués" ;--# notpresent +{-VP (Cond Pl P1) =>-} "jauríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "jauria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "jauríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "jauríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "jauries" ;--# notpresent {-VP (Cond Pl P3) =>-} "jaurien" ;--# notpresent {-VP (Cond Sg P3) =>-} "jauria" ;--# notpresent @@ -1011,33 +1011,33 @@ lin omplir_V = verbV {-VP (Pres Subj Sg P2) =>-} "omplis" ; {-VP (Pres Subj Pl P3) =>-} "omplin" ; {-VP (Pres Subj Sg P3) =>-} "ompli" ; -{-VP (Impf Ind Pl P1) =>-} "omplíem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "omplíem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "omplia" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "omplíeu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "omplíeu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "omplies" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "omplien" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "omplia" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "omplíssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "omplís" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "omplíssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "omplíssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "omplís" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "omplíssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "omplissis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "omplissin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "omplís" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "omplís" ;--# notpresent {-VP (Fut Pl P1) =>-} "omplirem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "ompliré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "ompliré" ;--# notpresent {-VP (Fut Pl P2) =>-} "omplireu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "ompliràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "ompliràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "ompliran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "omplirà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "omplíssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "omplís" ;--# notpresent -{-VP (Pret Pl P2) =>-} "omplíssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "omplirà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "omplíssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "omplís" ;--# notpresent +{-VP (Pret Pl P2) =>-} "omplíssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "omplissis" ;--# notpresent {-VP (Pret Pl P3) =>-} "omplissin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "omplís" ;--# notpresent -{-VP (Cond Pl P1) =>-} "ompliríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "omplís" ;--# notpresent +{-VP (Cond Pl P1) =>-} "ompliríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "ompliria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "ompliríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "ompliríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "ompliries" ;--# notpresent {-VP (Cond Pl P3) =>-} "omplirien" ;--# notpresent {-VP (Cond Sg P3) =>-} "ompliria" ;--# notpresent @@ -1068,8 +1068,8 @@ lin venir_V = verbV {-VP (Pres Ind Pl P1) =>-} "venim" ; {-VP (Pres Ind Sg P1) =>-} "vinc" ; {-VP (Pres Ind Pl P2) =>-} "veniu" ; -{-VP (Pres Ind Sg P2) =>-} "véns" ; -{-VP (Pres Ind Pl P3) =>-} "vénen" ; +{-VP (Pres Ind Sg P2) =>-} "véns" ; +{-VP (Pres Ind Pl P3) =>-} "vénen" ; {-VP (Pres Ind Sg P3) =>-} "ve" ; {-VP (Pres Subj Pl P1) =>-} "vinguem" ; {-VP (Pres Subj Sg P1) =>-} "vingui" ; @@ -1077,33 +1077,33 @@ lin venir_V = verbV {-VP (Pres Subj Sg P2) =>-} "vinguis" ; {-VP (Pres Subj Pl P3) =>-} "vinguin" ; {-VP (Pres Subj Sg P3) =>-} "vingui" ; -{-VP (Impf Ind Pl P1) =>-} "veníem" ;--# notpresent +{-VP (Impf Ind Pl P1) =>-} "veníem" ;--# notpresent {-VP (Impf Ind Sg P1) =>-} "venia" ;--# notpresent -{-VP (Impf Ind Pl P2) =>-} "veníeu" ;--# notpresent +{-VP (Impf Ind Pl P2) =>-} "veníeu" ;--# notpresent {-VP (Impf Ind Sg P2) =>-} "venies" ;--# notpresent {-VP (Impf Ind Pl P3) =>-} "venien" ;--# notpresent {-VP (Impf Ind Sg P3) =>-} "venia" ;--# notpresent -{-VP (Impf Subj Pl P1) =>-} "vinguéssim" ;--# notpresent -{-VP (Impf Subj Sg P1) =>-} "vingués" ;--# notpresent -{-VP (Impf Subj Pl P2) =>-} "vinguéssiu" ;--# notpresent +{-VP (Impf Subj Pl P1) =>-} "vinguéssim" ;--# notpresent +{-VP (Impf Subj Sg P1) =>-} "vingués" ;--# notpresent +{-VP (Impf Subj Pl P2) =>-} "vinguéssiu" ;--# notpresent {-VP (Impf Subj Sg P2) =>-} "vinguessis" ;--# notpresent {-VP (Impf Subj Pl P3) =>-} "vinguessin" ;--# notpresent -{-VP (Impf Subj Sg P3) =>-} "vingués" ;--# notpresent +{-VP (Impf Subj Sg P3) =>-} "vingués" ;--# notpresent {-VP (Fut Pl P1) =>-} "vindrem" ;--# notpresent -{-VP (Fut Sg P1) =>-} "vindré" ;--# notpresent +{-VP (Fut Sg P1) =>-} "vindré" ;--# notpresent {-VP (Fut Pl P2) =>-} "vindreu" ;--# notpresent -{-VP (Fut Sg P2) =>-} "vindràs" ;--# notpresent +{-VP (Fut Sg P2) =>-} "vindràs" ;--# notpresent {-VP (Fut Pl P3) =>-} "vindran" ;--# notpresent -{-VP (Fut Sg P3) =>-} "vindrà" ;--# notpresent -{-VP (Pret Pl P1) =>-} "vinguéssim" ;--# notpresent -{-VP (Pret Sg P1) =>-} "vingués" ;--# notpresent -{-VP (Pret Pl P2) =>-} "vinguéssiu" ;--# notpresent +{-VP (Fut Sg P3) =>-} "vindrà" ;--# notpresent +{-VP (Pret Pl P1) =>-} "vinguéssim" ;--# notpresent +{-VP (Pret Sg P1) =>-} "vingués" ;--# notpresent +{-VP (Pret Pl P2) =>-} "vinguéssiu" ;--# notpresent {-VP (Pret Sg P2) =>-} "vinguessis" ;--# notpresent {-VP (Pret Pl P3) =>-} "vinguessin" ;--# notpresent -{-VP (Pret Sg P3) =>-} "vingués" ;--# notpresent -{-VP (Cond Pl P1) =>-} "vindríem" ;--# notpresent +{-VP (Pret Sg P3) =>-} "vingués" ;--# notpresent +{-VP (Cond Pl P1) =>-} "vindríem" ;--# notpresent {-VP (Cond Sg P1) =>-} "vindria" ;--# notpresent -{-VP (Cond Pl P2) =>-} "vindríeu" ;--# notpresent +{-VP (Cond Pl P2) =>-} "vindríeu" ;--# notpresent {-VP (Cond Sg P2) =>-} "vindries" ;--# notpresent {-VP (Cond Pl P3) =>-} "vindrien" ;--# notpresent {-VP (Cond Sg P3) =>-} "vindria" ;--# notpresent diff --git a/lib/src/catalan/IrregCatAbs.gf b/lib/src/catalan/IrregCatAbs.gf index a016549b8..1043b2755 100644 --- a/lib/src/catalan/IrregCatAbs.gf +++ b/lib/src/catalan/IrregCatAbs.gf @@ -1,6 +1,6 @@ ---# -coding=latin1 abstract IrregCatAbs = Cat ** { + flags coding=utf8 ; -- fun abarse_V : V ; -- fun abastecer_V : V ; -- fun abeldar_V : V ; @@ -16,7 +16,7 @@ abstract IrregCatAbs = Cat ** { -- fun absterger_V : V ; -- fun absterger2_V : V ; -- fun abstraer_V : V ; --- fun abuñolar_V : V ; +-- fun abuñolar_V : V ; -- fun acaecer2_V : V ; -- fun acaecer_V : V ; -- fun acertar_V : V ; @@ -95,7 +95,7 @@ abstract IrregCatAbs = Cat ** { -- fun arbolecer_V : V ; -- fun arborecer_V : V ; -- fun arcaizar_V : V ; --- fun argüir_V : V ; +-- fun argüir_V : V ; -- fun aridecer_V : V ; -- fun arrecir_V : V ; -- fun arrendar_V : V ; @@ -113,8 +113,8 @@ abstract IrregCatAbs = Cat ** { -- fun aspaventar_V : V ; -- fun asperger_V : V ; -- fun asperger2_V : V ; --- fun astreñir_V : V ; --- fun astriñir_V : V ; +-- fun astreñir_V : V ; +-- fun astriñir_V : V ; -- fun astringir_V : V ; -- fun atardecer_V : V ; -- fun atender_V : V ; @@ -136,7 +136,7 @@ abstract IrregCatAbs = Cat ** { -- fun bienquerer_V : V ; -- fun blandir_V : V ; -- fun blanquecer_V : V ; --- fun bruñir_V : V ; +-- fun bruñir_V : V ; -- fun bullir_V : V ; -- fun caber_V : V ; -- fun caer_V : V ; @@ -145,7 +145,7 @@ abstract IrregCatAbs = Cat ** { -- fun canecerse_V : V ; -- fun carecer_V : V ; -- fun cegar_V : V ; --- fun ceñir_V : V ; +-- fun ceñir_V : V ; -- fun cerner_V : V ; -- fun cernir_V : V ; -- fun cerrar_V : V ; @@ -199,7 +199,7 @@ abstract IrregCatAbs = Cat ** { -- fun consolar_V : V ; -- fun consonar_V : V ; -- fun constituir_V : V ; --- fun constreñir_V : V ; +-- fun constreñir_V : V ; -- fun construir_V : V ; -- fun contar_V : V ; -- fun contender_V : V ; @@ -275,7 +275,7 @@ abstract IrregCatAbs = Cat ** { -- fun descabullirse_V : V ; -- fun descaecer_V : V ; -- fun descaer_V : V ; --- fun desceñir_V : V ; +-- fun desceñir_V : V ; -- fun descender_V : V ; -- fun descerrar_V : V ; -- fun descimentar_V : V ; @@ -335,7 +335,7 @@ abstract IrregCatAbs = Cat ** { -- fun desimponer_V : V ; -- fun desinvernar_V : V ; -- fun deslendrar_V : V ; --- fun desleír_V : V ; +-- fun desleír_V : V ; -- fun deslucir_V : V ; -- fun desmajolar_V : V ; -- fun desmedirse_V : V ; @@ -349,7 +349,7 @@ abstract IrregCatAbs = Cat ** { -- fun desolar_V : V ; -- fun desoldar_V : V ; -- fun desollar_V : V ; --- fun desoír_V : V ; +-- fun desoír_V : V ; -- fun desosar_V : V ; -- fun desosegar_V : V ; -- fun desparecer_V : V ; @@ -366,7 +366,7 @@ abstract IrregCatAbs = Cat ** { -- fun desproveer_V : V ; -- fun desquerer_V : V ; -- fun desraizar_V : V ; --- fun desteñir_V : V ; +-- fun desteñir_V : V ; -- fun destentar_V : V ; -- fun desterrar_V : V ; -- fun destituir_V : V ; @@ -485,7 +485,7 @@ abstract IrregCatAbs = Cat ** { -- fun engorar_V : V ; -- fun engrandecer_V : V ; -- fun engravecer_V : V ; --- fun engreír_V : V ; +-- fun engreír_V : V ; -- fun engrosar_V : V ; -- fun engrumecerse_V : V ; -- fun engullir_V : V ; @@ -524,7 +524,7 @@ abstract IrregCatAbs = Cat ** { -- fun ensarmentar_V : V ; -- fun ensarnecer_V : V ; -- fun ensilvecerse_V : V ; --- fun ensoñar_V : V ; +-- fun ensoñar_V : V ; -- fun ensoberbecer_V : V ; -- fun ensolver_V : V ; -- fun ensombrecer_V : V ; @@ -546,7 +546,7 @@ abstract IrregCatAbs = Cat ** { -- fun entrecoger2_V : V ; -- fun entredecir_V : V ; -- fun entrelucir_V : V ; --- fun entreoír_V : V ; +-- fun entreoír_V : V ; -- fun entreparecerse_V : V ; -- fun entrepernar_V : V ; -- fun entretener_V : V ; @@ -584,7 +584,7 @@ abstract IrregCatAbs = Cat ** { fun estar_V : V ; -- fun estatuir_V : V ; -- fun estregar_V : V ; --- fun estreñir_V : V ; +-- fun estreñir_V : V ; -- fun estremecer_V : V ; -- fun europeizar_V : V ; -- fun evanecer_V : V ; @@ -613,21 +613,21 @@ abstract IrregCatAbs = Cat ** { -- fun fotocomponer_V : V ; -- fun frangir_V : V ; -- fun fregar_V : V ; --- fun freír_V : V ; +-- fun freír_V : V ; -- fun fruir_V : V ; -- fun fruncir_V : V ; -- fun frutecer_V : V ; -- fun fulgir_V : V ; -- fun fungir_V : V ; --- fun gañir_V : V ; +-- fun gañir_V : V ; -- fun garantir_V : V ; -- fun gemir_V : V ; -- fun gernir_V : V ; -- fun gobernar_V : V ; -- fun grandisonar_V : V ; --- fun gruñir_V : V ; +-- fun gruñir_V : V ; -- fun gruir_V : V ; --- fun guañir_V : V ; +-- fun guañir_V : V ; -- fun guarecer_V : V ; -- fun guarnecer_V : V ; fun haver_V : V ; @@ -635,7 +635,7 @@ abstract IrregCatAbs = Cat ** { -- fun hacer_V : V ; -- fun hebraizar_V : V ; -- fun heder_V : V ; --- fun heñir_V : V ; +-- fun heñir_V : V ; -- fun helar_V : V ; -- fun henchir_V : V ; -- fun hender_V : V ; @@ -688,7 +688,7 @@ abstract IrregCatAbs = Cat ** { -- fun jimenzar_V : V ; -- fun judaizar_V : V ; -- fun jugar_V : V ; --- fun juñir_V : V ; +-- fun juñir_V : V ; -- fun languidecer_V : V ; -- fun leer_V : V ; -- fun licuefacer_V : V ; @@ -722,7 +722,7 @@ abstract IrregCatAbs = Cat ** { -- fun mostrar_V : V ; -- fun mover_V : V ; -- fun mugir_V : V ; --- fun muñir_V : V ; +-- fun muñir_V : V ; -- fun mullir_V : V ; -- fun nacer_V : V ; -- fun negar_V : V ; @@ -736,7 +736,7 @@ abstract IrregCatAbs = Cat ** { -- fun ofrecer_V : V ; -- fun oler_V : V ; -- fun oponer_V : V ; --- fun oír_V : V ; +-- fun oír_V : V ; -- fun oscurecer_V : V ; -- fun pacer_V : V ; -- fun padecer_V : V ; @@ -756,7 +756,7 @@ abstract IrregCatAbs = Cat ** { -- fun pervertir_V : V ; -- fun pimpollecer_V : V ; -- fun placer_V : V ; --- fun plañir_V : V ; +-- fun plañir_V : V ; -- fun plastecer_V : V ; -- fun plegar_V : V ; -- fun poblar_V : V ; @@ -807,13 +807,13 @@ abstract IrregCatAbs = Cat ** { -- fun reabrir_V : V ; -- fun reaparecer_V : V ; -- fun reapretar_V : V ; --- fun reargüir_V : V ; +-- fun reargüir_V : V ; -- fun reaventar_V : V ; -- fun reblandecer_V : V ; -- fun rebullir_V : V ; -- fun recaer_V : V ; -- fun recalentar_V : V ; --- fun receñir_V : V ; +-- fun receñir_V : V ; -- fun recentar_V : V ; -- fun recluir_V : V ; -- fun recocer_V : V ; @@ -836,7 +836,7 @@ abstract IrregCatAbs = Cat ** { -- fun recostar_V : V ; -- fun recrecer_V : V ; -- fun recrudecer_V : V ; --- fun redargüir_V : V ; +-- fun redargüir_V : V ; -- fun redecir_V : V ; -- fun redescontar_V : V ; -- fun redistribuir_V : V ; @@ -849,15 +849,15 @@ abstract IrregCatAbs = Cat ** { -- fun refluir_V : V ; -- fun reforzar_V : V ; -- fun refregar_V : V ; --- fun refreír_V : V ; +-- fun refreír_V : V ; -- fun refringir_V : V ; -- fun refulgir_V : V ; --- fun regañir_V : V ; +-- fun regañir_V : V ; -- fun regar_V : V ; -- fun regimentar_V : V ; -- fun regir_V : V ; -- fun regoldar_V : V ; --- fun regruñir_V : V ; +-- fun regruñir_V : V ; -- fun reguarnecer_V : V ; -- fun rehacer_V : V ; -- fun rehenchir_V : V ; @@ -868,7 +868,7 @@ abstract IrregCatAbs = Cat ** { -- fun rehuir_V : V ; -- fun rehumedecer_V : V ; -- fun reinscribir_V : V ; --- fun reñir_V : V ; +-- fun reñir_V : V ; -- fun rejuvenecer_V : V ; -- fun releer_V : V ; -- fun relentecer_V : V ; @@ -899,7 +899,7 @@ abstract IrregCatAbs = Cat ** { -- fun requebrar_V : V ; -- fun requerir_V : V ; -- fun rernorder_V : V ; --- fun reír_V : V ; +-- fun reír_V : V ; -- fun resaber_V : V ; -- fun resalir_V : V ; -- fun resarcir_V : V ; @@ -916,16 +916,16 @@ abstract IrregCatAbs = Cat ** { -- fun restablecer_V : V ; -- fun restituir_V : V ; -- fun restregar_V : V ; --- fun restriñir_V : V ; +-- fun restriñir_V : V ; -- fun restringir_V : V ; -- fun resurgir_V : V ; -- fun retallecer_V : V ; --- fun reteñir_V : V ; +-- fun reteñir_V : V ; -- fun retemblar_V : V ; -- fun retener_V : V ; -- fun retentar_V : V ; --- fun retiñir_V : V ; --- fun retoñecer_V : V ; +-- fun retiñir_V : V ; +-- fun retoñecer_V : V ; -- fun retorcer_V : V ; -- fun retostar_V : V ; -- fun retraducir_V : V ; @@ -970,7 +970,7 @@ abstract IrregCatAbs = Cat ** { -- fun serrar_V : V ; -- fun servir_V : V ; fun ser_V : V ; --- fun soñar_V : V ; +-- fun soñar_V : V ; -- fun sobrecalentar_V : V ; -- fun sobrecoger_V : V ; -- fun sobrecoger2_V : V ; @@ -989,13 +989,13 @@ abstract IrregCatAbs = Cat ** { -- fun sobrevestir_V : V ; -- fun sobrevolar_V : V ; -- fun socolar_V : V ; --- fun sofreír_V : V ; +-- fun sofreír_V : V ; -- fun solar_V : V ; -- fun soldar_V : V ; -- fun soler_V : V ; -- fun soltar_V : V ; -- fun sonar_V : V ; --- fun sonreír_V : V ; +-- fun sonreír_V : V ; -- fun sorregar_V : V ; -- fun sosegar_V : V ; -- fun sostener_V : V ; @@ -1023,10 +1023,10 @@ abstract IrregCatAbs = Cat ** { -- fun suscribir_V : V ; -- fun sustituir_V : V ; -- fun sustraer_V : V ; --- fun tañer_V : V ; +-- fun tañer_V : V ; -- fun tallecer_V : V ; -- fun tardecer_V : V ; --- fun teñir_V : V ; +-- fun teñir_V : V ; -- fun telecomponer_V : V ; -- fun teledirigir_V : V ; -- fun temblar_V : V ; @@ -1053,8 +1053,8 @@ abstract IrregCatAbs = Cat ** { -- fun trasfregar_V : V ; -- fun trasgredir_V : V ; -- fun traslucir_V : V ; --- fun trasoñar_V : V ; --- fun trasoír_V : V ; +-- fun trasoñar_V : V ; +-- fun trasoír_V : V ; -- fun trasparecer_V : V ; -- fun trasponer_V : V ; -- fun trastrocar_V : V ; diff --git a/lib/src/catalan/LexiconCat.gf b/lib/src/catalan/LexiconCat.gf index 47a5181e7..173470d95 100644 --- a/lib/src/catalan/LexiconCat.gf +++ b/lib/src/catalan/LexiconCat.gf @@ -1,10 +1,10 @@ --# -path=.:../romance:../common:../abstract:../../prelude ---# -coding=latin1 concrete LexiconCat of Lexicon = CatCat ** open (M=MorphoCat), ParadigmsCat, BeschCat in { flags + coding=utf8 ; optimize=values ; oper @@ -14,14 +14,14 @@ oper saberV : V = verbV (saber_99 "saber") ; lin - airplane_N = regMN "avió" ; + airplane_N = regMN "avió" ; answer_V2S = mkV2S (verbV (compondre_26 "respondre")) dative ; apartment_N = regMN "pis" ; apple_N = regFN "poma" ; art_N = regMN "art" ; ask_V2Q = mkV2Q (mkV "preguntar") dative ; - baby_N = regMN "nadó" ; + baby_N = regMN "nadó" ; bad_A = mkADeg (regA "dolent") (regA "pitjor") ; bank_N = regMN "banc" ; beautiful_A = prefA (regADeg "bell") ; @@ -41,11 +41,11 @@ lin bread_N = irregMN "pa" "pans" ; break_V2 = dirV2 (verbV (trencar_112 "trencar")) ; broad_A = regADeg "ample" ; -- put it in MorphoCat?: like black_A - brother_N2 = deN2 (regMN "germà") ; - brown_A = compADeg (mkA "marró" "marrona" "marrons" "marrones" "marronament") ; + brother_N2 = deN2 (regMN "germà") ; + brown_A = compADeg (mkA "marró" "marrona" "marrons" "marrones" "marronament") ; butter_N = regFN "mantega" ; buy_V2 = dirV2 (mkV "comprar") ; - camera_N = regFN "càmara" ; + camera_N = regFN "càmara" ; cap_N = regFN "gorra" ; car_N = regMN "cotxe" ; carpet_N = regFN "catifa" ; @@ -54,7 +54,7 @@ lin chair_N = regFN "cadira" ; cheese_N = regMN "formatge" ; child_N = regMN "nen" ; -- nena - church_N = regFN "església" ; + church_N = regFN "església" ; city_N = regFN "ciutat" ; clean_A = regADeg "net" ; clever_A = regADeg "inteligent" ; @@ -63,32 +63,32 @@ lin cold_A = regADeg "fred" ; come_V = verbV (venir_117 "venir") ; computer_N = regMN "ordinador" ; - country_N = regMN "país" ; -- masc - cousin_N = regMN "cosí" ; + country_N = regMN "país" ; -- masc + cousin_N = regMN "cosí" ; cow_N = mkN "vaca" ; die_V = verbV (morir_71 "morir") ; dirty_A = regADeg "brut" ; - distance_N3 = mkN3 (regFN "distància") genitive dative ; + distance_N3 = mkN3 (regFN "distància") genitive dative ; doctor_N = regMN "metge" ; -- metgessa dog_N = regMN "gos" ; -- gossa door_N = regFN "porta" ; drink_V2 = dirV2 (verbV (beure_11 "beure")) ; - easy_A2V = mkA2V (regA "fácil") dative genitive ; + easy_A2V = mkA2V (regA "fácil") dative genitive ; eat_V2 = dirV2 (verbV (envejar_48 "menjar")) ; empty_A = compADeg (mkA "buit" "buida" "buits" "buides" "buidament") ; enemy_N = regMN "enemic" ; -- enemiga - factory_N = regFN "fàbrica" ; + factory_N = regFN "fàbrica" ; father_N2 = deN2 (regMN "pare") ; - fear_VS = mkVS (verbV (témer_107 "témer")) ; + fear_VS = mkVS (verbV (témer_107 "témer")) ; find_V2 = dirV2 (mkV "trobar") ; fish_N = regMN "peix" ; - floor_N = regMN "terra" ; -- sòl + floor_N = regMN "terra" ; -- sòl forget_V2 = dirV2 (mkV "oblidar") ; fridge_N = regFN "nevera" ; friend_N = regMN "amic" ; -- amiga fruit_N = regFN "fruita" ; fun_AV = mkAV (regA "divertit") genitive ; - garden_N = regMN "jardí" ; + garden_N = regMN "jardí" ; girl_N = regFN "noia" ; glove_N = regMN "guant" ; gold_N = regMN "or" ; @@ -99,20 +99,20 @@ lin hate_V2 = dirV2 (verbV (canviar_16 "odiar")) ; hat_N = regMN "barret" ; hear_V2 = mkV2 (mkV "escoltar") dative ; -- Must be "oir". Add it to Besch - hill_N = regMN "turó" ; + hill_N = regMN "turó" ; hope_VS = mkVS (mkV "esperar") ; horse_N = regMN "cavall" ; hot_A = regADeg "calent" ; house_N = regFN "casa" ; important_A = regADeg "important" ; - industry_N = regFN "indústria" ; + industry_N = regFN "indústria" ; iron_N = regMN "ferro" ; king_N = regMN "rei" ; know_V2 = dirV2 saberV ; know_VQ = mkVQ saberV; know_VS = mkVS saberV; lake_N = regMN "llac" ; - lamp_N = regFN "làmpada" ; + lamp_N = regFN "làmpada" ; learn_V2 = dirV2 (verbV (aprendre_6 "aprendre")) ; leather_N = regMN "cuiro" ; leave_V2 = dirV2 (mkV "partir") ; @@ -130,10 +130,10 @@ lin moon_N = regFN "lluna" ; mother_N2 = deN2 (regFN "mare") ; -- fem mountain_N = regFN "muntanya" ; - music_N = regFN "música" ; + music_N = regFN "música" ; narrow_A = regADeg "estret" ; new_A = prefixA (compADeg (mkA "nou" "nova" "nous" "noves" "novament")) ; - newspaper_N = regMN "diari" ; -- periòdic + newspaper_N = regMN "diari" ; -- periòdic oil_N = regMN "oli" ; old_A = regADeg "vell" ; open_V2 = dirV2 (verbV (obrir_77 "obrir")) ; @@ -143,26 +143,26 @@ lin peace_N = regFN "pau" ; pen_N = regMN "llapis" ; planet_N = regMN "planeta" ; - plastic_N = regMN "plàstic" ; + plastic_N = regMN "plàstic" ; play_V2 = dirV2 (verbV (pregar_86 "jugar")) ; policeman_N = regMN "policia" ; -- fem refers to the institution - priest_N = regMN "capellà" ; -- masc + priest_N = regMN "capellà" ; -- masc probable_AS = mkAS (regA "probable") ; queen_N = regN "reina" ; - radio_N = regFN "ràdio" ; + radio_N = regFN "ràdio" ; rain_V0 = mkV0 (verbV (moure_72 "ploure")) ; read_V2 = dirV2 (verbV (servir_101 "llegir")) ; red_A = regADeg "vermell" ; - religion_N = mkN "religió" "religions" feminine ; + religion_N = mkN "religió" "religions" feminine ; restaurant_N = regMN "restaurant" ; river_N = regMN "riu" ; rock_N = regFN "roca" ; roof_N = regFN "teulada" ; rubber_N = regFN "goma" ; - run_V = verbV (córrer_30 "córrer") ; + run_V = verbV (córrer_30 "córrer") ; say_VS = mkVS (verbV (dir_41 "dir")) ; school_N = regFN "escola" ; - science_N = regFN "ciència" ; + science_N = regFN "ciència" ; sea_N = regMN "mar" ; -- masc & fem seek_V2 = dirV2 (verbV (trencar_112 "buscar")) ; see_V2 = dirV2 (verbV (veure_118 "veure")) ; @@ -179,14 +179,14 @@ lin sleep_V = verbV (dormir_44 "dormir") ; small_A = prefA (mkA "petit" "petita" "petits" "petites" "petitament") ; snake_N = regFN "serp" ; -- fem - sock_N = regMN "mitjó" ; + sock_N = regMN "mitjó" ; speak_V2 = dirV2 (mkV "parlar") ; star_N = regFN "estrella" ; steel_N = regMN "acer" ; stone_N = regFN "pedra" ; stove_N = regMN "forn" ; student_N = regN "estudiant" ; -- used both for fem & masc - stupid_A = regADeg "estúpid" ; + stupid_A = regADeg "estúpid" ; sun_N = regMN "sol" ; switch8off_V2 = dirV2 (verbV (pregar_86 "apagar")) ; switch8on_V2 = dirV2 (verbV (atendre_8 "encendre")) ; @@ -194,20 +194,20 @@ lin talk_V3 = mkV3 (mkV "parlar") dative genitive ; teacher_N = regMN "mestre" ; -- mestra teach_V2 = dirV2 (mkV "ensenyar") ; - television_N = mkN "televisió" "televisions" feminine ; -- televisor masc + television_N = mkN "televisió" "televisions" feminine ; -- televisor masc thick_A = compADeg (mkA "gruixut" "gruixuda" "gruixuts" "gruixudes" "gruixudament") ; thin_A = compADeg (mkA "fi" "fina" "fins" "fines" "finament") ; train_N = regMN "tren" ; travel_V = verbV (envejar_48 "viatjar") ; tree_N = regMN "arbre" ; - --- trousers_N = regN "pantalón" ; -- masc + --- trousers_N = regN "pantalón" ; -- masc ugly_A = compADeg (mkA "lleig" "lletja" "lletjos" "lletges" "lletjament") ; understand_V2 = dirV2 (verbV (atendre_8 "entendre")) ; university_N = regFN "universitat" ; village_N = regMN "poble" ; wait_V2 = mkV2 (mkV "esperar") dative ; walk_V = mkV "caminar" ; - warm_A = compADeg (mkA "tebi" "tèbia" "tebis" "tèbies" "tèbiament") ; + warm_A = compADeg (mkA "tebi" "tèbia" "tebis" "tèbies" "tèbiament") ; war_N = regFN "guerra" ; watch_V2 = dirV2 (mkV "mirar") ; water_N = regFN "aigua" ; @@ -224,9 +224,9 @@ lin do_V2 = dirV2 (verbV (fer_56 "fer")) ; now_Adv = mkAdv "ara" ; already_Adv = mkAdv "ja" ; - song_N = mkN "cançó" "cançons" feminine ; + song_N = mkN "cançó" "cançons" feminine ; add_V3 = dirV3 (mkV "afegir") dative ; -- also: (mkV "sumar") - number_N = regMN "número" ; + number_N = regMN "número" ; put_V2 = dirV2 (mkV "posar") ; stop_V = mkV "aturar" ; jump_V = mkV "saltar" ; @@ -240,7 +240,7 @@ lin heavy_A = regA "pesat" ; near_A = regA "proper" ; rotten_A = regA "podrit" ; - round_A = regA "rodó" ; + round_A = regA "rodó" ; sharp_A = regA "esmolat" ; -- punxegut smooth_A = regA "llis" ; straight_A = regA "directe" ; @@ -249,12 +249,12 @@ lin animal_N = regMN "animal" ; -- masc (sometimes fem when adj) ashes_N = regMN "cendra" ; back_N = regFN "esquena" ; - bark_N = regFN "escorça" ; + bark_N = regFN "escorça" ; belly_N = regFN "panxa" ; blood_N = regFN "sang" ; bone_N = regMN "os" ; breast_N = regFN "sina" ; -- pit - cloud_N = regMN "núvol" ; + cloud_N = regMN "núvol" ; day_N = regMN "dia" ; dust_N = regFN "pols" ; ear_N = regFN "orella" ; @@ -272,11 +272,11 @@ lin grass_N = regFN "herba" ; guts_N = regMN "budell" ; hair_N = regMN "cabell" ; - hand_N = regFN "mà" ; + hand_N = regFN "mà" ; head_N = regMN "cap" ; heart_N = regMN "cor" ; horn_N = regFN "banya" ; - husband_N = regMN "marit" ; -- espòs + husband_N = regMN "marit" ; -- espòs ice_N = regMN "gel" ; knee_N = regMN "genoll" ; leaf_N = regFN "fulla" ; @@ -300,7 +300,7 @@ lin sky_N = regMN "cel" ; smoke_N = regMN "fum" ; snow_N = regFN "neu" ; -- fem - stick_N = regMN "bastó" ; + stick_N = regMN "bastó" ; tail_N = regFN "cua" ; tongue_N = regFN "llengua" ; tooth_N = regFN "dent" ; @@ -316,7 +316,7 @@ lin cut_V2 = dirV2 (mkV "tallar") ; dig_V = mkV "cavar" ; fall_V = verbV (caure_18 "caure") ; - fear_V2 = dirV2 (verbV (témer_107 "témer")) ; + fear_V2 = dirV2 (verbV (témer_107 "témer")) ; fight_V2 = dirV2 (mkV "lluitar") ; float_V = mkV "surar" ; flow_V = verbV (reduir_94 "fluir") ; -- also: mkV "circular" @@ -325,13 +325,13 @@ lin give_V3 = dirdirV3 (verbV (donar_43 "donar")) ; hit_V2 = dirV2 (verbV (trencar_112 "picar")) ; hold_V2 = dirV2 (verbV (obtenir_78 "sostenir")) ; - hunt_V2 = dirV2 (verbV (començar_22 "caçar")) ; + hunt_V2 = dirV2 (verbV (començar_22 "caçar")) ; kill_V2 = dirV2 (mkV "matar") ; laugh_V = verbV (riure_96 "riure") ; lie_V = reflV (verbV (jeure_62 "jeure")) ; play_V = verbV (pregar_86 "jugar") ; pull_V2 = dirV2 (mkV "tibar") ; - push_V2 = dirV2 (verbV (atènyer_59 "empènyer")) ; + push_V2 = dirV2 (verbV (atènyer_59 "empènyer")) ; rub_V2 = dirV2 (verbV (pregar_86 "refregar")) ; scratch_V2 = dirV2 (mkV "gratar") ; sew_V = verbV (cosir_31 "cosir") ; @@ -347,7 +347,7 @@ lin swell_V = mkV "inflar" ; swim_V = mkV "nedar" ; think_V = mkV "pensar" ; - throw_V2 = dirV2 (verbV (començar_22 "llençar")) ; + throw_V2 = dirV2 (verbV (començar_22 "llençar")) ; tie_V2 = dirV2 (verbV (pregar_86 "lligar")) ; turn_V = mkV "girar" ; vomit_V = mkV "vomitar" ; @@ -357,12 +357,12 @@ lin john_PN = mkPN "Joan" masculine ; today_Adv = mkAdv "avui" ; - grammar_N = regFN "gramàtica" ; + grammar_N = regFN "gramàtica" ; language_N = regFN "llengua" ; rule_N = regFN "regla" ; question_N = regFN "pregunta" ; ready_A = regA "preparat" ; - reason_N = regFN "raó" ; + reason_N = regFN "raó" ; uncertain_A = regA "incert" ; diff --git a/lib/src/catalan/NumeralCat.gf b/lib/src/catalan/NumeralCat.gf index 684e2d6b0..8c339a837 100644 --- a/lib/src/catalan/NumeralCat.gf +++ b/lib/src/catalan/NumeralCat.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 concrete NumeralCat of Numeral = CatCat [Numeral,Digits] ** open CommonRomance, ResRomance, MorphoCat, Prelude in { + flags coding=utf8 ; -- -- gcc M3.5.1, M3.5.2 -- @@ -38,7 +38,7 @@ oper cardOrdReg : CardOrd -> Str -> Str -> Str = \co,sis,si -> case co of { NCard _ => sis ; - NOrd Masc Sg => si + "è" ; + NOrd Masc Sg => si + "è" ; NOrd Fem Sg => si + "ena" ; NOrd Masc Pl => si + "ens" ; NOrd Fem Pl => si + "enes" @@ -55,7 +55,7 @@ oper cardOrd3 : CardOrd -> (m,f:Str) -> Str = \co,dos,dues -> case co of { NCard Masc => dos ; NCard Fem => dues ; - NOrd Masc Sg => dos + "è" ; + NOrd Masc Sg => dos + "è" ; NOrd Fem Sg => dos + "ena" ; NOrd Masc Pl => dos + "ens" ; NOrd Fem Pl => dos + "enes" diff --git a/lib/src/catalan/ParadigmsCat.gf b/lib/src/catalan/ParadigmsCat.gf index debbd2537..347db18bd 100644 --- a/lib/src/catalan/ParadigmsCat.gf +++ b/lib/src/catalan/ParadigmsCat.gf @@ -1,5 +1,4 @@ --# -path=.:../romance:../common:../abstract:../../prelude ---# -coding=latin1 --1 Catalan Lexical Paradigms -- @@ -35,7 +34,7 @@ resource ParadigmsCat = flags optimize=all ; - -- coding = utf8 ; + coding = utf8 ; --2 Parameters -- @@ -93,11 +92,11 @@ oper --3 Compound nouns -- -- Some nouns are ones where the first part is inflected as a noun but --- the second part is not inflected. e.g. "número de telèfon". +-- the second part is not inflected. e.g. "número de telèfon". -- They could be formed in syntax, but we give a shortcut here since -- they are frequent in lexica. - compN : N -> Str -> N ; -- compound, e.g. "número" + "de telèfon" + compN : N -> Str -> N ; -- compound, e.g. "número" + "de telèfon" --3 Relational nouns @@ -112,9 +111,9 @@ oper deN2 : N -> N2 ; -- relation with genitive aN2 : N -> N2 ; -- relation with dative --- Three-place relational nouns ("la connexió de x a y") need two prepositions. +-- Three-place relational nouns ("la connexió de x a y") need two prepositions. - mkN3 : N -> Prep -> Prep -> N3 ; -- e.g. connexió + genitive + dative + mkN3 : N -> Prep -> Prep -> N3 ; -- e.g. connexió + genitive + dative --3 Relational common noun phrases @@ -194,7 +193,7 @@ oper mkV : overload { --- Regular verbs are ones inflected like "cantar", "perdre", "tÈmer", "perdre", "servir", "dormir" +-- Regular verbs are ones inflected like "cantar", "perdre", "tÈmer", "perdre", "servir", "dormir" -- The regular verb function works for models I, IIa, IIb and IIa -- The module $BeschCat$ gives the complete set of "Bescherelle" conjugations. @@ -332,7 +331,7 @@ oper {s = table {Posit => a.s ! Posit ; _ => b.s ! Posit} ; isPre = a.isPre ; lock_A = <>} ; compADeg a = - {s = table {Posit => a.s ! Posit ; _ => \\f => "més" ++ a.s ! Posit ! f} ; + {s = table {Posit => a.s ! Posit ; _ => \\f => "més" ++ a.s ! Posit ! f} ; isPre = a.isPre ; lock_A = <>} ; regADeg a = compADeg (regA a) ; @@ -341,18 +340,18 @@ oper mkAdV x = ss x ** {lock_AdV = <>} ; mkAdA x = ss x ** {lock_AdA = <>} ; - regV x = -- cantar, perdre, témer, dormir + regV x = -- cantar, perdre, témer, dormir case (Predef.dp 3 x) of { --regular changes in stem "iar" => canviar_16 x ; --esglaiar with non-smart paradigm "jar" => envejar_48 x ; - "çar" => començar_22 x ; + "çar" => començar_22 x ; "gir" => fugir_58 x ; "ure" => beure_11 x ; - "xer" => créixer_33 x ; --conèixer,aparèixer with regAltV + "xer" => créixer_33 x ; --conèixer,aparèixer with regAltV _ + "re" => perdre_83 x ; - _ + "er" => verbEr x ; --handles accents in infinitives and c/ç, g/j + _ + "er" => verbEr x ; --handles accents in infinitives and c/ç, g/j _ + "ir" => dormir_44 x ; --inchoative verbs with regAltV _ + "ur" => dur_45 x ; _ => cantar_15 x } ; @@ -372,7 +371,7 @@ oper <_+"re",_+"ig"> => veure_118 x ; <_+"ar",_+"ig"> => anar_4 x ; - <"xer" ,_+ "c"> => conèixer_27 x ; --créixer, merèixer with regV + <"xer" ,_+ "c"> => conèixer_27 x ; --créixer, merèixer with regV <_+"er",_+ "c"> => valer_114 x ; <_+"re",_+ "c"> => doldre_42 x ; --participles of type dolgut --for absolt, pres, ... use mk3V @@ -398,19 +397,19 @@ oper <"rir", _+"ixo",_+"rt"> => cobrir_20 x ; --cob|rir cob|ert <_+"ir",_+"ixo",_+"rt"> => complir_25 x ; --compl|ir compl|ert - <_+"ir",_+"ixo",_+"ït"> => lluir_64 x ; --lluir lluïm lluït + <_+"ir",_+"ixo",_+"ït"> => lluir_64 x ; --lluir lluïm lluït <"dre",_,"nut"> => vendre_116 x ; <_+"re",_+"c",_+"t"> => absoldre_1 x ; --c in sgP1 and subj, not in part <_+"re",_,_+"es"> => prendre_87 x ; - <_+"re",_,_+"ès"> => atendre_8 x ; + <_+"re",_,_+"ès"> => atendre_8 x ; <_+"re",_,_+"as"> => raure_91 x ; - <_+"re",_,_+"às"> => romandre_97 x ; + <_+"re",_,_+"às"> => romandre_97 x ; <_+"re",_,_+"os"> => cloure_19 x ; - <_+"re",_,_+"ós"> => confondre_28 x ; - <_+"re",_,_+"òs"> => recloure_93 x ; + <_+"re",_,_+"ós"> => confondre_28 x ; + <_+"re",_,_+"òs"> => recloure_93 x ; <_,_,_> => regAltV x y } ; diff --git a/lib/src/chinese/ConstructionChi.gf b/lib/src/chinese/ConstructionChi.gf index 15704fd70..07bda5a39 100644 --- a/lib/src/chinese/ConstructionChi.gf +++ b/lib/src/chinese/ConstructionChi.gf @@ -2,6 +2,7 @@ concrete ConstructionChi of Construction = CatChi ** open SyntaxChi, ParadigmsChi, (L = LexiconChi), (E = ExtraChi), (G = GrammarChi), (R = ResChi), Prelude in { +flags coding=utf8 ; lin diff --git a/lib/src/chinese/QuestionChi.gf b/lib/src/chinese/QuestionChi.gf index 0575b3af3..3c473fe17 100644 --- a/lib/src/chinese/QuestionChi.gf +++ b/lib/src/chinese/QuestionChi.gf @@ -2,6 +2,7 @@ concrete QuestionChi of Question = CatChi ** open ResChi, Prelude in { flags optimize=all_subs ; + flags coding=utf8 ; lin diff --git a/lib/src/danish/DiffDan.gf b/lib/src/danish/DiffDan.gf index daf6157a2..8d2ba40f9 100644 --- a/lib/src/danish/DiffDan.gf +++ b/lib/src/danish/DiffDan.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 instance DiffDan of DiffScand = open CommonScand, Prelude in { + flags coding=utf8 ; -- Parameters. @@ -40,7 +40,7 @@ instance DiffDan of DiffScand = open CommonScand, Prelude in { mkVerb9 "have" "har" "hav" "havde" "haft" "haven" "havet" "havne" "havende" ** {part = [] ; isVaere = False} ; verbBe = - mkVerb9 "være" "er" "var" "var" "været" "væren" "været" "værne" "værende" ** + mkVerb9 "være" "er" "var" "var" "været" "væren" "været" "værne" "værende" ** {part = [] ; isVaere = False} ; verbBecome = mkVerb9 "blive" "bliver" "bliv" "blev" "blevet" @@ -69,7 +69,7 @@ instance DiffDan of DiffScand = open CommonScand, Prelude in { RPrep _ => gennumForms "hvilken" "hvilket" "hvilke" ! gennum g n } ; - pronSuch = gennumForms "sådan" "sådant" "sådanne" ; + pronSuch = gennumForms "sÃ¥dan" "sÃ¥dant" "sÃ¥danne" ; reflPron : Agr -> Str = \a -> case of { => "os" ; diff --git a/lib/src/danish/IdiomDan.gf b/lib/src/danish/IdiomDan.gf index ec4f9521a..c3c77bdc1 100644 --- a/lib/src/danish/IdiomDan.gf +++ b/lib/src/danish/IdiomDan.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 concrete IdiomDan of Idiom = CatDan ** open MorphoDan, ParadigmsDan, IrregDan, Prelude in { flags optimize=all_subs ; + coding=utf8 ; lin ImpersCl vp = mkClause "det" (agrP3 MorphoDan.neutrum Sg) vp ; @@ -31,7 +31,7 @@ concrete IdiomDan of Idiom = CatDan ** } ; ProgrVP vp = - insertObj (\\a => ["ved å"] ++ infVP vp a) (predV verbBe) ; + insertObj (\\a => ["ved Ã¥"] ++ infVP vp a) (predV verbBe) ; ImpPl1 vp = {s = ["lad os"] ++ infVP vp {g = Utr ; n = Pl ; p = P1}} ; diff --git a/lib/src/danish/IrregDan.gf b/lib/src/danish/IrregDan.gf index bd6ff6bc6..baf2bda90 100644 --- a/lib/src/danish/IrregDan.gf +++ b/lib/src/danish/IrregDan.gf @@ -1,38 +1,38 @@ --# -path=.:../scandinavian:../common:../abstract:../../prelude ---# -coding=latin1 -- http://users.cybercity.dk/~nmb3879/danishgram3.html concrete IrregDan of IrregDanAbs = CatDan ** open Prelude, ParadigmsDan in { flags optimize=values ; + coding=utf8 ; lin - bære_V = irregV "bære" "bar" "båret" ; + bære_V = irregV "bære" "bar" "bÃ¥ret" ; bede_V = mkV "bede" "beder" "bedes" "bad" "bedt" "bed" ; bide_V = irregV "bite" "bed" "bidt" ; binde_V = irregV "binde" "bandt" "bundet" ; blive_V = irregV "blive" "blev" "blevet" ; - brænde_V = irregV "brænde" "brandt" "brændt" ;-- + brænde_V = irregV "brænde" "brandt" "brændt" ;-- bringe_V = irregV "bringe" "bragte" "bragt" ; burde_V = irregV "burde" "burde" "burdet" ;-- - dø_V = irregV "dø" "døde" "død" ; + dø_V = irregV "dø" "døde" "død" ; drage_V = irregV "drage" "drog" "draget" ; drikke_V = irregV "drikke" "drak" "drukket" ; drive_V = irregV "drive" "drev" "drevet" ; falde_V = irregV "falde" "faldt" "faldet" ;----er - få_V = irregV "få" "fik" "fået" ; + fÃ¥_V = irregV "fÃ¥" "fik" "fÃ¥et" ; finde_V = irregV "finde" "fandt" "fundet" ; - flyde_V = irregV "flyde" "flød" "flydt" ; - flyve_V = irregV "flyve" "fløj" "fløjet" ; + flyde_V = irregV "flyde" "flød" "flydt" ; + flyve_V = irregV "flyve" "fløj" "fløjet" ; forlade_V = irregV "forlade" "forlod" "forladet" ; - forstå_V = irregV "forstå" "forstod" "forstået" ; - fryse_V = irregV "fryse" "frøs" "frosset" ; - gå_V = irregV "gå" "gik" "gået" ;----er + forstÃ¥_V = irregV "forstÃ¥" "forstod" "forstÃ¥et" ; + fryse_V = irregV "fryse" "frøs" "frosset" ; + gÃ¥_V = irregV "gÃ¥" "gik" "gÃ¥et" ;----er give_V = irregV "give" "gav" "givet" ; gnide_V = irregV "gnide" "gned" "gnidd" ;-- - gøre_V = irregV "gøre" "gjorde" "gjort" ; + gøre_V = irregV "gøre" "gjorde" "gjort" ; have_V = mkV "have" "har" "havde" "haft" "havd" "hav" ; hede_V = mkV "hede" "hed" "hedes" "hedde" "hett" "hed" ; ---- hente_V = irregV "hente" "hentet" "hendt" ;-- @@ -41,31 +41,31 @@ concrete IrregDan of IrregDanAbs = CatDan ** open Prelude, ParadigmsDan in { komme_V = irregV "komme" "kom" "kommet" ; kunne_V = irregV "kunne" "kunne" "kunnet" ; lade_V = irregV "lade" "lod" "ladet" ; - lægge_V = irregV "lægge" "lagde" "lagt" ; + lægge_V = irregV "lægge" "lagde" "lagt" ; le_V = irregV "le" "lo" "leet" ; - ligge_V = irregV "ligge" "lå" "ligget" ; - løbe_V = irregV "løbe" "løb" "løbet" ; - måtte_V = irregV "måtte" "måtte" "måttet" ; + ligge_V = irregV "ligge" "lÃ¥" "ligget" ; + løbe_V = irregV "løbe" "løb" "løbet" ; + mÃ¥tte_V = irregV "mÃ¥tte" "mÃ¥tte" "mÃ¥ttet" ; renne_V = irregV "renne" "rant" "rent" ;-- - sælge_V = irregV "sælge" "solgte" "solgt" ; - sætte_V = irregV "sætte" "satte" "sat" ; - se_V = irregV "se" "så" "set" ; + sælge_V = irregV "sælge" "solgte" "solgt" ; + sætte_V = irregV "sætte" "satte" "sat" ; + se_V = irregV "se" "sÃ¥" "set" ; sidde_V = irregV "sidde" "sad" "siddet" ; sige_V = irregV "sige" "sagde" "sagt" ; - skære_V = irregV "skære" "skar" "skåret" ;-- + skære_V = irregV "skære" "skar" "skÃ¥ret" ;-- skrive_V = irregV "skrive" "skrev" "skrevet" ; skulle_V = irregV "skulle" "skulle" "skullet" ; - slå_V = irregV "slå" "slog" "slått" ;-- + slÃ¥_V = irregV "slÃ¥" "slog" "slÃ¥tt" ;-- sove_V = irregV "sove" "sov" "sovet" ; - spørge_V = irregV "spørge" "spurgte" "spurgt" ; + spørge_V = irregV "spørge" "spurgte" "spurgt" ; springe_V = irregV "springe" "sprang" "sprunget" ;-- - stå_V = irregV "stå" "stod" "stået" ; + stÃ¥_V = irregV "stÃ¥" "stod" "stÃ¥et" ; stikke_V = irregV "stikke" "stakk" "stukket" ;-- synge_V = irregV "synge" "sang" "sunget" ;-- tage_V = irregV "tage" "tog" "taget" ; -- treffe_V = irregV "treffe" "traff" "truffet" ;-- -- trives_V = irregV "trives" "trivdes" (variants {"trives" ;-- "trivs"}) ;-- - tælle_V = irregV "tælle" "talte" "talt" ; + tælle_V = irregV "tælle" "talte" "talt" ; vide_V = mkV "vide" "ved" "vedes" "vidste" "vidst" "ved" ; ---- } diff --git a/lib/src/danish/IrregDanAbs.gf b/lib/src/danish/IrregDanAbs.gf index e86a44b92..1e75f61a7 100644 --- a/lib/src/danish/IrregDanAbs.gf +++ b/lib/src/danish/IrregDanAbs.gf @@ -1,33 +1,33 @@ ---# -coding=latin1 abstract IrregDanAbs = Cat ** { + flags coding=utf8 ; fun - bære_V : V ; + bære_V : V ; bede_V : V ; bide_V : V ; binde_V : V ; blive_V : V ; - brænde_V : V ; + brænde_V : V ; bringe_V : V ; burde_V : V ; - dø_V : V ; + dø_V : V ; drage_V : V ; drikke_V : V ; drive_V : V ; falde_V : V ; - få_V : V ; + fÃ¥_V : V ; finde_V : V ; flyde_V : V ; flyve_V : V ; forlade_V : V ; - forstå_V : V ; + forstÃ¥_V : V ; fryse_V : V ; - gå_V : V ; + gÃ¥_V : V ; give_V : V ; -- gjelde_V : V ; gnide_V : V ; - gøre_V : V ; + gøre_V : V ; have_V : V ; hente_V : V ; hede_V : V ; @@ -36,29 +36,29 @@ abstract IrregDanAbs = Cat ** { komme_V : V ; kunne_V : V ; lade_V : V ; - lægge_V : V ; + lægge_V : V ; le_V : V ; ligge_V : V ; - løbe_V : V ; - måtte_V : V ; + løbe_V : V ; + mÃ¥tte_V : V ; renne_V : V ; - sælge_V : V ; - sætte_V : V ; + sælge_V : V ; + sætte_V : V ; se_V : V ; sidde_V : V ; sige_V : V ; - skære_V : V ; + skære_V : V ; skrive_V : V ; skulle_V : V ; - slå_V : V ; + slÃ¥_V : V ; sove_V : V ; - spørge_V : V ; + spørge_V : V ; springe_V : V ; - stå_V : V ; + stÃ¥_V : V ; stikke_V : V ; synge_V : V ; tage_V : V ; - tælle_V : V ; + tælle_V : V ; -- treffe_V : V ; -- trives_V : V ; vide_V : V ; diff --git a/lib/src/danish/LexiconDan.gf b/lib/src/danish/LexiconDan.gf index 86caba1a8..b789e64b6 100644 --- a/lib/src/danish/LexiconDan.gf +++ b/lib/src/danish/LexiconDan.gf @@ -1,53 +1,53 @@ --# -path=.:../scandinavian:../common:../abstract:../../prelude ---# -coding=latin1 concrete LexiconDan of Lexicon = CatDan ** open Prelude, ParadigmsDan, IrregDan in { flags startcat=Phr ; lexer=textlit ; unlexer=text ; + coding=utf8 ; optimize=values ; lin airplane_N = mk2N "fly" "flyet" ; answer_V2S = mkV2S (regV "svare") (mkPrep "til") ; - apartment_N = mk2N "værelse" "værelsen" ; - apple_N = mk3N "æble" "æblet" "æbler" ; + apartment_N = mk2N "værelse" "værelsen" ; + apple_N = mk3N "æble" "æblet" "æbler" ; art_N = mk2N "kunst" "kunsten" ; - ask_V2Q = mkV2Q spørge_V noPrep ; + ask_V2Q = mkV2Q spørge_V noPrep ; baby_N = mk2N "baby" "babyen" ; ---- babyen - bad_A = regADeg "dårlig" ; ---- + bad_A = regADeg "dÃ¥rlig" ; ---- bank_N = mk2N "bank" "banken" ; beautiful_A = mk3ADeg "smuk" "smukt" "smukke" ; ---- become_VA = mkVA blive_V ; - beer_N = mk2N "øl" "ølet" ; + beer_N = mk2N "øl" "ølet" ; beg_V2V = mkV2V bede_V noPrep (mkPrep "at") ; - big_A = irregADeg "stor" "større" "størst"; + big_A = irregADeg "stor" "større" "størst"; bike_N = mkN "cykel" "cykeln" "cykler" "cyklerne" ; ---- bird_N = mk2N "fugl" "fuglen" ; black_A = mk2ADeg "sort" "sort" ; - blue_A = mk2ADeg "blå" "blått"; - boat_N = mk3N "båd" "båden" "både" ; - book_N = mkN "bog" "bogen" "bøger" "bøgene" ; - boot_N = mkN "støvle" "støvlen" "støvler" "støvlerne" ; + blue_A = mk2ADeg "blÃ¥" "blÃ¥tt"; + boat_N = mk3N "bÃ¥d" "bÃ¥den" "bÃ¥de" ; + book_N = mkN "bog" "bogen" "bøger" "bøgene" ; + boot_N = mkN "støvle" "støvlen" "støvler" "støvlerne" ; boss_N = mk2N "chef" "chefen" ; boy_N = mk2N "dreng" "drengen" ; - bread_N = mk2N "brød" "brødet" ; + bread_N = mk2N "brød" "brødet" ; break_V2 = dirV2 (mk2V "knuse" "knuste") ; broad_A = regADeg "bred" ; - brother_N2 = mkN2 (mk3N "broder" "brodren" "brødre") (mkPrep "til") ; ---- + brother_N2 = mkN2 (mk3N "broder" "brodren" "brødre") (mkPrep "til") ; ---- brown_A = regADeg "brun" ; - butter_N = mk2N "smør" "smøret" ; - buy_V2 = dirV2 (mk2V "købe" "købte") ; ---- + butter_N = mk2N "smør" "smøret" ; + buy_V2 = dirV2 (mk2V "købe" "købte") ; ---- camera_N = mk2N "kamera" "kameraen" ; ---- cap_N = mk2N "hue" "huen" ; car_N = mk2N "bil" "bilen" ; - carpet_N = mk2N "tæppe" "tæppen" ; + carpet_N = mk2N "tæppe" "tæppen" ; cat_N = mk3N "kat" "katten" "katte" ; ceiling_N = mk2N "loft" "loftet" ; chair_N = mk3N "stol" "stolen" "stole" ; cheese_N = mk2N "ost" "osten" ; - child_N = mk3N "barn" "barnet" "børn" ; ---- + child_N = mk3N "barn" "barnet" "børn" ; ---- church_N = mk2N "kirke" "kirken" ; city_N = mk2N "by" "byen" ; clean_A = regADeg "ren" ; @@ -58,27 +58,27 @@ lin come_V = vaereV komme_V ; computer_N = mk2N "datamaskine" "datamaskinen" ; country_N = mk2N "land" "landet" ; - cousin_N = mk3N "fætter" "fættren" "fættre" ; ---- + cousin_N = mk3N "fætter" "fættren" "fættre" ; ---- cow_N = mk2N "ku" "kuen" ; ---- - die_V = vaereV dø_V ; + die_V = vaereV dø_V ; dirty_A = regADeg "smudsig" ; ---- distance_N3 = mkN3 (regGenN "afstand" utrum) (mkPrep "fra") (mkPrep "til") ; - doctor_N = mk2N "læge" "lægen" ; + doctor_N = mk2N "læge" "lægen" ; dog_N = mk2N "hund" "hunden" ; - door_N = mk2N "dør" "døren" ; + door_N = mk2N "dør" "døren" ; drink_V2 = dirV2 drikke_V ; easy_A2V = mkA2V (regA "nem") (mkPrep "for") ; ---- eat_V2 = dirV2 (mk2V "spise" "spiste") ; - empty_A = mkADeg "tøm" "tømt" "tømme" "tømmere" "tømmest" ; ---- + empty_A = mkADeg "tøm" "tømt" "tømme" "tømmere" "tømmest" ; ---- enemy_N = mk2N "fjende" "fjenden" ; factory_N = mk2N "fabrik" "fabriken" ; - father_N2 = mkN2 ( (mk3N "far" "fadren" "fædre")) (mkPrep "til") ; ---- + father_N2 = mkN2 ( (mk3N "far" "fadren" "fædre")) (mkPrep "til") ; ---- fear_VS = mkVS (regV "frygte") ; find_V2 = dirV2 (irregV "finde" "fand" "fundet") ; ---- fish_N = mk2N "fisk" "fisken" ; floor_N = mk2N "gulv" "gulvet" ; forget_V2 = dirV2 (mkV "glemme" "glemmer" "glemmes" "glemte" "glemt" "glem") ; ---- - fridge_N = mk2N "køleskab" "køleskabet" ; + fridge_N = mk2N "køleskab" "køleskabet" ; friend_N = mk3N "ven" "vennen" "venner" ; ---- fruit_N = mk2N "frugt" "frugten" ; fun_AV = mkAV (mkA "morsom" "morsomt" "morsomme") ; ---- @@ -87,14 +87,14 @@ lin glove_N = mk2N "handske" "handsken" ; gold_N = mk2N "guld" "guldet" ; good_A = mkADeg "god" "godt" "gode" "bedre" "bedst" ; ---- - go_V = vaereV gå_V ; - green_A = mk3ADeg "grøn" "grønt" "grønne" ; + go_V = vaereV gÃ¥_V ; + green_A = mk3ADeg "grøn" "grønt" "grønne" ; harbour_N = mk2N "havn" "havnen" ; hate_V2 = dirV2 (regV "hade") ; hat_N = mk3N "hat" "hatten" "hatte" ; - hear_V2 = dirV2 (mk2V "høre" "hørte") ; - hill_N = mk2N "høj" "højen" ; - hope_VS = mkVS (regV "håbe") ; + hear_V2 = dirV2 (mk2V "høre" "hørte") ; + hill_N = mk2N "høj" "højen" ; + hope_VS = mkVS (regV "hÃ¥be") ; horse_N = mk3N "hest" "hesten" "heste" ; hot_A = regADeg "hed" ; house_N = mk3N "hus" "huset" "huse" ; @@ -106,32 +106,32 @@ lin know_V2 = dirV2 (mkV "kende" "kendte") ; know_VQ = mkVQ vide_V ; know_VS = mkVS vide_V ; - lake_N = mk2N "sø" "søen" ; + lake_N = mk2N "sø" "søen" ; lamp_N = mk2N "lampe" "lampen" ; - learn_V2 = dirV2 (mk2V "lære" "lærte") ; - leather_N = mk2N "læder" "lædret" ; + learn_V2 = dirV2 (mk2V "lære" "lærte") ; + leather_N = mk2N "læder" "lædret" ; leave_V2 = dirV2 forlade_V ; like_V2 = mkV2 holde_V (mkPrep "af") ; listen_V2 = dirV2 (regV "lytte") ; live_V = mk2V "leve" "levde" ; - long_A = irregADeg "lang" "længere" "længst" ; ---- + long_A = irregADeg "lang" "længere" "længst" ; ---- lose_V2 = dirV2 (regV "tabe") ; - love_N = mk2N "kærlighed" "kærligheden" ; + love_N = mk2N "kærlighed" "kærligheden" ; love_V2 = dirV2 (regV "elske") ; - man_N = mkN "mand" "manden" "mænd" "mændene" ; + man_N = mkN "mand" "manden" "mænd" "mændene" ; married_A2 = mkA2 (mk2A "gift" "gift") (mkPrep "med") ; - meat_N = mk2N "kød" "kødet" ; - milk_N = mk2N "mælk" "mælken" ; - moon_N = mk2N "måne" "månen" ; - mother_N2 = mkN2 (mkN "moder" "moderen" "mødre" "mødrene") (mkPrep "til") ; ---- + meat_N = mk2N "kød" "kødet" ; + milk_N = mk2N "mælk" "mælken" ; + moon_N = mk2N "mÃ¥ne" "mÃ¥nen" ; + mother_N2 = mkN2 (mkN "moder" "moderen" "mødre" "mødrene") (mkPrep "til") ; ---- mountain_N = mk2N "bjerg" "bjerget" ; music_N = mk2N "musik" "musiken" ; narrow_A = regADeg "smal" ; new_A = mkADeg "ny" "nytt" "nye" "nyere" "nyest" ; newspaper_N = mk2N "avis" "avisen" ; oil_N = mk2N "olie" "olien" ; - old_A = mkADeg "gammel" "gammelt" "gamle" "ældre" "ældst" ; ---- - open_V2 = dirV2 (regV "åbne") ; + old_A = mkADeg "gammel" "gammelt" "gamle" "ældre" "ældst" ; ---- + open_V2 = dirV2 (regV "Ã¥bne") ; paint_V2A = mkV2A (regV "male") noPrep ; paper_N = mk2N "papir" "papiret" ; paris_PN = mkPN "Paris" neutrum ; @@ -141,43 +141,43 @@ lin plastic_N = mk2N "plast" "plasten" ; play_V2 = dirV2 (mk2V "spille" "spilte") ; policeman_N = mk2N "politibetjent" "politibetjenten" ; ---- - priest_N = mk2N "præst" "præsten" ; + priest_N = mk2N "præst" "præsten" ; probable_AS = mkAS (regA "sandsynlig") ; queen_N = mk2N "dronning" "dronningen" ; radio_N = mk2N "radio" "radioen" ; rain_V0 = mkV0 (regV "regne") ; - read_V2 = dirV2 (mk2V "læse" "læste") ; - red_A = regADeg "rød" ; + read_V2 = dirV2 (mk2V "læse" "læste") ; + red_A = regADeg "rød" ; religion_N = mk2N "religion" "religionen" ; restaurant_N = mk2N "restaurant" "restauranten" ; river_N = mk2N "flod" "floden" ; rock_N = mk2N "sten" "stenen" ; roof_N = mk2N "tag" "taget" ; rubber_N = mk2N "gummi" "gummien" ; - run_V = vaereV (regV "løbe") ; + run_V = vaereV (regV "løbe") ; say_VS = mkVS sige_V ; school_N = mk2N "skole" "skolen" ; science_N = mk2N "videnskab" "videnskaben" ; sea_N = mk2N "hav" "havet" ; see_V2 = dirV2 se_V ; - seek_V2 = mkV2 (mk2V "søge" "søgte") (mkPrep "efter") ; - sell_V3 = dirV3 sælge_V (mkPrep "til") ; + seek_V2 = mkV2 (mk2V "søge" "søgte") (mkPrep "efter") ; + sell_V3 = dirV3 sælge_V (mkPrep "til") ; send_V3 = dirV3 (mk2V "sende" "sendte") (mkPrep "til") ; - sheep_N = mk2N "får" "fåret" ; + sheep_N = mk2N "fÃ¥r" "fÃ¥ret" ; ship_N = mk2N "skib" "skibet" ; shirt_N = mk2N "skjorte" "skjorten" ; shoe_N = mk2N "sko" "skoen" ; shop_N = mk2N "butik" "butiken" ; short_A = regADeg "kort" ; - silver_N = mk2N "sølv" "sølvet"; - sister_N = mk3N "søster" "søstren" "søstrer" ; ---- + silver_N = mk2N "sølv" "sølvet"; + sister_N = mk3N "søster" "søstren" "søstrer" ; ---- sleep_V = sove_V ; - small_A = mkADeg "lille" "lille" "små" "mindre" "mindst" ; ---- + small_A = mkADeg "lille" "lille" "smÃ¥" "mindre" "mindst" ; ---- snake_N = mk2N "slange" "slangen" ; sock_N = mk2N "sok" "sokken" ; speak_V2 = dirV2 (regV "tale") ; ---- star_N = mk2N "stjerne" "stjernen" ; - steel_N = mk2N "stål" "stålet" ; + steel_N = mk2N "stÃ¥l" "stÃ¥let" ; stone_N = mk2N "sten" "stenen" ; stove_N = mk2N "komfur" "komfuren" ; student_N = mk2N "student" "studenten" ; @@ -187,24 +187,24 @@ lin switch8on_V2 = dirV2 (partV (regV "lukke") "op") ; table_N = mk2N "bord" "bordet" ; talk_V3 = mkV3 (regV "tale") (mkPrep "til") (mkPrep "om") ; - teacher_N = mkN "lærer" "læreren" "lærere" "lærerne" ; + teacher_N = mkN "lærer" "læreren" "lærere" "lærerne" ; teach_V2 = dirV2 (mk2V "undervise" "underviste") ; television_N = mk2N "fjernsyn" "fjernsynet" ; thick_A = mk3ADeg "tyk" "tykt" "tykke" ; thin_A = mk2ADeg "tynd" "tyndt" ; ---- train_N = mk2N "tog" "toget" ; travel_V = vaereV (mk2V "rejse" "rejste") ; - tree_N = mkN "træ" "træet" "træer" "træene" ; ---- + tree_N = mkN "træ" "træet" "træer" "træene" ; ---- ---- trousers_N = regGenN "trousers" ; ---- pl t ! ugly_A = mk3ADeg "grim" "grimt" "grimme" ; - understand_V2 = dirV2 (irregV "forstå" "forstod" "forstått") ; + understand_V2 = dirV2 (irregV "forstÃ¥" "forstod" "forstÃ¥tt") ; university_N = mk2N "universitet" "universitetet" ; village_N = mk2N "landsby" "landsbyen" ; - wait_V2 = mkV2 (regV "vente") (mkPrep "på") ; - walk_V = vaereV gå_V ; + wait_V2 = mkV2 (regV "vente") (mkPrep "pÃ¥") ; + walk_V = vaereV gÃ¥_V ; warm_A = regADeg "varm" ; war_N = mk2N "krig" "krigen" ; - watch_V2 = mkV2 se_V (mkPrep "på") ; + watch_V2 = mkV2 se_V (mkPrep "pÃ¥") ; water_N = mk2N "vand" "vandet" ; white_A = regADeg "hvid" ; window_N = mkN "vindue" "vinduet" "vinduer" "vinduene" ; ---- er? @@ -212,36 +212,36 @@ lin win_V2 = dirV2 (irregV "vinde" "vand" "vundet") ; woman_N = mk2N "kvinde" "kvinden" ; wonder_VQ = mkVQ (depV (regV "undre")) ; - wood_N = mkN "træ" "træet" "træer" "træene" ; ---- + wood_N = mkN "træ" "træet" "træer" "træene" ; ---- write_V2 = dirV2 (irregV "skrive" "skrev" "skrevet") ; yellow_A = regADeg "gul" ; young_A = irregADeg "ung" "yngre" "yngst" ; ---- - do_V2 = dirV2 gøre_V ; + do_V2 = dirV2 gøre_V ; now_Adv = mkAdv "nu" ; already_Adv = mkAdv "allerede" ; song_N = mk2N "sang" "sangen" ; - add_V3 = mkV3 (regV "tilføje") noPrep (mkPrep "til") ; ---- + add_V3 = mkV3 (regV "tilføje") noPrep (mkPrep "til") ; ---- number_N = mk2N "nummer" "numret" ; ---- - put_V2 = dirV2 sætte_V ; + put_V2 = dirV2 sætte_V ; stop_V = vaereV (regV "standse") ; jump_V = regV "hoppe" ; left_Ord = {s = "venstre" ; isDet = True} ; - right_Ord = {s = "højre" ; isDet = True} ; + right_Ord = {s = "højre" ; isDet = True} ; far_Adv = mkAdv "fjern" ; correct_A = regA "rigtig" ; - dry_A = mk3ADeg "tør" "tørt" "tørre" ; - dull_A = regA "sløv" ; + dry_A = mk3ADeg "tør" "tørt" "tørre" ; + dull_A = regA "sløv" ; full_A = regA "fuld" ; heavy_A = irregADeg "tung" "tyngre" "tyngst" ; - near_A = mkADeg "nære" "nære" "nære" "nærmere" "nærmest" ; - rotten_A = mk3ADeg "rådden" "råddent" "rådne" ; ---- + near_A = mkADeg "nære" "nære" "nære" "nærmere" "nærmest" ; + rotten_A = mk3ADeg "rÃ¥dden" "rÃ¥ddent" "rÃ¥dne" ; ---- round_A = regA "rund" ; sharp_A = regA "skarp" ; - smooth_A = regA "jævn" ; + smooth_A = regA "jævn" ; straight_A = mk3ADeg "ret" "rett" "rette" ; ---- - wet_A = regA "våd" ; + wet_A = regA "vÃ¥d" ; wide_A = regA "bred" ; animal_N = mk2N "dyr" "dyret" ; ashes_N = mk2N "aske" "asken" ; @@ -253,81 +253,81 @@ lin breast_N = mk2N "bryst" "brystet" ; cloud_N = mk2N "sky" "skyen" ; day_N = mk3N "dag" "dagen" "dage" ; - dust_N = mk2N "støv" "støvet" ; - ear_N = mk3N "øre" "øret" "ører" ; + dust_N = mk2N "støv" "støvet" ; + ear_N = mk3N "øre" "øret" "ører" ; earth_N = mk2N "jord" "jorden" ; - egg_N = mk2N "æg" "æget" ; - eye_N = mk3N "øje" "øjet" "øjne" ; + egg_N = mk2N "æg" "æget" ; + eye_N = mk3N "øje" "øjet" "øjne" ; fat_N = mk2N "fedt" "fedtet" ; feather_N = mk2N "fjer" "fjeren" ; fingernail_N = mk2N "negl" "neglen" ; fire_N = mk2N "ild" "ilden" ; flower_N = mk2N "blomst" "blomsten" ; - fog_N = mk2N "tåge" "tågen" ; - foot_N = mk2N "fod" "føder" ; ---- + fog_N = mk2N "tÃ¥ge" "tÃ¥gen" ; + foot_N = mk2N "fod" "føder" ; ---- forest_N = mk2N "skov" "skoven" ; - grass_N = mk2N "græs" "græset" ; + grass_N = mk2N "græs" "græset" ; guts_N = mk2N "tarm" "tarmen" ; ---- indvolde - hair_N = mk2N "hår" "håret" ; - hand_N = mk2N "hånd" "hånden" ; + hair_N = mk2N "hÃ¥r" "hÃ¥ret" ; + hand_N = mk2N "hÃ¥nd" "hÃ¥nden" ; head_N = mk2N "hoved" "hovedet" ; heart_N = mk3N "hjerte" "hjertet" "hjerter" ; horn_N = mk2N "horn" "hornet" ; - husband_N = mk2N "ægtefælle" "ægtefællen" ; ---- + husband_N = mk2N "ægtefælle" "ægtefællen" ; ---- ice_N = mk2N "is" "isen" ; - knee_N = mkN "knæ" "knæt" "knær" "knæne" ; ---- - leaf_N = mk2N "løv" "løvet" ; + knee_N = mkN "knæ" "knæt" "knær" "knæne" ; ---- + leaf_N = mk2N "løv" "løvet" ; leg_N = mk2N "ben" "benet" ; liver_N = mkN "lever" "leveren" "levrer" "levrene" ; ---- louse_N = mk3N "lus" "lusen" "lus" ; mouth_N = mk2N "mund" "munden" ; name_N = mk2N "navn" "navnet" ; neck_N = mk2N "hals" "halsen" ; - night_N = mk3N "nat" "natten" "nætter" ; ---- - nose_N = mk2N "næse" "næsen" ; + night_N = mk3N "nat" "natten" "nætter" ; ---- + nose_N = mk2N "næse" "næsen" ; person_N = mk2N "person" "personen" ; rain_N = mk2N "regn" "regnet" ; road_N = mk2N "vej" "vejen" ; - root_N = mk3N "rod" "roden" "røder" ; ---- + root_N = mk3N "rod" "roden" "røder" ; ---- rope_N = mk2N "reb" "rebet" ; salt_N = mk2N "salt" "saltet" ; sand_N = mk2N "sand" "sanden" ; - seed_N = mk2N "frø" "frøet" ; + seed_N = mk2N "frø" "frøet" ; skin_N = mk2N "skind" "skindet" ; sky_N = mk3N "himmel" "himlen" "himler" ; ---- - smoke_N = mk2N "røg" "røgen" ; - snow_N = mk2N "snø" "snøen" ; + smoke_N = mk2N "røg" "røgen" ; + snow_N = mk2N "snø" "snøen" ; stick_N = mk2N "pind" "pinden" ; tail_N = mk2N "hale" "halen" ; tongue_N = mk2N "tunge" "tungen" ; - tooth_N = mkN "tand" "tanden" "tænder" "tændene" ; ---- + tooth_N = mkN "tand" "tanden" "tænder" "tændene" ; ---- wife_N = mk2N "kone" "konen" ; wind_N = mk2N "vind" "vinden" ; wing_N = mk2N "vinge" "vingen" ; worm_N = mk2N "orm" "ormen" ; - year_N = mk2N "år" "året" ; + year_N = mk2N "Ã¥r" "Ã¥ret" ; bite_V2 = dirV2 bide_V ; - blow_V = mk2V "blæse" "blæste" ; - burn_V = brænde_V ; - count_V2 = dirV2 tælle_V ; - cut_V2 = dirV2 (skære_V) ; + blow_V = mk2V "blæse" "blæste" ; + burn_V = brænde_V ; + count_V2 = dirV2 tælle_V ; + cut_V2 = dirV2 (skære_V) ; dig_V = mk2V "grave" "gravde" ; fall_V = vaereV falde_V ; fear_V2 = dirV2 (regV "frygte") ; - fight_V2 = dirV2 (regV "kæmpe") ; + fight_V2 = dirV2 (regV "kæmpe") ; float_V = flyde_V ; - flow_V = regV "strømme" ; + flow_V = regV "strømme" ; fly_V = vaereV flyve_V ; freeze_V = fryse_V ; give_V3 = dirV3 give_V (mkPrep "til"); - hit_V2 = dirV2 (slå_V) ; + hit_V2 = dirV2 (slÃ¥_V) ; hold_V2 = dirV2 (holde_V) ; hunt_V2 = dirV2 (regV "jage") ; - kill_V2 = dirV2 (regV "dræbe") ; + kill_V2 = dirV2 (regV "dræbe") ; laugh_V = le_V ; lie_V = ligge_V ; play_V = regV "spille" ; - pull_V2 = dirV2 (regV "trække") ; + pull_V2 = dirV2 (regV "trække") ; push_V2 = dirV2 (regV "skubbe") ; rub_V2 = dirV2 (gnide_V) ; scratch_V2 = dirV2 (regV "kradse") ; @@ -339,29 +339,29 @@ lin split_V2 = dirV2 (regV "splitte") ; ---- squeeze_V2 = dirV2 (regV "presse") ; stab_V2 = dirV2 (stikke_V) ; - stand_V = vaereV stå_V ; + stand_V = vaereV stÃ¥_V ; suck_V2 = dirV2 (regV "sutte") ; ---- swell_V = regV "svulme" ; - swim_V = regV "svømme" ; - think_V = mk2V "tænke" "tænkte" ; ---- + swim_V = regV "svømme" ; + think_V = mk2V "tænke" "tænkte" ; ---- throw_V2 = dirV2 (regV "kaste") ; tie_V2 = dirV2 binde_V ; turn_V = regV "dreje" ; vomit_V = partV (regV "kaste") "op" ; wash_V2 = dirV2 (regV "vaske") ; wipe_V2 = dirV2 (regV "viske") ; - breathe_V = regV "ånde" ; + breathe_V = regV "Ã¥nde" ; grammar_N = regN "grammatik" ; language_N = mk2N "sprog" "sproget" ; rule_N = mkN "regel" "regeln" "regler" "reglerne" ; - question_N = mk2N "spørgsmål" "spørgsmålet" ; + question_N = mk2N "spørgsmÃ¥l" "spørgsmÃ¥let" ; ----- ready_A = regA "färdig" ; +---- ready_A = regA "färdig" ; ---- reason_N = regN "anledning" ; today_Adv = mkAdv "idag" ; ----- uncertain_A = mk3A "osäker" "osäkert" "osäkra" ; +---- uncertain_A = mk3A "osäker" "osäkert" "osäkra" ; } ; diff --git a/lib/src/danish/MorphoDan.gf b/lib/src/danish/MorphoDan.gf index 89db624dc..faea2b30e 100644 --- a/lib/src/danish/MorphoDan.gf +++ b/lib/src/danish/MorphoDan.gf @@ -1,4 +1,3 @@ ---# -coding=latin1 --1 A Simple Danish Resource Morphology -- -- Aarne Ranta 2002 @@ -10,7 +9,7 @@ -- We use the parameter types and word classes defined for morphology. resource MorphoDan = CommonScand, ResDan ** open Prelude, Predef in { - + flags coding=utf8 ; oper -- type synonyms @@ -153,9 +152,9 @@ oper mkTal : (x1,_,_,_,x5 : Str) -> LinDigit = - \två, tolv, tjugo, andra, tyvende -> + \tvÃ¥, tolv, tjugo, andra, tyvende -> {s = table { - ental => cardOrd två andra ; + ental => cardOrd tvÃ¥ andra ; ton => cardReg tolv ; tiotal => cardOrd tjugo tyvende } diff --git a/lib/src/danish/NumeralDan.gf b/lib/src/danish/NumeralDan.gf index 5d13c277c..05587f294 100644 --- a/lib/src/danish/NumeralDan.gf +++ b/lib/src/danish/NumeralDan.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 concrete NumeralDan of Numeral = CatDan ** open MorphoDan in { + flags coding=utf8 ; -- AR 12/10/2002 following www.geocities.com/tsca.geo/dansk/dknummer.html @@ -24,7 +24,7 @@ lin n9 = mkTal "ni" "nitten" "halvfems" "niende" "halvfemsindstyvende" ; pot01 = { s = \\f => table { NCard g => case g of {Neutr => "et" ; _ => "en"} ; - _ => "første" + _ => "første" } ; n = Sg } ; diff --git a/lib/src/danish/ParadigmsDan.gf b/lib/src/danish/ParadigmsDan.gf index a8e54e90f..28b4bd293 100644 --- a/lib/src/danish/ParadigmsDan.gf +++ b/lib/src/danish/ParadigmsDan.gf @@ -1,5 +1,4 @@ --# -path=.:../scandinavian:../common:../abstract:../../prelude ---# -coding=latin1 --1 Danish Lexical Paradigms -- @@ -33,6 +32,7 @@ resource ParadigmsDan = ResDan, MorphoDan, CatDan in { + flags coding=utf8 ; --2 Parameters -- @@ -213,11 +213,11 @@ oper ---3 Verbs with 'være' as auxiliary +--3 Verbs with 'være' as auxiliary -- --- By default, the auxiliary is "have". This function changes it to "være". +-- By default, the auxiliary is "have". This function changes it to "være". - vaereV : V -> V ; -- force auxiliary "være" + vaereV : V -> V ; -- force auxiliary "være" diff --git a/lib/src/danish/StructuralDan.gf b/lib/src/danish/StructuralDan.gf index dfe579829..64438e161 100644 --- a/lib/src/danish/StructuralDan.gf +++ b/lib/src/danish/StructuralDan.gf @@ -1,23 +1,23 @@ ---# -coding=latin1 concrete StructuralDan of Structural = CatDan ** open MorphoDan, ParadigmsDan, (X = ConstructX), IrregDan, Prelude in { flags optimize=all ; + coding=utf8 ; lin above_Prep = ss "ovenfor" ; after_Prep = ss "efter" ; by8agent_Prep = ss "af" ; all_Predet = {s = detForms "all" "alt" "alle" ; p = [] ; a = PNoAg} ; - almost_AdA, almost_AdN = ss "næsten" ; + almost_AdA, almost_AdN = ss "næsten" ; although_Subj = ss ["selv om"] ; always_AdV = ss "altid" ; and_Conj = {s1 = [] ; s2 = "og" ; n = Pl} ; because_Subj = ss "fordi" ; - before_Prep = ss "før" ; + before_Prep = ss "før" ; behind_Prep = ss "bag" ; between_Prep = ss "mellem" ; - both7and_DConj = sd2 "både" "og" ** {n = Pl} ; + both7and_DConj = sd2 "bÃ¥de" "og" ** {n = Pl} ; but_PConj = ss "men" ; by8means_Prep = ss "med" ; can8know_VV, can_VV = @@ -29,8 +29,8 @@ concrete StructuralDan of Structural = CatDan ** every_Det = {s = \\_,_ => "hver" ; sp = \\_,_ => "enhver" ; n = Sg ; det = DDef Indef} ; everything_NP = regNP "alt" "alts" Neutr Sg ; everywhere_Adv = ss "overalt" ; - few_Det = {s,sp = \\_,_ => "få" ; n = Pl ; det = DDef Indef} ; ---- first_Ord = {s = "første" ; isDet = True} ; + few_Det = {s,sp = \\_,_ => "fÃ¥" ; n = Pl ; det = DDef Indef} ; +--- first_Ord = {s = "første" ; isDet = True} ; for_Prep = ss "for" ; from_Prep = ss "fra" ; he_Pron = MorphoDan.mkNP "han" "ham" "hans" "hans" "hans" Utr Sg P3 ; @@ -51,10 +51,10 @@ concrete StructuralDan of Structural = CatDan ** most_Predet = {s = detForms ["den meste"] ["det meste"] ["de fleste"] ; p = [] ; a = PNoAg} ; much_Det = {s,sp = \\_,_ => "meget" ; n = Pl ; det = DDef Indef} ; must_VV = - mkV "måtte" "må" "må" "måtte" "måttet" "mått" ** + mkV "mÃ¥tte" "mÃ¥" "mÃ¥" "mÃ¥tte" "mÃ¥ttet" "mÃ¥tt" ** {c2 = mkComplement [] ; lock_VV = <>} ; no_Utt = ss ["nej"] ; - on_Prep = ss "på" ; + on_Prep = ss "pÃ¥" ; only_Predet = {s = \\_,_ => "kun" ; p = [] ; a = PNoAg} ; or_Conj = {s1 = [] ; s2 = "eller" ; n = Pl} ; otherwise_PConj = ss "anderledes" ; @@ -63,7 +63,7 @@ concrete StructuralDan of Structural = CatDan ** possess_Prep = ss "af" ; quite_Adv = ss "temmelig" ; she_Pron = MorphoDan.mkNP "hun" "hende" "hendes" "hendes" "hendes" Utr Sg P3 ; - so_AdA = ss "så" ; + so_AdA = ss "sÃ¥" ; someSg_Det = {s,sp = \\_ => genderForms "nogen" "noget" ; n = Sg ; det = DIndef} ; somePl_Det = {s,sp = \\_,_ => "nogle" ; n = Pl ; det = DIndef} ; somebody_NP = regNP "nogen" "nogens" Utr Sg ; @@ -99,8 +99,8 @@ concrete StructuralDan of Structural = CatDan ** we_Pron = MorphoDan.mkNP "vi" "os" "vores" "vores" "vores" Utr Pl P1 ; whatSg_IP = {s = \\_ => "hvad" ; g = Utr ; n = Sg} ; ---- infl whatPl_IP = {s = \\_ => "hvilke" ; g = Utr ; n = Pl} ; ---- infl - when_IAdv = ss "hvornår" ; - when_Subj = ss "når" ; + when_IAdv = ss "hvornÃ¥r" ; + when_Subj = ss "nÃ¥r" ; where_IAdv = ss "hvor" ; which_IQuant = { s = table { diff --git a/lib/src/dutch/ExtraDut.gf b/lib/src/dutch/ExtraDut.gf index e88a7efda..5eb90ded1 100644 --- a/lib/src/dutch/ExtraDut.gf +++ b/lib/src/dutch/ExtraDut.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 concrete ExtraDut of ExtraDutAbs = CatDut ** open ResDut, MorphoDut, Coordination, Prelude, IrregDut, (P = ParadigmsDut) in { + flags coding=utf8 ; lincat VPI = {s : Bool => Str} ; @@ -32,7 +32,7 @@ concrete ExtraDut of ExtraDutAbs = CatDut ** -- -- TImpfSubj = {s = [] ; t = Past ; m = MConjunct} ; --# notpresent -- --- moegen_VV = auxVV mögen_V ; +-- moegen_VV = auxVV mögen_V ; -- --} @@ -59,7 +59,7 @@ lin let verb = vpi.s ! o ! agr in case o of { Main => subj ++ verb ; - Inv => verb ++ subj ; ---- älskar henne och sover jag + Inv => verb ++ subj ; ---- älskar henne och sover jag Sub => subj ++ verb } } ; diff --git a/lib/src/dutch/IrregDutAbs.gf b/lib/src/dutch/IrregDutAbs.gf index b44a1820a..488034724 100644 --- a/lib/src/dutch/IrregDutAbs.gf +++ b/lib/src/dutch/IrregDutAbs.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 abstract IrregDutAbs = Cat ** { + flags coding=utf8 ; fun bakken_V : V ; -- to fry fun bannen_V : V ; -- to ban @@ -158,7 +158,7 @@ fun vouwen_V : V ; -- to fold fun vragen_V : V ; -- to ask fun vreten_V : V ; -- to eat, to devour fun vriezen_V : V ; -- to freeze ("it's freezing") -fun vrijen_V : V ; -- vreeën / vrijden gevreeën / gevrijd to make love +fun vrijen_V : V ; -- vreeën / vrijden gevreeën / gevrijd to make love fun wassen_V : V ; -- to wash fun wegen_V : V ; -- to weigh fun werpen_V : V ; -- to throw diff --git a/lib/src/dutch/LexiconDut.gf b/lib/src/dutch/LexiconDut.gf index a70bcea9a..bb6821770 100644 --- a/lib/src/dutch/LexiconDut.gf +++ b/lib/src/dutch/LexiconDut.gf @@ -1,5 +1,4 @@ --# -path=.:../common:../abstract:../../prelude ---# -coding=latin1 -- work by Aarne Ranta @@ -7,6 +6,7 @@ concrete LexiconDut of Lexicon = CatDut ** open Prelude, ParadigmsDut, IrregDut in { flags + coding=utf8 ; optimize=all_subs ; lin @@ -183,7 +183,7 @@ hunt_V2 = mkV2 "jagen" ; husband_N = mkN "man" utrum ; ice_N = mkN "ijs" neuter ; important_A = mkA "belangrijk" ; -industry_N = mkN "industrie" "industrieën" utrum ; +industry_N = mkN "industrie" "industrieën" utrum ; iron_N = mkN "ijzer" neuter ; jump_V = springen_V ; kill_V2 = mkV2 "dooden" ; diff --git a/lib/src/dutch/MorphoDut.gf b/lib/src/dutch/MorphoDut.gf index 6e20492e3..3894a6577 100644 --- a/lib/src/dutch/MorphoDut.gf +++ b/lib/src/dutch/MorphoDut.gf @@ -1,9 +1,8 @@ --# -path=.:../common:../../prelude ---# -coding=latin1 -- ----1 A Simple Dutman Resource Morphology ---- ----- Aarne Ranta & Harald Hammarström 2002 -- 2006 +---- Aarne Ranta & Harald Hammarström 2002 -- 2006 ---- ---- This resource morphology contains definitions needed in the resource ---- syntax. To build a lexicon, it is better to use $ParadigmsDut$, which @@ -11,6 +10,7 @@ -- resource MorphoDut = ResDut ** open Prelude, (Predef=Predef) in { +flags coding=utf8 ; --{ -- -- flags optimize=all ; @@ -36,7 +36,7 @@ resource MorphoDut = ResDut ** open Prelude, (Predef=Predef) in -- -- genitS : Str -> Str = \hund -> case hund of { -- _ + ("el" | "en" | "er") => hund + "s" ; --- _ + ("s" | "ß" | "sch" | "st" | "x" | "z") => hund + "es" ; +-- _ + ("s" | "ß" | "sch" | "st" | "x" | "z") => hund + "es" ; -- _ => hund + variants {"s" ; "es"} -- } ; -- pluralN : Str -> Str = \hund -> case hund of { @@ -52,14 +52,14 @@ resource MorphoDut = ResDut ** open Prelude, (Predef=Predef) in ---- Duden, p. 119 -- -- verbT : Str -> Str = \v -> case v of { --- _ + ("t" | "d") => v + "et" ; -- gründen, reden, betten +-- _ + ("t" | "d") => v + "et" ; -- gründen, reden, betten -- _ + ("ch" | "k" | "p" | "t" | "g" | "b" | "d" | "f" | "s") + --- ("m" | "n") => v + "et" ; -- atmen, widmen, öffnen, rechnen --- _ => v + "t" -- lernen, lärmen, qualmen etc +-- ("m" | "n") => v + "et" ; -- atmen, widmen, öffnen, rechnen +-- _ => v + "t" -- lernen, lärmen, qualmen etc -- } ; -- -- verbST : Str -> Str = \v -> case v of { --- _ + ("s" | "ss" | "ß" | "sch" | "x" | "z") => v + "t" ; +-- _ + ("s" | "ss" | "ß" | "sch" | "x" | "z") => v + "t" ; -- _ => v + "st" -- } ; -- diff --git a/lib/src/dutch/NumeralDut.gf b/lib/src/dutch/NumeralDut.gf index 0e82726d3..4ff540569 100644 --- a/lib/src/dutch/NumeralDut.gf +++ b/lib/src/dutch/NumeralDut.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 concrete NumeralDut of Numeral = CatDut [Numeral,Digits] ** open ResDut, Prelude in { flags optimize = all_subs ; + coding=utf8 ; lincat Digit = {s : DForm => CardOrd => Str ; en : Str} ; @@ -23,7 +23,7 @@ lin pot01 = { s = \\f => table { - NCard g _ => "een" ; ---- "één" ; + NCard g _ => "een" ; ---- "één" ; NOrd af => (regAdjective "eerst").s ! Posit ! af } ; n = Sg ; @@ -102,7 +102,7 @@ lin DTeen => cardOrd dreizehn (dreizehn + "de") ; DTen => cardOrd dreissig (dreissig + "ste") } ; - en = case drei of {_ + "e" => "ën" ; _ => "en"} + en = case drei of {_ + "e" => "ën" ; _ => "en"} } ; invNum : CardOrd = NCard Utr Nom ; diff --git a/lib/src/dutch/ResDut.gf b/lib/src/dutch/ResDut.gf index 5e28b5edf..ee9942905 100644 --- a/lib/src/dutch/ResDut.gf +++ b/lib/src/dutch/ResDut.gf @@ -1,5 +1,4 @@ --# -path=.:../abstract:../common ---# -coding=latin1 --1 Dutch auxiliary operations. -- @@ -8,6 +7,7 @@ resource ResDut = ParamX ** open Prelude, Predef in { flags optimize=all ; + coding=utf8 ; --2 For $Noun$ @@ -33,7 +33,7 @@ resource ResDut = ParamX ** open Prelude, Predef in { } ; regNoun : Str -> Noun = \s -> case s of { - _ + ("a" | "o" | "y" | "u" | "oe" | "é") => mkNoun s (s + "'s") Utr ; + _ + ("a" | "o" | "y" | "u" | "oe" | "é") => mkNoun s (s + "'s") Utr ; _ + ("oir" | "ion" | "je") => mkNoun s (s + "s") Neutr ; ? + ? + ? + _ + ("el" | "em" | "en" | "er" | "erd" | "aar" | "aard" | "ie") => -- unstressed @@ -41,7 +41,7 @@ resource ResDut = ParamX ** open Prelude, Predef in { _ + ("i"|"u") => mkNoun s (endCons s + "en") Utr ; b + v@("aa"|"ee"|"oo"|"uu") + c@? => mkNoun s (b + shortVoc v c + "en") Utr ; b + ("ei"|"eu"|"oe"|"ou"|"ie"|"ij"|"ui") + ? => mkNoun s (endCons s + "en") Utr ; - _ + "ie" => mkNoun s (s + "ën") Utr ; + _ + "ie" => mkNoun s (s + "ën") Utr ; b + v@("a"|"e"|"i"|"o"|"u" ) + c@? => mkNoun s (b + v + c + c + "en") Utr ; _ => mkNoun s (endCons s + "en") Utr } ; diff --git a/lib/src/estonian/ExtraEstAbs.gf b/lib/src/estonian/ExtraEstAbs.gf index 0f16b97bb..ffe4946c5 100644 --- a/lib/src/estonian/ExtraEstAbs.gf +++ b/lib/src/estonian/ExtraEstAbs.gf @@ -1,27 +1,27 @@ ---# -coding=latin1 abstract ExtraEstAbs = Extra [ GenNP, VPI,ListVPI,BaseVPI,ConsVPI,MkVPI,ComplVPIVV,ConjVPI, VPS,ListVPS,BaseVPS,ConsVPS,ConjVPS,MkVPS,PredVPS,ConjVPS,Tense,Temp,Pol,S, VV,VP,Conj,NP,Quant,IAdv,IComp,ICompAP,IAdvAdv,Adv,AP, Pron, ProDrop] ** { + flags coding=utf8 ; fun GenCN : NP -> CN -> CN ; -- auton merkki AdvExistNP : Adv -> NP -> Cl ; -- kuvassa olemme me AdvPredNP : Adv -> V -> NP -> Cl ; -- kuvassa hymyilee Veikko - ICompExistNP : IComp -> NP -> QCl ; -- missä/kuka on Veikko - IAdvPredNP : IAdv -> V -> NP -> QCl ; -- mistä alkaa Ruotsi + ICompExistNP : IComp -> NP -> QCl ; -- missä/kuka on Veikko + IAdvPredNP : IAdv -> V -> NP -> QCl ; -- mistä alkaa Ruotsi RelExistNP : Prep -> RP -> NP -> RCl ; -- jossa on jazzia --- i_implicPron : Pron ; -- (minä), minut, ... +-- i_implicPron : Pron ; -- (minä), minut, ... whatPart_IP : IP ; PartCN : CN -> NP ; -- olutta - vai_Conj : Conj ; -- minä vai sinä? ("or" in question) + vai_Conj : Conj ; -- minä vai sinä? ("or" in question) --Short forms of the pronouns ma_Pron : Pron ; @@ -41,12 +41,12 @@ abstract ExtraEstAbs = Extra [ Part ; -- discourse particle fun - S_SVO : Part -> Temp -> Pol -> ClPlus -> S ; -- mepäs juomme maitoa nyt + S_SVO : Part -> Temp -> Pol -> ClPlus -> S ; -- mepäs juomme maitoa nyt S_OSV : Part -> Temp -> Pol -> ClPlusObj -> S ; -- maitoapas me juomme nyt S_VSO : Part -> Temp -> Pol -> ClPlus -> S ; -- juommepas me maitoa nyt - S_ASV : Part -> Temp -> Pol -> ClPlusAdv -> S ; -- nytpäs me juomme maitoa + S_ASV : Part -> Temp -> Pol -> ClPlusAdv -> S ; -- nytpäs me juomme maitoa --- S_SOV : Part -> Temp -> Pol -> ClPlus -> S ; -- mepäs maitoa juomme +-- S_SOV : Part -> Temp -> Pol -> ClPlus -> S ; -- mepäs maitoa juomme S_OVS : Part -> Temp -> Pol -> ClPlus -> S ; -- maitoapas juomme me -- S_VOS : Part -> Temp -> Pol -> ClPlus -> S ; -- juommepas maitoa me diff --git a/lib/src/finnish/AdjectiveFin.gf b/lib/src/finnish/AdjectiveFin.gf index eb435b068..da60745b1 100644 --- a/lib/src/finnish/AdjectiveFin.gf +++ b/lib/src/finnish/AdjectiveFin.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 concrete AdjectiveFin of Adjective = CatFin ** open ResFin, StemFin, Prelude in { flags optimize=all_subs ; -- gfc size from 2864336 to 6786 - i.e. factor 422 + coding=utf8 ; lin @@ -12,7 +12,7 @@ concrete AdjectiveFin of Adjective = CatFin ** open ResFin, StemFin, Prelude in let acomp = (snoun2nounSep {s = \\f => a.s ! Compar ! sAN f ; h = a.h}).s in { s = \\isMod,af => case isMod of { True => np.s ! NPCase Part ++ acomp ! af ; -- minua isompi - _ => acomp ! af ++ "kuin" ++ np.s ! NPCase Nom -- isompi kuin minä + _ => acomp ! af ++ "kuin" ++ np.s ! NPCase Nom -- isompi kuin minä } } ; CAdvAP ad ap np = { diff --git a/lib/src/finnish/AdverbFin.gf b/lib/src/finnish/AdverbFin.gf index fdde5155e..bf1eb0bca 100644 --- a/lib/src/finnish/AdverbFin.gf +++ b/lib/src/finnish/AdverbFin.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 concrete AdverbFin of Adverb = CatFin ** open ResFin, Prelude, StemFin in { + flags coding=utf8 ; lin PositAdvAdj a = {s = a.s ! Posit ! sAAdv} ; @@ -14,7 +14,7 @@ concrete AdverbFin of Adverb = CatFin ** open ResFin, Prelude, StemFin in { AdAdv = cc2 ; - PositAdAAdj a = {s = sANGen (a.s ! Posit)} ; -- älyttömän + PositAdAAdj a = {s = sANGen (a.s ! Posit)} ; -- älyttömän SubjS = cc2 ; ----b AdvSC s = s ; diff --git a/lib/src/finnish/CatFin.gf b/lib/src/finnish/CatFin.gf index 054e47de5..3607e78e5 100644 --- a/lib/src/finnish/CatFin.gf +++ b/lib/src/finnish/CatFin.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 concrete CatFin of Cat = CommonX ** open ResFin, StemFin, Prelude in { flags optimize=all_subs ; + coding=utf8 ; lincat @@ -40,7 +40,7 @@ concrete CatFin of Cat = CommonX ** open ResFin, StemFin, Prelude in { -- Adjective -- The $Bool$ tells whether usage is modifying (as opposed to --- predicative), e.g. "x on suurempi kuin y" vs. "y:tä suurempi luku". +-- predicative), e.g. "x on suurempi kuin y" vs. "y:tä suurempi luku". AP = {s : Bool => NForm => Str} ; @@ -53,13 +53,13 @@ concrete CatFin of Cat = CommonX ** open ResFin, StemFin, Prelude in { NP = {s : NPForm => Str ; a : Agr ; isPron : Bool ; isNeg : Bool} ; Det = { s1 : Case => Str ; -- minun kolme - s2 : Harmony => Str ; -- -ni (Front for -nsä, Back for -nsa) + s2 : Harmony => Str ; -- -ni (Front for -nsä, Back for -nsa) sp : Case => Str ; -- se (substantival form) n : Number ; -- Pl (agreement feature for verb) isNum : Bool ; -- True (a numeral is present) isPoss : Bool ; -- True (a possessive suffix is present) isDef : Bool ; -- True (verb agrees in Pl, Nom is not Part) - isNeg : Bool -- False (only True for "mikään", "kukaan") + isNeg : Bool -- False (only True for "mikään", "kukaan") } ; ---- QuantSg, QuantPl = {s1 : Case => Str ; s2 : Str ; isPoss, isDef : Bool} ; Ord = {s : NForm => Str} ; diff --git a/lib/src/finnish/ConstructionFin.gf b/lib/src/finnish/ConstructionFin.gf index 629e0dddb..412af667e 100644 --- a/lib/src/finnish/ConstructionFin.gf +++ b/lib/src/finnish/ConstructionFin.gf @@ -2,6 +2,7 @@ concrete ConstructionFin of Construction = CatFin ** open SyntaxFin, SymbolicFin, ParadigmsFin, (L = LexiconFin), (E = ExtraFin), (R = ResFin), Prelude in { +flags coding=utf8 ; lin hungry_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsFin.mkN "nälkä"))) ; diff --git a/lib/src/finnish/ExtraFin.gf b/lib/src/finnish/ExtraFin.gf index 5e00b914f..d9d5cc464 100644 --- a/lib/src/finnish/ExtraFin.gf +++ b/lib/src/finnish/ExtraFin.gf @@ -1,13 +1,13 @@ --# -path=.:abstract:common:prelude ---# -coding=latin1 concrete ExtraFin of ExtraFinAbs = CatFin ** open ResFin, MorphoFin, Coordination, Prelude, NounFin, VerbFin, StructuralFin, StemFin, (R = ParamX) in { + flags coding=utf8 ; lin GenNP np = { s1,sp = \\_,_ => np.s ! NPCase Gen ; - s2 = case np.isPron of { -- "isän auto", "hänen autonsa" + s2 = case np.isPron of { -- "isän auto", "hänen autonsa" True => table {Front => BIND ++ possSuffixFront np.a ; Back => BIND ++ possSuffix np.a } ; False => \\_ => [] @@ -50,8 +50,8 @@ concrete ExtraFin of ExtraFinAbs = CatFin ** [VPS] = { s1,s2 : Agr => Str ; - sc : SubjCase ; --- take the first: minä osaan kutoa ja täytyy virkata - h : Harmony --- take the first: osaanko minä kutoa ja käyn koulua + sc : SubjCase ; --- take the first: minä osaan kutoa ja täytyy virkata + h : Harmony --- take the first: osaanko minä kutoa ja käyn koulua } ; lin @@ -120,7 +120,7 @@ concrete ExtraFin of ExtraFinAbs = CatFin ** -- i_implicPron = mkPronoun [] "minun" "minua" "minuna" "minuun" Sg P1 ; whatPart_IP = { s = table { - NPCase Nom | NPAcc => "mitä" ; + NPCase Nom | NPAcc => "mitä" ; c => whatSg_IP.s ! c } ; n = Sg @@ -150,7 +150,7 @@ concrete ExtraFin of ExtraFinAbs = CatFin ** let n = complNumAgr agr ; c = case n of { - Sg => Nom ; -- minä olen iso ; te olette iso + Sg => Nom ; -- minä olen iso ; te olette iso Pl => ResFin.Part -- me olemme isoja ; te olette isoja } --- definiteness of NP ? in "kuinka" ++ ap.s ! False ! (NCase n c) @@ -161,13 +161,13 @@ concrete ExtraFin of ExtraFinAbs = CatFin ** ProDrop p = { s = table {NPCase (Nom) => [] ; c => p.s ! c} ; poss = [] ; - -- drop Gen only works in adjectival position: "autoni", but not in "ø täytyy mennä" + -- drop Gen only works in adjectival position: "autoni", but not in "ø täytyy mennä" a = p.a ; hasPoss = p.hasPoss ; } ; ProDropPoss p = { - s1 = \\_,_ => case p.a of {Ag _ P3 => p.s ! NPCase Gen ; _ => []} ; -- hänen nimensä ; minun nimeni + s1 = \\_,_ => case p.a of {Ag _ P3 => p.s ! NPCase Gen ; _ => []} ; -- hänen nimensä ; minun nimeni sp = \\_,_ => p.s ! NPCase Gen ; s2 = case p.hasPoss of { True => table {Front => BIND ++ possSuffixFront p.a ; @@ -233,13 +233,13 @@ concrete ExtraFin of ExtraFinAbs = CatFin ** ClPlusWithAdv c = c ; noPart = {s = \\_ => []} ; - han_Part = mkPart "han" "hän" ; - pa_Part = mkPart "pa" "pä" ; - pas_Part = mkPart "pas" "päs" ; - ko_Part = mkPart "ko" "kö" ; - kos_Part = mkPart "kos" "kös" ; - kohan_Part = mkPart "kohan" "köhän" ; - pahan_Part = mkPart "pahan" "pähän" ; + han_Part = mkPart "han" "hän" ; + pa_Part = mkPart "pa" "pä" ; + pas_Part = mkPart "pas" "päs" ; + ko_Part = mkPart "ko" "kö" ; + kos_Part = mkPart "kos" "kös" ; + kohan_Part = mkPart "kohan" "köhän" ; + pahan_Part = mkPart "pahan" "pähän" ; PassVPSlash vp = passVP vp vp.c2 ; @@ -252,7 +252,7 @@ concrete ExtraFin of ExtraFinAbs = CatFin ** ---- uses inversion of active: Guernican maalasi Picasso. TODO: use the agent participle ---- TODO maybe squeeze s2 between the fin and inf (but this is subtle) ----- sinua olen rakastanut minä -> sinua olen minä rakastanus +---- sinua olen rakastanut minä -> sinua olen minä rakastanus -- advantage though: works for all V2 verbs, need not be transitive ---- TODO: agr should be to the agent diff --git a/lib/src/finnish/ExtraFinAbs.gf b/lib/src/finnish/ExtraFinAbs.gf index d6d3d94d8..0ca1fc4e3 100644 --- a/lib/src/finnish/ExtraFinAbs.gf +++ b/lib/src/finnish/ExtraFinAbs.gf @@ -1,4 +1,3 @@ ---# -coding=latin1 abstract ExtraFinAbs = Extra [ IP, IQuant,Num,CN,VPSlash, GenNP,GenIP,GenRP, @@ -6,6 +5,7 @@ abstract ExtraFinAbs = Extra [ VPI,ListVPI,BaseVPI,ConsVPI,MkVPI,ComplVPIVV,ConjVPI, VPS,ListVPS,BaseVPS,ConsVPS,ConjVPS,MkVPS,PredVPS,ConjVPS,Tense,Temp,Pol,S, VV,VP,Conj,NP,Quant,IAdv,IComp,ICompAP,IAdvAdv,Adv,AP, Pron, RP, ProDrop] ** { + flags coding=utf8 ; fun GenCN : NP -> CN -> CN ; -- auton merkki @@ -13,17 +13,17 @@ abstract ExtraFinAbs = Extra [ AdvExistNP : Adv -> NP -> Cl ; -- kuvassa olemme me --- now obsolete because of Idiom.ExistNPAdv AdvPredNP : Adv -> V -> NP -> Cl ; -- kuvassa hymyilee Veikko - ICompExistNP : IComp -> NP -> QCl ; -- missä/kuka on Veikko - IAdvPredNP : IAdv -> V -> NP -> QCl ; -- mistä alkaa Ruotsi + ICompExistNP : IComp -> NP -> QCl ; -- missä/kuka on Veikko + IAdvPredNP : IAdv -> V -> NP -> QCl ; -- mistä alkaa Ruotsi RelExistNP : Prep -> RP -> NP -> RCl ; -- jossa on jazzia --- i_implicPron : Pron ; -- (minä), minut, ... +-- i_implicPron : Pron ; -- (minä), minut, ... whatPart_IP : IP ; PartCN : CN -> NP ; -- olutta - vai_Conj : Conj ; -- minä vai sinä? ("or" in question) + vai_Conj : Conj ; -- minä vai sinä? ("or" in question) CompPartAP : AP -> Comp ; -- kahvi on valmista @@ -36,12 +36,12 @@ abstract ExtraFinAbs = Extra [ Part ; -- discourse particle fun - S_SVO : Part -> Temp -> Pol -> ClPlus -> S ; -- mepäs juomme maitoa nyt + S_SVO : Part -> Temp -> Pol -> ClPlus -> S ; -- mepäs juomme maitoa nyt S_OSV : Part -> Temp -> Pol -> ClPlusObj -> S ; -- maitoapas me juomme nyt S_VSO : Part -> Temp -> Pol -> ClPlus -> S ; -- juommepas me maitoa nyt - S_ASV : Part -> Temp -> Pol -> ClPlusAdv -> S ; -- nytpäs me juomme maitoa + S_ASV : Part -> Temp -> Pol -> ClPlusAdv -> S ; -- nytpäs me juomme maitoa --- S_SOV : Part -> Temp -> Pol -> ClPlus -> S ; -- mepäs maitoa juomme +-- S_SOV : Part -> Temp -> Pol -> ClPlus -> S ; -- mepäs maitoa juomme S_OVS : Part -> Temp -> Pol -> ClPlus -> S ; -- maitoapas juomme me -- S_VOS : Part -> Temp -> Pol -> ClPlus -> S ; -- juommepas maitoa me diff --git a/lib/src/finnish/Kotus.gf b/lib/src/finnish/Kotus.gf index 6351aef62..b5fe474fe 100644 --- a/lib/src/finnish/Kotus.gf +++ b/lib/src/finnish/Kotus.gf @@ -1,6 +1,6 @@ ---# -coding=latin1 resource Kotus = open MorphoFin, Prelude in { + flags coding=utf8 ; -- interpretations of paradigms in KOTUS word list, used in DictFin. @@ -8,61 +8,61 @@ oper vowelHarmony = vowHarmony ; oper - d01 : Str -> NForms -- 1780 öljy + d01 : Str -> NForms -- 1780 öljy = \s -> dUkko s (s + "n") ; - d01A : Str -> NForms -- 166 yökkö + d01A : Str -> NForms -- 166 yökkö = \s -> dUkko s (weakGrade s + "n") ; - d02 : Str -> NForms -- 1189 ääntely + d02 : Str -> NForms -- 1189 ääntely = \s -> dSilakka s (s + "n") (s + "j" + getHarmony (last s)) ; - d03 : Str -> NForms -- 481 ääntiö + d03 : Str -> NForms -- 481 ääntiö = \s -> dSilakka s (s + "n") (s + "it" + vowelHarmony s) ; - d04A : Str -> NForms -- 273 äpärikkö + d04A : Str -> NForms -- 273 äpärikkö = \s -> let ws = weakGrade s in dSilakka s (ws + "n") (ws + "it" + getHarmony (last s)) ; - d05 : Str -> NForms -- 3212 öljymaali + d05 : Str -> NForms -- 3212 öljymaali = \s -> case last s of { "i" => dPaatti s (s + "n") ; _ => dUnix s } ; - d05A : Str -> NForms -- 1959 öylätti + d05A : Str -> NForms -- 1959 öylätti = \s -> dPaatti s (weakGrade s + "n") ; - d06 : Str -> NForms -- 1231 öykkäri + d06 : Str -> NForms -- 1231 öykkäri = \s -> dTohtori s ; d07 : Str -> NForms -- 81 vuoksi = \s -> dArpi s (init s + "en") ; - d07A : Str -> NForms -- 70 väki + d07A : Str -> NForms -- 70 väki = \s -> dArpi s (init (weakGrade s) + "en") ; - d08 : Str -> NForms -- 99 à la carte + d08 : Str -> NForms -- 99 à la carte = \s -> dNukke s (s + "n") ; d08A : Str -> NForms -- 5 vinaigrette = \s -> dNukke s (weakGrade s + "n") ; - d09 : Str -> NForms -- 696 ääriraja + d09 : Str -> NForms -- 696 ääriraja = \s -> let a = last s in dSilakka s (s + "n") - (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; - d09A : Str -> NForms -- 1040 ääniraita + (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; + d09A : Str -> NForms -- 1040 ääniraita = \s -> let a = last s in dSilakka s (weakGrade s + "n") - (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; - d10 : Str -> NForms -- 2119 äänittäjä + (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; + d10 : Str -> NForms -- 2119 äänittäjä = \s -> dSilakka s (s + "n") (init s + "i" + vowelHarmony (last s)) ; - d10A : Str -> NForms -- 284 änkkä + d10A : Str -> NForms -- 284 änkkä = \s -> dSilakka s (weakGrade s + "n") (init s + "i" + vowelHarmony (last s)) ; - d11 : Str -> NForms -- 46 ödeema + d11 : Str -> NForms -- 46 ödeema = \s -> dSilakka s (weakGrade s + "n") (init s + "i" + vowelHarmony (last s)) ; - d12 : Str -> NForms -- 1125 örinä + d12 : Str -> NForms -- 1125 örinä = \s -> let a = vowelHarmony (last s) in dSilakka s (s + "n") - (init s + case a of {"a" => "o" ; _ => "ö"} + "it" + a) ; + (init s + case a of {"a" => "o" ; _ => "ö"} + "it" + a) ; d13 : Str -> NForms -- 157 virtaska = \s -> let a = vowelHarmony (last s) in dSilakka s (s + "n") - (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; - d14A : Str -> NForms -- 244 ötökkä + (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; + d14A : Str -> NForms -- 244 ötökkä = \s -> let a = vowelHarmony (last s) ; ws = weakGrade s in dSilakka s (ws + "n") - (init ws + case a of {"a" => "o" ; _ => "ö"} + "it" + a) ; - d15 : Str -> NForms -- 170 äreä + (init ws + case a of {"a" => "o" ; _ => "ö"} + "it" + a) ; + d15 : Str -> NForms -- 170 äreä = dKorkea ; d16 : Str -> NForms -- 2 kumpikin --? = \s -> let kumpi = Predef.take 5 s ; kin = Predef.drop 5 s in @@ -71,13 +71,13 @@ oper = dSuurempi ; d17 : Str -> NForms -- 38 virkkuu = dPaluu ; - d18 : Str -> NForms -- voi, tee, sää + d18 : Str -> NForms -- voi, tee, sää = dPuu ; - d19 : Str -> NForms -- 6 yö + d19 : Str -> NForms -- 6 yö = dSuo ; d20 : Str -> NForms -- 46 voodoo = dPaluu ; - d21 : Str -> NForms -- 22 tax-free --? rosé + d21 : Str -> NForms -- 22 tax-free --? rosé = dPuu ; d22 : Str -> NForms -- 13 tournedos = \s -> nForms10 @@ -89,20 +89,20 @@ oper = \s -> dArpi s (init s + "en") ; d25 : Str -> NForms -- 9 tuomi = \s -> dArpi s (init s + "en") ; - d26 : Str -> NForms -- 113 ääri + d26 : Str -> NForms -- 113 ääri = \s -> dArpi s (init s + "en") ; d27 : Str -> NForms -- 23 vuosi = \s -> dArpi s (Predef.tk 2 s + "den") ; d28 : Str -> NForms -- 13 virsi = \s -> dArpi s (Predef.tk 2 s + "ren") ; - d28A : Str -> NForms -- 1 jälsi + d28A : Str -> NForms -- 1 jälsi = \s -> dArpi s (Predef.tk 2 s + "len") ; d29 : Str -> NForms -- 1 lapsi = \s -> let lapsi = dArpi s (init s + "en") in table {2 => Predef.tk 3 s + "ta" ; i => lapsi ! i} ; d30 : Str -> NForms -- 2 veitsi = \s -> let lapsi = dArpi s (init s + "en") in - table {2 => Predef.tk 3 s + "stä" ; i => lapsi ! i} ; + table {2 => Predef.tk 3 s + "stä" ; i => lapsi ! i} ; d31 : Str -> NForms -- 3 yksi = \s -> let y = Predef.tk 3 s ; @@ -112,9 +112,9 @@ oper (s + "en") (s + a) (s + "n" + a) (s + "ss" + a) (s + "in") ; d32 : Str -> NForms -- 20 uumen = \s -> dPiennar s (s + "en") ; - d32A : Str -> NForms -- 54 ystävätär + d32A : Str -> NForms -- 54 ystävätär = \s -> dPiennar s (strongGrade (init s) + last s + "en") ; - d33 : Str -> NForms -- 168 väistin + d33 : Str -> NForms -- 168 väistin = \s -> dLiitin s (init s + "men") ; d33A : Str -> NForms -- 181 yllytin = \s -> dLiitin s (strongGrade (init s) + "men") ; @@ -124,14 +124,14 @@ oper s (alastom + "an") (s + "ta") (alastom + "ana") (alastom + "aan") (alastom + "ien") (alastom + "ia") (alastom + "ina") (alastom + "issa") (alastom + "iin") ; - d34A : Str -> NForms -- 569 ääretön + d34A : Str -> NForms -- 569 ääretön = dOnneton ; - d35A : Str -> NForms -- 1 lämmin - = \s -> let lämpim = strongGrade (init s) + "m" in + d35A : Str -> NForms -- 1 lämmin + = \s -> let lämpim = strongGrade (init s) + "m" in nForms10 - s (lämpim + "än") (s + "tä") (lämpim + "änä") (lämpim + "ään") - (lämpim + "ien") (lämpim + "iä") (lämpim + "inä") (lämpim + "issä") - (lämpim + "iin") ; + s (lämpim + "än") (s + "tä") (lämpim + "änä") (lämpim + "ään") + (lämpim + "ien") (lämpim + "iä") (lämpim + "inä") (lämpim + "issä") + (lämpim + "iin") ; d36 : Str -> NForms -- 11 ylin = dSuurin ; d37 : Str -> NForms -- 1 vasen @@ -140,32 +140,32 @@ oper s (vasem + "man") (s + "ta") (vasem + "pana") (vasem + "paan") (vasem + "pien") (vasem + "pia") (vasem + "pina") (vasem + "missa") (vasem + "piin") ; - d38 : Str -> NForms -- 4195 öykkärimäinen + d38 : Str -> NForms -- 4195 öykkärimäinen = dNainen ; - d39 : Str -> NForms -- 2730 örähdys + d39 : Str -> NForms -- 2730 örähdys = dJalas ; - d40 : Str -> NForms -- 2482 öykkärimäisyys + d40 : Str -> NForms -- 2482 öykkärimäisyys = dLujuus ; - d41 : Str -> NForms -- 127 äyräs + d41 : Str -> NForms -- 127 äyräs = \s -> let is = init s in dRae s (is + last is + "n") ; - d41A : Str -> NForms -- 401 öljykangas + d41A : Str -> NForms -- 401 öljykangas = \s -> let is = init s in dRae s (strongGrade is + last is + "n") ; d42 : Str -> NForms -- 1 mies = \s -> let mieh = init s + "h" in nForms10 - s (mieh + "en") (s + "tä") (mieh + "enä") (mieh + "een") - (s + "ten") (mieh + "iä") (mieh + "inä") (mieh + "issä") + s (mieh + "en") (s + "tä") (mieh + "enä") (mieh + "een") + (s + "ten") (mieh + "iä") (mieh + "inä") (mieh + "issä") (mieh + "iin") ; d43 : Str -> NForms -- 11 tiehyt = \s -> dRae s (init s + "en") ; d43A : Str -> NForms -- 1 immyt = \s -> dRae s (strongGrade (init s) + "en") ; - d44 : Str -> NForms -- 1 kevät - = \s -> let kevä = init s in + d44 : Str -> NForms -- 1 kevät + = \s -> let kevä = init s in nForms10 - s (kevä + "än") (s + "tä") (kevä + "änä") (kevä + "äseen") - (s + "iden") (kevä + "itä") (kevä + "inä") (kevä + "issä") - (kevä + "isiin") ; + s (kevä + "än") (s + "tä") (kevä + "änä") (kevä + "äseen") + (s + "iden") (kevä + "itä") (kevä + "inä") (kevä + "issä") + (kevä + "isiin") ; d45 : Str -> NForms -- 23 yhdes = \s -> let yhde = init s ; a = vowelHarmony s in nForms10 @@ -180,9 +180,9 @@ oper (tuha + "nsiin") ; d47 : Str -> NForms -- 46 ylirasittunut = dOttanut ; - d48 : Str -> NForms -- 346 äpäre + d48 : Str -> NForms -- 346 äpäre = \s -> dRae s (s + last s + "n") ; - d48A : Str -> NForms -- 481 äänne + d48A : Str -> NForms -- 481 äänne = \s -> dRae s (strongGrade s + "en") ; d49 : Str -> NForms -- 31 vempele = \s -> case last s of { @@ -192,32 +192,32 @@ oper d49A : Str -> NForms -- 11 vemmel = \s -> dPiennar s (strongGrade (init s) + "len") ; {- - d50 : Str -> NForms -- 520 vääräsääri + d50 : Str -> NForms -- 520 vääräsääri = \s -> ; d51 : Str -> NForms -- 62 vierasmies = \s -> ; -} - c52 : Str -> VForms -- 667 ärjyä + c52 : Str -> VForms -- 667 ärjyä = \s -> cHukkua s (init s + "n") ; - c52A : Str -> VForms -- 1568 öljyyntyä + c52A : Str -> VForms -- 1568 öljyyntyä = \s -> cHukkua s (weakGrade (init s) + "n") ; - c53 : Str -> VForms -- 605 äänestää + c53 : Str -> VForms -- 605 äänestää = \s -> let ott = Predef.tk 2 s in cOttaa s (init s + "n") (ott + "in") (ott + "i") ; - c53A : Str -> VForms -- 2121 örähtää + c53A : Str -> VForms -- 2121 örähtää = \s -> let ota = weakGrade (init s) in cOttaa s (ota + "n") (init ota + "in") (Predef.tk 2 s + "i") ; - c54 : Str -> VForms -- 2 pieksää + c54 : Str -> VForms -- 2 pieksää = \s -> let ott = Predef.tk 2 s in cOttaa s (init s + "n") (ott + "in") (ott + "i") ; - c54A : Str -> VForms -- 316 ääntää + c54A : Str -> VForms -- 316 ääntää = \s -> let ota = weakGrade (init s) ; o = Predef.tk 2 ota in cOttaa s (ota + "n") (o + "sin") (o + "si") ; - c55A : Str -> VForms -- 7 yltää + c55A : Str -> VForms -- 7 yltää = c54A ; --? diff: variation ylti/ylsi c56 : Str -> VForms -- 22 valaa = \s -> let val = Predef.tk 2 s in - cOttaa s (init s + "n") (val + "oin") (val + "oi") ; -- never ö + cOttaa s (init s + "n") (val + "oin") (val + "oi") ; -- never ö c56A : Str -> VForms -- 28 virkkaa = \s -> let ota = weakGrade (init s) ; ot = init ota in cOttaa s (ota + "n") (ot + "oin") (ot + "oi") ; @@ -232,69 +232,69 @@ oper vForms12 s (tunne + "n") (tunte + "e") (tunte + "vat") (tunte + "kaa") (tunne + "taan") (tuns + "in") (tuns + "i") (init tunte + "isi") (tunte + "nut") (tunne + "ttu") (tunte + "nee") ; -- just one verb - c60A : Str -> VForms -- 1 lähteä - = c58A ; --? diff lähti/läksi, just one verb - c61 : Str -> VForms -- 249 äyskiä + c60A : Str -> VForms -- 1 lähteä + = c58A ; --? diff lähti/läksi, just one verb + c61 : Str -> VForms -- 249 äyskiä = \s -> cHukkua s (init s + "n") ; - c61A : Str -> VForms -- 153 vääntelehtiä + c61A : Str -> VForms -- 153 vääntelehtiä = \s -> cHukkua s (weakGrade (init s) + "n") ; - c62 : Str -> VForms -- 684 öykkäröidä + c62 : Str -> VForms -- 684 öykkäröidä = \s -> cJuoda s ; c63 : Str -> VForms -- 3 saada = c62 ; - c64 : Str -> VForms -- 8 viedä + c64 : Str -> VForms -- 8 viedä = c62 ; - c65 : Str -> VForms -- 1 käydä + c65 : Str -> VForms -- 1 käydä = \s -> let kay = Predef.tk 2 s ; kavi = init kay + "vi" in - vForms12 s (kay + "n") kay (kay + "vät") (kay + "kää") (kay + "dään") + vForms12 s (kay + "n") kay (kay + "vät") (kay + "kää") (kay + "dään") (kavi + "n") kavi (kavi + "si") (kay + "nyt") (kay + "tty") (kay + "nee") ; -- just one verb - c66 : Str -> VForms -- 268 öristä + c66 : Str -> VForms -- 268 öristä = \s -> cKuunnella s (Predef.tk 2 s + "in") ; c66A : Str -> VForms -- 3 vavista = \s -> cKuunnella s (strongGrade (Predef.tk 3 s) + "sin") ; - c67 : Str -> VForms -- 704 ällistellä + c67 : Str -> VForms -- 704 ällistellä = \s -> cKuunnella s (Predef.tk 2 s + "in") ; - c67A : Str -> VForms -- 634 äännellä + c67A : Str -> VForms -- 634 äännellä = \s -> cKuunnella s (strongGrade (Predef.tk 3 s) + "lin") ; - c68 : Str -> VForms -- 49 viheriöidä - = c62 ; -- diff viheriöin/viheriöitsen - c69 : Str -> VForms -- 48 villitä + c68 : Str -> VForms -- 49 viheriöidä + = c62 ; -- diff viheriöin/viheriöitsen + c69 : Str -> VForms -- 48 villitä = \s -> cHarkita s ; - c70 : Str -> VForms -- 3 syöstä + c70 : Str -> VForms -- 3 syöstä = \s -> cJuosta s (Predef.tk 3 s + "ksen") ; - c71 : Str -> VForms -- 2 tehdä + c71 : Str -> VForms -- 2 tehdä = \s -> let te = Predef.tk 3 s in - vForms12 s (te + "en") (te + "kee") (te + "kevät") (te + "hkää") (te + "hdään") + vForms12 s (te + "en") (te + "kee") (te + "kevät") (te + "hkää") (te + "hdään") (te + "en") (te + "ki") (te + "kisi") (te + "hnyt") (te + "hty") - (te + "hnee") ; -- just two verbs: nähdä, tehdä - c72 : Str -> VForms -- 93 yletä + (te + "hnee") ; -- just two verbs: nähdä, tehdä + c72 : Str -> VForms -- 93 yletä = \s -> cValjeta s (Predef.tk 2 s + "ni") ; - c72A : Str -> VForms -- 52 yhdetä + c72A : Str -> VForms -- 52 yhdetä = \s -> cValjeta s (strongGrade (Predef.tk 2 s) + "ni") ; - c73 : Str -> VForms -- 600 äkseerata + c73 : Str -> VForms -- 600 äkseerata = \s -> cPudota s (Predef.tk 2 s + "si") ; - c73A : Str -> VForms -- 313 änkätä + c73A : Str -> VForms -- 313 änkätä = \s -> cPudota s (strongGrade (Predef.tk 2 s) + "si") ; - c74 : Str -> VForms -- 99 öljytä + c74 : Str -> VForms -- 99 öljytä = \s -> cPudota s (Predef.tk 2 s + "si") ; - c74A : Str -> VForms -- 72 ängetä + c74A : Str -> VForms -- 72 ängetä = \s -> cPudota s (strongGrade (Predef.tk 2 s) + "si") ; - c75 : Str -> VForms -- 39 viritä + c75 : Str -> VForms -- 39 viritä = \s -> cPudota s (Predef.tk 2 s + "si") ; - c75A : Str -> VForms -- 9 siitä + c75A : Str -> VForms -- 9 siitä = \s -> cPudota s (strongGrade (Predef.tk 2 s) + "si") ; - c76A : Str -> VForms -- 2 tietää + c76A : Str -> VForms -- 2 tietää = \s -> let tieta = init s ; tieda = weakGrade tieta ; ties = Predef.tk 2 tieta + "s" in cOttaa s (tieda + "n") (ties + "in") (ties + "i") ; -- only tietaa, taitaa -- defective verbs c77 : Str -> VForms -- 3 vipajaa = c56A ; ---- - c78 : Str -> VForms -- 31 ähkää + c78 : Str -> VForms -- 31 ähkää = c56A ; ---- c78A : Str -> VForms -- 1 tuikkaa = c56A ; ---- - c99 : Str -> Str -- 5453 öykkärimäisesti + c99 : Str -> Str -- 5453 öykkärimäisesti = \s -> s ; c101 : Str -> Str -- pronouns etc diff --git a/lib/src/finnish/LexiconFin.gf b/lib/src/finnish/LexiconFin.gf index b4d95bcea..ca6521509 100644 --- a/lib/src/finnish/LexiconFin.gf +++ b/lib/src/finnish/LexiconFin.gf @@ -1,9 +1,9 @@ --# -path=.:prelude ---# -coding=latin1 concrete LexiconFin of Lexicon = CatFin ** open MorphoFin, StemFin, ParadigmsFin in { flags + coding=utf8 ; optimize=values ; @@ -14,16 +14,16 @@ lin apartment_N = mkN "asunto" ; apple_N = mkN "omena" ; --- omenia, not omenoita art_N = mkN "taide" ; - ask_V2Q = mkV2 (mkV "kysyä") (casePrep ablative) ; + ask_V2Q = mkV2 (mkV "kysyä") (casePrep ablative) ; baby_N = mkN "vauva" ; bad_A = mkA (mkN "paha") "pahempi" "pahin" ; bank_N = mkN "pankki" ; beautiful_A = mkA (mkN "kaunis") "kauniimpi" "kaunein" ; become_VA = mkVA (mkV "tulla") (casePrep translative) ; beer_N = mkN "olut" "oluita" ; - beg_V2V = mkV2V (mk2V "pyytää" "pyysi") (casePrep partitive) ; + beg_V2V = mkV2V (mk2V "pyytää" "pyysi") (casePrep partitive) ; big_A = mkA (mkN "suuri" "suuria") "suurempi" "suurin" ; - bike_N = mkN "polku" (mkN "pyörä") ; + bike_N = mkN "polku" (mkN "pyörä") ; bird_N = mkN "lintu" ; black_A = mkA (mkN "musta") "mustempi" "mustin" ; blue_A = mkA (mkN "sininen") "sinisempi" "sinisin" ; @@ -32,12 +32,12 @@ lin boot_N = mkN "saapas" ; boss_N = mkN "pomo" ; boy_N = mkN "poika" "pojan" "poikia" ; - bread_N = mkN "leipä" ; + bread_N = mkN "leipä" ; break_V2 = mkV2 (mkV "rikkoa") ; - broad_A = mkA (mkN "leveä") "leveämpi" "levein" ; + broad_A = mkA (mkN "leveä") "leveämpi" "levein" ; brother_N2 = mkN2 ( - mkN "veli" "veljen" "veljenä" "veljeä" "veljeen" - "veljinä" "veljissä" "veljien" "veljiä" "veljiin") ; + mkN "veli" "veljen" "veljenä" "veljeä" "veljeen" + "veljinä" "veljissä" "veljien" "veljiä" "veljiin") ; brown_A = mkA (mkN "ruskea") "ruskeampi" "ruskein" ; butter_N = mk3N "voi" "voin" "voita" ; ---- errors in Part buy_V2 = mkV2 (mkV "ostaa") ; @@ -57,42 +57,42 @@ lin clever_A = mkA (mkN "viisas") ; close_V2 = mkV2 (mkV "sulkea") ; coat_N = mkN "takki" ; - cold_A = mkA (mkN "kylmä") "kylmempi" "kylmin" ; + cold_A = mkA (mkN "kylmä") "kylmempi" "kylmin" ; come_V = mkV "tulla" ; computer_N = mkN "tietokone" ; country_N = mkN "maa" ; cousin_N = mkN "serkku" ; - cow_N = mkN "lehmä" ; + cow_N = mkN "lehmä" ; die_V = mkV "kuolla" ; dirty_A = mkA (mkN "likainen") "likaisempi" "likaisin" ; - distance_N3 = mkN3 (mkN "etäisyys") (casePrep elative) (casePrep illative) ; + distance_N3 = mkN3 (mkN "etäisyys") (casePrep elative) (casePrep illative) ; doctor_N = mk2N "tohtori" "tohtoreita" ; dog_N = mkN "koira" ; door_N = mkN "ovi" "ovia" ; drink_V2 = mkV2 (mkV "juoda") (casePrep partitive) ; easy_A2V = mkA2 (mkA (mkN "helppo") "helpompi" "helpoin") (casePrep allative) ; - eat_V2 = mkV2 (mkV "syödä") (casePrep partitive) ; - empty_A = mkA (mkN "tyhjä") "tyhjempi" "tyhjin" ; + eat_V2 = mkV2 (mkV "syödä") (casePrep partitive) ; + empty_A = mkA (mkN "tyhjä") "tyhjempi" "tyhjin" ; enemy_N = mkN "vihollinen" ; factory_N = mkN "tehdas" ; - father_N2 = mkN2 (mkN "isä") ; - fear_VS = mkVS (mk2V "pelätä" "pelkäsi") ; - find_V2 = mkV2 (mk2V "löytää" "löysi") ; + father_N2 = mkN2 (mkN "isä") ; + fear_VS = mkVS (mk2V "pelätä" "pelkäsi") ; + find_V2 = mkV2 (mk2V "löytää" "löysi") ; fish_N = mkN "kala" ; floor_N = mk2N "lattia" "lattioita" ; forget_V2 = mkV2 (mkV "unohtaa") ; - fridge_N = mkN "jääkaappi" ; - friend_N = mkN "ystävä" ; - fruit_N = mkN "hedelmä" ; + fridge_N = mkN "jääkaappi" ; + friend_N = mkN "ystävä" ; + fruit_N = mkN "hedelmä" ; fun_AV = mkAV (mkA (mkN "hauska") "hauskempi" "hauskin") ; garden_N = mkN "puutarha" "puutarhan" "puutarhoja" ; - girl_N = mkN "tyttö" ; - glove_N = mkN "käsine" ; + girl_N = mkN "tyttö" ; + glove_N = mkN "käsine" ; gold_N = mkN "kulta" ; - good_A = mkA (mkN "hyvä") (mkN "parempi" "paremman" "parempia") (exceptNomN (mkN "parhas" "parhaan" "parhaita" "parasta") "paras") "hyvin" "paremmin" "parhaiten" ; - go_V = mkV "mennä" ; - green_A = mkA (mkN "vihreä") "vihreämpi" "vihrein" ; + good_A = mkA (mkN "hyvä") (mkN "parempi" "paremman" "parempia") (exceptNomN (mkN "parhas" "parhaan" "parhaita" "parasta") "paras") "hyvin" "paremmin" "parhaiten" ; + go_V = mkV "mennä" ; + green_A = mkA (mkN "vihreä") "vihreämpi" "vihrein" ; harbour_N = mkN "satama" "sataman" "satamia" ; hate_V2 = mkV2 (mkV "vihata") cpartitive ; hat_N = mkN "hattu" ; @@ -102,54 +102,54 @@ lin horse_N = mkN "hevonen" ; hot_A = mkA (mkN "kuuma") "kuumempi" "kuumin" ; house_N = mkN "talo" ; - important_A = mkA (mkN "tärkeä") "tärkeämpi" "tärkein" ; + important_A = mkA (mkN "tärkeä") "tärkeämpi" "tärkein" ; industry_N = mkN "teollisuus" ; iron_N = mkN "rauta" ; king_N = mkN "kuningas" ; - know_VS = mkVS (mkV "tietää" "tiesi") ; - know_VQ = mkVQ (mkV "tietää" "tiesi") ; + know_VS = mkVS (mkV "tietää" "tiesi") ; + know_VQ = mkVQ (mkV "tietää" "tiesi") ; know_V2 = mkV2 (mkV "tuntea" "tunsi") ; - lake_N = mkN "järvi" "järviä" ; + lake_N = mkN "järvi" "järviä" ; lamp_N = mkN "lamppu" ; learn_V2 = mkV2 (mk12V "oppia" "opin" "oppii" "oppivat" "oppikaa" "opitaan" "opin" "oppi" "oppisi" "oppinut" "opittu" "opitun") ; leather_N = mkN "nahka" ; --- nahan - leave_V2 = mkV2 (mkV "jättää") ; - like_V2 = mkV2 (mkV "pitää") elative ; + leave_V2 = mkV2 (mkV "jättää") ; + like_V2 = mkV2 (mkV "pitää") elative ; listen_V2 = mkV2 (mkV "kuunnella" "kuunteli") partitive ; - live_V = mkV "elää" ; - long_A = mkA (mkN "pitkä") "pitempi" "pisin" ; - lose_V2 = mkV2 (mkV "hävitä" "hävisi") ; --- hukata + live_V = mkV "elää" ; + long_A = mkA (mkN "pitkä") "pitempi" "pisin" ; + lose_V2 = mkV2 (mkV "hävitä" "hävisi") ; --- hukata love_N = mk3N "rakkaus" "rakkauden" "rakkauksia" ; love_V2 = mkV2 (mkV "rakastaa") partitive ; - man_N = mkN "mies" "miehen" "miestä" "miehenä" "mieheen" - "miesten" "miehiä" "miehinä" "miehissä" "miehiin" ; + man_N = mkN "mies" "miehen" "miestä" "miehenä" "mieheen" + "miesten" "miehiä" "miehinä" "miehissä" "miehiin" ; married_A2 = mkA2 (mkA "avioitunut") (postPrep genitive "kanssa") ; ---- infl meat_N = mkN "liha" ; milk_N = mkN "maito" ; moon_N = mkN "kuu" ; - mother_N2 = mkN2 (mkN "äiti") ; + mother_N2 = mkN2 (mkN "äiti") ; mountain_N = mkN "vuori" "vuoria" ; music_N = mkN "musiikki" ; narrow_A = mkA (mkN "kapea") "kapeampi" "kapein" ; new_A = mkA (mk3N "uusi" "uuden" "uusia") "uudempi" "uusin" ; - newspaper_N = mkN "sanoma" (mkN "lehti" "lehtiä") ; --- for correct vowel harmony - oil_N = mkN "öljy" ; + newspaper_N = mkN "sanoma" (mkN "lehti" "lehtiä") ; --- for correct vowel harmony + oil_N = mkN "öljy" ; old_A = mkA (mkN "vanha") "vanhempi" "vanhin" ; open_V2 = mkV2 (mkV "avata" "avasi") ; paint_V2A = mkV2A (mkV "maalata") accPrep (casePrep translative) ; paper_N = mk2N "paperi" "papereita" ; paris_PN = mkPN (mkN "Pariisi") ; peace_N = mkN "rauha" ; - pen_N = mkN "kynä" ; + pen_N = mkN "kynä" ; planet_N = mkN "planeetta" ; plastic_N = mkN "muovi" ; - play_V2 = mkV2 (mkV "pelata") cpartitive ; --- leikkiä, soittaa + play_V2 = mkV2 (mkV "pelata") cpartitive ; --- leikkiä, soittaa policeman_N = mkN "poliisi" ; priest_N = mkN "pappi" ; probable_AS = mkAS --- for vowel harmony - (mkA (mkN "todennäköinen") "tonennäköisempi" "todennäköisin") ; ---- sta + (mkA (mkN "todennäköinen") "tonennäköisempi" "todennäköisin") ; ---- sta queen_N = mkN "kuningatar" ; radio_N = mk2N "radio" "radioita" ; rain_V0 = mkV0 (mk2V "sataa" "satoi") ; @@ -165,36 +165,36 @@ lin say_VS = mkVS (mkV "sanoa") ; school_N = mkN "koulu" ; science_N = mkN "tiede" ; - sea_N = mkN "meri" "meren" "meriä" "merta" ; - seek_V2 = mkV2 (mkV "etsiä") cpartitive ; + sea_N = mkN "meri" "meren" "meriä" "merta" ; + seek_V2 = mkV2 (mkV "etsiä") cpartitive ; see_V2 = mkV2 ( - mk12V "nähdä" "näen" "näkee" "näkevät" "nähkää" "nähdään" - "näin" "näki" "näkisi" "nähnyt" "nähty" "nähdyn") ; - sell_V3 = mkV3 (mkV "myydä") accPrep (casePrep allative) ; - send_V3 = mkV3 (mkV "lähettää") accPrep (casePrep allative) ; + mk12V "nähdä" "näen" "näkee" "näkevät" "nähkää" "nähdään" + "näin" "näki" "näkisi" "nähnyt" "nähty" "nähdyn") ; + sell_V3 = mkV3 (mkV "myydä") accPrep (casePrep allative) ; + send_V3 = mkV3 (mkV "lähettää") accPrep (casePrep allative) ; sheep_N = mkN "lammas" ; ship_N = mkN "laiva" ; shirt_N = mkN "paita" ; - shoe_N = mkN "kenkä" ; + shoe_N = mkN "kenkä" ; shop_N = mkN "kauppa" ; - short_A = mkA (mkN "lyhyt" "lyhyitä") ; + short_A = mkA (mkN "lyhyt" "lyhyitä") ; silver_N = mkN "hopea" ; sister_N = mkN "sisko" ; sleep_V = mkV "nukkua" ; - small_A = mkA (mk2N "pieni" "pieniä") "pienempi" "pienin" ; - snake_N = mkN "käärme" ; + small_A = mkA (mk2N "pieni" "pieniä") "pienempi" "pienin" ; + snake_N = mkN "käärme" ; sock_N = mkN "sukka" ; speak_V2 = mkV2 (mkV "puhua") cpartitive ; - star_N = mkN "tähti" "tähtiä" ; - steel_N = mkN "teräs" ; - stone_N = mkN "kivi" "kiviä" ; - stove_N = mk3N "liesi" "lieden" "liesiä" ; + star_N = mkN "tähti" "tähtiä" ; + steel_N = mkN "teräs" ; + stone_N = mkN "kivi" "kiviä" ; + stove_N = mk3N "liesi" "lieden" "liesiä" ; student_N = mk2N "opiskelija" "opiskelijoita" ; - stupid_A = mkA "tyhmä" ; + stupid_A = mkA "tyhmä" ; sun_N = mkN "aurinko" ; switch8off_V2 = mkV2 (mkV "sammuttaa") ; --- - switch8on_V2 = mkV2 (mkV "sytyttää") ; --- - table_N = mkN "pöytä" ; + switch8on_V2 = mkV2 (mkV "sytyttää") ; --- + table_N = mkN "pöytä" ; talk_V3 = mkV3 (mkV "puhua") (casePrep allative) (casePrep elative) ; teacher_N = mkN "opettaja" ; teach_V2 = mkV2 (mkV "opettaa") ; @@ -206,107 +206,107 @@ lin tree_N = mkN "puu" ; ---- trousers_N = mkN "trousers" ; ugly_A = mkA (mkN "ruma") "rumempi" "rumin" ; - understand_V2 = mkV2 (mkV "ymmärtää" "ymmärrän" "ymmärsi") ; + understand_V2 = mkV2 (mkV "ymmärtää" "ymmärrän" "ymmärsi") ; university_N = mkN "yliopisto" ; - village_N = mkN "kylä" ; + village_N = mkN "kylä" ; wait_V2 = mkV2 (mkV "odottaa") partitive ; - walk_V = mkV "kävellä" "käveli" ; + walk_V = mkV "kävellä" "käveli" ; warm_A = mkA - (mkN "lämmin" "lämpimän" "lämmintä" "lämpimänä" "lämpimään" - "lämpiminä" "lämpimiä" "lämpimien" "lämpimissä" "lämpimiin" + (mkN "lämmin" "lämpimän" "lämmintä" "lämpimänä" "lämpimään" + "lämpiminä" "lämpimiä" "lämpimien" "lämpimissä" "lämpimiin" ) - "lämpimämpi" "lämpimin" ; + "lämpimämpi" "lämpimin" ; war_N = mkN "sota" ; watch_V2 = mkV2 (mkV "katsella") cpartitive ; - water_N = mk3N "vesi" "veden" "vesiä" ; + water_N = mk3N "vesi" "veden" "vesiä" ; white_A = mkA "valkoinen" ; window_N = mk2N "ikkuna" "ikkunoita" ; wine_N = mkN "viini" ; win_V2 = mkV2 (mkV "voittaa") ; woman_N = mkN "nainen" ; - wonder_VQ = mkVQ (mkV "ihmetellä") ; + wonder_VQ = mkVQ (mkV "ihmetellä") ; wood_N = mkN "puu" ; write_V2 = mkV2 (mkV "kirjoittaa") ; yellow_A = mkA "keltainen" ; young_A = mkA (mkN "nuori" "nuoria") "nuorempi" "nuorin" ; do_V2 = mkV2 ( - mkV "tehdä" "teen" "tekee" "tekevät" "tehkää" "tehdään" + mkV "tehdä" "teen" "tekee" "tekevät" "tehkää" "tehdään" "tein" "teki" "tekisi" "tehnyt" "tehty" "tehdyn") ; now_Adv = mkAdv "nyt" ; already_Adv = mkAdv "jo" ; song_N = mkN "laulu" ; - add_V3 = mkV3 (mkV "lisätä") accPrep (casePrep illative) ; + add_V3 = mkV3 (mkV "lisätä") accPrep (casePrep illative) ; number_N = mk2N "numero" "numeroita" ; put_V2 = mkV2 (mkV "panna") ; - stop_V = mkV "pysähtyä" ; - jump_V = mkV "hypätä" ; + stop_V = mkV "pysähtyä" ; + jump_V = mkV "hypätä" ; left_Ord = mkOrd (snoun2nounBind (mkN "vasen")) ; right_Ord = mkOrd (snoun2nounBind (mkN "oikea")) ; far_Adv = mkAdv "kaukana" ; correct_A = mkA "oikea" ; dry_A = mkA (mkN "kuiva") "kuivempi" "kuivin" ; - dull_A = mkA (mkN "tylsä") "tylsempi" "tylsin" ; - full_A = mkA (mk3N "täysi" "täyden" "täysiä") "täydempi" "täysin" ; + dull_A = mkA (mkN "tylsä") "tylsempi" "tylsin" ; + full_A = mkA (mk3N "täysi" "täyden" "täysiä") "täydempi" "täysin" ; heavy_A = mkA "raskas" ; - near_A = mkA (mkN "läheinen") "läheisempi" "lähin" ; - rotten_A = mkA "mätä" ; - round_A = mkA "pyöreä" ; - sharp_A = mkA "terävä" ; - smooth_A = mkA "sileä" ; + near_A = mkA (mkN "läheinen") "läheisempi" "lähin" ; + rotten_A = mkA "mätä" ; + round_A = mkA "pyöreä" ; + sharp_A = mkA "terävä" ; + smooth_A = mkA "sileä" ; straight_A = mkA (mkN "suora") "suorempi" "suorin" ; - wet_A = mkA (mkN "märkä") "märempi" "märin" ; - wide_A = mkA "leveä" ; - animal_N = mk3N "eläin" "eläimen" "eläimiä" ; + wet_A = mkA (mkN "märkä") "märempi" "märin" ; + wide_A = mkA "leveä" ; + animal_N = mk3N "eläin" "eläimen" "eläimiä" ; ashes_N = mkN "tuhka" ; - back_N = mkN "selkä" ; + back_N = mkN "selkä" ; bark_N = mkN "kaarna" ; belly_N = mkN "vatsa" ; - blood_N = mkN "veri" "veren" "veriä" "verta" ; + blood_N = mkN "veri" "veren" "veriä" "verta" ; bone_N = mkN "luu" ; breast_N = mkN "rinta" ; - cloud_N = mk2N "pilvi" "pilviä" ; - day_N = mkN "päivä" ; - dust_N = mkN "pöly" ; + cloud_N = mk2N "pilvi" "pilviä" ; + day_N = mkN "päivä" ; + dust_N = mkN "pöly" ; ear_N = mkN "korva" ; earth_N = mkN "maa" ; egg_N = mkN "muna" ; - eye_N = mkN "silmä" ; + eye_N = mkN "silmä" ; fat_N = mkN "rasva" ; - feather_N = mk3N "höyhen" "höyhenen" "höyheniä" ; - fingernail_N = mk3N "kynsi" "kynnen" "kynsiä" ; + feather_N = mk3N "höyhen" "höyhenen" "höyheniä" ; + fingernail_N = mk3N "kynsi" "kynnen" "kynsiä" ; fire_N = mk2N "tuli" "tulia" ; flower_N = mkN "kukka" ; fog_N = mkN "sumu" ; foot_N = mkN "jalka" ; - forest_N = mkN "metsä" ; + forest_N = mkN "metsä" ; grass_N = mkN "ruoho" ; - guts_N = mkN "sisälmys" ; --- suoli + guts_N = mkN "sisälmys" ; --- suoli hair_N = mkN "hius" ; - hand_N = mk3N "käsi" "käden" "käsiä" ; - head_N = mkN "pää" ; - heart_N = mkN "sydän" "sydämen" "sydäntä" "sydämenä" "sydämeen" - "sydänten" "sydämiä" "sydäminä" "sydämissä" "sydämiin" ; + hand_N = mk3N "käsi" "käden" "käsiä" ; + head_N = mkN "pää" ; + heart_N = mkN "sydän" "sydämen" "sydäntä" "sydämenä" "sydämeen" + "sydänten" "sydämiä" "sydäminä" "sydämissä" "sydämiin" ; horn_N = mk2N "sarvi" "sarvia" ; - husband_N = mkN "mies" "miehen" "miestä" "miehenä" "mieheen" - "miesten" "miehiä" "miehinä" "miehissä" "miehiin" ; - ice_N = mkN "jää" ; + husband_N = mkN "mies" "miehen" "miestä" "miehenä" "mieheen" + "miesten" "miehiä" "miehinä" "miehissä" "miehiin" ; + ice_N = mkN "jää" ; knee_N = mk2N "polvi" "polvia" ; - leaf_N = mk2N "lehti" "lehtiä" ; - leg_N = mkN "jalka" ; --- sääri + leaf_N = mk2N "lehti" "lehtiä" ; + leg_N = mkN "jalka" ; --- sääri liver_N = mkN "maksa" ; louse_N = mkN "lude" ; mouth_N = mkN "suu" ; - name_N = mk2N "nimi" "nimiä" ; + name_N = mk2N "nimi" "nimiä" ; neck_N = mkN "niska" ; - night_N = mkN "yö" ; - nose_N = mkN "nenä" ; - person_N = mkN "henkilö" ; + night_N = mkN "yö" ; + nose_N = mkN "nenä" ; + person_N = mkN "henkilö" ; rain_N = mkN "sade" ; road_N = mkN "tie" ; root_N = mk2N "juuri" "juuria" ; - rope_N = mk3N "köysi" "köyden" "köysiä" ; + rope_N = mk3N "köysi" "köyden" "köysiä" ; salt_N = mkN "suola" ; sand_N = mkN "hiekka" ; seed_N = mkN "siemen" ; @@ -315,12 +315,12 @@ lin smoke_N = mkN "savu" ; snow_N = mkN "lumi" "lumen" "lumia" "lunta" ; stick_N = mkN "keppi" ; - tail_N = mkN "häntä" ; - tongue_N = mk2N "kieli" "kieliä" ; + tail_N = mkN "häntä" ; + tongue_N = mk2N "kieli" "kieliä" ; tooth_N = mkN "hammas" ; wife_N = mkN "vaimo" ; wind_N = mk2N "tuuli" "tuulia" ; - wing_N = mk2N "siipi" "siipiä" ; + wing_N = mk2N "siipi" "siipiä" ; worm_N = mkN "mato" ; year_N = mk3N "vuosi" "vuoden" "vuosia" ; bite_V2 = mkV2 (mkV "purra") ; @@ -330,57 +330,57 @@ lin cut_V2 = mkV2 (mk2V "leikata" "leikkasi") ; dig_V = mkV "kaivaa" ; fall_V = mkV "pudota" "putoan" "putosi" ; - fear_V2 = mkV2 (mkV "pelätä" "pelkään" "pelkäsi") cpartitive ; + fear_V2 = mkV2 (mkV "pelätä" "pelkään" "pelkäsi") cpartitive ; fight_V2 = mkV2 (mkV "taistella") (postPrep partitive "vastaan") ; float_V = mkV "kellua" ; flow_V = mkV "virrata" "virtaan" "virtasi" ; - fly_V = mkV "lentää" ; - freeze_V = mkV "jäätyä" ; + fly_V = mkV "lentää" ; + freeze_V = mkV "jäätyä" ; give_V3 = mkV3 (mkV "antaa" "annan" "antoi") accPrep (casePrep allative) ; - hit_V2 = mkV2 (mkV "lyödä") cpartitive ; - hold_V2 = mkV2 (mkV "pitää") cpartitive ; - hunt_V2 = mkV2 (mkV "metsästää") cpartitive ; + hit_V2 = mkV2 (mkV "lyödä") cpartitive ; + hold_V2 = mkV2 (mkV "pitää") cpartitive ; + hunt_V2 = mkV2 (mkV "metsästää") cpartitive ; kill_V2 = mkV2 (mkV "tappaa") ; laugh_V = mkV "nauraa" "nauroi" ; lie_V = mkV "maata" "makasi" ; play_V = mkV "pelata" ; - pull_V2 = mkV2 (mkV "vetää") ; - push_V2 = mkV2 (mkV "työntää") ; + pull_V2 = mkV2 (mkV "vetää") ; + push_V2 = mkV2 (mkV "työntää") ; rub_V2 = mkV2 (mkV "hieroa") cpartitive ; scratch_V2 = mkV2 (mkV "raapia") cpartitive ; sew_V = mkV "ommella" ; sing_V = mkV "laulaa" ; sit_V = mkV "istua" ; smell_V = mk2V "haista" "haisi" ; - spit_V = mkV "sylkeä" ; + spit_V = mkV "sylkeä" ; split_V2 = mkV2 (mk2V "halkaista" "halkaisi") ; squeeze_V2 = mkV2 (mkV "puristaa") cpartitive ; - stab_V2 = mkV2 (mkV "pistää") cpartitive ; - stand_V = mk12V "seistä" "seison" "seisoo" "seisovat" "seiskää" "seistään" - "seisoin" "seisoi" "seisoisi" "seissyt" "seisty" "seistyn" ; --- *seisoivät - suck_V2 = mkV2 (mkV "imeä") cpartitive ; + stab_V2 = mkV2 (mkV "pistää") cpartitive ; + stand_V = mk12V "seistä" "seison" "seisoo" "seisovat" "seiskää" "seistään" + "seisoin" "seisoi" "seisoisi" "seissyt" "seisty" "seistyn" ; --- *seisoivät + suck_V2 = mkV2 (mkV "imeä") cpartitive ; swell_V = mkV "turvota" "turposi" ; swim_V = mkV "uida" "uin" "ui" ; think_V = mkV "ajatella" "ajattelen" "ajatteli" ; - throw_V2 = mkV2 (mkV "heittää") ; + throw_V2 = mkV2 (mkV "heittää") ; tie_V2 = mkV2 (mkV "sitoa") ; - turn_V = mkV "kääntyä" ; + turn_V = mkV "kääntyä" ; vomit_V = mkV "oksentaa" ; - wash_V2 = mkV2 (mkV "pestä") ; - wipe_V2 = mkV2 (mkV "pyyhkiä") ; + wash_V2 = mkV2 (mkV "pestä") ; + wipe_V2 = mkV2 (mkV "pyyhkiä") ; - breathe_V = mkV "hengittää" ; + breathe_V = mkV "hengittää" ; grammar_N = mkN "kielioppi" ; - language_N = mk2N "kieli" "kieliä" ; - rule_N = mkN "sääntö" ; + language_N = mk2N "kieli" "kieliä" ; + rule_N = mkN "sääntö" ; john_PN = mkPN "Jussi" ; question_N = mkN "kysymys" ; ready_A = mkA (mkN "valmis") ; reason_N = mkN "syy" ; - today_Adv = mkAdv "tänään" ; - uncertain_A = mkA "epävarma" ; + today_Adv = mkAdv "tänään" ; + uncertain_A = mkA "epävarma" ; oper mkOrd : Noun -> Ord ; diff --git a/lib/src/finnish/MorphoFin.gf b/lib/src/finnish/MorphoFin.gf index 22f314b4a..67f79ffed 100644 --- a/lib/src/finnish/MorphoFin.gf +++ b/lib/src/finnish/MorphoFin.gf @@ -1,5 +1,4 @@ --# -path=.:../common:prelude ---# -coding=latin1 --1 A Simple Finnish Resource Morphology -- @@ -12,6 +11,7 @@ resource MorphoFin = ResFin ** open Prelude in { flags optimize=noexpand ; + coding=utf8 ; oper @@ -109,7 +109,7 @@ resource MorphoFin = ResFin ** open Prelude in { (onnettom + "in" + a) (onnettom + "iss" + a) (onnettom + "iin") ; - -- 2-syllable a/ä, o/ö, u/y + -- 2-syllable a/ä, o/ö, u/y dUkko : (_,_ : Str) -> NForms = \ukko,ukon -> let o = last ukko ; @@ -118,8 +118,8 @@ resource MorphoFin = ResFin ** open Prelude in { uko = init ukon ; uk = init uko ; ukkoja = case of { - _ + "ä" => -- kylä,kyliä,kylien,kylissä,kyliin - ; + _ + "ä" => -- kylä,kyliä,kylien,kylissä,kyliin + ; _ + ("au" | "eu") + _ + "a" => -- kauhojen,seurojen ; _ + ("o" | "u") + _ + "a" => -- pula,pulia,pulien,pulissa,puliin @@ -136,7 +136,7 @@ resource MorphoFin = ResFin ** open Prelude in { ukkoja.p2 ukkoja.p1 ukkoina ukoissa ukkoja.p5 ; - -- 3-syllable a/ä/o/ö + -- 3-syllable a/ä/o/ö dSilakka : (_,_,_ : Str) -> NForms = \silakka,silakan,silakoita -> let o = last silakka ; @@ -145,15 +145,15 @@ resource MorphoFin = ResFin ** open Prelude in { silaka = init silakan ; silak = init silaka ; silakkaa = silakka + case o of { - "o" | "ö" => "t" + a ; -- radiota + "o" | "ö" => "t" + a ; -- radiota _ => a -- sammakkoa } ; silakoiden = case of { - _ + "i" + ("a" | "ä") => -- asemia + _ + "i" + ("a" | "ä") => -- asemia ; - _ + O@("o" | "ö" | "u" | "y" | "e") + ("ja" | "jä") => -- pasuunoja + _ + O@("o" | "ö" | "u" | "y" | "e") + ("ja" | "jä") => -- pasuunoja ; - _ + O@("o" | "ö" | "u" | "y" | "e") + ("ita" | "itä") => -- silakoita + _ + O@("o" | "ö" | "u" | "y" | "e") + ("ita" | "itä") => -- silakoita ; _ => Predef.error silakoita } ; @@ -172,7 +172,7 @@ resource MorphoFin = ResFin ** open Prelude in { ar = init arp ; arpe = case last arp of { "s" => case last arv of { - "d" | "l" | "n" | "r" => -- suden,sutta ; jälsi ; kansi ; hirsi + "d" | "l" | "n" | "r" => -- suden,sutta ; jälsi ; kansi ; hirsi ; _ => -- kuusta,kuusien @@ -183,7 +183,7 @@ resource MorphoFin = ResFin ** open Prelude in { ; _ => -- arpea,arpien,arvissa - } ; ---- pieni,pientä; uni,unta + } ; ---- pieni,pientä; uni,unta in nForms10 arpi arven arpe.p1 (arpe.p4 + "en" + a) (arpe.p4 + "een") arpe.p2 (arpi + a) @@ -282,23 +282,23 @@ resource MorphoFin = ResFin ** open Prelude in { "A" => <"n","ta","na","han","iden","ita","ina","issa","ihin"> ; "B" | "C" | "D" | "E" | "G" | "P" | "T" | "V" | "W" => - <"n","tä","nä","hen","iden","itä","inä","issä","ihin"> ; + <"n","tä","nä","hen","iden","itä","inä","issä","ihin"> ; "F" | "L" | "M" | "N" | "R" | "S" | "X" => - <"n","ää","nä","ään","ien","iä","inä","issä","iin"> ; - "H" | "K" | "O" | "Å" => + <"n","ää","nä","ään","ien","iä","inä","issä","iin"> ; + "H" | "K" | "O" | "Ã…" => <"n","ta","na","hon","iden","ita","ina","issa","ihin"> ; "I" | "J" => - <"n","tä","nä","hin","iden","itä","inä","issä","ihin"> ; + <"n","tä","nä","hin","iden","itä","inä","issä","ihin"> ; "Q" | "U" => <"n","ta","na","hun","iden","ita","ina","issa","ihin"> ; "Z" => <"n","aa","na","aan","ojen","oja","oina","oissa","oihin"> ; - "Ä" => - <"n","tä","nä","hän","iden","itä","inä","issä","ihin"> ; - "Ö" => - <"n","tä","nä","hön","iden","itä","inä","issä","ihin"> ; + "Ä" => + <"n","tä","nä","hän","iden","itä","inä","issä","ihin"> ; + "Ö" => + <"n","tä","nä","hön","iden","itä","inä","issä","ihin"> ; "Y" => - <"n","tä","nä","hyn","iden","itä","inä","issä","ihin"> ; + <"n","tä","nä","hyn","iden","itä","inä","issä","ihin"> ; _ => Predef.error (["illegal abbreviation"] ++ SDP) } ; in nForms10 @@ -609,7 +609,7 @@ resource MorphoFin = ResFin ** open Prelude in { pudot = init pudota ; pudo = init pudot ; ai = case last pudo of { - "a" | "ä" => <[], "i"> ; + "a" | "ä" => <[], "i"> ; _ => } ; puto = Predef.tk 2 putosi ; @@ -735,7 +735,7 @@ resource MorphoFin = ResFin ** open Prelude in { tule_ = init tulen ; tuli_ = init tulin ; a = last tulkaa ; - tulko = Predef.tk 2 tulkaa + (ifTok Str a "a" "o" "ö") ; + tulko = Predef.tk 2 tulkaa + (ifTok Str a "a" "o" "ö") ; o = last tulko ; tulkoo = tulko + o ; tullee = Predef.tk 2 tullut + "ee" ; @@ -853,13 +853,13 @@ resource MorphoFin = ResFin ** open Prelude in { "rk" + ("i" | "e") => ku + "rj" + o ; "lk" + _ => ku + "l" + o ; "rk" + _ => ku + "r" + o ; - ("hk" | "tk") + _ => kukko ; -- *tahko-tahon, *pitkä-pitkän + ("hk" | "tk") + _ => kukko ; -- *tahko-tahon, *pitkä-pitkän ("f"|"s") + ("k" | "p" | "t") + _ => kukko ; -- *lasku-lasvun, *raspi-rasvin, *lastu-lasdun, *afta-aftan ("k"|"p") + "t" + _ => kukko ; -- *projekti-projekdin x + "ku" => ku + x + "vu" ; - x + "k" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + o ; - x + "p" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + "v" + o ; - x + "t" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + "d" + o ; + x + "k" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + o ; + x + "p" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + "v" + o ; + x + "t" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + "d" + o ; _ => kukko } ; @@ -878,13 +878,13 @@ resource MorphoFin = ResFin ** open Prelude in { "ll" + a => "lt" + a ; h@("h" | "l") + "je" + e => h + "ke" ; -- pohje/lahje impossible ("tk" | "hk" | "sk" | "sp" | "st") + _ => nke ; -- viuhke,kuiske - a + k@("k"|"p"|"t") + e@("e"|"a"|"ä"|"u"|"y"|"i"|"o"|"ö") => a + k + k + e ; - a + "d" + e@("e"|"a"|"ä"|"u"|"i"|"o"|"ö") => a + "t" + e ; - s + a@("a" | "ä") + "e" => s + a + "ke" ; -- säe, tae + a + k@("k"|"p"|"t") + e@("e"|"a"|"ä"|"u"|"y"|"i"|"o"|"ö") => a + k + k + e ; + a + "d" + e@("e"|"a"|"ä"|"u"|"i"|"o"|"ö") => a + "t" + e ; + s + a@("a" | "ä") + "e" => s + a + "ke" ; -- säe, tae s + "ui" => s + "uki" ; -- ruis s + "aa" => s + "aka" ; -- taata - s + "i" + a@("a" | "e" | "i") => s + "ik" + a ; -- liata, siitä, pietä - a + "v" + e@("e"|"a"|"ä"|"u"|"i") => a + "p" + e ; -- taive/toive imposs + s + "i" + a@("a" | "e" | "i") => s + "ik" + a ; -- liata, siitä, pietä + a + "v" + e@("e"|"a"|"ä"|"u"|"i") => a + "p" + e ; -- taive/toive imposs ase => ase } ; @@ -895,12 +895,12 @@ resource MorphoFin = ResFin ** open Prelude in { vowHarmony : Str -> Str = \s -> case s of { _ + ("a" | "o" | "u" | "A" | "O" | "U") + _ => "a" ; - _ => "ä" + _ => "ä" } ; getHarmony : Str -> Str = \u -> case u of { "a"|"o"|"u" => "a" ; - _ => "ä" + _ => "ä" } ; ----------------------- @@ -914,7 +914,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn -> mkDetPol : Bool -> Number -> CommonNoun -> { s1,sp : Case => Str ; -- minun kolme - s2 : Harmony => Str ; -- -ni ; nsa/nsä + s2 : Harmony => Str ; -- -ni ; nsa/nsä n : Number ; -- Pl (agreement feature for verb) isNum : Bool ; -- True (a numeral is present) isPoss : Bool ; -- True (a possessive suffix is present) @@ -930,7 +930,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn -> } ; -- Here we define personal and relative pronouns. --- Personal pronouns have possessive suffix (hänen talonsa) but "se" doesn't (sen talo) +-- Personal pronouns have possessive suffix (hänen talonsa) but "se" doesn't (sen talo) mkPronoun : (_,_,_,_,_ : Str) -> Number -> Person -> {s : NPForm => Str ; a : Agr ; hasPoss : Bool ; poss : Str} = mkPronounGen True ; @@ -999,16 +999,16 @@ oper s = table { Nom => "se" ; Gen => "sen" ; - Part => "sitä" ; + Part => "sitä" ; Transl => "siksi" ; - Ess => "sinä" ; - Iness => "siinä" ; - Elat => "siitä" ; + Ess => "sinä" ; + Iness => "siinä" ; + Elat => "siitä" ; Illat => "siihen" ; - Adess => "sillä" ; - Ablat => "siltä" ; + Adess => "sillä" ; + Ablat => "siltä" ; Allat => "sille" ; - Abess => "sittä" + Abess => "sittä" } ; } ; @@ -1016,16 +1016,16 @@ oper s = table { Nom => "ne" ; Gen => "niiden" ; - Part => "niitä" ; + Part => "niitä" ; Transl => "niiksi" ; - Ess => "niinä" ; - Iness => "niissä" ; - Elat => "niitä" ; + Ess => "niinä" ; + Iness => "niissä" ; + Elat => "niitä" ; Illat => "niihin" ; - Adess => "niillä" ; - Ablat => "niiltä" ; + Adess => "niillä" ; + Ablat => "niiltä" ; Allat => "niille" ; - Abess => "niittä" + Abess => "niittä" } ; } ; diff --git a/lib/src/finnish/NounFin.gf b/lib/src/finnish/NounFin.gf index 764580c86..3d061b815 100644 --- a/lib/src/finnish/NounFin.gf +++ b/lib/src/finnish/NounFin.gf @@ -1,6 +1,6 @@ ---# -coding=latin1 concrete NounFin of Noun = CatFin ** open ResFin, MorphoFin, StemFin, Prelude in { + flags coding=utf8 ; lin -- The $Number$ is subtle: "nuo autot", "nuo kolme autoa" are both plural @@ -16,10 +16,10 @@ concrete NounFin of Noun = CatFin ** open ResFin, MorphoFin, StemFin, Prelude in let k = npform2case n c in case of { - <_, NPAcc, True,_,_> => ; -- myin kolme kytkintä(ni) - <_, NPCase Nom, True,_,_> => ; -- kolme kytkintä(ni) on + <_, NPAcc, True,_,_> => ; -- myin kolme kytkintä(ni) + <_, NPCase Nom, True,_,_> => ; -- kolme kytkintä(ni) on <_, _, True,False,_> => ; -- kolmeksi kytkimeksi - => ; -- myin kytkimiä + => ; -- myin kytkimiä <_, NPAcc, _,True,_> => ; -- myin kytkime+ni <_, NPCase Nom,_,True,_> => ; -- kytkime+ni on/ovat... <_, NPCase Gen,_,True,_> => ; -- kytkime+ni vika @@ -34,7 +34,7 @@ concrete NounFin of Noun = CatFin ** open ResFin, MorphoFin, StemFin, Prelude in in det.s1 ! k.p1 ++ cn.s ! k.p2 ++ det.s2 ! cn.h ; a = agrP3 (case of { - => Sg ; -- kolme kytkintä on + => Sg ; -- kolme kytkintä on _ => det.n }) ; isPron = False ; isNeg = det.isNeg @@ -73,21 +73,21 @@ concrete NounFin of Noun = CatFin ** open ResFin, MorphoFin, StemFin, Prelude in PPartNP np v2 = { s = \\c => np.s ! c ++ (sverb2verbSep v2).s ! PastPartPass (AN (NCase (complNumAgr np.a) Ess)) ; a = np.a ; - isPron = np.isPron ; -- minun täällä - ni + isPron = np.isPron ; -- minun täällä - ni isNeg = np.isNeg } ; AdvNP np adv = { s = \\c => np.s ! c ++ adv.s ; a = np.a ; - isPron = np.isPron ; -- minun täällä - ni + isPron = np.isPron ; -- minun täällä - ni isNeg = np.isNeg } ; ExtAdvNP np adv = { s = \\c => np.s ! c ++ embedInCommas adv.s ; a = np.a ; - isPron = np.isPron ; -- minun täällä - ni + isPron = np.isPron ; -- minun täällä - ni isNeg = np.isNeg } ; @@ -164,8 +164,8 @@ concrete NounFin of Noun = CatFin ** open ResFin, MorphoFin, StemFin, Prelude in IndefArt = { s1 = \\_,_ => [] ; -- Nom is Part in Pl: use isDef in DetCN sp = \\n,c => - (nhn (mkSubst "ä" "yksi" "yhde" "yhte" "yhtä" "yhteen" "yksi" "yksi" - "yksien" "yksiä" "yksiin")).s ! NCase n c ; + (nhn (mkSubst "ä" "yksi" "yhde" "yhte" "yhtä" "yhteen" "yksi" "yksi" + "yksien" "yksiä" "yksiin")).s ! NCase n c ; s2 = \\_ => [] ; isNum,isPoss,isDef,isNeg = False -- autoja on } ; @@ -239,7 +239,7 @@ concrete NounFin of Noun = CatFin ** open ResFin, MorphoFin, StemFin, Prelude in } ; PartNP cn np = {s = \\nf => cn.s ! nf ++ np.s ! NPCase Part ; - h = cn.h ---- gives "lasin viiniänsa" ; should be "lasinsa viiniä" + h = cn.h ---- gives "lasin viiniänsa" ; should be "lasinsa viiniä" } ; diff --git a/lib/src/finnish/NumeralFin.gf b/lib/src/finnish/NumeralFin.gf index 6aa97b932..1fec69e00 100644 --- a/lib/src/finnish/NumeralFin.gf +++ b/lib/src/finnish/NumeralFin.gf @@ -1,10 +1,10 @@ ---# -coding=latin1 concrete NumeralFin of Numeral = CatFin [Numeral,Digits] ** open Prelude, ParadigmsFin, MorphoFin, StemFin in { -- Notice: possessive forms are not used. They get wrong, since every -- part is made to agree in them. flags optimize = all_subs ; + coding=utf8 ; lincat Sub1000000 = {s : CardOrd => Str ; n : MorphoFin.Number} ; @@ -18,23 +18,23 @@ lin (nhn (mkSubst "a" "kolme" "kolme" "kolme" "kolmea" "kolmeen" "kolmi" "kolmi" "kolmien" "kolmia" "kolmiin")) (ordN "a" "kolmas") ; - n4 = co (snoun2nounBind (mkN "neljä")) (ordN "ä" "neljäs") ; - n5 = co (snoun2nounBind (mkN "viisi" "viiden" "viisiä")) (ordN "ä" "viides") ; + n4 = co (snoun2nounBind (mkN "neljä")) (ordN "ä" "neljäs") ; + n5 = co (snoun2nounBind (mkN "viisi" "viiden" "viisiä")) (ordN "ä" "viides") ; n6 = co (snoun2nounBind (mkN "kuusi" "kuuden" "kuusia")) (ordN "a" "kuudes") ; n7 = co - (nhn (mkSubst "ä" "seitsemän" "seitsemä" "seitsemä" "seitsemää" - "seitsemään" "seitsemi" "seitsemi" "seitsemien" "seitsemiä" + (nhn (mkSubst "ä" "seitsemän" "seitsemä" "seitsemä" "seitsemää" + "seitsemään" "seitsemi" "seitsemi" "seitsemien" "seitsemiä" "seitsemiin")) - (ordN "ä" "seitsemäs") ; + (ordN "ä" "seitsemäs") ; n8 = co (nhn (mkSubst "a" "kahdeksan" "kahdeksa" "kahdeksa" "kahdeksaa" "kahdeksaan" "kahdeksi" "kahdeksi" "kahdeksien" "kahdeksia" "kahdeksiin")) (ordN "a" "kahdeksas") ; n9 = co - (nhn (mkSubst "ä" "yhdeksän" "yhdeksä" "yhdeksä" "yhdeksää" - "yhdeksään" "yhdeksi" "yhdeksi" "yhdeksien" "yhdeksiä" "yhdeksiin")) - (ordN "ä" "yhdeksäs") ; + (nhn (mkSubst "ä" "yhdeksän" "yhdeksä" "yhdeksä" "yhdeksää" + "yhdeksään" "yhdeksi" "yhdeksi" "yhdeksien" "yhdeksiä" "yhdeksiin")) + (ordN "ä" "yhdeksäs") ; pot01 = {s = table { @@ -100,21 +100,21 @@ param oper yksiN = co - (nhn (mkSubst "ä" "yksi" "yhde" "yhte" "yhtä" "yhteen" "yksi" "yksi" - "yksien" "yksiä" "yksiin")) - (ordN "ä" "yhdes") ; -- yhdestoista + (nhn (mkSubst "ä" "yksi" "yhde" "yhte" "yhtä" "yhteen" "yksi" "yksi" + "yksien" "yksiä" "yksiin")) + (ordN "ä" "yhdes") ; -- yhdestoista yksi_ensiN = co - (nhn (mkSubst "ä" "yksi" "yhde" "yhte" "yhtä" "yhteen" "yksi" "yksi" - "yksien" "yksiä" "yksiin")) - (snoun2nounBind (mkN "ensimmäinen")) ; -- ensimmäinen ---- sadasensimmäinentuhannes + (nhn (mkSubst "ä" "yksi" "yhde" "yhte" "yhtä" "yhteen" "yksi" "yksi" + "yksien" "yksiä" "yksiin")) + (snoun2nounBind (mkN "ensimmäinen")) ; -- ensimmäinen ---- sadasensimmäinentuhannes kaksi_toinenN = co (nhn (mkSubst "a" "kaksi" "kahde" "kahte" "kahta" "kahteen" "kaksi" "kaksi" "kaksien" "kaksia" "kaksiin")) (snoun2nounBind (mkN "toinen")) ; kymmenenN = co - (nhn (mkSubst "ä" "kymmenen" "kymmene" "kymmene" "kymmentä" - "kymmeneen" "kymmeni" "kymmeni" "kymmenien" "kymmeniä" "kymmeniin")) - (ordN "ä" "kymmenes") ; + (nhn (mkSubst "ä" "kymmenen" "kymmene" "kymmene" "kymmentä" + "kymmeneen" "kymmeni" "kymmeni" "kymmenien" "kymmeniä" "kymmeniin")) + (ordN "ä" "kymmenes") ; sataN = co (snoun2nounBind (mkN "sata")) (ordN "a" "sadas") ; @@ -126,7 +126,7 @@ oper kymmentaN = {s = table { - NCard (NCase Sg Nom) => "kymmentä" ; + NCard (NCase Sg Nom) => "kymmentä" ; k => kymmenenN.s ! k } } ; diff --git a/lib/src/finnish/ParadigmsFin.gf b/lib/src/finnish/ParadigmsFin.gf index b742a6786..95d27a371 100644 --- a/lib/src/finnish/ParadigmsFin.gf +++ b/lib/src/finnish/ParadigmsFin.gf @@ -1,5 +1,4 @@ --# -path=.:../abstract:../common:../../prelude ---# -coding=latin1 --1 Finnish Lexical Paradigms -- @@ -30,6 +29,7 @@ resource ParadigmsFin = open in { flags optimize=noexpand ; + coding=utf8 ; --2 Parameters -- @@ -57,12 +57,12 @@ oper ablative : Case ; -- e.g. "talolta" allative : Case ; -- e.g. "talolle" - infFirst : InfForm ; -- e.g. "tehdä" - infIness : InfForm ; -- e.g. "tekemässä" - infElat : InfForm ; -- e.g. "tekemästä" - infIllat : InfForm ; -- e.g. "tekemään" - infPresPart : InfForm ; -- e.g. "tekevän" - infPresPartAgr : InfForm ; -- e.g. "tekevänsä" + infFirst : InfForm ; -- e.g. "tehdä" + infIness : InfForm ; -- e.g. "tekemässä" + infElat : InfForm ; -- e.g. "tekemästä" + infIllat : InfForm ; -- e.g. "tekemään" + infPresPart : InfForm ; -- e.g. "tekevän" + infPresPartAgr : InfForm ; -- e.g. "tekevänsä" -- The following type is used for defining *rection*, i.e. complements -- of many-place verbs and adjective. A complement can be defined by @@ -107,16 +107,16 @@ oper -- -- If the one-argument paradigm does not give the correct result, one can try and give -- two or three forms. Most notably, the two-argument variant is used --- for nouns like "kivi - kiviä", which would otherwise become like --- "rivi - rivejä". Three arguments are used e.g. for +-- for nouns like "kivi - kiviä", which would otherwise become like +-- "rivi - rivejä". Three arguments are used e.g. for -- "auto - auton - autoja", which would otherwise become -- "auto - audon". mkN : overload { mkN : (kukko : Str) -> N ; -- predictable nouns, covers 82% mkN : (savi,savia : Str) -> N ; -- different pl.part - mkN : (vesi,veden,vesiä : Str) -> N ; -- also different sg.gen - mkN : (vesi,veden,vesiä,vettä : Str) -> N ; -- also different sg.part + mkN : (vesi,veden,vesiä : Str) -> N ; -- also different sg.gen + mkN : (vesi,veden,vesiä,vettä : Str) -> N ; -- also different sg.part mkN : (olo,n,a,na,oon,jen,ja,ina,issa,ihin : Str) -> N ; -- worst case, 10 forms mkN : (pika : Str) -> (juna : N) -> N ; -- compound with invariable prefix mkN : (oma : N) -> (tunto : N) -> N ; -- compound with inflecting prefix @@ -166,7 +166,7 @@ oper -- Comparison adjectives have three forms. -- The comparative and the superlative -- are always inflected in the same way, so the nominative of them is actually --- enough (except for the superlative "paras" of "hyvä"). +-- enough (except for the superlative "paras" of "hyvä"). mkA : overload { mkA : Str -> A ; -- regular noun made into adjective @@ -204,14 +204,14 @@ oper mkV : (huutaa,huudan,huusi : Str) -> V ; -- also deviating pres. 1sg mkV : (huutaa,dan,taa,tavat,takaa,detaan,sin,si,sisi,tanut,dettu,tanee : Str) -> V ; -- worst-case verb mkV : VK -> V ; -- verb from DictFin (Kotus) - mkV : V -> Str -> V ; -- hakata päälle (particle verb) - mkV : Str -> V -> V ; -- laimin+lyödä (prefixed verb) + mkV : V -> Str -> V ; -- hakata päälle (particle verb) + mkV : Str -> V -> V ; -- laimin+lyödä (prefixed verb) } ; -- All the patterns above have $nominative$ as subject case. -- If another case is wanted, use the following. - caseV : Case -> V -> V ; -- deviating subj. case, e.g. genitive "täytyä" + caseV : Case -> V -> V ; -- deviating subj. case, e.g. genitive "täytyä" -- The verbs "be" is special. @@ -251,7 +251,7 @@ oper = \v,p,q -> v ** {c2 = p ; c3 = q ; lock_V3 = <>} ; } ; - dirV3 : V -> Case -> V3 ; -- siirtää, (accusative), illative + dirV3 : V -> Case -> V3 ; -- siirtää, (accusative), illative dirdirV3 : V -> V3 ; -- antaa, (accusative), (allative) @@ -261,7 +261,7 @@ oper -- questions, verb phrases, and adjectives. mkVV = overload { - mkVV : Str -> VV -- e.g. "yrittää" (puhua) + mkVV : Str -> VV -- e.g. "yrittää" (puhua) = \s -> mkVVf (mkV s) infFirst ; mkVV : V -> VV -- e.g. "alkaa" (puhua) = \v -> mkVVf v infFirst ; @@ -272,7 +272,7 @@ mkVV = overload { } ; mkVS = overload { - mkVS : Str -> VS -- e.g. "väittää" + mkVS : Str -> VS -- e.g. "väittää" = \s -> lin VS (mk1V s) ; mkVS : V -> VS -- e.g. "sanoa" = \v -> lin VS v ; @@ -283,9 +283,9 @@ mkVS = overload { = \s -> mkV2Vf (mkV s) (casePrep partitive) infIllat ; ---- mkV2V : V -> V2V -- partitive + infillat = \v -> mkV2Vf v (casePrep partitive) infIllat ; ---- - mkV2V : V -> Prep -> V2V -- e.g. "käskeä" genitive + infFiilat + mkV2V : V -> Prep -> V2V -- e.g. "käskeä" genitive + infFiilat = \v,p -> mkV2Vf v p infIllat ; - mkV2V : V -> Prep -> InfForm -> V2V -- e.g. "kieltää" partitive infElat + mkV2V : V -> Prep -> InfForm -> V2V -- e.g. "kieltää" partitive infElat = \v,p,f -> mk2V2 v p ** {vi = infform2vvtype f ; lock_V2V = <>} ; mkV2V : V -> Case -> InfForm -> V2V = \v,c,f -> mk2V2 v (casePrep c) ** {vi = infform2vvtype f ; lock_V2V = <>} ; @@ -295,11 +295,11 @@ mkVS = overload { mkV2S : V -> Prep -> V2S ; -- e.g. "sanoa" allative mkVVf : V -> InfForm -> VV ; -- e.g. "ruveta" infIllat - mkV2Vf : V -> Prep -> InfForm -> V2V ; -- e.g. "kieltää" partitive infElat + mkV2Vf : V -> Prep -> InfForm -> V2V ; -- e.g. "kieltää" partitive infElat mkVA : V -> Prep -> VA ; -- e.g. "maistua" ablative mkV2A : V -> Prep -> Prep -> V2A ; -- e.g. "maalata" accusative translative mkVQ : V -> VQ ; - mkV2Q : V -> Prep -> V2Q ; -- e.g. "kysyä" ablative + mkV2Q : V -> Prep -> V2Q ; -- e.g. "kysyä" ablative mkAS : A -> AS ; --% --- mkA2S : A -> Prep -> A2S ; --% @@ -344,7 +344,7 @@ mkVS = overload { = \nu,noun -> lin Det (MorphoFin.mkDet nu (snoun2nounBind noun)) ; mkDet : (isNeg : Bool) -> Number -> N -> Det -- use this with True to create a negative determiner = \isNeg,nu,noun -> lin Det (MorphoFin.mkDetPol isNeg nu (snoun2nounBind noun)) ; - mkDet : (isNeg : Bool) -> Number -> N -> Case -> Det -- paljon + False + partitive, ei yhtään + True + partitive + mkDet : (isNeg : Bool) -> Number -> N -> Case -> Det -- paljon + False + partitive, ei yhtään + True + partitive = \isNeg,nu,noun,_ -> lin Det (MorphoFin.mkDetPol isNeg nu (snoun2nounBind noun)) ; } ; @@ -459,51 +459,51 @@ mkVS = overload { ukk = init ukko ; uko = weakGrade ukko ; ukon = uko + "n" ; - o = case last ukko of {"ä" => "ö" ; "a" => "o"} ; -- only used then + o = case last ukko of {"ä" => "ö" ; "a" => "o"} ; -- only used then renka = strongGrade (init ukko) ; rake = strongGrade ukko ; in case ukko of { _ + "nen" => dNainen ukko ; - _ + ("aa" | "ee" | "ii" | "oo" | "uu" | "yy" |"ää"|"öö") => dPuu ukko ; - _ + ("ai" | "ei" | "oi" | "ui" | "yi" | "äi" | "öi") => dPuu ukko ; - _ + ("ie" | "uo" | "yö") => dSuo ukko ; - _ + ("ea" | "eä") => dKorkea ukko ; + _ + ("aa" | "ee" | "ii" | "oo" | "uu" | "yy" |"ää"|"öö") => dPuu ukko ; + _ + ("ai" | "ei" | "oi" | "ui" | "yi" | "äi" | "öi") => dPuu ukko ; + _ + ("ie" | "uo" | "yö") => dSuo ukko ; + _ + ("ea" | "eä") => dKorkea ukko ; _ + "is" => dKaunis ukko ; _ + ("i" | "u") + "n" => dLiitin ukko (renka + "men") ; - _ + ("ton" | "tön") => dOnneton ukko ; + _ + ("ton" | "tön") => dOnneton ukko ; _ + "e" => dRae ukko (rake + "en") ; _ + ("ut" | "yt") => dOttanut ukko ; - _ + ("as" | "äs") => dRae ukko (renka + last renka + "n") ; + _ + ("as" | "äs") => dRae ukko (renka + last renka + "n") ; _ + ("uus" | "yys" | "eus" | "eys") => dLujuus ukko ; _ + "s" => dJalas ukko ; --- {- heuristics for 3-syllable nouns ending a/ä - _ + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + ? + - _ + "i" + ? + a@("a" | "ä") => - dSilakka ukko (ukko + "n") (ukk + o + "it" + a) ; -- pesijä - _ + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + ? + _ + - ("a" | "e" | "o" | "u" | "y" | "ä" | "ö") + - ("l" | "r" | "n") + a@("a" | "ä") => +-- {- heuristics for 3-syllable nouns ending a/ä + _ + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + ? + + _ + "i" + ? + a@("a" | "ä") => + dSilakka ukko (ukko + "n") (ukk + o + "it" + a) ; -- pesijä + _ + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + ? + _ + + ("a" | "e" | "o" | "u" | "y" | "ä" | "ö") + + ("l" | "r" | "n") + a@("a" | "ä") => dSilakka ukko (ukko + "n") (ukk + o + "it" + a) ; -- sarana, omena - _ + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + ? + _ + - ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + - ("n" | "k" | "s") + "k" + a@("a" | "ä") => + _ + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + ? + _ + + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + + ("n" | "k" | "s") + "k" + a@("a" | "ä") => dSilakka ukko (uko + "n") (init uko + o + "it" + a) ; -- silakka - _ + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + ? + _ + - ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + - ("n" | "t" | "s") + "t" + a@("a" | "ä") => - dSilakka ukko (uko + "n") (ukk + o + "j" + a) ; -- yhdyntä (but not isäntä) + _ + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + ? + _ + + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") + + ("n" | "t" | "s") + "t" + a@("a" | "ä") => + dSilakka ukko (uko + "n") (ukk + o + "j" + a) ; -- yhdyntä (but not isäntä) _ + ("a" | "e" | "i" | "o" | "u") + ? + _ + ("a" | "e" | "o" | "u") + ? + "a" => dSilakka ukko (ukko + "n") (ukk + "ia") ; -- asema, johtaja -- -} - _ + "i" +o@("o"|"ö") => dSilakka ukko (ukko+"n") (ukko+"it"+getHarmony o); + _ + "i" +o@("o"|"ö") => dSilakka ukko (ukko+"n") (ukko+"it"+getHarmony o); _ + "i" + "a" => dSilakka ukko (ukko + "n") (ukk + "oita") ; - _ + "i" + "ä" => dSilakka ukko (ukko + "n") (ukk + "öitä") ; - _ + ("a" | "o" | "u" | "y" | "ä" | "ö") => dUkko ukko ukon ; + _ + "i" + "ä" => dSilakka ukko (ukko + "n") (ukk + "öitä") ; + _ + ("a" | "o" | "u" | "y" | "ä" | "ö") => dUkko ukko ukon ; _ + "i" => dPaatti ukko ukon ; - _ + ("ar" | "är") => dPiennar ukko (renka + "ren") ; + _ + ("ar" | "är") => dPiennar ukko (renka + "ren") ; _ + "e" + ("l" | "n") => dPiennar ukko (ukko + "en") ; _ => dUnix ukko } ; @@ -515,28 +515,28 @@ mkVS = overload { ukon = weakGrade ukko + "n" ; in case of { - <_, _ + ":" + ? + ("a" | "ä")> => dSDP ukko ; + <_, _ + ":" + ? + ("a" | "ä")> => dSDP ukko ; <_ + "ea", _ + "oita"> => dSilakka ukko ukon ukkoja ; -- idea, but not korkea - <_ + ("aa" | "ee" | "ii" | "oo" | "uu" | "yy" | "ää" | "öö" | - "ie" | "uo" | "yö" | "ea" | "eä" | - "ia" | "iä" | "io" | "iö"), _ + ("a" | "ä")> => + <_ + ("aa" | "ee" | "ii" | "oo" | "uu" | "yy" | "ää" | "öö" | + "ie" | "uo" | "yö" | "ea" | "eä" | + "ia" | "iä" | "io" | "iö"), _ + ("a" | "ä")> => nForms1 ukko ; --- to protect --- how to get "dioja"? - <_ + ("a" | "ä" | "o" | "ö"), _ + ("a" | "ä")> => + <_ + ("a" | "ä" | "o" | "ö"), _ + ("a" | "ä")> => dSilakka ukko ukon ukkoja ; - => + => dArpi ukko (init (weakGrade ukko) + "en") ; - <_ + "i", _ + ("eita" | "eitä")> => + <_ + "i", _ + ("eita" | "eitä")> => dTohtori ukko ; - <_ + ("ut" | "yt"),_ + ("uita" | "yitä")> => dRae ukko (init ukko + "en") ; - <_ + "e", nuk + ("eja" | "ejä")> => + <_ + ("ut" | "yt"),_ + ("uita" | "yitä")> => dRae ukko (init ukko + "en") ; + <_ + "e", nuk + ("eja" | "ejä")> => dNukke ukko ukon ; <_ + "s", _ + "ksi" + ?> => dJalas ukko ; - <_ + ("l" | "n" | "r" | "s"), _ + ("eja" | "ejä")> => dUnix ukko ; - <_, _ + ("a" | "ä")> => ukot ; + <_ + ("l" | "n" | "r" | "s"), _ + ("eja" | "ejä")> => dUnix ukko ; + <_, _ + ("a" | "ä")> => ukot ; _ => Predef.error - (["last argument should end in a/ä, not"] ++ ukkoja) + (["last argument should end in a/ä, not"] ++ ukkoja) } ; nForms3 : (_,_,_ : Str) -> NForms = \ukko,ukon,ukkoja -> @@ -546,17 +546,17 @@ mkVS = overload { in case of { <_, _ + ":n"> => dSDP ukko ; - <_ + ("aa" | "ee" | "ii" | "oo" | "uu" | "yy" | "ää" | "öö" | - "ie" | "uo" | "yö" | "ea" | "eä" | - "ia" | "iä" | "io" | "iö" | "ja" | "jä"), _ + "n"> => + <_ + ("aa" | "ee" | "ii" | "oo" | "uu" | "yy" | "ää" | "öö" | + "ie" | "uo" | "yö" | "ea" | "eä" | + "ia" | "iä" | "io" | "iö" | "ja" | "jä"), _ + "n"> => ukot ; --- to protect - <_ + ("a" | "o" | "u" | "y" | "ä" | "ö"), _ + "n"> => + <_ + ("a" | "o" | "u" | "y" | "ä" | "ö"), _ + "n"> => dSilakka ukko ukon ukkoja ; -- auto,auton - <_ + "mpi", _ + ("emman" | "emmän")> => dSuurempi ukko ; - <_ + "in", _ + ("imman" | "immän")> => dSuurin ukko ; + <_ + "mpi", _ + ("emman" | "emmän")> => dSuurempi ukko ; + <_ + "in", _ + ("imman" | "immän")> => dSuurin ukko ; => -- was nonlinear dRae ukko ukon ; - => -- was nonlinear + => -- was nonlinear dRae ukko ukon ; => dRae ukko ukon ; => dArpi ukko ukon ; @@ -571,14 +571,14 @@ mkVS = overload { ukot = nForms3 ukko ukon ukkoja ; in case of { - <_,_ + "n", _ + ("a" | "ä"), _ + ("a" | "ä")> => + <_,_ + "n", _ + ("a" | "ä"), _ + ("a" | "ä")> => table { 2 => ukkoa ; n => ukot ! n } ; _ => Predef.error - (["last arguments should end in n, a/ä, and a/ä, not"] ++ + (["last arguments should end in n, a/ä, and a/ä, not"] ++ ukon ++ ukkoja ++ ukkoa) } ; @@ -613,7 +613,7 @@ mkVS = overload { noun : Str -> NForms = \s -> case s of { _ + "i" => dPaatti s (s + "n") ; _ + "e" => dNukke s (s + "n") ; - _ + ("a" | "o" | "u" | "y" | "ä" | "ö" | "ü") => dUkko s (s + "n") ; + _ + ("a" | "o" | "u" | "y" | "ä" | "ö" | "ü") => dUkko s (s + "n") ; _ => dUnix s } } ; @@ -693,28 +693,28 @@ mkVS = overload { ot = init ota ; in case ottaa of { - _ + ("e" | "i" | "o" | "u" | "y" | "ö") + ("a" | "ä") => + _ + ("e" | "i" | "o" | "u" | "y" | "ö") + ("a" | "ä") => cHukkua ottaa (ota + "n") ; - _ + ("l" | "n" | "r") + ("taa" | "tää") => + _ + ("l" | "n" | "r") + ("taa" | "tää") => cOttaa ottaa (ota + "n") (ots + "in") (ots + "i") ; ("" | ?) + ("a" | "e" | "i" | "o" | "u") + ? + _ + ("a" | "e" | "i" | "o" | "u") + _ + "aa" => cOttaa ottaa (ota + "n") (ot + "in") (ott + "i") ; ("" | ?) + ("a" | "e" | "i") + _ + "aa" => cOttaa ottaa (ota + "n") (ot + "oin") (ott + "oi") ; - _ + ("aa" | "ää") => + _ + ("aa" | "ää") => cOttaa ottaa (ota + "n") (ot + "in") (ott + "i") ; - _ + ("ella" | "ellä") => + _ + ("ella" | "ellä") => cKuunnella ottaa otin ; - _ + ("osta" | "östä") => + _ + ("osta" | "östä") => cJuosta ottaa (init ott + "ksen") ; - _ + ("st" | "nn" | "ll" | "rr") + ("a" | "ä") => + _ + ("st" | "nn" | "ll" | "rr") + ("a" | "ä") => cJuosta ottaa (ott + "en") ; - _ + ("ita" | "itä") => + _ + ("ita" | "itä") => cHarkita ottaa ; - _ + ("eta" | "etä" | "ota" | "ata" | "uta" | "ytä" | "ätä" | "ötä") => + _ + ("eta" | "etä" | "ota" | "ata" | "uta" | "ytä" | "ätä" | "ötä") => cPudota ottaa (strongGrade ott + "si") ; - _ + ("da" | "dä") => + _ + ("da" | "dä") => cJuoda ottaa ; _ => Predef.error (["expected infinitive, found"] ++ ottaa) } ; @@ -726,17 +726,17 @@ mkVS = overload { autoin = weakGrade (init huusi) + "in" ; in case of { - <_ + ("taa" | "tää"), _ + ("oi" | "öi")> => + <_ + ("taa" | "tää"), _ + ("oi" | "öi")> => cOttaa huutaa (huuda + "n") autoin huusi ; - <_ + ("aa" | "ää"), _ + "i"> => + <_ + ("aa" | "ää"), _ + "i"> => cOttaa huutaa (huuda + "n") huusin huusi ; - <_ + ("eta" | "etä"), _ + "eni"> => + <_ + ("eta" | "etä"), _ + "eni"> => cValjeta huutaa huusi ; - <_ + ("sta" | "stä"), _ + "si"> => - vForms1 huutaa ; -- pestä, halkaista - <_ + ("ta" | "tä"), _ + "si"> => + <_ + ("sta" | "stä"), _ + "si"> => + vForms1 huutaa ; -- pestä, halkaista + <_ + ("ta" | "tä"), _ + "si"> => cPudota huutaa huusi ; - <_ + ("lla" | "llä"), _ + "li"> => + <_ + ("lla" | "llä"), _ + "li"> => cKuunnella huutaa huusin ; _ => vForms1 huutaa } ; @@ -747,7 +747,7 @@ mkVS = overload { vOlla = { s = ollaSVerbForms ; - sc = SCNom ; h = Back ; lock_V = <> ; p = []} ; ---- lieneekö + sc = SCNom ; h = Back ; lock_V = <> ; p = []} ; ---- lieneekö mk2V2 : V -> Prep -> V2 = \v,c -> v ** {c2 = c ; lock_V2 = <>} ; caseV2 : V -> Case -> V2 = \v,c -> mk2V2 v (casePrep c) ; diff --git a/lib/src/finnish/QuestionFin.gf b/lib/src/finnish/QuestionFin.gf index 6fd35044d..be6903ba2 100644 --- a/lib/src/finnish/QuestionFin.gf +++ b/lib/src/finnish/QuestionFin.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 concrete QuestionFin of Question = CatFin ** open ResFin, StemFin, Prelude in { flags optimize=all_subs ; + coding=utf8 ; lin @@ -55,9 +55,9 @@ concrete QuestionFin of Question = CatFin ** open ResFin, StemFin, Prelude in { let k = npform2case n c ; ncase = case of { - => NCase Sg Part ; -- mitkä kolme kytkintä + => NCase Sg Part ; -- mitkä kolme kytkintä <_, True> => NCase Sg k ; -- miksi kolmeksi kytkimeksi - _ => NCase n k -- mitkä kytkimet + _ => NCase n k -- mitkä kytkimet } in idet.s ! k ++ cn.s ! ncase ; @@ -81,9 +81,9 @@ concrete QuestionFin of Question = CatFin ** open ResFin, StemFin, Prelude in { s = \\k => let ncase = case of { - => NCase Sg Part ; -- mitkä kolme kytkintä + => NCase Sg Part ; -- mitkä kolme kytkintä <_, True> => NCase Sg k ; -- miksi kolmeksi kytkimeksi - _ => NCase n k -- mitkä kytkimet + _ => NCase n k -- mitkä kytkimet } in idet.s ! n ! k ++ num.s ! Sg ! k ; diff --git a/lib/src/finnish/RelativeFin.gf b/lib/src/finnish/RelativeFin.gf index 9bafcd874..e6b60db08 100644 --- a/lib/src/finnish/RelativeFin.gf +++ b/lib/src/finnish/RelativeFin.gf @@ -1,12 +1,12 @@ ---# -coding=latin1 concrete RelativeFin of Relative = CatFin ** open Prelude, ResFin, MorphoFin, StemFin in { flags optimize=all_subs ; + coding=utf8 ; lin RelCl cl = { - s = \\t,a,p,_ => "siten" ++ "että" ++ cl.s ! t ! a ! p ! SDecl ; + s = \\t,a,p,_ => "siten" ++ "että" ++ cl.s ! t ! a ! p ! SDecl ; ---- sellainen c = NPCase Nom } ; diff --git a/lib/src/finnish/ResFin.gf b/lib/src/finnish/ResFin.gf index 3c1a05d8d..39d5cb120 100644 --- a/lib/src/finnish/ResFin.gf +++ b/lib/src/finnish/ResFin.gf @@ -1,5 +1,4 @@ --# -path=.:../abstract:../common:../../prelude ---# -coding=latin1 --1 Finnish auxiliary operations. @@ -11,6 +10,7 @@ resource ResFin = ParamX ** open Prelude in { flags optimize=all ; + coding=utf8 ; --2 Parameters for $Noun$ @@ -220,11 +220,11 @@ param let c = case co.c of { NPAcc => case b of { - Neg => NPCase Part ; -- en näe taloa/sinua + Neg => NPCase Part ; -- en näe taloa/sinua Pos => case isFin of { - True => NPAcc ; -- näen/täytyy nähdä sinut + True => NPAcc ; -- näen/täytyy nähdä sinut _ => case np.isPron of { - False => NPCase Nom ; -- täytyy nähdä talo + False => NPCase Nom ; -- täytyy nähdä talo _ => NPAcc } } @@ -298,7 +298,7 @@ oper } ; kin : Polarity -> Harmony -> Str = - \p,b -> case p of {Pos => (mkPart "kin" "kin").s ! b ; Neg => (mkPart "kaan" "kään").s ! b} ; + \p,b -> case p of {Pos => (mkPart "kin" "kin").s ! b ; Neg => (mkPart "kaan" "kään").s ! b} ; mkPart : Str -> Str -> {s : Harmony => Str} = \ko,koe -> {s = table {Back => glueTok ko ; Front => glueTok koe}} ; @@ -311,7 +311,7 @@ oper subjForm : NP -> SubjCase -> Polarity -> Str = \np,sc,b -> appCompl False b {s = <[],[],\\_ => []> ; c = subjcase2npform sc} np ; - questPart : Harmony -> Str = \b -> case b of {Back => "ko" ; _ => "kö"} ; + questPart : Harmony -> Str = \b -> case b of {Back => "ko" ; _ => "kö"} ; -- The definitions below were moved here from $MorphoFin$ so that the -- auxiliary of predication can be defined. @@ -365,7 +365,7 @@ oper Potent Sg P3 => "lienee" ; --# notpresent Potent Pl P1 => "lienemme" ; --# notpresent Potent Pl P2 => "lienette" ; --# notpresent - Potent Pl P3 => "lienevät" ; --# notpresent + Potent Pl P3 => "lienevät" ; --# notpresent PotentNeg => "liene" ; --# notpresent Imper Sg => "ole" ; Imper Pl => "olkaa" ; @@ -398,8 +398,8 @@ oper -- Unfortunately not enough (without complicated processes). -- We moreover give grade alternation forms as arguments, since it does not -- happen automatically. ---- A problem remains with the verb "seistä", where the infinitive ---- stem has vowel harmony "ä" but the others "a", thus "seisoivat" but "seiskää". +--- A problem remains with the verb "seistä", where the infinitive +--- stem has vowel harmony "ä" but the others "a", thus "seisoivat" but "seiskää". noun2adj : CommonNoun -> Adj = noun2adjComp True ; @@ -521,9 +521,9 @@ oper (rakei + "den") (rakei + ("t" + a)) (rakei + "siin") ; --- Nouns with partitive "a"/"ä" ; +-- Nouns with partitive "a"/"ä" ; -- to account for grade and vowel alternation, three forms are usually enough --- Examples: "talo", "kukko", "huippu", "koira", "kukka", "syylä",... +-- Examples: "talo", "kukko", "huippu", "koira", "kukka", "syylä",... sKukko : (_,_,_ : Str) -> NounH = \kukko,kukon,kukkoja -> let { @@ -555,7 +555,7 @@ oper oper reflPron : Agr -> NP = \agr -> let - itse = (nhn (sKukko "itse" "itsen" "itsejä")).s ; + itse = (nhn (sKukko "itse" "itsen" "itsejä")).s ; nsa = possSuffixFront agr in { s = table { @@ -575,7 +575,7 @@ oper } ; possSuffixFront : Agr -> Str = \agr -> - table Agr ["ni" ; "si" ; "nsä" ; "mme" ; "nne" ; "nsä" ; "nne"] ! agr ; + table Agr ["ni" ; "si" ; "nsä" ; "mme" ; "nne" ; "nsä" ; "nne"] ! agr ; possSuffix : Agr -> Str = \agr -> table Agr ["ni" ; "si" ; "nsa" ; "mme" ; "nne" ; "nsa" ; "nne"] ! agr ; @@ -586,7 +586,7 @@ oper isPron = False -- has no special accusative } ; - etta_Conj : Str = "että" ; + etta_Conj : Str = "että" ; heavyDet : PDet -> PDet ** {sp : Case => Str} = \d -> d ** {sp = d.s1} ; PDet : Type = { diff --git a/lib/src/finnish/SentenceFin.gf b/lib/src/finnish/SentenceFin.gf index b95efd4d7..269b47ab0 100644 --- a/lib/src/finnish/SentenceFin.gf +++ b/lib/src/finnish/SentenceFin.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 concrete SentenceFin of Sentence = CatFin ** open Prelude, ResFin, StemFin in { flags optimize=all_subs ; + coding=utf8 ; lin @@ -38,7 +38,7 @@ concrete SentenceFin of Sentence = CatFin ** open Prelude, ResFin, StemFin in { SlashVS np vs slash = { s = \\t,a,p => (mkClause (subjForm np vs.sc) np.a - (insertExtrapos ("että" ++ slash.s) + (insertExtrapos ("että" ++ slash.s) (predSV vs)) ).s ! t ! a ! p ! SDecl ; c2 = slash.c2 @@ -63,7 +63,7 @@ concrete SentenceFin of Sentence = CatFin ** open Prelude, ResFin, StemFin in { AdvS a s = {s = a.s ++ s.s} ; ExtAdvS a s = {s = a.s ++ "," ++ s.s} ; - RelS s r = {s = s.s ++ "," ++ r.s ! agrP3 Sg} ; ---- mikä + RelS s r = {s = s.s ++ "," ++ r.s ! agrP3 Sg} ; ---- mikä SSubjS a subj b = {s = a.s ++ "," ++ subj.s ++ b.s} ; diff --git a/lib/src/finnish/StructuralFin.gf b/lib/src/finnish/StructuralFin.gf index 12c1f94a6..dffdf4728 100644 --- a/lib/src/finnish/StructuralFin.gf +++ b/lib/src/finnish/StructuralFin.gf @@ -1,12 +1,12 @@ ---# -coding=latin1 concrete StructuralFin of Structural = CatFin ** open MorphoFin, ParadigmsFin, (X = ConstructX), StemFin, Prelude in { flags optimize=all ; + coding=utf8 ; lin - above_Prep = postGenPrep "yläpuolella" ; - after_Prep = postGenPrep "jälkeen" ; + above_Prep = postGenPrep "yläpuolella" ; + after_Prep = postGenPrep "jälkeen" ; all_Predet = {s = \\n,c => let @@ -24,8 +24,8 @@ concrete StructuralFin of Structural = CatFin ** because_Subj = ss "koska" ; before_Prep = prePrep partitive "ennen" ; behind_Prep = postGenPrep "takana" ; - between_Prep = postGenPrep "välissä" ; - both7and_DConj = sd2 "sekä" "että" ** {n = Pl} ; + between_Prep = postGenPrep "välissä" ; + both7and_DConj = sd2 "sekä" "että" ** {n = Pl} ; but_PConj = ss "mutta" ; by8agent_Prep = postGenPrep "toimesta" ; by8means_Prep = casePrep adessive ; @@ -38,20 +38,20 @@ concrete StructuralFin of Structural = CatFin ** everything_NP = makeNP ((((mkN "kaikki" "kaiken" "kaikkena")))) Sg ; everywhere_Adv = ss "kaikkialla" ; few_Det = MorphoFin.mkDet Sg (snoun2nounBind (mkN "harva")) ; ---- first_Ord = {s = \\n,c => (mkN "ensimmäinen").s ! NCase n c} ; +--- first_Ord = {s = \\n,c => (mkN "ensimmäinen").s ! NCase n c} ; for_Prep = casePrep allative ; from_Prep = casePrep elative ; - he_Pron = mkPronoun "hän" "hänen" "häntä" "hänenä" "häneen" Sg P3 ; - here_Adv = ss "täällä" ; - here7to_Adv = ss "tänne" ; - here7from_Adv = ss "täältä" ; + he_Pron = mkPronoun "hän" "hänen" "häntä" "hänenä" "häneen" Sg P3 ; + here_Adv = ss "täällä" ; + here7to_Adv = ss "tänne" ; + here7from_Adv = ss "täältä" ; how_IAdv = ss "miten" ; how8much_IAdv = ss "kuinka paljon" ; how8many_IDet = {s = \\c => "kuinka" ++ (snoun2nounBind (mkN "moni" "monia")).s ! NCase Sg c ; n = Sg ; isNum = False} ; if_Subj = ss "jos" ; - in8front_Prep = postGenPrep "edessä" ; - i_Pron = mkPronoun "minä" "minun" "minua" "minuna" "minuun" Sg P1 ; + in8front_Prep = postGenPrep "edessä" ; + i_Pron = mkPronoun "minä" "minun" "minua" "minuna" "minuun" Sg P1 ; in_Prep = casePrep inessive ; it_Pron = { s = \\c => pronSe.s ! npform2case Sg c ; @@ -59,12 +59,12 @@ concrete StructuralFin of Structural = CatFin ** hasPoss = False ; poss = "sen" ; } ; - less_CAdv = X.mkCAdv "vähemmän" "kuin" ; + less_CAdv = X.mkCAdv "vähemmän" "kuin" ; many_Det = MorphoFin.mkDet Sg (snoun2nounBind (mkN "moni" "monia")) ; - more_CAdv = X.mkCAdv "enemmän" "kuin" ; + more_CAdv = X.mkCAdv "enemmän" "kuin" ; most_Predet = {s = \\n,c => (nForms2N (dSuurin "useinta")).s ! NCase n (npform2case n c)} ; much_Det = MorphoFin.mkDet Sg {s = \\_ => "paljon" ; h = Back} ; --Harmony not relevant, it's just a CommonNoun - must_VV = mkVV (caseV genitive (mkV "täytyä")) ; + must_VV = mkVV (caseV genitive (mkV "täytyä")) ; no_Utt = ss "ei" ; on_Prep = casePrep adessive ; --- one_Quant = MorphoFin.mkDet Sg DEPREC @@ -72,10 +72,10 @@ concrete StructuralFin of Structural = CatFin ** or_Conj = {s1 = [] ; s2 = "tai" ; n = Sg} ; otherwise_PConj = ss "muuten" ; part_Prep = casePrep partitive ; - please_Voc = ss ["ole hyvä"] ; --- number + please_Voc = ss ["ole hyvä"] ; --- number possess_Prep = casePrep genitive ; quite_Adv = ss "melko" ; - she_Pron = mkPronoun "hän" "hänen" "häntä" "hänenä" "häneen" Sg P3 ; + she_Pron = mkPronoun "hän" "hänen" "häntä" "hänenä" "häneen" Sg P3 ; so_AdA = ss "niin" ; somebody_NP = { s = \\c => jokuPron ! Sg ! npform2case Sg c ; @@ -109,19 +109,19 @@ concrete StructuralFin of Structural = CatFin ** } ; s2 = \\_ => [] ; isNum,isPoss = False ; isDef = True ; isNeg = False } ; - that_Subj = ss "että" ; - there_Adv = ss "siellä" ; --- tuolla + that_Subj = ss "että" ; + there_Adv = ss "siellä" ; --- tuolla there7to_Adv = ss "sinne" ; - there7from_Adv = ss "sieltä" ; + there7from_Adv = ss "sieltä" ; therefore_PConj = ss "siksi" ; - they_Pron = mkPronoun "he" "heidän" "heitä" "heinä" "heihin" Pl P3 ; --- ne + they_Pron = mkPronoun "he" "heidän" "heitä" "heinä" "heihin" Pl P3 ; --- ne this_Quant = heavyQuant { s1 = table (MorphoFin.Number) { Sg => table (MorphoFin.Case) { - c => (mkPronoun "tämä" "tämän" "tätä" "tänä" "tähän" Sg P3).s ! NPCase c + c => (mkPronoun "tämä" "tämän" "tätä" "tänä" "tähän" Sg P3).s ! NPCase c } ; Pl => table (MorphoFin.Case) { - c => (mkPronoun "nämä" "näiden" "näitä" "näinä" "näihin" Sg P3).s ! NPCase c + c => (mkPronoun "nämä" "näiden" "näitä" "näinä" "näihin" Sg P3).s ! NPCase c } } ; s2 = \\_ => [] ; isNum,isPoss = False ; isDef = True ; isNeg = False @@ -130,11 +130,11 @@ concrete StructuralFin of Structural = CatFin ** too_AdA = ss "liian" ; to_Prep = casePrep illative ; --- allative under_Prep = postGenPrep "alla" ; - very_AdA = ss "erittäin" ; + very_AdA = ss "erittäin" ; want_VV = mkVV (mkV "tahtoa") ; - we_Pron = mkPronoun "me" "meidän" "meitä" "meinä" "meihin" Pl P1 ; + we_Pron = mkPronoun "me" "meidän" "meitä" "meinä" "meihin" Pl P1 ; whatPl_IP = { - s = table {NPAcc => "mitkä" ; c => mikaInt ! Pl ! npform2case Pl c} ; + s = table {NPAcc => "mitkä" ; c => mikaInt ! Pl ! npform2case Pl c} ; n = Pl } ; whatSg_IP = { @@ -143,7 +143,7 @@ concrete StructuralFin of Structural = CatFin ** } ; when_IAdv = ss "milloin" ; when_Subj = ss "kun" ; - where_IAdv = ss "missä" ; + where_IAdv = ss "missä" ; which_IQuant = { s = mikaInt } ; @@ -152,17 +152,17 @@ concrete StructuralFin of Structural = CatFin ** n = Sg } ; whoPl_IP = { - s = table {NPAcc => "ketkä" ; c => kukaInt ! Pl ! npform2case Pl c} ; + s = table {NPAcc => "ketkä" ; c => kukaInt ! Pl ! npform2case Pl c} ; n = Pl } ; why_IAdv = ss "miksi" ; without_Prep = prePrep partitive "ilman" ; with_Prep = postGenPrep "kanssa" ; - yes_Utt = ss "kyllä" ; - youSg_Pron = mkPronoun "sinä" "sinun" "sinua" "sinuna" "sinuun" Sg P2 ; - youPl_Pron = mkPronoun "te" "teidän" "teitä" "teinä" "teihin" Pl P2 ; + yes_Utt = ss "kyllä" ; + youSg_Pron = mkPronoun "sinä" "sinun" "sinua" "sinuna" "sinuun" Sg P2 ; + youPl_Pron = mkPronoun "te" "teidän" "teitä" "teinä" "teihin" Pl P2 ; youPol_Pron = - let p = mkPronoun "te" "teidän" "teitä" "teinä" "teihin" Pl P2 in + let p = mkPronoun "te" "teidän" "teitä" "teinä" "teihin" Pl P2 in {s = p.s ; a = AgPol ; hasPoss = True ; poss = p.poss} ; oper @@ -201,16 +201,16 @@ oper } in table { Sg => table { - Nom => "mikä" ; - Gen => "minkä" ; - Part => "mitä" ; + Nom => "mikä" ; + Gen => "minkä" ; + Part => "mitä" ; Illat => "mihin" ; c => mi.s ! NCase Sg c } ; Pl => table { - Nom => "mitkä" ; - Gen => "minkä" ; - Part => "mitä" ; + Nom => "mitkä" ; + Gen => "minkä" ; + Part => "mitä" ; Illat => "mihin" ; c => mi.s ! NCase Sg c } @@ -218,55 +218,55 @@ oper kukaInt : MorphoFin.Number => (MorphoFin.Case) => Str = let - kuka = snoun2nounBind (mkN "kuka" "kenen" "ketä" "kenä" "keneen" - "keiden" "keitä" "keinä" "keissä" "keihin") ; + kuka = snoun2nounBind (mkN "kuka" "kenen" "ketä" "kenä" "keneen" + "keiden" "keitä" "keinä" "keissä" "keihin") ; in table { Sg => table { c => kuka.s ! NCase Sg c } ; Pl => table { - Nom => "ketkä" ; + Nom => "ketkä" ; c => kuka.s ! NCase Pl c } } ; mikaanPron : MorphoFin.Number => (MorphoFin.Case) => Str = \\n,c => case of { - => "mikään" ; - <_,Part> => "mitään" ; - => "minkään" ; - => "mitkään" ; - => "mittenkään" ; - <_,Ess> => "minään" ; - <_,Iness> => "missään" ; - <_,Elat> => "mistään" ; - <_,Adess> => "millään" ; - <_,Ablat> => "miltään" ; - _ => mikaInt ! n ! c + "kään" + => "mikään" ; + <_,Part> => "mitään" ; + => "minkään" ; + => "mitkään" ; + => "mittenkään" ; + <_,Ess> => "minään" ; + <_,Iness> => "missään" ; + <_,Elat> => "mistään" ; + <_,Adess> => "millään" ; + <_,Ablat> => "miltään" ; + _ => mikaInt ! n ! c + "kään" } ; kukaanPron : MorphoFin.Number => (MorphoFin.Case) => Str = table { Sg => table { Nom => "kukaan" ; - Part => "ketään" ; - Ess => "kenään" ; - Iness => "kessään" ; - Elat => "kestään" ; - Illat => "kehenkään" ; - Adess => "kellään" ; - Ablat => "keltään" ; - c => kukaInt ! Sg ! c + "kään" + Part => "ketään" ; + Ess => "kenään" ; + Iness => "kessään" ; + Elat => "kestään" ; + Illat => "kehenkään" ; + Adess => "kellään" ; + Ablat => "keltään" ; + c => kukaInt ! Sg ! c + "kään" } ; Pl => table { - Nom => "ketkään" ; - Part => "keitään" ; - Ess => "keinään" ; - Iness => "keissään" ; - Elat => "keistään" ; - Adess => "keillään" ; - Ablat => "keiltään" ; - c => kukaInt ! Pl ! c + "kään" + Nom => "ketkään" ; + Part => "keitään" ; + Ess => "keinään" ; + Iness => "keissään" ; + Elat => "keistään" ; + Adess => "keillään" ; + Ablat => "keiltään" ; + c => kukaInt ! Pl ! c + "kään" } } ; @@ -300,10 +300,10 @@ lin isPron = False ; isNeg = True } ; - at_least_AdN = ss "vähintään" ; - at_most_AdN = ss "enintään" ; + at_least_AdN = ss "vähintään" ; + at_most_AdN = ss "enintään" ; - as_CAdv = X.mkCAdv "yhtä" "kuin" ; + as_CAdv = X.mkCAdv "yhtä" "kuin" ; except_Prep = postPrep partitive "lukuunottamatta" ; diff --git a/lib/src/finnish/TerminologyFin.gf b/lib/src/finnish/TerminologyFin.gf index bdd59135a..bc07ffc2f 100644 --- a/lib/src/finnish/TerminologyFin.gf +++ b/lib/src/finnish/TerminologyFin.gf @@ -10,6 +10,7 @@ concrete TerminologyFin of Terminology = CatFin ** open Prelude, HTML in { +flags coding=utf8 ; lincat diff --git a/lib/src/finnish/VerbFin.gf b/lib/src/finnish/VerbFin.gf index 0d2f1b863..593f959e2 100644 --- a/lib/src/finnish/VerbFin.gf +++ b/lib/src/finnish/VerbFin.gf @@ -1,9 +1,9 @@ --1 Verb Phrases in Finnish ---# -coding=latin1 concrete VerbFin of Verb = CatFin ** open Prelude, ResFin, StemFin in { flags optimize=all_subs ; + coding=utf8 ; lin UseV = predSV ; @@ -22,8 +22,8 @@ concrete VerbFin of Verb = CatFin ** open Prelude, ResFin, StemFin in { (\\_,b,a => infVP v.sc b a vp (vvtype2infform v.vi)) (predSV {s = v.s ; sc = case vp.s.sc of { - SCNom => v.sc ; -- minun täytyy pestä auto - c => c -- minulla täytyy olla auto + SCNom => v.sc ; -- minun täytyy pestä auto + c => c -- minulla täytyy olla auto } ; h = v.h ; p = v.p } @@ -71,8 +71,8 @@ concrete VerbFin of Verb = CatFin ** open Prelude, ResFin, StemFin in { (\\_,b,a => infVP v.sc b a vp v.vi) (predSV {s = v.s ; sc = case vp.s.sc of { - NPCase Nom => v.sc ; -- minun täytyy pestä auto - c => c -- minulla täytyy olla auto + NPCase Nom => v.sc ; -- minun täytyy pestä auto + c => c -- minulla täytyy olla auto } ; h = v.h ; p = v.p } @@ -108,7 +108,7 @@ concrete VerbFin of Verb = CatFin ** open Prelude, ResFin, StemFin in { let n = complNumAgr agr ; c = case n of { - Sg => Nom ; -- minä olen iso ; te olette iso + Sg => Nom ; -- minä olen iso ; te olette iso Pl => Part -- me olemme isoja ; te olette isoja } --- definiteness of NP ? in ap.s ! False ! (NCase n c) @@ -118,7 +118,7 @@ concrete VerbFin of Verb = CatFin ** open Prelude, ResFin, StemFin in { let n = complNumAgr agr ; c = case n of { - Sg => Nom ; -- minä olen iso ; te olette iso + Sg => Nom ; -- minä olen iso ; te olette iso Pl => Part -- me olemme isoja ; te olette isoja } --- definiteness of NP ? in cn.s ! (NCase n c) @@ -136,13 +136,13 @@ concrete VerbFin of Verb = CatFin ** open Prelude, ResFin, StemFin in { -- The work is done jointly in ResFin.infVP and appCompl. -- Cases to test: l -table (to see negated forms) --``` --- minun täytyy ostaa auto +-- minun täytyy ostaa auto -- PredVP (UsePron i_Pron) (ComplVV must_VV -- (ComplV2 buy_V2 (DetCN (DetSg (SgQuant DefArt) NoOrd) (UseN car_N)))) --- minä tahdon ostaa auton +-- minä tahdon ostaa auton -- PredVP (UsePron i_Pron) (ComplVV want_VV -- (ComplV2 buy_V2 (DetCN (DetSg (SgQuant DefArt) NoOrd) (UseN car_N)))) --- minulla täytyy olla auto +-- minulla täytyy olla auto -- PredVP (UsePron i_Pron) (ComplVV must_VV -- (ComplV2 have_V2 (DetCN (DetSg (SgQuant DefArt) NoOrd) (UseN car_N)))) --``` diff --git a/lib/src/finnish/stemmed/WNKotus.gf b/lib/src/finnish/stemmed/WNKotus.gf index 0fe69e6a0..0149eedb1 100644 --- a/lib/src/finnish/stemmed/WNKotus.gf +++ b/lib/src/finnish/stemmed/WNKotus.gf @@ -1,8 +1,8 @@ --# -path=.:..:../../abstract:../../common:../../english:../kotus ---# -coding=latin1 resource WNKotus = open Kotus, MorphoFin, ParadigmsFin, CatFin, StemFin, Prelude in { + flags coding=utf8 ; -- interpretations of paradigms in KOTUS word list, used in DictFin built with the Finnish Wordnet oper vowelHarmony = vowHarmony ; @@ -33,7 +33,7 @@ oper mkWN : NForms -> Str -> Str -> N = \s,t,u -> separateN (t ++ u) (lin N (nforms2snoun s)) ; mkWN : (_ : N) -> N = \n -> n ; mkWN : N -> Str -> N = \n,s -> separateN s n ; --- emansipaation kannattaja - mkWN : N -> (_,_ : Str) -> N = \n,s,t -> separateN (s ++ t) n ; --- silmäluomien synnynnäinen puuttuminen + mkWN : N -> (_,_ : Str) -> N = \n,s,t -> separateN (s ++ t) n ; --- silmäluomien synnynnäinen puuttuminen } ; mkWA = overload { @@ -43,7 +43,7 @@ oper mkWN : NForms -> Str -> A = \s,t -> mkA (separateN t (lin N (nforms2snoun s))) ; mkWA : (_ : N) -> A = \n -> mkA n ; mkWA : N -> Str -> A = \n,s -> mkA (separateN s n) ; --- emansipaation kannattaja - mkWA : N -> (_,_ : Str) -> A = \n,s,t -> mkA (separateN (s ++ t) n) ; --- silmäluomien synnynnäinen puuttuminen + mkWA : N -> (_,_ : Str) -> A = \n,s,t -> mkA (separateN (s ++ t) n) ; --- silmäluomien synnynnäinen puuttuminen } ; mkWAdv = overload { @@ -143,61 +143,61 @@ oper -- kotus paradigms - k1 : Str -> NForms -- 1780 öljy + k1 : Str -> NForms -- 1780 öljy = \s -> dUkko s (s + "n") ; - k1A : Str -> NForms -- 166 yökkö + k1A : Str -> NForms -- 166 yökkö = \s -> dUkko s (weakGrade s + "n") ; - k2 : Str -> NForms -- 1189 ääntely + k2 : Str -> NForms -- 1189 ääntely = \s -> dSilakka s (s + "n") (s + "j" + getHarmony (last s)) ; - k3 : Str -> NForms -- 481 ääntiö + k3 : Str -> NForms -- 481 ääntiö = \s -> dSilakka s (s + "n") (s + "it" + vowelHarmony s) ; - k4A : Str -> NForms -- 273 äpärikkö + k4A : Str -> NForms -- 273 äpärikkö = \s -> let ws = weakGrade s in dSilakka s (ws + "n") (ws + "it" + getHarmony (last s)) ; - k5 : Str -> NForms -- 3212 öljymaali + k5 : Str -> NForms -- 3212 öljymaali = \s -> case last s of { "i" => dPaatti s (s + "n") ; _ => dUnix s } ; - k5A : Str -> NForms -- 1959 öylätti + k5A : Str -> NForms -- 1959 öylätti = \s -> dPaatti s (weakGrade s + "n") ; - k6 : Str -> NForms -- 1231 öykkäri + k6 : Str -> NForms -- 1231 öykkäri = \s -> dTohtori s ; k7 : Str -> NForms -- 81 vuoksi = \s -> dArpi s (init s + "en") ; - k7A : Str -> NForms -- 70 väki + k7A : Str -> NForms -- 70 väki = \s -> dArpi s (init (weakGrade s) + "en") ; - k8 : Str -> NForms -- 99 à la carte + k8 : Str -> NForms -- 99 à la carte = \s -> dNukke s (s + "n") ; k8A : Str -> NForms -- 5 vinaigrette = \s -> dNukke s (weakGrade s + "n") ; - k9 : Str -> NForms -- 696 ääriraja + k9 : Str -> NForms -- 696 ääriraja = \s -> let a = last s in dSilakka s (s + "n") - (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; - k9A : Str -> NForms -- 1040 ääniraita + (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; + k9A : Str -> NForms -- 1040 ääniraita = \s -> let a = last s in dSilakka s (weakGrade s + "n") - (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; - k10 : Str -> NForms -- 2119 äänittäjä + (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; + k10 : Str -> NForms -- 2119 äänittäjä = \s -> dSilakka s (s + "n") (init s + "i" + vowelHarmony (last s)) ; - k10A : Str -> NForms -- 284 änkkä + k10A : Str -> NForms -- 284 änkkä = \s -> dSilakka s (weakGrade s + "n") (init s + "i" + vowelHarmony (last s)) ; - k11 : Str -> NForms -- 46 ödeema + k11 : Str -> NForms -- 46 ödeema = \s -> dSilakka s (weakGrade s + "n") (init s + "i" + vowelHarmony (last s)) ; - k12 : Str -> NForms -- 1125 örinä + k12 : Str -> NForms -- 1125 örinä = \s -> let a = vowelHarmony (last s) in dSilakka s (s + "n") - (init s + case a of {"a" => "o" ; _ => "ö"} + "it" + a) ; + (init s + case a of {"a" => "o" ; _ => "ö"} + "it" + a) ; k13 : Str -> NForms -- 157 virtaska = \s -> let a = vowelHarmony (last s) in dSilakka s (s + "n") - (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; - k14A : Str -> NForms -- 244 ötökkä + (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ; + k14A : Str -> NForms -- 244 ötökkä = \s -> let a = vowelHarmony (last s) ; ws = weakGrade s in dSilakka s (ws + "n") - (init ws + case a of {"a" => "o" ; _ => "ö"} + "it" + a) ; - k15 : Str -> NForms -- 170 äreä + (init ws + case a of {"a" => "o" ; _ => "ö"} + "it" + a) ; + k15 : Str -> NForms -- 170 äreä = dKorkea ; k16 : Str -> NForms -- 2 kumpikin --? = \s -> let kumpi = Predef.take 5 s ; kin = Predef.drop 5 s in @@ -206,13 +206,13 @@ oper = dSuurempi ; k17 : Str -> NForms -- 38 virkkuu = dPaluu ; - k18 : Str -> NForms -- voi, tee, sää + k18 : Str -> NForms -- voi, tee, sää = dPuu ; - k19 : Str -> NForms -- 6 yö + k19 : Str -> NForms -- 6 yö = dSuo ; k20 : Str -> NForms -- 46 voodoo = dPaluu ; - k21 : Str -> NForms -- 22 tax-free --? rosé + k21 : Str -> NForms -- 22 tax-free --? rosé = dPuu ; k22 : Str -> NForms -- 13 tournedos = \s -> nForms10 @@ -224,20 +224,20 @@ oper = \s -> dArpi s (init s + "en") ; k25 : Str -> NForms -- 9 tuomi = \s -> dArpi s (init s + "en") ; - k26 : Str -> NForms -- 113 ääri + k26 : Str -> NForms -- 113 ääri = \s -> dArpi s (init s + "en") ; k27 : Str -> NForms -- 23 vuosi = \s -> dArpi s (Predef.tk 2 s + "den") ; k28 : Str -> NForms -- 13 virsi = \s -> dArpi s (Predef.tk 2 s + "ren") ; - k28A : Str -> NForms -- 1 jälsi + k28A : Str -> NForms -- 1 jälsi = \s -> dArpi s (Predef.tk 2 s + "len") ; k29 : Str -> NForms -- 1 lapsi = \s -> let lapsi = dArpi s (init s + "en") in table {2 => Predef.tk 3 s + "ta" ; i => lapsi ! i} ; k30 : Str -> NForms -- 2 veitsi = \s -> let lapsi = dArpi s (init s + "en") in - table {2 => Predef.tk 3 s + "stä" ; i => lapsi ! i} ; + table {2 => Predef.tk 3 s + "stä" ; i => lapsi ! i} ; k31 : Str -> NForms -- 3 yksi = \s -> let y = Predef.tk 3 s ; @@ -247,9 +247,9 @@ oper (s + "en") (s + a) (s + "n" + a) (s + "ss" + a) (s + "in") ; k32 : Str -> NForms -- 20 uumen = \s -> dPiennar s (s + "en") ; - k32A : Str -> NForms -- 54 ystävätär + k32A : Str -> NForms -- 54 ystävätär = \s -> dPiennar s (strongGrade (init s) + last s + "en") ; - k33 : Str -> NForms -- 168 väistin + k33 : Str -> NForms -- 168 väistin = \s -> dLiitin s (init s + "men") ; k33A : Str -> NForms -- 181 yllytin = \s -> dLiitin s (strongGrade (init s) + "men") ; @@ -259,14 +259,14 @@ oper s (alastom + "an") (s + "ta") (alastom + "ana") (alastom + "aan") (alastom + "ien") (alastom + "ia") (alastom + "ina") (alastom + "issa") (alastom + "iin") ; - k34A : Str -> NForms -- 569 ääretön + k34A : Str -> NForms -- 569 ääretön = dOnneton ; - k35A : Str -> NForms -- 1 lämmin - = \s -> let lämpim = strongGrade (init s) + "m" in + k35A : Str -> NForms -- 1 lämmin + = \s -> let lämpim = strongGrade (init s) + "m" in nForms10 - s (lämpim + "än") (s + "tä") (lämpim + "änä") (lämpim + "ään") - (lämpim + "ien") (lämpim + "iä") (lämpim + "inä") (lämpim + "issä") - (lämpim + "iin") ; + s (lämpim + "än") (s + "tä") (lämpim + "änä") (lämpim + "ään") + (lämpim + "ien") (lämpim + "iä") (lämpim + "inä") (lämpim + "issä") + (lämpim + "iin") ; k36 : Str -> NForms -- 11 ylin = dSuurin ; k37 : Str -> NForms -- 1 vasen @@ -275,32 +275,32 @@ oper s (vasem + "man") (s + "ta") (vasem + "pana") (vasem + "paan") (vasem + "pien") (vasem + "pia") (vasem + "pina") (vasem + "missa") (vasem + "piin") ; - k38 : Str -> NForms -- 4195 öykkärimäinen + k38 : Str -> NForms -- 4195 öykkärimäinen = dNainen ; - k39 : Str -> NForms -- 2730 örähdys + k39 : Str -> NForms -- 2730 örähdys = dJalas ; - k40 : Str -> NForms -- 2482 öykkärimäisyys + k40 : Str -> NForms -- 2482 öykkärimäisyys = dLujuus ; - k41 : Str -> NForms -- 127 äyräs + k41 : Str -> NForms -- 127 äyräs = \s -> let is = init s in dRae s (is + last is + "n") ; - k41A : Str -> NForms -- 401 öljykangas + k41A : Str -> NForms -- 401 öljykangas = \s -> let is = init s in dRae s (strongGrade is + last is + "n") ; k42 : Str -> NForms -- 1 mies = \s -> let mieh = init s + "h" in nForms10 - s (mieh + "en") (s + "tä") (mieh + "enä") (mieh + "een") - (s + "ten") (mieh + "iä") (mieh + "inä") (mieh + "issä") + s (mieh + "en") (s + "tä") (mieh + "enä") (mieh + "een") + (s + "ten") (mieh + "iä") (mieh + "inä") (mieh + "issä") (mieh + "iin") ; k43 : Str -> NForms -- 11 tiehyt = \s -> dRae s (init s + "en") ; k43A : Str -> NForms -- 1 immyt = \s -> dRae s (strongGrade (init s) + "en") ; - k44 : Str -> NForms -- 1 kevät - = \s -> let kevä = init s in + k44 : Str -> NForms -- 1 kevät + = \s -> let kevä = init s in nForms10 - s (kevä + "än") (s + "tä") (kevä + "änä") (kevä + "äseen") - (s + "iden") (kevä + "itä") (kevä + "inä") (kevä + "issä") - (kevä + "isiin") ; + s (kevä + "än") (s + "tä") (kevä + "änä") (kevä + "äseen") + (s + "iden") (kevä + "itä") (kevä + "inä") (kevä + "issä") + (kevä + "isiin") ; k45 : Str -> NForms -- 23 yhdes = \s -> let yhde = init s ; a = vowelHarmony s in nForms10 @@ -315,9 +315,9 @@ oper (tuha + "nsiin") ; k47 : Str -> NForms -- 46 ylirasittunut = dOttanut ; - k48 : Str -> NForms -- 346 äpäre + k48 : Str -> NForms -- 346 äpäre = \s -> dRae s (s + last s + "n") ; - k48A : Str -> NForms -- 481 äänne + k48A : Str -> NForms -- 481 äänne = \s -> dRae s (strongGrade s + "en") ; k49 : Str -> NForms -- 31 vempele = \s -> case last s of { @@ -327,27 +327,27 @@ oper k49A : Str -> NForms -- 11 vemmel = \s -> dPiennar s (strongGrade (init s) + "len") ; - k52 : Str -> VForms -- 667 ärjyä + k52 : Str -> VForms -- 667 ärjyä = \s -> cHukkua s (init s + "n") ; - k52A : Str -> VForms -- 1568 öljyyntyä + k52A : Str -> VForms -- 1568 öljyyntyä = \s -> cHukkua s (weakGrade (init s) + "n") ; - k53 : Str -> VForms -- 605 äänestää + k53 : Str -> VForms -- 605 äänestää = \s -> let ott = Predef.tk 2 s in cOttaa s (init s + "n") (ott + "in") (ott + "i") ; - k53A : Str -> VForms -- 2121 örähtää + k53A : Str -> VForms -- 2121 örähtää = \s -> let ota = weakGrade (init s) in cOttaa s (ota + "n") (init ota + "in") (Predef.tk 2 s + "i") ; - k54 : Str -> VForms -- 2 pieksää + k54 : Str -> VForms -- 2 pieksää = \s -> let ott = Predef.tk 2 s in cOttaa s (init s + "n") (ott + "in") (ott + "i") ; - k54A : Str -> VForms -- 316 ääntää + k54A : Str -> VForms -- 316 ääntää = \s -> let ota = weakGrade (init s) ; o = Predef.tk 2 ota in cOttaa s (ota + "n") (o + "sin") (o + "si") ; - k55A : Str -> VForms -- 7 yltää + k55A : Str -> VForms -- 7 yltää = c54A ; --? diff: variation ylti/ylsi k56 : Str -> VForms -- 22 valaa = \s -> let val = Predef.tk 2 s in - cOttaa s (init s + "n") (val + "oin") (val + "oi") ; -- never ö + cOttaa s (init s + "n") (val + "oin") (val + "oi") ; -- never ö k56A : Str -> VForms -- 28 virkkaa = \s -> let ota = weakGrade (init s) ; ot = init ota in cOttaa s (ota + "n") (ot + "oin") (ot + "oi") ; @@ -362,69 +362,69 @@ oper vForms12 s (tunne + "n") (tunte + "e") (tunte + "vat") (tunte + "kaa") (tunne + "taan") (tuns + "in") (tuns + "i") (init tunte + "isi") (tunte + "nut") (tunne + "ttu") (tunte + "nee") ; -- just one verb - k60A : Str -> VForms -- 1 lähteä - = c58A ; --? diff lähti/läksi, just one verb - k61 : Str -> VForms -- 249 äyskiä + k60A : Str -> VForms -- 1 lähteä + = c58A ; --? diff lähti/läksi, just one verb + k61 : Str -> VForms -- 249 äyskiä = \s -> cHukkua s (init s + "n") ; - k61A : Str -> VForms -- 153 vääntelehtiä + k61A : Str -> VForms -- 153 vääntelehtiä = \s -> cHukkua s (weakGrade (init s) + "n") ; - k62 : Str -> VForms -- 684 öykkäröidä + k62 : Str -> VForms -- 684 öykkäröidä = \s -> cJuoda s ; k63 : Str -> VForms -- 3 saada = c62 ; - k64 : Str -> VForms -- 8 viedä + k64 : Str -> VForms -- 8 viedä = c62 ; - k65 : Str -> VForms -- 1 käydä + k65 : Str -> VForms -- 1 käydä = \s -> let kay = Predef.tk 2 s ; kavi = init kay + "vi" in - vForms12 s (kay + "n") kay (kay + "vät") (kay + "kää") (kay + "dään") + vForms12 s (kay + "n") kay (kay + "vät") (kay + "kää") (kay + "dään") (kavi + "n") kavi (kavi + "si") (kay + "nyt") (kay + "tty") (kay + "nee") ; -- just one verb - k66 : Str -> VForms -- 268 öristä + k66 : Str -> VForms -- 268 öristä = \s -> cKuunnella s (Predef.tk 2 s + "in") ; k66A : Str -> VForms -- 3 vavista = \s -> cKuunnella s (strongGrade (Predef.tk 3 s) + "sin") ; - k67 : Str -> VForms -- 704 ällistellä + k67 : Str -> VForms -- 704 ällistellä = \s -> cKuunnella s (Predef.tk 2 s + "in") ; - k67A : Str -> VForms -- 634 äännellä + k67A : Str -> VForms -- 634 äännellä = \s -> cKuunnella s (strongGrade (Predef.tk 3 s) + "lin") ; - k68 : Str -> VForms -- 49 viheriöidä - = c62 ; -- diff viheriöin/viheriöitsen - k69 : Str -> VForms -- 48 villitä + k68 : Str -> VForms -- 49 viheriöidä + = c62 ; -- diff viheriöin/viheriöitsen + k69 : Str -> VForms -- 48 villitä = \s -> cHarkita s ; - k70 : Str -> VForms -- 3 syöstä + k70 : Str -> VForms -- 3 syöstä = \s -> cJuosta s (Predef.tk 3 s + "ksen") ; - k71 : Str -> VForms -- 2 tehdä + k71 : Str -> VForms -- 2 tehdä = \s -> let te = Predef.tk 3 s in - vForms12 s (te + "en") (te + "kee") (te + "kevät") (te + "hkää") (te + "hdään") + vForms12 s (te + "en") (te + "kee") (te + "kevät") (te + "hkää") (te + "hdään") (te + "en") (te + "ki") (te + "kisi") (te + "hnyt") (te + "hty") - (te + "hnee") ; -- just two verbs: nähdä, tehdä - k72 : Str -> VForms -- 93 yletä + (te + "hnee") ; -- just two verbs: nähdä, tehdä + k72 : Str -> VForms -- 93 yletä = \s -> cValjeta s (Predef.tk 2 s + "ni") ; - k72A : Str -> VForms -- 52 yhdetä + k72A : Str -> VForms -- 52 yhdetä = \s -> cValjeta s (strongGrade (Predef.tk 2 s) + "ni") ; - k73 : Str -> VForms -- 600 äkseerata + k73 : Str -> VForms -- 600 äkseerata = \s -> cPudota s (Predef.tk 2 s + "si") ; - k73A : Str -> VForms -- 313 änkätä + k73A : Str -> VForms -- 313 änkätä = \s -> cPudota s (strongGrade (Predef.tk 2 s) + "si") ; - k74 : Str -> VForms -- 99 öljytä + k74 : Str -> VForms -- 99 öljytä = \s -> cPudota s (Predef.tk 2 s + "si") ; - k74A : Str -> VForms -- 72 ängetä + k74A : Str -> VForms -- 72 ängetä = \s -> cPudota s (strongGrade (Predef.tk 2 s) + "si") ; - k75 : Str -> VForms -- 39 viritä + k75 : Str -> VForms -- 39 viritä = \s -> cPudota s (Predef.tk 2 s + "si") ; - k75A : Str -> VForms -- 9 siitä + k75A : Str -> VForms -- 9 siitä = \s -> cPudota s (strongGrade (Predef.tk 2 s) + "si") ; - k76A : Str -> VForms -- 2 tietää + k76A : Str -> VForms -- 2 tietää = \s -> let tieta = init s ; tieda = weakGrade tieta ; ties = Predef.tk 2 tieta + "s" in cOttaa s (tieda + "n") (ties + "in") (ties + "i") ; -- only tietaa, taitaa -- defective verbs k77 : Str -> VForms -- 3 vipajaa = c56A ; ---- - k78 : Str -> VForms -- 31 ähkää + k78 : Str -> VForms -- 31 ähkää = c56A ; ---- k78A : Str -> VForms -- 1 tuikkaa = c56A ; ---- - k99 : Str -> Str -- 5453 öykkärimäisesti + k99 : Str -> Str -- 5453 öykkärimäisesti = \s -> s ; k101 : Str -> Str -- pronouns etc @@ -440,7 +440,7 @@ oper ---- remnants of erroneous annotations - k50 : Str -> N ---- Forms -- 520 vääräsääri + k50 : Str -> N ---- Forms -- 520 vääräsääri = \s -> mkN s ; k51 : Str -> N ---- Forms -- 62 vierasmies = \s -> mkN s ; diff --git a/lib/src/french/BeschFre.gf b/lib/src/french/BeschFre.gf index 8e68fd481..3ace02ece 100644 --- a/lib/src/french/BeschFre.gf +++ b/lib/src/french/BeschFre.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 resource BeschFre = open Prelude, MorphoFre in { flags optimize=noexpand ; -- faster and smaller than =all + coding=utf8 ; oper VerbeN = {s : VF => Str} ; oper mkNV : Verbe -> VerbeN = \ve -> {s = vvf ve} ; @@ -16,29 +16,29 @@ oper v_nancy100inf : Str -> VerbeN = \ve -> {s = table { oper v_besch1 : Str -> VerbeN = \s -> mkNV (conjAvoir s) ; -oper v_besch2 : Str -> VerbeN = \s -> mkNV (conjÊtre s) ; +oper v_besch2 : Str -> VerbeN = \s -> mkNV (conjÊtre s) ; -- 3-5 not used oper v_besch6 : Str -> VerbeN = \s -> mkNV (conj1aimer s) ; oper v_besch7 : Str -> VerbeN = \s -> mkNV (conj1placer s) ; oper v_besch8 : Str -> VerbeN = \s -> mkNV (conj1manger s) ; oper v_besch9 : Str -> VerbeN = \s -> mkNV (conj1peser s) ; -oper v_besch10 : Str -> VerbeN = \s -> mkNV (conj1céder s) ; +oper v_besch10 : Str -> VerbeN = \s -> mkNV (conj1céder s) ; oper v_besch11 : Str -> VerbeN = \s -> mkNV (conj1jeter s) ; oper v_besch12 : Str -> VerbeN = \s -> mkNV (conj1jeter s) ; oper v_besch13 : Str -> VerbeN = \s -> mkNV (conj1aimer s) ; -oper v_besch14 : Str -> VerbeN = \s -> mkNV (conj1assiéger s) ; +oper v_besch14 : Str -> VerbeN = \s -> mkNV (conj1assiéger s) ; oper v_besch15 : Str -> VerbeN = \s -> mkNV (conj1aimer s) ; --- ? oper v_besch16 : Str -> VerbeN = \s -> mkNV (conj1payer s) ; oper v_besch17 : Str -> VerbeN = \s -> mkNV (conj1payer s) ; oper v_besch18 : Str -> VerbeN = \s -> mkNV (conj1envoyer s) ; oper v_besch19 : Str -> VerbeN = \s -> mkNV (conj2finir s) ; -oper v_besch20 : Str -> VerbeN = \s -> mkNV (conj2haïr s) ; +oper v_besch20 : Str -> VerbeN = \s -> mkNV (conj2haïr s) ; -- oper v_besch21 : Str -> VerbeN = \s -> mkNV (conj s) ; -- not used oper v_besch22 : Str -> VerbeN = \s -> mkNV (conj3aller s) ; oper v_besch23 : Str -> VerbeN = \s -> mkNV (conj3tenir s) ; -oper v_besch24 : Str -> VerbeN = \s -> mkNV (conj3quérir s) ; +oper v_besch24 : Str -> VerbeN = \s -> mkNV (conj3quérir s) ; oper v_besch25 : Str -> VerbeN = \s -> mkNV (conj3sentir s) ; -oper v_besch26 : Str -> VerbeN = \s -> mkNV (conj3vêtir s) ; +oper v_besch26 : Str -> VerbeN = \s -> mkNV (conj3vêtir s) ; oper v_besch27 : Str -> VerbeN = \s -> mkNV (conj3couvrir s) ; oper v_besch28 : Str -> VerbeN = \s -> mkNV (conj3cueillir s) ; oper v_besch29 : Str -> VerbeN = \s -> mkNV (conj3assaillir s) ; @@ -49,7 +49,7 @@ oper v_besch33 : Str -> VerbeN = \s -> mkNV (conj3courir s) ; oper v_besch34 : Str -> VerbeN = \s -> mkNV (conj3mourir s) ; oper v_besch35 : Str -> VerbeN = \s -> mkNV (conj3sentir s) ; oper v_besch36 : Str -> VerbeN = \s -> mkNV (conj3fuir s) ; -oper v_besch37 : Str -> VerbeN = \s -> mkNV (conj3ouïr s) ; +oper v_besch37 : Str -> VerbeN = \s -> mkNV (conj3ouïr s) ; oper v_besch38 : Str -> VerbeN = \s -> mkNV (conj3cevoir s) ; oper v_besch39 : Str -> VerbeN = \s -> mkNV (conj3voir s) ; oper v_besch40 : Str -> VerbeN = \s -> mkNV (conj3pourvoir s) ; @@ -76,10 +76,10 @@ oper v_besch60 : Str -> VerbeN = \s -> mkNV (conj3vaincre s) ; oper v_besch61 : Str -> VerbeN = \s -> mkNV (conj3traire s) ; oper v_besch62 : Str -> VerbeN = \s -> mkNV (conj3faire s) ; oper v_besch63 : Str -> VerbeN = \s -> mkNV (conj3plaire s) ; -oper v_besch64 : Str -> VerbeN = \s -> mkNV (conj3connaître s) ; -oper v_besch65 : Str -> VerbeN = \s -> mkNV (conj3naître s) ; -oper v_besch66 : Str -> VerbeN = \s -> mkNV (conj3paître s) ; -oper v_besch67 : Str -> VerbeN = \s -> mkNV (conj3croître s) ; +oper v_besch64 : Str -> VerbeN = \s -> mkNV (conj3connaître s) ; +oper v_besch65 : Str -> VerbeN = \s -> mkNV (conj3naître s) ; +oper v_besch66 : Str -> VerbeN = \s -> mkNV (conj3paître s) ; +oper v_besch67 : Str -> VerbeN = \s -> mkNV (conj3croître s) ; oper v_besch68 : Str -> VerbeN = \s -> mkNV (conj3croire s) ; oper v_besch69 : Str -> VerbeN = \s -> mkNV (conj3boire s) ; oper v_besch70 : Str -> VerbeN = \s -> mkNV (conj3clore s) ; @@ -92,7 +92,7 @@ oper v_besch76 : Str -> VerbeN = \s -> mkNV (conj3vivre s) ; oper v_besch77 : Str -> VerbeN = \s -> mkNV (conj3lire s) ; oper v_besch78 : Str -> VerbeN = \s -> mkNV (conj3dire s) ; oper v_besch79 : Str -> VerbeN = \s -> mkNV (conj3rire s) ; -oper v_besch80 : Str -> VerbeN = \s -> mkNV (conj3écrire s) ; +oper v_besch80 : Str -> VerbeN = \s -> mkNV (conj3écrire s) ; oper v_besch81 : Str -> VerbeN = \s -> mkNV (conj3confire s) ; oper v_besch82 : Str -> VerbeN = \s -> mkNV (conj3cuire s) ; @@ -158,31 +158,31 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do -- The worst case has three different stems. auxConj1 : Str -> Str -> Str -> Verbe = \jet, jett, jeter -> - verbHabituel jett jet jett jet jeter (jet+"é") (jet+"er") affixSgE affixPasseA ; + verbHabituel jett jet jett jet jeter (jet+"é") (jet+"er") affixSgE affixPasseA ; conj1aimer : Str -> Verbe = \aimer -> let {aim = troncVerb aimer} in auxConj1 aim aim aimer ; - conj1céder : Str -> Verbe = \céder -> + conj1céder : Str -> Verbe = \céder -> let { - ced = troncVerb céder ; + ced = troncVerb céder ; d = Predef.dp 1 ced ; c = Predef.tk 2 ced ; - cèd = c + "è" + d ; - céd = c + "é" + d + cèd = c + "è" + d ; + céd = c + "é" + d } - in auxConj1 céd cèd céder ; + in auxConj1 céd cèd céder ; - conj1peser : Str -> Verbe = \céder -> ---- ? a verifier + conj1peser : Str -> Verbe = \céder -> ---- ? a verifier let { - ced = troncVerb céder ; + ced = troncVerb céder ; d = Predef.dp 1 ced ; c = Predef.tk 2 ced ; - cèd = c + "è" + d ; - céd = c + "e" + d + cèd = c + "è" + d ; + céd = c + "e" + d } - in auxConj1 céd cèd céder ; + in auxConj1 céd cèd céder ; conj1jeter : Str -> Verbe = \jeter -> let { @@ -194,7 +194,7 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do conj1placer : Str -> Verbe = \placer -> let { pla = Predef.tk 3 placer ; - plac = preVoyelleFront (pla+"ç") (pla+"c") + plac = preVoyelleFront (pla+"ç") (pla+"c") } in auxConj1 plac plac placer ; @@ -205,9 +205,9 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do } in auxConj1 mange mange manger ; - conj1assiéger : Str -> Verbe = \assiéger -> - let {assi = Predef.tk 4 assiéger} in - auxConj1 (preVoyelleFront (assi+"ége") (assi+"ég")) (assi+"èg") assiéger ; + conj1assiéger : Str -> Verbe = \assiéger -> + let {assi = Predef.tk 4 assiéger} in + auxConj1 (preVoyelleFront (assi+"ége") (assi+"ég")) (assi+"èg") assiéger ; conj1payer : Str -> Verbe = \payer -> let {pa = Predef.tk 3 payer} in @@ -223,9 +223,9 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do case parler of { _ + "ir" => conj2finir parler ; _ + "re" => conj3rendre parler ; - _ + "éger" => conj1assiéger parler ; + _ + "éger" => conj1assiéger parler ; _ + ("eler" | "eter") => conj1jeter parler ; - _ + "éder" => conj1céder parler ; + _ + "éder" => conj1céder parler ; _ + "cer" => conj1placer parler ; _ + "ger" => conj1manger parler ; _ + "yer" => conj1payer parler ; @@ -261,13 +261,13 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do } in verbHabituel fini finiss finiss fin finir fini finir affixSgS affixPasseI ; - conj2haïr : Str -> Verbe = \haïr -> - let {ha = troncVerb haïr ; + conj2haïr : Str -> Verbe = \haïr -> + let {ha = troncVerb haïr ; hai = ha + "i" ; - haï = ha + "ï" ; - haiss = ha + "ïss" + haï = ha + "ï" ; + haiss = ha + "ïss" } in - verbHabituel hai haiss haiss ha haïr haï haïr affixSgS (affixPasse "ï" "ï") ; + verbHabituel hai haiss haiss ha haïr haï haïr affixSgS (affixPasse "ï" "ï") ; --3 The third conjugation @@ -279,23 +279,23 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do let {t = Predef.tk 4 tenir} in verbHabituel (t+"ien") (t+"en") (t+"ienn") t (t+"iendr") (t+"enu") tenir - affixSgS (affixPasse "in" "în") ; + affixSgS (affixPasse "in" "în") ; -- Many verbs have "is" in the past participle. But there is so much variation -- that the worst-case macro needs seven forms. auxConj3is : (_,_,_,_,_,_,_ : Str) -> Verbe = - \quier, quér, quièr, qu, querr, quis, quiss -> + \quier, quér, quièr, qu, querr, quis, quiss -> verbAffixes - quier quér quièr qu querr quièr quér - (quier + "s") quis quiss (quér + "ir") affixSgS affixPasseI ; + quier quér quièr qu querr quièr quér + (quier + "s") quis quiss (quér + "ir") affixSgS affixPasseI ; auxConj3ir : (_,_,_ : Str) -> Verbe = \sen, sent, i -> auxConj3is sen sent sent sent (sent+"ir") (sent+i) (sent+i+"s") ; - conj3quérir : Str -> Verbe = \quérir -> - let {qu = Predef.tk 4 quérir} in - auxConj3is (qu+"ier") (qu+"ér") (qu+"ièr") qu (qu+"err") (qu+"is") (qu+"is") ; + conj3quérir : Str -> Verbe = \quérir -> + let {qu = Predef.tk 4 quérir} in + auxConj3is (qu+"ier") (qu+"ér") (qu+"ièr") qu (qu+"err") (qu+"is") (qu+"is") ; conj3sentir : Str -> Verbe = \sentir -> let { @@ -304,13 +304,13 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do } in auxConj3ir sen sent "i" ; - conj3vêtir : Str -> Verbe = \vêtir -> + conj3vêtir : Str -> Verbe = \vêtir -> let { - s = Predef.tk 5 vêtir ; - vet = auxConj3ir "vêt" "vêt" "u" + s = Predef.tk 5 vêtir ; + vet = auxConj3ir "vêt" "vêt" "u" } in table { - Indi Presn Sg P3 => s + "vêt" ; + Indi Presn Sg P3 => s + "vêt" ; p => s + vet ! p }; @@ -384,28 +384,28 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do let {m = Predef.tk 5 mourir} in auxConj3ourir (m + "eur") (m + "our") (m + "ort") ; --- A little auxiliary to cover "fuir" and "ouïr". --- *N.B.* some alternative forms for "ouïr" are still missing. +-- A little auxiliary to cover "fuir" and "ouïr". +-- *N.B.* some alternative forms for "ouïr" are still missing. - auxConj3ui : AffixPasse -> (_,_,_ : Str) -> Verbe = \affpasse, o, ou, ouï -> - let {oi : Str = o + "i" ; oy : Str = o + "y" ; ouïr : Str = ouï + "r"} in - verbHabituel oi oy oi ou ouïr ouï ouïr affixSgS affpasse ; + auxConj3ui : AffixPasse -> (_,_,_ : Str) -> Verbe = \affpasse, o, ou, ouï -> + let {oi : Str = o + "i" ; oy : Str = o + "y" ; ouïr : Str = ouï + "r"} in + verbHabituel oi oy oi ou ouïr ouï ouïr affixSgS affpasse ; conj3fuir : Str -> Verbe = \fuir -> let {fu = troncVerb fuir} in auxConj3ui affixPasseI fu fu (fu + "i") ; - conj3ouïr : Str -> Verbe = \ouir -> + conj3ouïr : Str -> Verbe = \ouir -> let {o = Predef.tk 3 ouir} in - auxConj3ui (affixPasse "ï" "ï") o (o + "u") (o + "uï") ; + auxConj3ui (affixPasse "ï" "ï") o (o + "u") (o + "uï") ; --- The verb "gésir" lacks many forms. +-- The verb "gésir" lacks many forms. - conj3gésir : Str -> Verbe = \gésir -> - let {g = Predef.tk 4 gésir} in + conj3gésir : Str -> Verbe = \gésir -> + let {g = Predef.tk 4 gésir} in table { - Inf => g + "ésir" ; - Indi Presn Sg p => g + lesAffixes "is" "is" "ît" ! p ; + Inf => g + "ésir" ; + Indi Presn Sg p => g + lesAffixes "is" "is" "ît" ! p ; Indi Presn Pl p => g + "is" + affixPlOns ! p ; Indi Imparf n p => g + "is" + affixImparf ! n ! p ; Part PPres => g + "isant" ; @@ -431,8 +431,8 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do conj3cevoir : Str -> Verbe = \cevoir -> let {re = Predef.tk 6 cevoir} in - auxConj3usS (re+"çoi") (re+"cev") (re+"çoiv") (re+"ç") - (re+"cevr") (re+"çoiv") (re+"cev") (re+"cev") ; + auxConj3usS (re+"çoi") (re+"cev") (re+"çoiv") (re+"ç") + (re+"cevr") (re+"çoiv") (re+"cev") (re+"cev") ; conj3voir : Str -> Verbe = \voir -> let { @@ -467,7 +467,7 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do tdevoir = auxConj3usS "doi" "dev" "doiv" "d" "devr" "doiv" "dev" "dev" } in table { - Part (PPasse Masc Sg) => s + "dû" ; + Part (PPasse Masc Sg) => s + "dû" ; p => s + tdevoir ! p } ; @@ -485,7 +485,7 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do conj3mouvoir : Str -> Verbe = \mouvoir -> let { s = Predef.tk 7 mouvoir ; - mu = adjReg "mû" ; + mu = adjReg "mû" ; tmouvoir = auxConj3usS "meu" "mouv" "meuv" "m" "mouvr" "meuv" "mouv" "mouv" } in table { @@ -502,7 +502,7 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do Indi Futur Sg P3 => faudr + "a" ; Condi Sg P3 => faudr + "ait" ; Subjo SPres Sg P3 => faill + "e" ; - Subjo SImparf Sg P3 => pl + "ût" ; + Subjo SImparf Sg P3 => pl + "ût" ; Part PPres => fall + "ant" ; Part (PPasse g n) => adjReg (pl + "u") ! g ! n ; _ => nonExist @@ -546,7 +546,7 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do conj3asseoir : Str -> Verbe = \asseoir -> let { ass = Predef.tk 4 asseoir ; - tasseoir = auxConj3is "ied" "ey" "ey" "" "iér" "is" "is" + tasseoir = auxConj3is "ied" "ey" "ey" "" "iér" "is" "is" } in table { Inf => ass + "eoir" ; @@ -571,17 +571,17 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do tseoir = conj3asseoir seoir } in table { - Indi Presn Pl P3 => s + "iéent" ; + Indi Presn Pl P3 => s + "iéent" ; Indi _ _ P1 => nonExist ; Indi _ _ P2 => nonExist ; Indi Passe _ _ => nonExist ; Condi _ P1 => nonExist ; Condi _ P2 => nonExist ; - Subjo SPres Sg P3 => s + "iée" ; - Subjo SPres Pl P3 => s + "iéent" ; + Subjo SPres Sg P3 => s + "iée" ; + Subjo SPres Pl P3 => s + "iéent" ; Subjo _ _ _ => nonExist ; Imper _ => nonExist ; - Part PPres => s + "éant" ; + Part PPres => s + "éant" ; t => tseoir ! t } ; @@ -617,19 +617,19 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do } in \\p => e + tchoir ! p ; - conj3échoir : Str -> Verbe = \échoir -> - let {techoir = conj3choir échoir} in + conj3échoir : Str -> Verbe = \échoir -> + let {techoir = conj3choir échoir} in table { Indi _ _ P1 => nonExist ; Indi _ _ P2 => nonExist ; - Indi Presn Pl P3 => Predef.tk 3 échoir + "éent" ; ----v Indi Presn Pl P3 => Predef.tk 3 échoir + variants {"oient" ; "éent"} ; + Indi Presn Pl P3 => Predef.tk 3 échoir + "éent" ; +---v Indi Presn Pl P3 => Predef.tk 3 échoir + variants {"oient" ; "éent"} ; Subjo _ _ P1 => nonExist ; Subjo _ _ P2 => nonExist ; Condi _ P1 => nonExist ; Condi _ P2 => nonExist ; Imper _ => nonExist ; - Part PPres => Predef.tk 3 échoir + "éant" ; + Part PPres => Predef.tk 3 échoir + "éant" ; t => techoir ! t } ; @@ -722,9 +722,9 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do auxConj3re affixSgS affixPasseU boi buv boiv b (boi + "r") (b + "u") (b + "us") ; - auxConj3ît : Verbe -> Str -> Verbe = \conj,plaît -> + auxConj3ît : Verbe -> Str -> Verbe = \conj,plaît -> table { - Indi Presn Sg P3 => plaît ; + Indi Presn Sg P3 => plaît ; t => conj ! t } ; @@ -733,50 +733,50 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do pl = Predef.tk 4 plaire ; tplaire = auxConj3oire (pl + "ai") (pl + "ais") (pl + "ais") pl } in - auxConj3ît tplaire (pl + "aît") ; + auxConj3ît tplaire (pl + "aît") ; - conj3connaître : Str -> Verbe = \connaître -> + conj3connaître : Str -> Verbe = \connaître -> let { - conn = Predef.tk 5 connaître ; + conn = Predef.tk 5 connaître ; connaiss = conn + "aiss" ; tconnaitre = auxConj3re affixSgS affixPasseU (conn + "ai") connaiss connaiss - conn (conn + "aîtr") (conn + "u") (conn + "us") + conn (conn + "aîtr") (conn + "u") (conn + "us") } in - auxConj3ît tconnaitre (conn + "aît") ; + auxConj3ît tconnaitre (conn + "aît") ; - conj3naître : Str -> Verbe = \naître -> + conj3naître : Str -> Verbe = \naître -> let { - n = Predef.tk 5 naître ; + n = Predef.tk 5 naître ; tnaitre = auxConj3re affixSgS affixPasseI (n + "ai") (n + "aiss") (n + "aiss") (n + "aqu") - (n + "aîtr") (n + "é") (n + "és") + (n + "aîtr") (n + "é") (n + "és") } in - auxConj3ît tnaitre (n + "aît") ; + auxConj3ît tnaitre (n + "aît") ; --- The conjugation of "paître" is defective in a curious way, especially --- if compared with "repaître". According to Bescherelle, the invariable +-- The conjugation of "paître" is defective in a curious way, especially +-- if compared with "repaître". According to Bescherelle, the invariable -- past participle is only used as a term of "fauconnerie" (one would expect it -- to be defective rather than invariable). - conj3paître : Str -> Verbe = \paître -> - let {tpaitre = conj3connaître paître} in + conj3paître : Str -> Verbe = \paître -> + let {tpaitre = conj3connaître paître} in table { Indi Passe _ _ => nonExist ; Subjo SImparf _ _ => nonExist ; - Part (PPasse _ _) => Predef.tk 5 paître + "u" ; + Part (PPasse _ _) => Predef.tk 5 paître + "u" ; p => tpaitre ! p } ; - conj3repaître = conj3connaître ; + conj3repaître = conj3connaître ; - conj3croître : Str -> Verbe = \croître -> - let {cr = Predef.tk 5 croître} in + conj3croître : Str -> Verbe = \croître -> + let {cr = Predef.tk 5 croître} in auxConj3re - affixSgS (affixPasse "û" "û") (cr + "oî") (cr + "oiss") - (cr + "oiss") cr (cr + "oîtr") (cr + "û") (cr + "ûs") ; + affixSgS (affixPasse "û" "û") (cr + "oî") (cr + "oiss") + (cr + "oiss") cr (cr + "oîtr") (cr + "û") (cr + "ûs") ; conj3croire : Str -> Verbe = \croire -> let {cr = Predef.tk 4 croire} in @@ -800,7 +800,7 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do nonExist (clo + "r") clos clos } in table { - Indi Presn Sg P3 => Predef.tk 1 clo + "ôt" ; + Indi Presn Sg P3 => Predef.tk 1 clo + "ôt" ; Indi Presn Pl P1 => nonExist ; Indi Presn Pl P2 => nonExist ; Indi Imparf _ _ => nonExist ; @@ -821,7 +821,7 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do conj3absoudre : Str -> Verbe = \absoudre -> let { abso = Predef.tk 4 absoudre ; - tabsoudre = conj3résoudre absoudre + tabsoudre = conj3résoudre absoudre } in table { Indi Passe _ _ => nonExist ; @@ -831,8 +831,8 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do p => tabsoudre ! p } ; - conj3résoudre : Str -> Verbe = \résoudre -> - let {reso = Predef.tk 4 résoudre} in + conj3résoudre : Str -> Verbe = \résoudre -> + let {reso = Predef.tk 4 résoudre} in auxConj3re affixSgS affixPasseU (reso + "u") (reso + "lv") (reso + "lv") (reso + "l") (reso + "udr") (reso + "lu") (reso + "lus") ; @@ -868,10 +868,10 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do let { viv = troncVerb vivre ; vi = Predef.tk 1 viv ; - véc = Predef.tk 1 vi + "éc" + véc = Predef.tk 1 vi + "éc" } in auxConj3re - affixSgS affixPasseU vi viv viv véc (viv + "r") (véc + "u") (véc + "us") ; + affixSgS affixPasseU vi viv viv véc (viv + "r") (véc + "u") (véc + "us") ; conj3lire : Str -> Verbe = \lire -> let { @@ -907,9 +907,9 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do auxConj3re affixSgS affixPasseI ecri ecriv ecriv ecrivi (ecri + "r") ecrit (ecrit+"s") ; - conj3écrire : Str -> Verbe = \écrire -> - let {écri = troncVerb écrire} in - auxConj3scrire écri (écri + "v") (écri + "v") (écri + "t") ; + conj3écrire : Str -> Verbe = \écrire -> + let {écri = troncVerb écrire} in + auxConj3scrire écri (écri + "v") (écri + "v") (écri + "t") ; conj3confire : Str -> Verbe = \confire -> let {confi = troncVerb confire} in @@ -929,7 +929,7 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do s = Predef.tk 5 aller ; pres = formesPresAi "v" "all" ; taller = verbHabituel - "all" "all" "aill" "all" "ir" "allé" "aller" + "all" "all" "aill" "all" "ir" "allé" "aller" affixSgS affixPasseA } in table { @@ -940,22 +940,22 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do t => s + taller ! t } ; - conjÊtre : Str -> Verbe = \etre -> + conjÊtre : Str -> Verbe = \etre -> let { s = Predef.tk 4 etre ; sg = lesAffixes "suis" "es" "est" ; - pl = lesAffixes "sommes" "êtes" "sont" ; + pl = lesAffixes "sommes" "êtes" "sont" ; tetre = verbHabituel - "soi" "soy" "soi" "f" "ser" "été" "être" affixSgS affixPasseU + "soi" "soy" "soi" "f" "ser" "été" "être" affixSgS affixPasseU } in table { Indi Presn Sg p => s + sg ! p ; Indi Presn Pl p => s + pl ! p ; - Indi Imparf n p => s + "ét" + affixImparf ! n ! p ; + Indi Imparf n p => s + "ét" + affixImparf ! n ! p ; Subjo SPres Sg p => s + "soi" + affixSgS ! p ; Subjo SPres Pl P3 => s + "soient" ; Subjo SPres Pl p => s + "soy" + affixPlOns ! p ; - Part PPres => s + "étant" ; + Part PPres => s + "étant" ; t => s + tetre ! t } ; diff --git a/lib/src/french/ConstructionFre.gf b/lib/src/french/ConstructionFre.gf index da50857de..1304d8731 100644 --- a/lib/src/french/ConstructionFre.gf +++ b/lib/src/french/ConstructionFre.gf @@ -4,6 +4,7 @@ concrete ConstructionFre of Construction = CatFre ** open SyntaxFre, SymbolicFre, ParadigmsFre, (L = LexiconFre), (E = ExtraFre), (I = IrregFre), (R = ResFre), (C = CommonRomance), Prelude in { +flags coding=utf8 ; lin diff --git a/lib/src/french/DiffFre.gf b/lib/src/french/DiffFre.gf index c3d2e3bec..77b2e9717 100644 --- a/lib/src/french/DiffFre.gf +++ b/lib/src/french/DiffFre.gf @@ -1,5 +1,4 @@ --# -path=.:../romance:../abstract:../common:prelude ---# -coding=latin1 instance DiffFre of DiffRomance - [ imperClit, @@ -7,7 +6,7 @@ instance DiffFre of DiffRomance - [ ] = open CommonRomance, PhonoFre, Prelude in { - flags optimize=noexpand ; -- coding=utf8 ; + flags optimize=noexpand ; coding=utf8 ; -- flags optimize=all ; param @@ -22,7 +21,7 @@ instance DiffFre of DiffRomance - [ prepCase : Case -> Str = \c -> case c of { Nom => [] ; Acc => [] ; - CPrep P_a => "à" ; + CPrep P_a => "à" ; CPrep P_de => elisDe ; CPrep PNul => [] } ; @@ -30,7 +29,7 @@ instance DiffFre of DiffRomance - [ artDef : Gender -> Number -> Case -> Str = \g,n,c -> case of { => pre {"du" ; ("de l'" ++ Predef.BIND) / voyelle} ; - => pre {"au" ; ("à l'" ++ Predef.BIND) / voyelle} ; + => pre {"au" ; ("à l'" ++ Predef.BIND) / voyelle} ; => elisLe ; => prepCase c ++ elisLa ; <_, Pl, CPrep P_de> => "des" ; @@ -239,20 +238,20 @@ instance DiffFre of DiffRomance - [ auxPassive : Verb = copula ; - copula : Verb = {s = table VF ["être";"être";"suis";"es";"est";"sommes";"êtes";"sont";"sois";"sois" + copula : Verb = {s = table VF ["être";"être";"suis";"es";"est";"sommes";"êtes";"sont";"sois";"sois" ;"soit";"soyons";"soyez";"soient"; -"étais";"étais";"était";"étions";"étiez";"étaient";--# notpresent -"fusse";"fusses";"fût";"fussions";"fussiez";"fussent";--# notpresent -"fus";"fus";"fut";"fûmes";"fûtes";"furent";--# notpresent +"étais";"étais";"était";"étions";"étiez";"étaient";--# notpresent +"fusse";"fusses";"fût";"fussions";"fussiez";"fussent";--# notpresent +"fus";"fus";"fut";"fûmes";"fûtes";"furent";--# notpresent "serai";"seras";"sera";"serons";"serez";"seront";--# notpresent "serais";"serais";"serait";"serions";"seriez";"seraient";--# notpresent -"sois";"soyons";"soyez";"été";"étés";"étée";"étées";"étant"]; vtyp=VTyp VHabere False} ; +"sois";"soyons";"soyez";"été";"étés";"étée";"étées";"étant"]; vtyp=VTyp VHabere False} ; avoir_V : Verb = {s=table VF ["avoir";"avoir";"ai";"as";"a";"avons";"avez";"ont";"aie";"aies";"ait" ;"ayons";"ayez";"aient"; "avais";"avais";"avait";"avions";"aviez";"avaient"; --# notpresent -"eusse";"eusses";"eût";"eussions";"eussiez";"eussent";--# notpresent -"eus";"eus";"eut";"eûmes";"eûtes";"eurent";--# notpresent +"eusse";"eusses";"eût";"eussions";"eussiez";"eussent";--# notpresent +"eus";"eus";"eut";"eûmes";"eûtes";"eurent";--# notpresent "aurai";"auras";"aura";"aurons";"aurez";"auront";--# notpresent "aurais";"aurais";"aurait";"aurions";"auriez";"auraient";--# notpresent "aie";"ayons";"ayez";"eu";"eus";"eue";"eues";"ayant"];vtyp=VTyp VHabere True}; ---- a-t-il eut-il diff --git a/lib/src/french/DocumentationFreFunctor.gf b/lib/src/french/DocumentationFreFunctor.gf index f8ca038d8..0d7282a63 100644 --- a/lib/src/french/DocumentationFreFunctor.gf +++ b/lib/src/french/DocumentationFreFunctor.gf @@ -11,6 +11,7 @@ incomplete concrete DocumentationFreFunctor of Documentation = CatFre ** open Prelude, HTML in { +flags coding=utf8 ; lincat diff --git a/lib/src/french/ExtraFre.gf b/lib/src/french/ExtraFre.gf index 6b1bcfdc7..8013fc733 100644 --- a/lib/src/french/ExtraFre.gf +++ b/lib/src/french/ExtraFre.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 concrete ExtraFre of ExtraFreAbs = ExtraRomanceFre ** open CommonRomance, PhonoFre, MorphoFre, ParadigmsFre, ParamX, ResFre, Prelude in { + flags coding=utf8 ; lin EstcequeS qs = {s = "est-ce" ++ elisQue ++ qs.s ! Indic} ; EstcequeIAdvS idet qs = {s = idet.s ++ "est-ce" ++ elisQue ++ qs.s ! Indic} ; @@ -28,7 +28,7 @@ concrete ExtraFre of ExtraFreAbs = ExtraRomanceFre ** "elles" "les" "leur" "eux" "leur" "leur" "leurs" Fem Pl P3 ; this8fem_NP = pn2np (mkPN ["celle-ci"] Fem) ; - those8fem_NP = makeNP ["celles-là"] Fem Pl ; + those8fem_NP = makeNP ["celles-là"] Fem Pl ; we8fem_Pron = mkPronoun "nous" "nous" "nous" "nous" "notre" "notre" "nos" Fem Pl P1 ; whoPl8fem_IP = @@ -53,7 +53,7 @@ concrete ExtraFre of ExtraFreAbs = ExtraRomanceFre ** ce_Pron = let ce = elision "c" in - mkPronoun ce ce ce ("cela" | "ça") "son" (elisPoss "s") "ses" Masc Sg P3 ; ---- variants? + mkPronoun ce ce ce ("cela" | "ça") "son" (elisPoss "s") "ses" Masc Sg P3 ; ---- variants? AdvDatVP = insertClit3 datClit ; AdvGenVP = insertClit3 genClit ; diff --git a/lib/src/french/ExtraFreAbs.gf b/lib/src/french/ExtraFreAbs.gf index be1b0d86e..cb3f67d26 100644 --- a/lib/src/french/ExtraFreAbs.gf +++ b/lib/src/french/ExtraFreAbs.gf @@ -1,14 +1,14 @@ ---# -coding=latin1 -- Structures special for French. These are not implemented in other -- Romance languages. abstract ExtraFreAbs = ExtraRomanceAbs - [ProDrop] ** { + flags coding=utf8 ; -- Notice: only direct (main-clause) questions are generated, and needed. fun EstcequeS : S -> Utt ; -- est-ce qu'il pleut - EstcequeIAdvS : IAdv -> S -> Utt ; -- où est-ce qu'il pleut + EstcequeIAdvS : IAdv -> S -> Utt ; -- où est-ce qu'il pleut -- These also generate indirect (subordinate) questions. diff --git a/lib/src/french/IdiomFre.gf b/lib/src/french/IdiomFre.gf index f58fa881d..1b5df02b1 100644 --- a/lib/src/french/IdiomFre.gf +++ b/lib/src/french/IdiomFre.gf @@ -2,6 +2,7 @@ concrete IdiomFre of Idiom = CatFre ** open (P = ParamX), PhonoFre, MorphoFre, ParadigmsFre, Prelude in { flags optimize=all_subs ; + flags coding=utf8 ; lin ImpersCl vp = mkClause "il" True False (agrP3 Masc Sg) vp ; diff --git a/lib/src/french/IrregFre.gf b/lib/src/french/IrregFre.gf index 37f82071d..6c512daa6 100644 --- a/lib/src/french/IrregFre.gf +++ b/lib/src/french/IrregFre.gf @@ -1,5 +1,4 @@ --# -path=.:../romance:../common:../abstract:../../prelude ---# -coding=latin1 -- Irregular verbs from Nancy, based on a list from Sylvain Pogodalla, 25/11/2004 -- Translated to GF by Aarne Ranta @@ -9,6 +8,7 @@ concrete IrregFre of IrregFreAbs = CatFre ** open DiffFre, MorphoFre, BeschFre, Prelude in { flags optimize=values ; + coding=utf8 ; -- all verbs in classes with "er" and "finir" are omitted @@ -18,15 +18,15 @@ lin abstenir_V = v_besch23 "abstenir" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; abstraire_V2 = v_besch61 "abstraire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; accourir_V = v_besch33 "accourir" ** {vtyp = vHabere ; lock_V = <>} ; - accroître_V2 = v_besch73 "accroître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + accroître_V2 = v_besch73 "accroître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; accueillir_V2 = v_besch28 "accueillir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - acquérir_V2 = v_besch24 "acquérir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + acquérir_V2 = v_besch24 "acquérir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; adjoindre_V2 = v_besch58 "adjoindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; admettre_V2 = v_besch56 "admettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; advenir_V = v_besch23 "advenir" ** {vtyp = vEsse ; lock_V = <>} ; aller_V = v_besch22 "aller" ** {vtyp = VTyp VEsse True ; lock_V = <>} ; apercevoir_V2 = v_besch38 "apercevoir" ** {vtyp = VTyp VRefl False ; lock_V2 = <> ; c2 = complGen} ; - apparaître_V = v_besch64 "apparaître" ** {vtyp = vHabere ; lock_V = <>} ; + apparaître_V = v_besch64 "apparaître" ** {vtyp = vHabere ; lock_V = <>} ; appartenir_V2 = v_besch23 "appartenir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; appendre_V2 = v_besch53 "appendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; apprendre_V2 = v_besch54 "apprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; @@ -47,7 +47,7 @@ lin clore_V2 = v_besch70 "clore" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; combattre_V2 = v_besch55 "combattre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; commettre_V2 = v_besch56 "commettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - comparaître_V2 = v_besch64 "comparaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + comparaître_V2 = v_besch64 "comparaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; complaire_V2 = v_besch63 "complaire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; comprendre_V2 = v_besch54 "comprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; compromettre_V2 = v_besch56 "compromettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; @@ -59,8 +59,8 @@ lin confire_V2 = v_besch81 "confire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; confondre_V2 = v_besch53 "confondre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; conjoindre_V2 = v_besch58 "conjoindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - connaître_V2 = v_besch64 "connaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - conquérir_V2 = v_besch24 "conquérir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + connaître_V2 = v_besch64 "connaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + conquérir_V2 = v_besch24 "conquérir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; consentir_V2 = v_besch25 "consentir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; construire_V2 = v_besch82 "construire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; contenir_V2 = v_besch23 "contenir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; @@ -78,67 +78,67 @@ lin couvrir_V2 = v_besch27 "couvrir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; craindre_V2 = v_besch59 "craindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; croire_V2 = v_besch68 "croire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; - croître_V = v_besch67 "croître" ** {vtyp = vEsse ; lock_V = <>} ; + croître_V = v_besch67 "croître" ** {vtyp = vEsse ; lock_V = <>} ; cueillir_V2 = v_besch28 "cueillir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; cuire_V2 = v_besch82 "cuire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - débattre_V2 = v_besch55 "débattre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - débouillir_V2 = v_besch31 "débouillir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - décevoir_V2 = v_besch38 "décevoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - déchoir_V2 = v_besch52 "déchoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - déclore_V2 = v_besch70 "déclore" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - décommettre_V2 = v_besch56 "décommettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - déconfire_V2 = v_besch81 "déconfire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - découdre_V2 = v_besch73 "découdre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - découvrir_V2 = v_besch27 "découvrir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - décrire_V2 = v_besch80 "décrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - décroître_V2 = v_besch67 "décroître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - décuire_V2 = v_besch82 "décuire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - déduire_V2 = v_besch82 "déduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - défaillir_V = v_besch30 "défaillir" ** {vtyp = vHabere ; lock_V = <>} ; - défaire_V2 = v_besch62 "défaire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - défendre_V2 = v_besch53 "défendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - démentir_V2 = v_besch25 "démentir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - démettre_V2 = v_besch56 "démettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - démordre_V = v_besch53 "démordre" ** {vtyp = vHabere ; lock_V = <>} ; - départir_V2 = v_besch25 "départir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; - dépeindre_V2 = v_besch57 "dépeindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - dépendre_V2 = v_besch53 "dépendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; - déplaire_V = v_besch63 "déplaire" ** {vtyp = vHabere ; lock_V = <>} ; - dépourvoir_V2 = v_besch40 "dépourvoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - déprendre_V2 = v_besch54 "déprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; - désapprendre_V2 = v_besch54 "désapprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + débattre_V2 = v_besch55 "débattre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + débouillir_V2 = v_besch31 "débouillir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + décevoir_V2 = v_besch38 "décevoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + déchoir_V2 = v_besch52 "déchoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + déclore_V2 = v_besch70 "déclore" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + décommettre_V2 = v_besch56 "décommettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + déconfire_V2 = v_besch81 "déconfire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + découdre_V2 = v_besch73 "découdre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + découvrir_V2 = v_besch27 "découvrir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + décrire_V2 = v_besch80 "décrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + décroître_V2 = v_besch67 "décroître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + décuire_V2 = v_besch82 "décuire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + déduire_V2 = v_besch82 "déduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + défaillir_V = v_besch30 "défaillir" ** {vtyp = vHabere ; lock_V = <>} ; + défaire_V2 = v_besch62 "défaire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + défendre_V2 = v_besch53 "défendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + démentir_V2 = v_besch25 "démentir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + démettre_V2 = v_besch56 "démettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + démordre_V = v_besch53 "démordre" ** {vtyp = vHabere ; lock_V = <>} ; + départir_V2 = v_besch25 "départir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; + dépeindre_V2 = v_besch57 "dépeindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + dépendre_V2 = v_besch53 "dépendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; + déplaire_V = v_besch63 "déplaire" ** {vtyp = vHabere ; lock_V = <>} ; + dépourvoir_V2 = v_besch40 "dépourvoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + déprendre_V2 = v_besch54 "déprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; + désapprendre_V2 = v_besch54 "désapprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; descendre_V2 = v_besch53 "descendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; desservir_V2 = v_besch35 "desservir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - déteindre_V2 = v_besch57 "déteindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - détendre_V2 = v_besch53 "détendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - détenir_V2 = v_besch23 "détenir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - détordre_V2 = v_besch53 "détordre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - détruire_V2 = v_besch82 "détruire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + déteindre_V2 = v_besch57 "déteindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + détendre_V2 = v_besch53 "détendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + détenir_V2 = v_besch23 "détenir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + détordre_V2 = v_besch53 "détordre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + détruire_V2 = v_besch82 "détruire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; devenir_V = v_besch23 "devenir" ** {vtyp = vEsse ; lock_V = <>} ; - dévêtir_V2 = v_besch26 "dévêtir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + dévêtir_V2 = v_besch26 "dévêtir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; devoir_V2 = v_besch42 "devoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; dire_V2 = v_besch78 "dire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; disconvenir_V2 = v_besch23 "disconvenir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; discourir_V2 = v_besch33 "discourir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; disjoindre_V2 = v_besch58 "disjoindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - disparaître_V2 = v_besch64 "disparaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + disparaître_V2 = v_besch64 "disparaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; dissoudre_V2 = v_besch72 "dissoudre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; distendre_V2 = v_besch53 "distendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; distordre_V2 = v_besch53 "distordre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; distraire_V2 = v_besch61 "distraire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; dormir_V2 = v_besch32 "dormir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - ébattre_V = v_besch55 "ébattre" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; - échoir_V2 = v_besch52 "échoir" ** {vtyp = vEsse ; lock_V2 = <> ; c2 = complDat} ; - éclore_V2 = v_besch70 "éclore" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - éconduire_V2 = v_besch82 "éconduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - écrire_V2 = v_besch80 "écrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - élire_V2 = v_besch77 "élire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + ébattre_V = v_besch55 "ébattre" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; + échoir_V2 = v_besch52 "échoir" ** {vtyp = vEsse ; lock_V2 = <> ; c2 = complDat} ; + éclore_V2 = v_besch70 "éclore" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + éconduire_V2 = v_besch82 "éconduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + écrire_V2 = v_besch80 "écrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + élire_V2 = v_besch77 "élire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; embatre_V2 = v_besch55 "embatre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; embattre_V2 = v_besch55 "embattre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; emboire_V = v_besch69 "emboire" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; - émettre_V2 = v_besch56 "émettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - émoudre_V2 = v_besch74 "émoudre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - émouvoir_V2 = v_besch44 "émouvoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + émettre_V2 = v_besch56 "émettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + émoudre_V2 = v_besch74 "émoudre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + émouvoir_V2 = v_besch44 "émouvoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; empreindre_V2 = v_besch57 "empreindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; enceindre_V2 = v_besch57 "enceindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; enclore_V2 = v_besch70 "enclore" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; @@ -148,12 +148,12 @@ lin enfreindre_V2 = v_besch57 "enfreindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; enfuir_V = v_besch36 "enfuir" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; enjoindre_V2 = v_besch58 "enjoindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - enquérir_V = v_besch24 "enquérir" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; + enquérir_V = v_besch24 "enquérir" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; entendre_V2 = v_besch53 "entendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; entr'apercevoir_V = v_besch38 "entr'apercevoir" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; entrebattre_V = v_besch55 "entrebattre" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; - entre_détruire_V = v_besch82 "entre-détruire" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; - entre_haïr_V = v_besch20 "entre-haïr" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; + entre_détruire_V = v_besch82 "entre-détruire" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; + entre_haïr_V = v_besch20 "entre-haïr" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; entremettre_V = v_besch56 "entremettre" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; entre_nuire_V = v_besch82 "entre-nuire" ** {vtyp = vHabere ; lock_V = <>} ; entreprendre_V2 = v_besch54 "entreprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; @@ -161,14 +161,14 @@ lin entrevoir_V2 = v_besch39 "entrevoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; entrouvrir_V2 = v_besch27 "entrouvrir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; envoyer_V2 = v_besch18 "envoyer" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - épandre_V2 = v_besch53 "épandre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - éperdre_V = v_besch53 "éperdre" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; - éprendre_V = v_besch54 "éprendre" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; - équivaloir_V2 = v_besch47 "équivaloir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; - éteindre_V2 = v_besch57 "éteindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - étendre_V2 = v_besch53 "étendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - étreindre_V2 = v_besch57 "étreindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - être_V = v_besch2 "être" ** {vtyp = vHabere ; lock_V = <>} ; + épandre_V2 = v_besch53 "épandre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + éperdre_V = v_besch53 "éperdre" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; + éprendre_V = v_besch54 "éprendre" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; + équivaloir_V2 = v_besch47 "équivaloir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; + éteindre_V2 = v_besch57 "éteindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + étendre_V2 = v_besch53 "étendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + étreindre_V2 = v_besch57 "étreindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + être_V = v_besch2 "être" ** {vtyp = vHabere ; lock_V = <>} ; exclure_V2 = v_besch71 "exclure" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; extraire_V2 = v_besch61 "extraire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; faillir_V2 = v_besch30 "faillir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; @@ -182,8 +182,8 @@ lin frire_V2 = v_besch81 "frire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; fuir_V2 = v_besch36 "fuir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; geindre_V2 = v_besch57 "geindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - gésir_V2 = mkNV (conj3gésir "gésir") ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - haïr_V2 = v_besch20 "haïr" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + gésir_V2 = mkNV (conj3gésir "gésir") ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + haïr_V2 = v_besch20 "haïr" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; inclure_V2 = v_besch71 "inclure" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; induire_V2 = v_besch82 "induire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; inscrire_V2 = v_besch80 "inscrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; @@ -197,20 +197,20 @@ lin luire_V = v_besch82 "luire" ** {vtyp = vHabere ; lock_V = <>} ; mainmettre_V2 = v_besch56 "mainmettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; maintenir_V2 = v_besch23 "maintenir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - méconnaître_V2 = v_besch64 "méconnaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - mécroire_V2 = v_besch68 "mécroire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - médire_V2 = v_besch78 "médire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; + méconnaître_V2 = v_besch64 "méconnaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + mécroire_V2 = v_besch68 "mécroire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + médire_V2 = v_besch78 "médire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; mentir_V2 = v_besch25 "mentir" ** {vtyp = vEsse ; lock_V2 = <> ; c2 = complDat} ; - méprendre_V2 = v_besch54 "méprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; + méprendre_V2 = v_besch54 "méprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; messeoir_V2 = v_besch50 "messeoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; mettre_V2 = v_besch56 "mettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - mévendre_V2 = v_besch53 "mévendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + mévendre_V2 = v_besch53 "mévendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; mordre_V2 = v_besch53 "mordre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; morfondre_V = v_besch53 "morfondre" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; moudre_V2 = v_besch74 "moudre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; mourir_V = v_besch34 "mourir" ** {vtyp = vEsse ; lock_V = <>} ; mouvoir_V2 = v_besch44 "mouvoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; - naître_V = v_besch65 "naître" ** {vtyp = vEsse ; lock_V = <>} ; + naître_V = v_besch65 "naître" ** {vtyp = vEsse ; lock_V = <>} ; nuire_V2 = v_besch82 "nuire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; obtenir_V2 = v_besch23 "obtenir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; obvenir_V = v_besch23 "obvenir" ** {vtyp = vEsse ; lock_V = <>} ; @@ -218,11 +218,11 @@ lin offrir_V2 = v_besch27 "offrir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; oindre_V2 = v_besch58 "oindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; omettre_V2 = v_besch56 "omettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - ouïr_V2 = v_besch37 "ouïr" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + ouïr_V2 = v_besch37 "ouïr" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; ouvrir_V2 = v_besch27 "ouvrir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - paître_V2 = v_besch66 "paître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - paître_V = v_besch66 "paître" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; - paraître_V = v_besch64 "paraître" ** {vtyp = vHabere ; lock_V = <>} ; + paître_V2 = v_besch66 "paître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + paître_V = v_besch66 "paître" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; + paraître_V = v_besch64 "paraître" ** {vtyp = vHabere ; lock_V = <>} ; parcourir_V2 = v_besch33 "parcourir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; parfondre_V2 = v_besch53 "parfondre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; partir_V = v_besch25 "partir" ** {vtyp = vEsse ; lock_V = <>} ; @@ -241,14 +241,14 @@ lin poursuivre_V2 = v_besch75 "poursuivre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; pourvoir_V2 = v_besch40 "pourvoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; pouvoir_V = v_besch43 "pouvoir" ** {vtyp = vHabere ; lock_V = <>} ; - prédire_V2 = v_besch78 "prédire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + prédire_V2 = v_besch78 "prédire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; prendre_V2 = v_besch54 "prendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; prescrire_V2 = v_besch80 "prescrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; pressentir_V2 = v_besch25 "pressentir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - prétendre_V2 = v_besch53 "prétendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; - prévaloir_V2 = v_besch47 "prévaloir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; - prévenir_V2 = v_besch23 "prévenir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - prévoir_V2 = v_besch39 "prévoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + prétendre_V2 = v_besch53 "prétendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; + prévaloir_V2 = v_besch47 "prévaloir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; + prévenir_V2 = v_besch23 "prévenir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + prévoir_V2 = v_besch39 "prévoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; produire_V2 = v_besch82 "produire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; promettre_V2 = v_besch56 "promettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; promouvoir_V2 = v_besch44 "promouvoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; @@ -258,64 +258,64 @@ lin raire_V2 = v_besch61 "raire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; rapprendre_V2 = v_besch54 "rapprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; rasseoir_V2 = v_besch49 "rasseoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - réadmettre_V2 = v_besch56 "réadmettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - réapparaître_V = v_besch64 "réapparaître" ** {vtyp = vHabere ; lock_V = <>} ; - réapprendre_V2 = v_besch54 "réapprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + réadmettre_V2 = v_besch56 "réadmettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + réapparaître_V = v_besch64 "réapparaître" ** {vtyp = vHabere ; lock_V = <>} ; + réapprendre_V2 = v_besch54 "réapprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; rebattre_V2 = v_besch55 "rebattre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; recevoir_V2 = v_besch38 "recevoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - recomparaître_V2 = v_besch64 "recomparaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + recomparaître_V2 = v_besch64 "recomparaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; reconduire_V2 = v_besch82 "reconduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - reconnaître_V2 = v_besch64 "reconnaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - reconquérir_V2 = v_besch24 "reconquérir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + reconnaître_V2 = v_besch64 "reconnaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + reconquérir_V2 = v_besch24 "reconquérir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; reconstruire_V2 = v_besch82 "reconstruire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; recoudre_V2 = v_besch73 "recoudre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; recourir_V2 = v_besch33 "recourir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; recouvrir_V2 = v_besch27 "recouvrir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - récrire_V2 = v_besch80 "récrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - recroître_V2 = v_besch67 "recroître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + récrire_V2 = v_besch80 "récrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + recroître_V2 = v_besch67 "recroître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; recueillir_V2 = v_besch28 "recueillir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; recuire_V2 = v_besch82 "recuire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - redécouvrir_V2 = v_besch27 "redécouvrir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - redéfaire_V2 = v_besch62 "redéfaire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + redécouvrir_V2 = v_besch27 "redécouvrir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + redéfaire_V2 = v_besch62 "redéfaire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; redescendre_V2 = v_besch53 "redescendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; redevenir_V = v_besch23 "redevenir" ** {vtyp = vEsse ; lock_V = <>} ; redevoir_V2 = v_besch42 "redevoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; redire_V2 = v_besch78 "redire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - réduire_V2 = v_besch82 "réduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; - réécrire_V2 = v_besch80 "réécrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - réélire_V2 = v_besch77 "réélire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - réentendre_V2 = v_besch53 "réentendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + réduire_V2 = v_besch82 "réduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; + réécrire_V2 = v_besch80 "réécrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + réélire_V2 = v_besch77 "réélire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + réentendre_V2 = v_besch53 "réentendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; refaire_V2 = v_besch62 "refaire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; refendre_V2 = v_besch53 "refendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; refondre_V2 = v_besch53 "refondre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - réinscrire_V2 = v_besch80 "réinscrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - réintroduire_V2 = v_besch82 "réintroduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + réinscrire_V2 = v_besch80 "réinscrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + réintroduire_V2 = v_besch82 "réintroduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; rejoindre_V2 = v_besch58 "rejoindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; relire_V2 = v_besch77 "relire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; reluire_V2 = v_besch82 "reluire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; remettre_V2 = v_besch56 "remettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; remordre_V2 = v_besch53 "remordre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; remoudre_V2 = v_besch74 "remoudre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - renaître_V2 = v_besch65 "renaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + renaître_V2 = v_besch65 "renaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; rendormir_V2 = v_besch32 "rendormir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; rendre_V2 = v_besch53 "rendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; rentraire_V2 = v_besch61 "rentraire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; rentrouvrir_V2 = v_besch27 "rentrouvrir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; renvoyer_V2 = v_besch18 "renvoyer" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - repaître_V2 = v_besch66 "repaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - répandre_V2 = v_besch53 "répandre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - reparaître_V = v_besch64 "reparaître" ** {vtyp = vEsse ; lock_V = <>} ; + repaître_V2 = v_besch66 "repaître" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + répandre_V2 = v_besch53 "répandre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + reparaître_V = v_besch64 "reparaître" ** {vtyp = vEsse ; lock_V = <>} ; repartir_V = v_besch25 "repartir" ** {vtyp = vEsse ; lock_V = <>} ; repeindre_V2 = v_besch57 "repeindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; rependre_V2 = v_besch53 "rependre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; repentir_V = v_besch25 "repentir" ** {vtyp = vHabere ; lock_V = <> ; c2 = complAcc} ; reperdre_V2 = v_besch53 "reperdre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; repleuvoir_V = v_besch45 "repleuvoir" ** {vtyp = vHabere ; lock_V = <>} ; - répondre_V2 = v_besch53 "répondre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + répondre_V2 = v_besch53 "répondre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; reprendre_V2 = v_besch54 "reprendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; reproduire_V2 = v_besch82 "reproduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - requérir_V2 = v_besch24 "requérir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - résoudre_V2 = mkNV (conj3résoudre "résoudre") ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + requérir_V2 = v_besch24 "requérir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + résoudre_V2 = mkNV (conj3résoudre "résoudre") ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; ressentir_V2 = v_besch25 "ressentir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complGen} ; resservir_V2 = v_besch35 "resservir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; ressortir_V = v_besch25 "ressortir" ** {vtyp = vEsse ; lock_V = <>} ; @@ -330,11 +330,11 @@ lin retraire_V2 = v_besch61 "retraire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; retranscrire_V2 = v_besch80 "retranscrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; retransmettre_V2 = v_besch56 "retransmettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - rétreindre_V2 = v_besch57 "rétreindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + rétreindre_V2 = v_besch57 "rétreindre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; revaloir_V2 = v_besch47 "revaloir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; revendre_V2 = v_besch53 "revendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; revenir_V = v_besch23 "revenir" ** {vtyp = vEsse ; lock_V = <>} ; - revêtir_V2 = v_besch26 "revêtir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + revêtir_V2 = v_besch26 "revêtir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; revivre_V2 = v_besch76 "revivre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; revoir_V2 = v_besch39 "revoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; revouloir_V2 = v_besch48 "revouloir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; @@ -345,7 +345,7 @@ lin satisfaire_V2 = v_besch62 "satisfaire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complDat} ; savoir_V2 = v_besch41 "savoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; secourir_V2 = v_besch33 "secourir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - séduire_V2 = v_besch82 "séduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + séduire_V2 = v_besch82 "séduire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; sentir_V2 = v_besch25 "sentir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; seoir_V = v_besch50 "seoir" ** {vtyp = vHabere ; lock_V = <>} ; servir_V2 = v_besch35 "servir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; @@ -381,14 +381,14 @@ lin traire_V2 = v_besch61 "traire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; transcrire_V2 = v_besch80 "transcrire" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; transmettre_V2 = v_besch56 "transmettre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; - transparaître_V = v_besch64 "transparaître" ** {vtyp = vHabere ; lock_V = <>} ; - tréfondre_V2 = v_besch53 "tréfondre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + transparaître_V = v_besch64 "transparaître" ** {vtyp = vHabere ; lock_V = <>} ; + tréfondre_V2 = v_besch53 "tréfondre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; tressaillir_V = v_besch29 "tressaillir" ** {vtyp = vHabere ; lock_V = <>} ; vaincre_V2 = v_besch60 "vaincre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; valoir_V2 = v_besch47 "valoir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; vendre_V2 = v_besch53 "vendre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; venir_V = v_besch23 "venir" ** {vtyp = vEsse ; lock_V = <>} ; - vêtir_V2 = v_besch26 "vêtir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; + vêtir_V2 = v_besch26 "vêtir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; vivre_V2 = v_besch76 "vivre" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; voir_V2 = v_besch39 "voir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; vouloir_V2 = v_besch48 "vouloir" ** {vtyp = vHabere ; lock_V2 = <> ; c2 = complAcc} ; diff --git a/lib/src/french/IrregFreAbs.gf b/lib/src/french/IrregFreAbs.gf index de2826564..a8fb38364 100644 --- a/lib/src/french/IrregFreAbs.gf +++ b/lib/src/french/IrregFreAbs.gf @@ -1,11 +1,11 @@ --# -path=.:../romance:../abstract:../../prelude ---# -coding=latin1 -- Irregular verbs from Nancy, based on a list from Sylvain Pogodalla, 25/11/2004 -- Translated to GF by Aarne Ranta -- added extracted subcat information 29/11 abstract IrregFreAbs = Cat ** { + flags coding=utf8 ; -- all verbs in classes with "er" and "ir" like "finir" are omitted @@ -15,15 +15,15 @@ fun abstenir_V : V ; abstraire_V2 : V2 ; accourir_V : V ; - accroître_V2 : V2 ; + accroître_V2 : V2 ; accueillir_V2 : V2 ; - acquérir_V2 : V2 ; + acquérir_V2 : V2 ; adjoindre_V2 : V2 ; admettre_V2 : V2 ; advenir_V : V ; aller_V : V ; apercevoir_V2 : V2 ; - apparaître_V : V ; + apparaître_V : V ; appartenir_V2 : V2 ; appendre_V2 : V2 ; apprendre_V2 : V2 ; @@ -44,7 +44,7 @@ fun clore_V2 : V2 ; combattre_V2 : V2 ; commettre_V2 : V2 ; - comparaître_V2 : V2 ; + comparaître_V2 : V2 ; complaire_V2 : V2 ; comprendre_V2 : V2 ; compromettre_V2 : V2 ; @@ -56,8 +56,8 @@ fun confire_V2 : V2 ; confondre_V2 : V2 ; conjoindre_V2 : V2 ; - connaître_V2 : V2 ; - conquérir_V2 : V2 ; + connaître_V2 : V2 ; + conquérir_V2 : V2 ; consentir_V2 : V2 ; construire_V2 : V2 ; contenir_V2 : V2 ; @@ -75,67 +75,67 @@ fun couvrir_V2 : V2 ; craindre_V2 : V2 ; croire_V2 : V2 ; - croître_V : V ; + croître_V : V ; cueillir_V2 : V2 ; cuire_V2 : V2 ; - débattre_V2 : V2 ; - débouillir_V2 : V2 ; - décevoir_V2 : V2 ; - déchoir_V2 : V2 ; - déclore_V2 : V2 ; - décommettre_V2 : V2 ; - déconfire_V2 : V2 ; - découdre_V2 : V2 ; - découvrir_V2 : V2 ; - décrire_V2 : V2 ; - décroître_V2 : V2 ; - décuire_V2 : V2 ; - déduire_V2 : V2 ; - défaillir_V : V ; - défaire_V2 : V2 ; - défendre_V2 : V2 ; - démentir_V2 : V2 ; - démettre_V2 : V2 ; - démordre_V : V ; - départir_V2 : V2 ; - dépeindre_V2 : V2 ; - dépendre_V2 : V2 ; - déplaire_V : V ; - dépourvoir_V2 : V2 ; - déprendre_V2 : V2 ; - désapprendre_V2 : V2 ; + débattre_V2 : V2 ; + débouillir_V2 : V2 ; + décevoir_V2 : V2 ; + déchoir_V2 : V2 ; + déclore_V2 : V2 ; + décommettre_V2 : V2 ; + déconfire_V2 : V2 ; + découdre_V2 : V2 ; + découvrir_V2 : V2 ; + décrire_V2 : V2 ; + décroître_V2 : V2 ; + décuire_V2 : V2 ; + déduire_V2 : V2 ; + défaillir_V : V ; + défaire_V2 : V2 ; + défendre_V2 : V2 ; + démentir_V2 : V2 ; + démettre_V2 : V2 ; + démordre_V : V ; + départir_V2 : V2 ; + dépeindre_V2 : V2 ; + dépendre_V2 : V2 ; + déplaire_V : V ; + dépourvoir_V2 : V2 ; + déprendre_V2 : V2 ; + désapprendre_V2 : V2 ; descendre_V2 : V2 ; desservir_V2 : V2 ; - déteindre_V2 : V2 ; - détendre_V2 : V2 ; - détenir_V2 : V2 ; - détordre_V2 : V2 ; - détruire_V2 : V2 ; + déteindre_V2 : V2 ; + détendre_V2 : V2 ; + détenir_V2 : V2 ; + détordre_V2 : V2 ; + détruire_V2 : V2 ; devenir_V : V ; - dévêtir_V2 : V2 ; + dévêtir_V2 : V2 ; devoir_V2 : V2 ; dire_V2 : V2 ; disconvenir_V2 : V2 ; discourir_V2 : V2 ; disjoindre_V2 : V2 ; - disparaître_V2 : V2 ; + disparaître_V2 : V2 ; dissoudre_V2 : V2 ; distendre_V2 : V2 ; distordre_V2 : V2 ; distraire_V2 : V2 ; dormir_V2 : V2 ; - ébattre_V : V ; - échoir_V2 : V2 ; - éclore_V2 : V2 ; - éconduire_V2 : V2 ; - écrire_V2 : V2 ; - élire_V2 : V2 ; + ébattre_V : V ; + échoir_V2 : V2 ; + éclore_V2 : V2 ; + éconduire_V2 : V2 ; + écrire_V2 : V2 ; + élire_V2 : V2 ; embatre_V2 : V2 ; embattre_V2 : V2 ; emboire_V : V ; - émettre_V2 : V2 ; - émoudre_V2 : V2 ; - émouvoir_V2 : V2 ; + émettre_V2 : V2 ; + émoudre_V2 : V2 ; + émouvoir_V2 : V2 ; empreindre_V2 : V2 ; enceindre_V2 : V2 ; enclore_V2 : V2 ; @@ -145,12 +145,12 @@ fun enfreindre_V2 : V2 ; enfuir_V : V ; enjoindre_V2 : V2 ; - enquérir_V : V ; + enquérir_V : V ; entendre_V2 : V2 ; entr'apercevoir_V : V ; entrebattre_V : V ; - entre_détruire_V : V ; - entre_haïr_V : V ; + entre_détruire_V : V ; + entre_haïr_V : V ; entremettre_V : V ; entre_nuire_V : V ; entreprendre_V2 : V2 ; @@ -158,14 +158,14 @@ fun entrevoir_V2 : V2 ; entrouvrir_V2 : V2 ; envoyer_V2 : V2 ; - épandre_V2 : V2 ; - éperdre_V : V ; - éprendre_V : V ; - équivaloir_V2 : V2 ; - éteindre_V2 : V2 ; - étendre_V2 : V2 ; - étreindre_V2 : V2 ; - être_V : V ; + épandre_V2 : V2 ; + éperdre_V : V ; + éprendre_V : V ; + équivaloir_V2 : V2 ; + éteindre_V2 : V2 ; + étendre_V2 : V2 ; + étreindre_V2 : V2 ; + être_V : V ; exclure_V2 : V2 ; extraire_V2 : V2 ; faillir_V2 : V2 ; @@ -179,8 +179,8 @@ fun frire_V2 : V2 ; fuir_V2 : V2 ; geindre_V2 : V2 ; - gésir_V2 : V2 ; - haïr_V2 : V2 ; + gésir_V2 : V2 ; + haïr_V2 : V2 ; inclure_V2 : V2 ; induire_V2 : V2 ; inscrire_V2 : V2 ; @@ -194,20 +194,20 @@ fun luire_V : V ; mainmettre_V2 : V2 ; maintenir_V2 : V2 ; - méconnaître_V2 : V2 ; - mécroire_V2 : V2 ; - médire_V2 : V2 ; + méconnaître_V2 : V2 ; + mécroire_V2 : V2 ; + médire_V2 : V2 ; mentir_V2 : V2 ; - méprendre_V2 : V2 ; + méprendre_V2 : V2 ; messeoir_V2 : V2 ; mettre_V2 : V2 ; - mévendre_V2 : V2 ; + mévendre_V2 : V2 ; mordre_V2 : V2 ; morfondre_V : V ; moudre_V2 : V2 ; mourir_V : V ; mouvoir_V2 : V2 ; - naître_V : V ; + naître_V : V ; nuire_V2 : V2 ; obtenir_V2 : V2 ; obvenir_V : V ; @@ -215,11 +215,11 @@ fun offrir_V2 : V2 ; oindre_V2 : V2 ; omettre_V2 : V2 ; - ouïr_V2 : V2 ; + ouïr_V2 : V2 ; ouvrir_V2 : V2 ; - paître_V2 : V2 ; - paître_V : V ; - paraître_V : V ; + paître_V2 : V2 ; + paître_V : V ; + paraître_V : V ; parcourir_V2 : V2 ; parfondre_V2 : V2 ; partir_V : V ; @@ -238,14 +238,14 @@ fun poursuivre_V2 : V2 ; pourvoir_V2 : V2 ; pouvoir_V : V ; - prédire_V2 : V2 ; + prédire_V2 : V2 ; prendre_V2 : V2 ; prescrire_V2 : V2 ; pressentir_V2 : V2 ; - prétendre_V2 : V2 ; - prévaloir_V2 : V2 ; - prévenir_V2 : V2 ; - prévoir_V2 : V2 ; + prétendre_V2 : V2 ; + prévaloir_V2 : V2 ; + prévenir_V2 : V2 ; + prévoir_V2 : V2 ; produire_V2 : V2 ; promettre_V2 : V2 ; promouvoir_V2 : V2 ; @@ -255,64 +255,64 @@ fun raire_V2 : V2 ; rapprendre_V2 : V2 ; rasseoir_V2 : V2 ; - réadmettre_V2 : V2 ; - réapparaître_V : V ; - réapprendre_V2 : V2 ; + réadmettre_V2 : V2 ; + réapparaître_V : V ; + réapprendre_V2 : V2 ; rebattre_V2 : V2 ; recevoir_V2 : V2 ; - recomparaître_V2 : V2 ; + recomparaître_V2 : V2 ; reconduire_V2 : V2 ; - reconnaître_V2 : V2 ; - reconquérir_V2 : V2 ; + reconnaître_V2 : V2 ; + reconquérir_V2 : V2 ; reconstruire_V2 : V2 ; recoudre_V2 : V2 ; recourir_V2 : V2 ; recouvrir_V2 : V2 ; - récrire_V2 : V2 ; - recroître_V2 : V2 ; + récrire_V2 : V2 ; + recroître_V2 : V2 ; recueillir_V2 : V2 ; recuire_V2 : V2 ; - redécouvrir_V2 : V2 ; - redéfaire_V2 : V2 ; + redécouvrir_V2 : V2 ; + redéfaire_V2 : V2 ; redescendre_V2 : V2 ; redevenir_V : V ; redevoir_V2 : V2 ; redire_V2 : V2 ; - réduire_V2 : V2 ; - réécrire_V2 : V2 ; - réélire_V2 : V2 ; - réentendre_V2 : V2 ; + réduire_V2 : V2 ; + réécrire_V2 : V2 ; + réélire_V2 : V2 ; + réentendre_V2 : V2 ; refaire_V2 : V2 ; refendre_V2 : V2 ; refondre_V2 : V2 ; - réinscrire_V2 : V2 ; - réintroduire_V2 : V2 ; + réinscrire_V2 : V2 ; + réintroduire_V2 : V2 ; rejoindre_V2 : V2 ; relire_V2 : V2 ; reluire_V2 : V2 ; remettre_V2 : V2 ; remordre_V2 : V2 ; remoudre_V2 : V2 ; - renaître_V2 : V2 ; + renaître_V2 : V2 ; rendormir_V2 : V2 ; rendre_V2 : V2 ; rentraire_V2 : V2 ; rentrouvrir_V2 : V2 ; renvoyer_V2 : V2 ; - repaître_V2 : V2 ; - répandre_V2 : V2 ; - reparaître_V : V ; + repaître_V2 : V2 ; + répandre_V2 : V2 ; + reparaître_V : V ; repartir_V : V ; repeindre_V2 : V2 ; rependre_V2 : V2 ; repentir_V : V ; reperdre_V2 : V2 ; repleuvoir_V : V ; - répondre_V2 : V2 ; + répondre_V2 : V2 ; reprendre_V2 : V2 ; reproduire_V2 : V2 ; - requérir_V2 : V2 ; - résoudre_V2 : V2 ; + requérir_V2 : V2 ; + résoudre_V2 : V2 ; ressentir_V2 : V2 ; resservir_V2 : V2 ; ressortir_V : V ; @@ -327,11 +327,11 @@ fun retraire_V2 : V2 ; retranscrire_V2 : V2 ; retransmettre_V2 : V2 ; - rétreindre_V2 : V2 ; + rétreindre_V2 : V2 ; revaloir_V2 : V2 ; revendre_V2 : V2 ; revenir_V : V ; - revêtir_V2 : V2 ; + revêtir_V2 : V2 ; revivre_V2 : V2 ; revoir_V2 : V2 ; revouloir_V2 : V2 ; @@ -342,7 +342,7 @@ fun satisfaire_V2 : V2 ; savoir_V2 : V2 ; secourir_V2 : V2 ; - séduire_V2 : V2 ; + séduire_V2 : V2 ; sentir_V2 : V2 ; seoir_V : V ; servir_V2 : V2 ; @@ -378,14 +378,14 @@ fun traire_V2 : V2 ; transcrire_V2 : V2 ; transmettre_V2 : V2 ; - transparaître_V : V ; - tréfondre_V2 : V2 ; + transparaître_V : V ; + tréfondre_V2 : V2 ; tressaillir_V : V ; vaincre_V2 : V2 ; valoir_V2 : V2 ; vendre_V2 : V2 ; venir_V : V ; - vêtir_V2 : V2 ; + vêtir_V2 : V2 ; vivre_V2 : V2 ; voir_V2 : V2 ; vouloir_V2 : V2 ; diff --git a/lib/src/french/LexiconFre.gf b/lib/src/french/LexiconFre.gf index 946adec74..42b916840 100644 --- a/lib/src/french/LexiconFre.gf +++ b/lib/src/french/LexiconFre.gf @@ -1,29 +1,29 @@ --# -path=.:../romance:../common:../abstract:../../prelude ---# -coding=latin1 concrete LexiconFre of Lexicon = CatFre ** open (M = MorphoFre), PhonoFre, ParadigmsFre, IrregFre in { flags + coding=utf8 ; optimize=values ; lin airplane_N = regGenN "avion" masculine ; - answer_V2S = mkV2S (v2V répondre_V2) dative ; + answer_V2S = mkV2S (v2V répondre_V2) dative ; apartment_N = regGenN "apartement" masculine ; apple_N = regGenN "pomme" feminine ; art_N = regGenN "art" feminine ; ask_V2Q = mkV2Q (regV "demander") dative ; - baby_N = regGenN "bébé" masculine ; + baby_N = regGenN "bébé" masculine ; bad_A = prefA (mkADeg (regA "mauvais") (regA "pire")) ; bank_N = regGenN "banque" feminine ; beautiful_A = prefA (compADeg (mkA (pre {voyelle => "bel" ; _ => "beau" }) "belle" "beaux" "bellement")) ; become_VA = mkVA devenir_V ; - beer_N = regGenN "bière" feminine ; + beer_N = regGenN "bière" feminine ; beg_V2V = mkV2V (regV "demander") accusative dative ; big_A = prefA (regA "grand") ; - bike_N = regGenN "vélo" masculine ; + bike_N = regGenN "vélo" masculine ; bird_N = regGenN "oiseau" masculine ; black_A = regA "noir" ; blue_A = regA "bleu" ; @@ -31,14 +31,14 @@ lin book_N = regGenN "livre" masculine ; boot_N = regGenN "botte" feminine ; boss_N = regGenN "chef" masculine ; - boy_N = regGenN "garçon" masculine ; + boy_N = regGenN "garçon" masculine ; bread_N = regGenN "pain" masculine ; break_V2 = dirV2 (regV "casser") ; broad_A = regA "large" ; - brother_N2 = deN2 (regGenN "frère" masculine) ; + brother_N2 = deN2 (regGenN "frère" masculine) ; brown_A = regA "brun" ; butter_N = regGenN "beurre" masculine ; - buy_V2 = dirV2 (reg3V "acheter" "achète" "achètera") ; + buy_V2 = dirV2 (reg3V "acheter" "achète" "achètera") ; camera_N = compN (regGenN "appareil" masculine) ["de photo"] ; cap_N = regGenN "casquette" feminine ; car_N = regGenN "voiture" feminine ; @@ -48,7 +48,7 @@ lin chair_N = regGenN "chaise" feminine ; cheese_N = regGenN "fromage" masculine ; child_N = regGenN "enfant" masculine ; - church_N = regGenN "église" feminine ; + church_N = regGenN "église" feminine ; city_N = regGenN "ville" feminine ; clean_A = regA "propre" ; clever_A = regA "sage" ; ---- @@ -63,7 +63,7 @@ lin die_V = mourir_V ; dirty_A = regA "sale" ; distance_N3 = mkN3 (regGenN "distance" feminine) genitive dative ; - doctor_N = regGenN "médecin" masculine ; + doctor_N = regGenN "médecin" masculine ; dog_N = regGenN "chien" masculine ; door_N = regGenN "porte" feminine ; drink_V2 = boire_V2 ; @@ -72,7 +72,7 @@ lin empty_A = regA "vide" ; enemy_N = regGenN "ennemi" masculine ; factory_N = regGenN "usine" feminine ; - father_N2 = deN2 (regGenN "père" masculine) ; + father_N2 = deN2 (regGenN "père" masculine) ; fear_VS = mkVS (v2V craindre_V2) ; fear_V2 = dirV2 (v2V craindre_V2) ; find_V2 = dirV2 (regV "trouver") ; @@ -92,11 +92,11 @@ lin go_V = aller_V ; green_A = regA "vert" ; harbour_N = regGenN "port" masculine ; - hate_V2 = haïr_V2 ; + hate_V2 = haïr_V2 ; hat_N = regGenN "chapeau" masculine ; hear_V2 = entendre_V2 ; hill_N = regGenN "colline" feminine ; - hope_VS = mkVS (reg3V "espérer" "espère" "espérera") ; + hope_VS = mkVS (reg3V "espérer" "espère" "espérera") ; horse_N = regGenN "cheval" masculine ; hot_A = regA "chaud" ; house_N = regGenN "maison" feminine ; @@ -104,7 +104,7 @@ lin industry_N = regGenN "industrie" feminine ; iron_N = regGenN "fer" masculine ; king_N = regGenN "roi" masculine ; - know_V2 = connaître_V2 ; + know_V2 = connaître_V2 ; know_VQ = mkVQ (lin V savoir_V2) ; know_VS = mkVS (lin V savoir_V2) ; lake_N = regGenN "lac" masculine ; @@ -113,21 +113,21 @@ lin leather_N = regGenN "cuir" masculine ; leave_V2 = dirV2 (regV "quitter") ; like_V2 = dirV2 (regV "aimer") ; - listen_V2 = dirV2 (regV "écouter") ; + listen_V2 = dirV2 (regV "écouter") ; live_V = v2V vivre_V2 ; long_A = compADeg (mkA "long" "longue" "longs" "longuement") ; lose_V2 = perdre_V2 ; love_N = regGenN "amour" masculine ; love_V2 = dirV2 (regV "aimer") ; man_N = regGenN "homme" masculine ; - married_A2 = mkA2 (regA "marié") dative ; + married_A2 = mkA2 (regA "marié") dative ; meat_N = regGenN "viande" feminine ; milk_N = regGenN "lait" masculine ; moon_N = regGenN "lune" feminine ; - mother_N2 = deN2 (regGenN "mère" feminine) ; + mother_N2 = deN2 (regGenN "mère" feminine) ; mountain_N = regGenN "montagne" feminine ; music_N = regGenN "musique" feminine ; - narrow_A = regA "étroit" ; + narrow_A = regA "étroit" ; new_A = prefA (compADeg (mkA (pre {voyelle => "nouvel" ; _ => "nouveau" }) "nouvelle" "nouveaux" "nouvellement")) ; newspaper_N = regGenN "journal" masculine ; @@ -140,11 +140,11 @@ lin paris_PN = mkPN "Paris" masculine ; peace_N = regGenN "paix" feminine ; pen_N = regGenN "stylo" masculine ; - planet_N = regGenN "planète" feminine ; + planet_N = regGenN "planète" feminine ; plastic_N = regGenN "plastic" masculine ; play_V2 = dirV2 (regV "jouer") ; policeman_N = regGenN "policier" masculine ; - priest_N = regGenN "prêtre" masculine ; + priest_N = regGenN "prêtre" masculine ; probable_AS = mkAS (regA "probable") ; queen_N = regGenN "reine" feminine ; radio_N = regGenN "radio" feminine ; @@ -153,13 +153,13 @@ lin red_A = regA "rouge" ; religion_N = regGenN "religion" feminine ; restaurant_N = regGenN "restaurant" masculine ; - river_N = regGenN "rivière" feminine ; + river_N = regGenN "rivière" feminine ; rock_N = regGenN "rocher" masculine ; roof_N = regGenN "toit" masculine ; rubber_N = regGenN "caoutchuc" masculine ; run_V = v2V courir_V2 ; say_VS = mkVS (v2V dire_V2) ; - school_N = regGenN "école" feminine ; + school_N = regGenN "école" feminine ; science_N = regGenN "science" feminine ; sea_N = regGenN "mer" feminine ; seek_V2 = dirV2 (regV "chercher") ; @@ -179,21 +179,21 @@ lin snake_N = regGenN "serpent" masculine ; sock_N = regGenN "chaussette" feminine ; speak_V2 = dirV2 (regV "parler") ; - star_N = regGenN "étoile" feminine ; + star_N = regGenN "étoile" feminine ; steel_N = regGenN "acier" masculine ; stone_N = regGenN "pierre" feminine ; stove_N = regGenN "four" masculine ; - student_N = regGenN "étudiant" masculine ; + student_N = regGenN "étudiant" masculine ; stupid_A = regA "stupide" ; sun_N = regGenN "soleil" masculine ; - switch8off_V2 = éteindre_V2 ; + switch8off_V2 = éteindre_V2 ; switch8on_V2 = dirV2 (regV "allumer") ; ---- table_N = regGenN "table" feminine ; talk_V3 = mkV3 (regV "parler") dative genitive ; teacher_N = regGenN "professeur" masculine ; teach_V2 = dirV2 (regV "enseigner") ; - television_N = regGenN "télévision" feminine ; - thick_A = compADeg (mkA "épais" "épaisse" "épais" "épaissement") ; + television_N = regGenN "télévision" feminine ; + thick_A = compADeg (mkA "épais" "épaisse" "épais" "épaissement") ; thin_A = regA "fin" ; train_N = regGenN "train" masculine ; travel_V = regV "voyager" ; @@ -201,7 +201,7 @@ lin ---- trousers_N = regGenN "pantalon" masculine ; ugly_A = regA "laide" ; understand_V2 = comprendre_V2 ; - university_N = regGenN "université" feminine ; + university_N = regGenN "université" feminine ; village_N = regGenN "village" masculine ; wait_V2 = attendre_V2 ; walk_V = regV "marcher" ; @@ -210,32 +210,32 @@ lin watch_V2 = dirV2 (regV "regarder") ; water_N = regGenN "eau" feminine ; white_A = compADeg (mkA "blanc" "blanche" "blancs" "blanchement") ; - window_N = regGenN "fenêtre" feminine ; + window_N = regGenN "fenêtre" feminine ; wine_N = regGenN "vin" masculine ; win_V2 = dirV2 (regV "gagner") ; ---- vaincre woman_N = regGenN "femme" feminine ; wonder_VQ = mkVQ (reflV (regV "demander")) ; wood_N = regGenN "bois" masculine ; - write_V2 = écrire_V2 ; + write_V2 = écrire_V2 ; yellow_A = regA "jaune" ; young_A = prefA (regA "jeune") ; do_V2 = faire_V2 ; now_Adv = mkAdv "maintenant" ; - already_Adv = mkAdv "déjà" ; + already_Adv = mkAdv "déjà" ; song_N = regGenN "chanson" feminine ; add_V3 = dirV3 (regV "ajouter") dative ; - number_N = regGenN "nombre" masculine ; ---- numéro + number_N = regGenN "nombre" masculine ; ---- numéro put_V2 = mettre_V2 ; - stop_V = reflV (regV "arrêter") ; + stop_V = reflV (regV "arrêter") ; jump_V = regV "sauter" ; left_Ord = M.mkOrd (regA "gauche") ; right_Ord = M.mkOrd (regA "droite") ; far_Adv = mkAdv "loin" ; correct_A = regA "correct" ; - dry_A = (mkA "sec" "sèche" "secs" "sèches") ; - dull_A = regA "émoussé" ; + dry_A = (mkA "sec" "sèche" "secs" "sèches") ; + dull_A = regA "émoussé" ; full_A = regA "plein" ; heavy_A = regA "lourd" ; near_A = regA "proche" ; @@ -244,19 +244,19 @@ lin sharp_A = regA "tranchant" ; smooth_A = regA "lisse" ; straight_A = regA "droite" ; - wet_A = regA "mouillé" ; + wet_A = regA "mouillé" ; wide_A = regA "large" ; animal_N = regN "animal" ; ashes_N = regGenN "cendre" masculine ; back_N = regN "dos" ; - bark_N = regN "écorce" ; + bark_N = regN "écorce" ; belly_N = regGenN "ventre" masculine ; blood_N = regN "sang" ; bone_N = regN "os" ; breast_N = regN "sein" ; --- poitrine cloud_N = regGenN "nuage" masculine ; day_N = regN "jour" ; - dust_N = regN "poussière" ; + dust_N = regN "poussière" ; ear_N = regN "oreille" ; earth_N = regN "terre" ; egg_N = regN "oeuf" ; @@ -268,12 +268,12 @@ lin flower_N = regGenN "fleur" feminine ; fog_N = regN "brouillard" ; foot_N = regN "pied" ; - forest_N = regGenN "forêt" feminine ; + forest_N = regGenN "forêt" feminine ; grass_N = regN "herbe" ; guts_N = regN "entraille" ; hair_N = regN "cheveu" ; hand_N = regGenN "main" feminine ; - head_N = regN "tête" ; + head_N = regN "tête" ; heart_N = regN "coeur" ; horn_N = regGenN "corne" masculine ; husband_N = regN "mari" ; @@ -298,9 +298,9 @@ lin seed_N = regN "graine" ; skin_N = regN "peau" ; sky_N = mkN "ciel" "cieux" masculine ; - smoke_N = regN "fumée" ; + smoke_N = regN "fumée" ; snow_N = regN "neige" ; - stick_N = regN "bâton" ; + stick_N = regN "bâton" ; tail_N = regN "queue" ; tongue_N = regN "langue" ; tooth_N = regGenN "dent" feminine ; @@ -308,11 +308,11 @@ lin wind_N = regN "vent" ; wing_N = regN "aile" ; worm_N = regN "ver" ; - year_N = regN "an" ; --- année + year_N = regN "an" ; --- année bite_V2 = mordre_V2 ; blow_V = regV "souffler" ; breathe_V = regV "respirer" ; - burn_V = regV "brûler" ; + burn_V = regV "brûler" ; count_V2 = dirV2 (regV "conter") ; cut_V2 = dirV2 (regV "tailler") ; dig_V = regV "creuser" ; @@ -321,13 +321,13 @@ lin float_V = regV "flotter" ; flow_V = regV "couler" ; fly_V = regV "voler" ; - freeze_V = reg3V "geler" "gèle" "gèlera" ; + freeze_V = reg3V "geler" "gèle" "gèlera" ; give_V3 = dirdirV3 (regV "donner") ; hit_V2 = dirV2 (regV "frapper") ; hunt_V2 = dirV2 (regV "chasser") ; kill_V2 = dirV2 (regV "tuer") ; laugh_V = rire_V2 ; - lie_V = reflV (v2V étendre_V2) ; + lie_V = reflV (v2V étendre_V2) ; play_V = regV "jouer" ; pull_V2 = dirV2 (regV "tirer") ; push_V2 = dirV2 (regV "pousser") ; @@ -340,7 +340,7 @@ lin spit_V = regV "cracher" ; squeeze_V2 = dirV2 (regV "serrer") ; stab_V2 = dirV2 (regV "poignarder") ; - stand_V = reflV (reg3V "lever" "lève" "lèvera") ; + stand_V = reflV (reg3V "lever" "lève" "lèvera") ; suck_V2 = dirV2 (regV "sucer") ; swell_V = regV "gonfler" ; swim_V = regV "nager" ; @@ -358,11 +358,11 @@ lin grammar_N = regN "grammaire" ; language_N = regN "langue" ; - rule_N = regN "règle" ; + rule_N = regN "règle" ; john_PN = regPN "Jean" ; question_N = regN "question" ; - ready_A = regA "prêt" ; + ready_A = regA "prêt" ; reason_N = regGenN "raison" feminine ; today_Adv = mkAdv "aujourd'hui" ; uncertain_A = regA "incertain" ; diff --git a/lib/src/french/MorphoFre.gf b/lib/src/french/MorphoFre.gf index a56abb364..e5d7df779 100644 --- a/lib/src/french/MorphoFre.gf +++ b/lib/src/french/MorphoFre.gf @@ -1,5 +1,4 @@ --# -path=.:../romance:../common:../../prelude ---# -coding=latin1 --1 A Simple French Resource Morphology -- @@ -13,13 +12,14 @@ resource MorphoFre = CommonRomance, ResFre ** open PhonoFre, Prelude, Predef in { flags optimize=noexpand ; + coding=utf8 ; --2 Front vowels -- -- In verb conjugation, we will need the concept of frontal vowel. oper - voyelleFront : Strs = strs {"e" ; "i" ; "y" ; "é" ; "è"} ; + voyelleFront : Strs = strs {"e" ; "i" ; "y" ; "é" ; "è"} ; preVoyelleFront : (_,_ : Str) -> Str = \t,u -> pre {t ; u / voyelleFront} ; @@ -110,7 +110,7 @@ oper in mkAdj grand (grand + "s") grande (grande + "ment") ; --- Masculine form used for adverbial; also covers "carré". +-- Masculine form used for adverbial; also covers "carré". adjJoli : Str -> Adj = \joli -> mkAdj joli (joli + "s") (joli + "e") (joli + "ment") ; @@ -134,7 +134,7 @@ oper adjCher : Str -> Adj = \cher -> let {ch = Predef.tk 2 cher} in - mkAdj cher (cher + "s") (ch + "ère") (ch + "èrement") ; + mkAdj cher (cher + "s") (ch + "ère") (ch + "èrement") ; mkAdjReg : Str -> Adj = \creux -> case Predef.dp 3 creux of { @@ -148,7 +148,7 @@ oper "s" => adjFrancais creux ; "x" => adjFrancais creux ; "e" => adjJeune creux ; - "é" => adjJoli creux ; + "é" => adjJoli creux ; "i" => adjJoli creux ; _ => adjGrand creux } @@ -265,7 +265,7 @@ oper _ + "a" => ; _ + "it" => ; _ + "ut" => ; - _ + "nt" => ; + _ + "nt" => ; _ => Predef.error ("cannot form past tense from" ++ tint) } ; tin = Predef.tk affpasse.p2 tint ; @@ -372,21 +372,21 @@ oper } ; affixPlMes : (_,_ : Str) -> Affixe = - \è, â -> lesAffixes (â + "mes") (â + "tes") (è + "rent") ; + \è, â -> lesAffixes (â + "mes") (â + "tes") (è + "rent") ; affixPasseAi : Number => Affixe = table { Sg => affixSgAi ; - Pl => affixPlMes "è" "â" + Pl => affixPlMes "è" "â" } ; - affixPasseS : (i,î : Str) -> Number => Affixe = \i,î -> table { + affixPasseS : (i,î : Str) -> Number => Affixe = \i,î -> table { Sg => table {p => i + affixSgS ! p} ; - Pl => affixPlMes i î + Pl => affixPlMes i î } ; - affixSImparfSse : (i,î : Str) -> Number => Affixe = \i,î -> table { + affixSImparfSse : (i,î : Str) -> Number => Affixe = \i,î -> table { Sg => table { - P3 => î + "t" ; + P3 => î + "t" ; p => i + "ss" + affixSgE ! p } ; Pl => table {p => i + "ss" + affixSPres ! Pl ! p} @@ -394,14 +394,14 @@ oper AffixPasse : Type = {ps : Number => Affixe ; si : Number => Affixe} ; - affixPasse : (_,_ : Str) -> AffixPasse = \i, î -> - {ps = affixPasseS i î ; si = affixSImparfSse i î} ; + affixPasse : (_,_ : Str) -> AffixPasse = \i, î -> + {ps = affixPasseS i î ; si = affixSImparfSse i î} ; - affixPasseA : AffixPasse = {ps = affixPasseAi ; si = affixSImparfSse "a" "â"} ; + affixPasseA : AffixPasse = {ps = affixPasseAi ; si = affixSImparfSse "a" "â"} ; - affixPasseI : AffixPasse = affixPasse "i" "î" ; + affixPasseI : AffixPasse = affixPasse "i" "î" ; - affixPasseU : AffixPasse = affixPasse "u" "û" ; + affixPasseU : AffixPasse = affixPasse "u" "û" ; affixPasseNonExist : AffixPasse = let {aff : Number => Affixe = diff --git a/lib/src/french/NumeralFre.gf b/lib/src/french/NumeralFre.gf index 81d849b1f..3d9a439b6 100644 --- a/lib/src/french/NumeralFre.gf +++ b/lib/src/french/NumeralFre.gf @@ -1,6 +1,6 @@ ---# -coding=latin1 concrete NumeralFre of Numeral = CatFre [Numeral,Digits] ** open CommonRomance, ResRomance, MorphoFre, Prelude in { + flags coding=utf8 ; -- originally written in 1998, automatically translated to current notation... -- last modified 24/1/2006, adding ordinals @@ -14,9 +14,9 @@ oper case co of { NCard _ => ds ; NOrd _ _ => case last ds of { - "q" => ds + "uième" ; - "e" => init ds + "ième" ; - _ => ds + "ième" + "q" => ds + "uième" ; + "e" => init ds + "ième" ; + _ => ds + "ième" } } ; inh = d.inh ; n = d.n @@ -67,13 +67,13 @@ lin n9 = digitPl {inh = teen ; n = Pl ; s = table {unit => "neuf" ; teen => "dix-neuf" ; jten => "quatre-vingt-dix" ; ten => "quatre-vingt-dix" ; tenplus => "quatre-vingt"}} ; lin pot01 = - {inh = Sg ; s = \\g => let dix = cardOrd g "dix" "dixième" in table { + {inh = Sg ; s = \\g => let dix = cardOrd g "dix" "dixième" in table { {p1 = unit ; p2 = indep} => - cardOrdG g "un" "une" "premier" "première" "premiers" "premières" ; + cardOrdG g "un" "une" "premier" "première" "premiers" "premières" ; {p1 = unit ; p2 = postpo} => - cardOrdG g "un" "une" "unième" "unième" "unième" "unième" ; + cardOrdG g "un" "une" "unième" "unième" "unième" "unième" ; {p1 = unit ; p2 = attr} => [] ; - {p1 = teen ; p2 = indep | postpo} => cardOrd g "onze" "onzième" ; + {p1 = teen ; p2 = indep | postpo} => cardOrd g "onze" "onzième" ; {p1 = teen ; p2 = attr} => [] ; {p1 = jten ; p2 = indep | postpo} => dix ; {p1 = jten ; p2 = attr} => [] ; @@ -96,9 +96,9 @@ lin pot0 d = {p1 = tenplus ; p2 = attr} => d.s ! g ! tenplus} ; n = Pl} ; lin pot110 = - {s = \\g => table {_ => cardOrd g "dix" "dixième"} ; n = Pl} ; + {s = \\g => table {_ => cardOrd g "dix" "dixième"} ; n = Pl} ; lin pot111 = - {s = \\g => table {_ => cardOrd g "onze" "onzième"} ; n = Pl} ; + {s = \\g => table {_ => cardOrd g "onze" "onzième"} ; n = Pl} ; lin pot1to19 d = {s = \\g => table {indep | postpo => d.s ! g ! teen ; attr => d.s ! g ! teen} ; n = Pl} ; lin pot0as1 n = @@ -122,8 +122,8 @@ lin pot1plus d e = lin pot1as2 n = n ; lin pot2 d = {s = \\g => table {indep | postpo => (d.s ! NCard Masc ! {p1 = unit ; p2 = attr}) - ++ table {Sg => cardOrd g "cent" "centième" ; Pl => cardOrd g "cents" "centième"} ! (d.inh) ; attr => (d.s ! - NCard Masc ! {p1 = unit ; p2 = attr}) ++ cardOrd g "cent" "centième"} ; n = Pl} ; + ++ table {Sg => cardOrd g "cent" "centième" ; Pl => cardOrd g "cents" "centième"} ! (d.inh) ; attr => (d.s ! + NCard Masc ! {p1 = unit ; p2 = attr}) ++ cardOrd g "cent" "centième"} ; n = Pl} ; lin pot2plus d e = {s = \\g => table { attr => (d.s ! NCard Masc ! {p1 = unit ; p2 = attr}) ++ "cent" ++ e.s ! g ! indep ; @@ -134,7 +134,7 @@ lin pot2plus d e = lin pot2as3 n = {s = \\g => n.s ! g ! indep ; n = n.n} ; lin pot3 n = - {s = \\g => (n.s ! NCard Masc ! attr) ++ cardOrd g "mille" "millième" ; n = Pl} ; + {s = \\g => (n.s ! NCard Masc ! attr) ++ cardOrd g "mille" "millième" ; n = Pl} ; lin pot3plus n m = {s = \\g => (n.s ! NCard Masc ! attr) ++ "mille" ++ m.s ! g ! postpo ; n = Pl} ; @@ -155,8 +155,8 @@ lin pot3plus n m = D_0 = mkDig "0" ; D_1 = mk3Dig "1" "1er" Sg ; ---- gender - D_2 = mk2Dig "2" "2ème" ; - D_3 = mk2Dig "3" "3ème" ; + D_2 = mk2Dig "2" "2ème" ; + D_3 = mk2Dig "3" "3ème" ; D_4 = mkDig "4" ; D_5 = mkDig "5" ; D_6 = mkDig "6" ; @@ -166,7 +166,7 @@ lin pot3plus n m = oper mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ; - mkDig : Str -> TDigit = \c -> mk2Dig c (c + "ème") ; + mkDig : Str -> TDigit = \c -> mk2Dig c (c + "ème") ; mk3Dig : Str -> Str -> Number -> TDigit = \c,o,n -> { s = table {NCard _ => c ; NOrd _ _ => o} ; ---- gender diff --git a/lib/src/french/ParadigmsFre.gf b/lib/src/french/ParadigmsFre.gf index 3c628a481..008d85cd3 100644 --- a/lib/src/french/ParadigmsFre.gf +++ b/lib/src/french/ParadigmsFre.gf @@ -1,5 +1,4 @@ --# -path=.:../romance:../common:../abstract:../../prelude ---# -coding=latin1 --1 French Lexical Paradigms -- @@ -34,6 +33,7 @@ resource ParadigmsFre = CatFre in { flags optimize=all ; + coding=utf8 ; --2 Parameters -- @@ -55,15 +55,15 @@ oper -- Prepositions used in many-argument functions are either strings -- (including the 'accusative' empty string) or strings that -- amalgamate with the following word (the 'genitive' "de" and the --- 'dative' "à"). +-- 'dative' "à"). accusative : Prep ; -- direct object case genitive : Prep ; -- genitive, constructed with "de" - dative : Prep ; -- dative, usually constructed with "à" + dative : Prep ; -- dative, usually constructed with "à" mkPrep : overload { - mkPrep : Str -> Prep ; -- simple preposition (other than "de" and "à") - mkPrep : Str -> Prep -> Prep ; -- complex preposition e.g. "à côté de" + mkPrep : Str -> Prep ; -- simple preposition (other than "de" and "à") + mkPrep : Str -> Prep -> Prep ; -- complex preposition e.g. "à côté de" } ; @@ -92,11 +92,11 @@ oper --3 Compound nouns -- -- Some nouns are ones where the first part is inflected as a noun but --- the second part is not inflected. e.g. "numéro de téléphone". +-- the second part is not inflected. e.g. "numéro de téléphone". -- They could be formed in syntax, but we give a shortcut here since -- they are frequent in lexica. - mkN : N -> Str -> N -- compound noun, e.g. numéro + de téléphone + mkN : N -> Str -> N -- compound noun, e.g. numéro + de téléphone } ; @@ -108,13 +108,13 @@ oper mkN2 : N -> Prep -> N2 ; -- e.g. fille + genitive --- The most common cases are the genitive "de" and the dative "à", +-- The most common cases are the genitive "de" and the dative "à", -- with the empty preposition. deN2 : N -> N2 ; --% aN2 : N -> N2 ; --% --- Three-place relational nouns ("la connection de x à y") need two prepositions. +-- Three-place relational nouns ("la connection de x à y") need two prepositions. mkN3 : N -> Prep -> Prep -> N3 ; -- e.g. connection + genitive + dative @@ -122,7 +122,7 @@ oper --3 Relational common noun phrases -- -- In some cases, you may want to make a complex $CN$ into a --- relational noun (e.g. "la vieille église de"). However, $N2$ and +-- relational noun (e.g. "la vieille église de"). However, $N2$ and -- $N3$ are purely lexical categories. But you can use the $AdvCN$ -- and $PrepNP$ constructions to build phrases like this. @@ -148,9 +148,9 @@ oper -- masculine singular. The heuristic takes into account certain -- deviant endings: "banal-banale-banaux", "chinois-chinoise-chinois", -- "heureux-heureuse-heureux", "italien-italienne", "jeune-jeune", --- "amer-amère", "carré- - -carrément", "joli- - -joliment". +-- "amer-amère", "carré- - -carrément", "joli- - -joliment". - mkA : (cher : Str) -> A ; -- predictable, e.g. cher-chère + mkA : (cher : Str) -> A ; -- predictable, e.g. cher-chère -- Often just the feminine singular is deviant. @@ -183,7 +183,7 @@ oper -- -- Two-place adjectives need a preposition for their second argument. - mkA2 : A -> Prep -> A2 ; -- e.g. supérieur + dative + mkA2 : A -> Prep -> A2 ; -- e.g. supérieur + dative --2 Adverbs @@ -199,7 +199,7 @@ oper -- Adverbs modifying adjectives and sentences can also be formed. - mkAdA : Str -> AdA ; -- modify adjective, e.g. très + mkAdA : Str -> AdA ; -- modify adjective, e.g. très --2 Verbs @@ -212,7 +212,7 @@ oper -- latter with plural present indicative forms as "finissons". -- The regular verb function in the first conjugation recognizes -- these endings, as well as the variations among --- "aimer, céder, placer, peser, jeter, placer, manger, assiéger, payer". +-- "aimer, céder, placer, peser, jeter, placer, manger, assiéger, payer". -- -- Sometimes, however, it is not predictable which variant of the "er" -- conjugation is to be selected. Then it is better to use the function @@ -243,13 +243,13 @@ oper } ; -- The function $mkV$ gives the default compound auxiliary "avoir". --- To change it to "être", use the following function. +-- To change it to "être", use the following function. - etreV : V -> V ; -- force auxiliary to be être (default avoir) + etreV : V -> V ; -- force auxiliary to be être (default avoir) --- This function turns a verb into reflexive, which implies the auxiliary "être". +-- This function turns a verb into reflexive, which implies the auxiliary "être". - reflV : V -> V ; -- reflexive, implies auxiliary être, e.g. se demander + reflV : V -> V ; -- reflexive, implies auxiliary être, e.g. se demander --3 Two-place verbs @@ -288,7 +288,7 @@ oper subjVS : V -> VS ; mkVV : V -> VV ; -- plain infinitive: "je veux parler" deVV : V -> VV ; -- "j'essaie de parler" - aVV : V -> VV ; -- "j'arrive à parler" + aVV : V -> VV ; -- "j'arrive à parler" mkV2S : overload { mkV2S : V -> V2S ; mkV2S : V -> Prep -> V2S ; @@ -419,7 +419,7 @@ oper mkV3 = overload { mkV3 : V -> V3 = dirdirV3 ; -- donner,_,_ mkV3 : V -> Prep -> V3 = dirV3 ; -- placer,_,sur - mkV3 : V -> Prep -> Prep -> V3 = mmkV3 -- parler, à, de + mkV3 : V -> Prep -> Prep -> V3 = mmkV3 -- parler, à, de } ; V0 : Type = V ; @@ -511,8 +511,8 @@ oper v2V : V2 -> V ; v2V v = v ** {lock_V = <>} ; - mmkV3 : V -> Prep -> Prep -> V3 ; -- parler, à, de - dirV3 : V -> Prep -> V3 ; -- donner,_,à + mmkV3 : V -> Prep -> Prep -> V3 ; -- parler, à, de + dirV3 : V -> Prep -> V3 ; -- donner,_,à dirdirV3 : V -> V3 ; -- donner,_,_ getVerbT : (VF => Str) -> Bool = \v -> case last (v ! (VFin (VPres Indic) Sg P3)) of { diff --git a/lib/src/french/TerminologyFre.gf b/lib/src/french/TerminologyFre.gf index 9de9b6cd6..2ba0a1359 100644 --- a/lib/src/french/TerminologyFre.gf +++ b/lib/src/french/TerminologyFre.gf @@ -10,6 +10,7 @@ concrete TerminologyFre of Terminology = CatFre ** open Prelude in { +flags coding=utf8 ; lincat diff --git a/lib/src/german/ConstructionGer.gf b/lib/src/german/ConstructionGer.gf index 751162435..f76fc49e6 100644 --- a/lib/src/german/ConstructionGer.gf +++ b/lib/src/german/ConstructionGer.gf @@ -3,6 +3,7 @@ concrete ConstructionGer of Construction = CatGer ** open SyntaxGer, SymbolicGer, ParadigmsGer, (L = LexiconGer), (E = ExtraGer), (G = GrammarGer), (I = IrregGer), (R = ResGer), (N = NounGer), Prelude in { +flags coding=utf8 ; lin diff --git a/lib/src/german/DocumentationGerFunctor.gf b/lib/src/german/DocumentationGerFunctor.gf index b0fa52561..834b4ca67 100644 --- a/lib/src/german/DocumentationGerFunctor.gf +++ b/lib/src/german/DocumentationGerFunctor.gf @@ -10,6 +10,7 @@ incomplete concrete DocumentationGerFunctor of Documentation = CatGer ** open Prelude, HTML in { +flags coding=utf8 ; lincat diff --git a/lib/src/german/ExtraGer.gf b/lib/src/german/ExtraGer.gf index 735b4f73f..212aa20b2 100644 --- a/lib/src/german/ExtraGer.gf +++ b/lib/src/german/ExtraGer.gf @@ -1,6 +1,6 @@ ---# -coding=latin1 concrete ExtraGer of ExtraGerAbs = CatGer ** open ResGer, Coordination, Prelude, IrregGer, (P = ParadigmsGer) in { + flags coding=utf8 ; lincat VPI = {s : Bool => Str} ; @@ -30,7 +30,7 @@ concrete ExtraGer of ExtraGerAbs = CatGer ** TImpfSubj = {s = [] ; t = Past ; m = MConjunct} ; --# notpresent - moegen_VV = auxVV mögen_V ; + moegen_VV = auxVV mögen_V ; ICompAP ap = {s = \\_ => "wie" ++ ap.s ! APred} ; @@ -79,7 +79,7 @@ concrete ExtraGer of ExtraGerAbs = CatGer ** let verb = vpi.s ! o ! agr in case o of { Main => subj ++ verb ; - Inv => verb ++ subj ; ---- älskar henne och sover jag + Inv => verb ++ subj ; ---- älskar henne och sover jag Sub => subj ++ verb } } ; diff --git a/lib/src/german/IdiomGer.gf b/lib/src/german/IdiomGer.gf index ec58146b3..8c52b6487 100644 --- a/lib/src/german/IdiomGer.gf +++ b/lib/src/german/IdiomGer.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 concrete IdiomGer of Idiom = CatGer ** open MorphoGer, ParadigmsGer, Prelude in { flags optimize=all_subs ; + coding=utf8 ; lin ImpersCl vp = mkClause "es" (agrP3 Sg) vp ; @@ -72,6 +72,6 @@ concrete IdiomGer of Idiom = CatGer ** } ; oper - geben = dirV2 (mk6V "geben" "gibt" "gib" "gab" "gäbe" "gegeben") ; + geben = dirV2 (mk6V "geben" "gibt" "gib" "gab" "gäbe" "gegeben") ; } diff --git a/lib/src/german/IrregGer.gf b/lib/src/german/IrregGer.gf index 236af7d67..40320bf8f 100644 --- a/lib/src/german/IrregGer.gf +++ b/lib/src/german/IrregGer.gf @@ -1,5 +1,4 @@ --# -path=.:prelude:../abstract:../common ---# -coding=latin1 -- adapted from verb list in -- http://www.iee.et.tu-dresden.de/~wernerr/grammar/verben_dt.html @@ -10,170 +9,171 @@ concrete IrregGer of IrregGerAbs = CatGer ** open in { flags optimize=values ; + coding=utf8 ; - lin backen_V = irregV "backen" "bäckt" "backt" "backt" "gebacken" ; - lin backen_u_V = irregV "backen" "bäckt" "buk" "buke" "gebacken" ; - lin befehlen_V = irregV "befehlen" "befiehlt" "befahl" "beföhle" "befähle)" ; - lin beginnen_V = irregV "beginnen" "beginnt" "begann" "begönne" "begänne)" ; - lin beißen_V = irregV "beißen" "beißt" "biß" "biße" "gebissen" ; - lin bergen_V = irregV "bergen" "birgt" "barg" "bärge" "geborgen" ; - lin bersten_V = irregV "bersten" "birst" "barst" "bärste" "geborsten" ; - lin bewegen_V = irregV "bewegen" "bewegt" "bewog" "bewöge" "bewogen" ; - lin biegen_V = irregV "biegen" "biegt" "bog" "böge" "gebogen" ; - lin bieten_V = irregV "bieten" "bietet" "bot" "böte" "geboten" ; - lin binden_V = irregV "binden" "bindt" "band" "bände" "gebunden" ; - lin bitten_V = irregV "bitten" "bittet" "bat" "bäte" "gebeten" ; - lin blasen_V = irregV "blasen" "bläst" "blies" "bliese" "geblasen" ; + lin backen_V = irregV "backen" "bäckt" "backt" "backt" "gebacken" ; + lin backen_u_V = irregV "backen" "bäckt" "buk" "buke" "gebacken" ; + lin befehlen_V = irregV "befehlen" "befiehlt" "befahl" "beföhle" "befähle)" ; + lin beginnen_V = irregV "beginnen" "beginnt" "begann" "begönne" "begänne)" ; + lin beißen_V = irregV "beißen" "beißt" "biß" "biße" "gebissen" ; + lin bergen_V = irregV "bergen" "birgt" "barg" "bärge" "geborgen" ; + lin bersten_V = irregV "bersten" "birst" "barst" "bärste" "geborsten" ; + lin bewegen_V = irregV "bewegen" "bewegt" "bewog" "bewöge" "bewogen" ; + lin biegen_V = irregV "biegen" "biegt" "bog" "böge" "gebogen" ; + lin bieten_V = irregV "bieten" "bietet" "bot" "böte" "geboten" ; + lin binden_V = irregV "binden" "bindt" "band" "bände" "gebunden" ; + lin bitten_V = irregV "bitten" "bittet" "bat" "bäte" "gebeten" ; + lin blasen_V = irregV "blasen" "bläst" "blies" "bliese" "geblasen" ; lin bleiben_V = irregV "bleiben" "bleibt" "blieb" "bliebe" "geblieben" ; - lin braten_V = irregV "braten" "brät" "briet" "briete" "gebraten" ; - lin brechen_V = irregV "brechen" "bricht" "brach" "bräche" "gebrochen" ; + lin braten_V = irregV "braten" "brät" "briet" "briete" "gebraten" ; + lin brechen_V = irregV "brechen" "bricht" "brach" "bräche" "gebrochen" ; lin brennen_V = irregV "brennen" "brennt" "brannte" "brennte" "gebrannt" ; lin bringen_V = irregV "bringen" "bringt" "brachte" "brachte" "gebracht" ; lin denken_V = irregV "denken" "denkt" "dachte" "dachte" "gedacht" ; lin dingen_V = irregV "dingen" "dingt" "dingte" "dang" "gedungen" ; - lin dreschen_V = irregV "dreschen" "drischt" "drosch" "drösche" "gedroschen" ; - lin dringen_V = irregV "dringen" "dringt" "drang" "dränge" "gedrungen" ; - lin dürfen_V = M.mkV - "dürfen" "darf" "darfst" "darf" "dürft" "dürf" + lin dreschen_V = irregV "dreschen" "drischt" "drosch" "drösche" "gedroschen" ; + lin dringen_V = irregV "dringen" "dringt" "drang" "dränge" "gedrungen" ; + lin dürfen_V = M.mkV + "dürfen" "darf" "darfst" "darf" "dürft" "dürf" "durfte" "durftest" "durften" "durftet" - "dürfte" "gedurft" [] + "dürfte" "gedurft" [] M.VHaben ** {lock_V = <>} ; lin empfehlen_V = irregV "empfehlen" "empfiehlt" "empfahl" - "empfähle" "empfohlen" ; + "empfähle" "empfohlen" ; lin empfehlen_o_V = irregV "empfehlen" "empfiehlt" "empfahl" - "empföhle" "empfohlen" ; - lin erlöschen_V = irregV "erlöschen" "erlischt" "erlosch" "erlösche" "erloschen" ; + "empföhle" "empfohlen" ; + lin erlöschen_V = irregV "erlöschen" "erlischt" "erlosch" "erlösche" "erloschen" ; lin erkennen_V = irregV "erkennen" "erkennt" "erkannte" "erkannte" "erkannt" ; - lin erschrecken_V = irregV "erschrecken" "erschrickt" "erschrak" "erschräke" "erschrocken" ; - lin essen_V = irregV "essen" "ißt" "aß" "äße" "gegessen" ; - lin fahren_V = irregV "fahren" "fährt" "fuhr" "führe" "gefahren" ; - lin fallen_V = irregV "fallen" "fällt" "fiel" "fiele" "gefallen" ; - lin fangen_V = irregV "fangen" "fängt" "fing" "finge" "gefangen" ; - lin fechten_V = irregV "fechten" "fechtet" "focht" "föchte" "gefochten" ; - lin finden_V = irregV "finden" "findt" "fand" "fände" "gefunden" ; - lin flechten_V = irregV "flechten" "flicht" "flocht" "flöchte" "geflochten" ; - lin fliegen_V = irregV "fliegen" "fliegt" "flog" "flöge" "geflogen" ; - lin fliehen_V = irregV "fliehen" "flieht" "floh" "flöhe" "geflohen" ; - lin fließen_V = irregV "fließen" "fließt" "floß" "flösse" "geflossen" ; - lin fressen_V = irregV "fressen" "frißt" "fraß" "fräße" "gefressen" ; - lin frieren_V = irregV "frieren" "friert" "fror" "fröre" "gefroren" ; - lin gären_V = irregV "gären" "gärt" "gärte" "göre" "gegoren" ; - lin gären_o_V = irregV "gären" "gärt" "gor" "göre" "gegoren" ; - lin gebären_V = irregV "gebären" "gebiert" "gebar" "gebäre" "geboren" ; - lin geben_V = irregV "geben" "gibt" "gab" "gäbe" "gegeben" ; + lin erschrecken_V = irregV "erschrecken" "erschrickt" "erschrak" "erschräke" "erschrocken" ; + lin essen_V = irregV "essen" "ißt" "aß" "äße" "gegessen" ; + lin fahren_V = irregV "fahren" "fährt" "fuhr" "führe" "gefahren" ; + lin fallen_V = irregV "fallen" "fällt" "fiel" "fiele" "gefallen" ; + lin fangen_V = irregV "fangen" "fängt" "fing" "finge" "gefangen" ; + lin fechten_V = irregV "fechten" "fechtet" "focht" "föchte" "gefochten" ; + lin finden_V = irregV "finden" "findt" "fand" "fände" "gefunden" ; + lin flechten_V = irregV "flechten" "flicht" "flocht" "flöchte" "geflochten" ; + lin fliegen_V = irregV "fliegen" "fliegt" "flog" "flöge" "geflogen" ; + lin fliehen_V = irregV "fliehen" "flieht" "floh" "flöhe" "geflohen" ; + lin fließen_V = irregV "fließen" "fließt" "floß" "flösse" "geflossen" ; + lin fressen_V = irregV "fressen" "frißt" "fraß" "fräße" "gefressen" ; + lin frieren_V = irregV "frieren" "friert" "fror" "fröre" "gefroren" ; + lin gären_V = irregV "gären" "gärt" "gärte" "göre" "gegoren" ; + lin gären_o_V = irregV "gären" "gärt" "gor" "göre" "gegoren" ; + lin gebären_V = irregV "gebären" "gebiert" "gebar" "gebäre" "geboren" ; + lin geben_V = irregV "geben" "gibt" "gab" "gäbe" "gegeben" ; lin gedeihen_V = irregV "gedeihen" "gedeiht" "gedieh" "gediehe" "gediehen" ; lin gehen_V = irregV "gehen" "geht" "ging" "ginge" "gegangen" ; lin gelingen_V = irregV "gelingen" "gelingt" "gelang" "gelange" "gelungen" ; lin gelten_V = irregV "gelten" "gilt" "galt" "galte" "gegolten" ; lin gelten_o_V = irregV "gelten" "gilt" "galt" "golte" "gegolten" ; - lin genesen_V = irregV "genesen" "genest" "genas" "genäse" "genesen" ; - lin genießen_V = irregV "genießen" "genießt" "genoß" "genösse" "genossen" ; - lin geschehen_V = irregV "geschehen" "geschieht" "geschah" "geschehen" "geschähe" ; - lin gewinnen_V = irregV "gewinnen" "gewinnt" "gewann" "gewänne" "gewonnen" ; - lin gewinnen_o_V = irregV "gewinnen" "gewinnt" "gewann" "gewönne" "gewonnen" ; - lin gießen_V = irregV "gießen" "gießt" "goß" "gösse" "gegossen" ; + lin genesen_V = irregV "genesen" "genest" "genas" "genäse" "genesen" ; + lin genießen_V = irregV "genießen" "genießt" "genoß" "genösse" "genossen" ; + lin geschehen_V = irregV "geschehen" "geschieht" "geschah" "geschehen" "geschähe" ; + lin gewinnen_V = irregV "gewinnen" "gewinnt" "gewann" "gewänne" "gewonnen" ; + lin gewinnen_o_V = irregV "gewinnen" "gewinnt" "gewann" "gewönne" "gewonnen" ; + lin gießen_V = irregV "gießen" "gießt" "goß" "gösse" "gegossen" ; lin gleichen_V = irregV "gleichen" "gleicht" "glich" "gliche" "geglichen" ; lin gleiten_V = irregV "gleiten" "gleitet" "glitt" "glitte" "geglitten" ; - lin glimmen_V = irregV "glimmen" "glimmt" "glomm" "glimmte" "glömme" ; - lin graben_V = irregV "graben" "gräbt" "grub" "grübe" "gegraben" ; + lin glimmen_V = irregV "glimmen" "glimmt" "glomm" "glimmte" "glömme" ; + lin graben_V = irregV "graben" "gräbt" "grub" "grübe" "gegraben" ; lin greifen_V = irregV "greifen" "greift" "griff" "griffe" "gegriffen" ; - lin haben_V = irregV "haben" "hat" "hatte" "hätte" "gehabt" ; - lin halten_V = irregV "halten" "hält" "hielt" "hielte" "gehalten" ; - lin hängen_V = irregV "hängen" "hängt" "hing" "hinge" "gehangen" ; + lin haben_V = irregV "haben" "hat" "hatte" "hätte" "gehabt" ; + lin halten_V = irregV "halten" "hält" "hielt" "hielte" "gehalten" ; + lin hängen_V = irregV "hängen" "hängt" "hing" "hinge" "gehangen" ; lin hauen_V = irregV "hauen" "haut" "hieb" "hiebe" "gehauen" ; lin hauen_te_V = irregV "hauen" "haut" "haute" "haute" "gehauen" ; - lin heben_V = irregV "heben" "hebt" "hob" "höbe" "gehoben" ; - lin heißen_V = irregV "heißen" "heißt" "hieß" "hieße" "geheißen" ; - lin helfen_V = irregV "helfen" "hilft" "half" "hülfe" "geholfen" ; + lin heben_V = irregV "heben" "hebt" "hob" "höbe" "gehoben" ; + lin heißen_V = irregV "heißen" "heißt" "hieß" "hieße" "geheißen" ; + lin helfen_V = irregV "helfen" "hilft" "half" "hülfe" "geholfen" ; lin kennen_V = irregV "kennen" "kennt" "kannte" "kennte" "gekannt" ; - lin klimmen_V = irregV "klimmen" "klimmt" "klomm" "klömme" "geklommen" ; - lin klingen_V = irregV "klingen" "klingt" "klang" "klänge" "geklungen" ; + lin klimmen_V = irregV "klimmen" "klimmt" "klomm" "klömme" "geklommen" ; + lin klingen_V = irregV "klingen" "klingt" "klang" "klänge" "geklungen" ; lin kneifen_V = irregV "kneifen" "kneift" "kniff" "kniffe" "gekniffen" ; - lin kommen_V = irregV "kommen" "kommt" "kam" "käme" "gekommen" ; - lin können_V = M.mkV - "können" "kann" "kannst" "kann" "könnt" "könn" + lin kommen_V = irregV "kommen" "kommt" "kam" "käme" "gekommen" ; + lin können_V = M.mkV + "können" "kann" "kannst" "kann" "könnt" "könn" "konnte" "konntest" "konnten" "konntet" - "könnte" "gekonnt" [] + "könnte" "gekonnt" [] M.VHaben ** {lock_V = <>} ; - lin kriechen_V = irregV "kriechen" "kriecht" "kroch" "kröche" "gekrochen" ; - lin küren_V = irregV "küren" "kürt" "kürte" "kor" "gekürt" ; - lin laden_V = irregV "laden" "lädt" "lud" "lüde" "geladen" ; - lin lassen_V = irregV "lassen" "läßt" "ließ" "ließe" "gelassen" ; - lin laufen_V = irregV "laufen" "läuft" "lief" "liefe" "gelaufen" ; + lin kriechen_V = irregV "kriechen" "kriecht" "kroch" "kröche" "gekrochen" ; + lin küren_V = irregV "küren" "kürt" "kürte" "kor" "gekürt" ; + lin laden_V = irregV "laden" "lädt" "lud" "lüde" "geladen" ; + lin lassen_V = irregV "lassen" "läßt" "ließ" "ließe" "gelassen" ; + lin laufen_V = irregV "laufen" "läuft" "lief" "liefe" "gelaufen" ; lin leiden_V = irregV "leiden" "leidt" "litt" "litte" "gelitten" ; lin leihen_V = irregV "leihen" "leiht" "lieh" "liehe" "geliehen" ; - lin lesen_V = irregV "lesen" "liest" "las" "läse" "gelesen" ; - lin liegen_V = irregV "liegen" "liegt" "lag" "läge" "gelegen" ; - lin lügen_V = irregV "lügen" "lügt" "log" "löge" "gelogen" ; + lin lesen_V = irregV "lesen" "liest" "las" "läse" "gelesen" ; + lin liegen_V = irregV "liegen" "liegt" "lag" "läge" "gelegen" ; + lin lügen_V = irregV "lügen" "lügt" "log" "löge" "gelogen" ; lin mahlen_V = irregV "mahlen" "mahlt" "mahlte" "mahlte" "gemahlen" ; lin meiden_V = irregV "meiden" "meidt" "mied" "miede" "gemieden" ; - lin melken_V = irregV "melken" "milkt" "molk" "mölke" "gemolken" ; - lin messen_V = irregV "messen" "mißt" "maß" "mäße" "gemessen" ; - lin mißlingen_V = irregV "mißlingen" "mißlingt" "mißlang" "mißlungen" "mißlänge" ; - lin mögen_V = M.mkV - "mögen" "mag" "magst" "mag" "mögt" "mög" + lin melken_V = irregV "melken" "milkt" "molk" "mölke" "gemolken" ; + lin messen_V = irregV "messen" "mißt" "maß" "mäße" "gemessen" ; + lin mißlingen_V = irregV "mißlingen" "mißlingt" "mißlang" "mißlungen" "mißlänge" ; + lin mögen_V = M.mkV + "mögen" "mag" "magst" "mag" "mögt" "mög" "mochte" "mochtest" "mochten" "mochtet" - "möchte" "gemocht" [] + "möchte" "gemocht" [] M.VHaben ** {lock_V = <>} ; - lin müssen_V = M.mkV - "müssen" "muß" "mußt" "muß" "müßt" "müß" - "mußte" "mußtest" "mußten" "mußtet" - "müßte" "gemußt" [] + lin müssen_V = M.mkV + "müssen" "muß" "mußt" "muß" "müßt" "müß" + "mußte" "mußtest" "mußten" "mußtet" + "müßte" "gemußt" [] M.VHaben ** {lock_V = <>} ; - lin nehmen_V = mk6V "nehmen" "nimmt" "nimm" "nahm" "nähme" "genommen" ; + lin nehmen_V = mk6V "nehmen" "nimmt" "nimm" "nahm" "nähme" "genommen" ; lin nennen_V = irregV "nennen" "nennt" "nannte" "nennte" "genannt" ; lin pfeifen_V = irregV "pfeifen" "pfeift" "pfiff" "pfiffe" "gepfiffen" ; lin preisen_V = irregV "preisen" "preist" "pries" "priese" "gepriesen" ; - lin quellen_V = irregV "quellen" "quillt" "quoll" "quölle" "gequollen" ; - lin raten_V = irregV "raten" "rät" "riet" "riete" "geraten" ; + lin quellen_V = irregV "quellen" "quillt" "quoll" "quölle" "gequollen" ; + lin raten_V = irregV "raten" "rät" "riet" "riete" "geraten" ; lin reiben_V = irregV "reiben" "reibt" "rieb" "riebe" "gerieben" ; - lin reißen_V = irregV "reißen" "reißt" "riß" "riße" "gerissen" ; + lin reißen_V = irregV "reißen" "reißt" "riß" "riße" "gerissen" ; lin reiten_V = irregV "reiten" "reitet" "ritt" "ritte" "geritten" ; lin rennen_V = irregV "rennen" "rennt" "rannte" "rennte" "gerannt" ; - lin riechen_V = irregV "riechen" "riecht" "roch" "röche" "gerochen" ; - lin ringen_V = irregV "ringen" "ringt" "rang" "ränge" "gerungen" ; - lin rinnen_V = irregV "rinnen" "rinnt" "rann" "ränne" "geronnen" ; + lin riechen_V = irregV "riechen" "riecht" "roch" "röche" "gerochen" ; + lin ringen_V = irregV "ringen" "ringt" "rang" "ränge" "gerungen" ; + lin rinnen_V = irregV "rinnen" "rinnt" "rann" "ränne" "geronnen" ; lin rufen_V = irregV "rufen" "ruft" "rief" "riefe" "gerufen" ; lin salzen_V = irregV "salzen" "salzt" "salzte" "salzte" "gesalzen" ; - lin saufen_V = irregV "saufen" "säuft" "soff" "söffe" "gesoffen" ; + lin saufen_V = irregV "saufen" "säuft" "soff" "söffe" "gesoffen" ; lin saugen_V = irregV "saugen" "saugt" "sog" "soge" "gesogen" ; - lin schaffen_V = irregV "schaffen" "schafft" "schuf" "schüfe" "geschaffen" ; + lin schaffen_V = irregV "schaffen" "schafft" "schuf" "schüfe" "geschaffen" ; lin scheiden_V = irregV "scheiden" "scheidt" "schied" "schiede" "geschieden" ; lin scheinen_V = irregV "scheinen" "scheint" "schien" "schiene" "geschienen" ; - lin scheißen_V = irregV "scheißen" "scheißt" "schiß" "schiße" "geschissen" ; - lin schelten_V = irregV "schelten" "schilt" "schalt" "schölte" "gescholten" ; - lin scheren_V = irregV "scheren" "schert" "schor" "schöre" "geschoren" ; - lin schieben_V = irregV "schieben" "schiebt" "schob" "schöbe" "geschoben" ; - lin schießen_V = irregV "schießen" "schießt" "schoß" "schösse" "geschossen" ; + lin scheißen_V = irregV "scheißen" "scheißt" "schiß" "schiße" "geschissen" ; + lin schelten_V = irregV "schelten" "schilt" "schalt" "schölte" "gescholten" ; + lin scheren_V = irregV "scheren" "schert" "schor" "schöre" "geschoren" ; + lin schieben_V = irregV "schieben" "schiebt" "schob" "schöbe" "geschoben" ; + lin schießen_V = irregV "schießen" "schießt" "schoß" "schösse" "geschossen" ; lin schinden_V = irregV "schinden" "schindt" "schund" "schunde" "geschunden" ; - lin schlafen_V = irregV "schlafen" "schläft" "schlief" "schliefe" "geschlafen" ; - lin schlagen_V = irregV "schlagen" "schlägt" "schlug" "schlüge" "geschlagen" ; + lin schlafen_V = irregV "schlafen" "schläft" "schlief" "schliefe" "geschlafen" ; + lin schlagen_V = irregV "schlagen" "schlägt" "schlug" "schlüge" "geschlagen" ; lin schleichen_V = irregV "schleichen" "schleicht" "schlich" "schliche" "geschlichen" ; lin schleifen_V = irregV "schleifen" "schleift" "schliff" "schliffe" "geschliffen" ; - lin schleißen_V = irregV "schleißen" "schleißt" "schliß" "schliß" "geschlissen" ; - lin schließen_V = irregV "schließen" "schließt" "schloß" "schlösse" "geschlossen" ; - lin schlingen_V = irregV "schlingen" "schlingt" "schlang" "schlünge" "geschlungen" ; - lin schmeißen_V = irregV "schmeißen" "schmeißt" "schmiß" "schmiße" "geschmissen" ; - lin schmelzen_V = irregV "schmelzen" "schmilzt" "schmolz" "schmölze" "geschmolzen" ; + lin schleißen_V = irregV "schleißen" "schleißt" "schliß" "schliß" "geschlissen" ; + lin schließen_V = irregV "schließen" "schließt" "schloß" "schlösse" "geschlossen" ; + lin schlingen_V = irregV "schlingen" "schlingt" "schlang" "schlünge" "geschlungen" ; + lin schmeißen_V = irregV "schmeißen" "schmeißt" "schmiß" "schmiße" "geschmissen" ; + lin schmelzen_V = irregV "schmelzen" "schmilzt" "schmolz" "schmölze" "geschmolzen" ; lin schneiden_V = irregV "schneiden" "schneidt" "schnitt" "schnitte" "geschnitten" ; lin schreiben_V = irregV "schreiben" "schreibt" "schrieb" "schriebe" "geschrieben" ; lin schreien_V = irregV "schreien" "schreit" "schrie" "schrie" "geschrien" ; lin schreiten_V = irregV "schreiten" "schreitet" "schritt" "schritte" "geschritten" ; lin schweigen_V = irregV "schweigen" "schweigt" "schwieg" "schwiege" "geschwiegen" ; - lin schwellen_V = irregV "schwellen" "schwillt" "schwoll" "schwölle" "geschwollen" ; - lin schwimmen_V = irregV "schwimmen" "schwimmt" "schwamm" "schwämme" "geschwommen" ; - lin schwimmen_o_V = irregV "schwimmen" "schwimmt" "schwamm" "schwömme" "geschwommen" ; - lin schwinden_V = irregV "schwinden" "schwindt" "schwand" "schwände" "geschwunden" ; - lin schwingen_V = irregV "schwingen" "schwingt" "schwang" "schwänge" "geschwungen" ; - lin schwören_V = irregV "schwören" "schwört" "schwor" "schwüre" "geschworen" ; - lin sehen_V = irregV "sehen" "sieht" "sah" "sähe" "gesehen" ; - lin sein_V = irregV "sein" "ist" "war" "wäre" "gewesen" ; + lin schwellen_V = irregV "schwellen" "schwillt" "schwoll" "schwölle" "geschwollen" ; + lin schwimmen_V = irregV "schwimmen" "schwimmt" "schwamm" "schwämme" "geschwommen" ; + lin schwimmen_o_V = irregV "schwimmen" "schwimmt" "schwamm" "schwömme" "geschwommen" ; + lin schwinden_V = irregV "schwinden" "schwindt" "schwand" "schwände" "geschwunden" ; + lin schwingen_V = irregV "schwingen" "schwingt" "schwang" "schwänge" "geschwungen" ; + lin schwören_V = irregV "schwören" "schwört" "schwor" "schwüre" "geschworen" ; + lin sehen_V = irregV "sehen" "sieht" "sah" "sähe" "gesehen" ; + lin sein_V = irregV "sein" "ist" "war" "wäre" "gewesen" ; lin senden_V = irregV "senden" "sendt" "sandte" "sandte" "gesandt" ; lin sieden_V = irregV "sieden" "siedt" "sott" "sotte" "gesotten" ; - lin singen_V = irregV "singen" "singt" "sang" "sänge" "gesungen" ; - lin sinken_V = irregV "sinken" "sinkt" "sank" "sänke" "gesunken" ; - lin sinnen_V = irregV "sinnen" "sinnt" "sann" "sänne" "gesonnen" ; - lin sitzen_V = irregV "sitzen" "sitzt" "saß" "säße" "gesessen" ; + lin singen_V = irregV "singen" "singt" "sang" "sänge" "gesungen" ; + lin sinken_V = irregV "sinken" "sinkt" "sank" "sänke" "gesunken" ; + lin sinnen_V = irregV "sinnen" "sinnt" "sann" "sänne" "gesonnen" ; + lin sitzen_V = irregV "sitzen" "sitzt" "saß" "säße" "gesessen" ; lin sollen_V = M.mkV "sollen" "soll" "sollst" "soll" "sollt" "soll" "sollte" "solltest" "sollten" "solltet" @@ -181,52 +181,52 @@ in { M.VHaben ** {lock_V = <>} ; lin speien_V = irregV "speien" "speit" "spie" "spie" "gespien" ; - lin spinnen_V = irregV "spinnen" "spinnt" "spann" "spänne" "gesponnen" ; - lin spinnen_o_V = irregV "spinnen" "spinnt" "spann" "spönne" "gesponnen" ; - lin spleißen_V = irregV "spleißen" "spleißt" "spliß" "spliße" "gesplissen" ; - lin sprechen_V = irregV "sprechen" "spricht" "sprach" "spräche" "gesprochen" ; - lin sprießen_V = irregV "sprießen" "sprießt" "sproß" "sprösse" "gesprossen" ; - lin springen_V = irregV "springen" "springt" "sprang" "spränge" "gesprungen" ; - lin stechen_V = irregV "stechen" "sticht" "stach" "stäche" "gestochen" ; - lin stehen_V = irregV "stehen" "steht" "stand" "stände" "gestanden" ; - lin stehen_u_V = irregV "stehen" "steht" "stand" "stünde" "gestanden" ; - lin stehlen_V = irregV "stehlen" "stiehlt" "stahl" "stähle" "gestohlen" ; + lin spinnen_V = irregV "spinnen" "spinnt" "spann" "spänne" "gesponnen" ; + lin spinnen_o_V = irregV "spinnen" "spinnt" "spann" "spönne" "gesponnen" ; + lin spleißen_V = irregV "spleißen" "spleißt" "spliß" "spliße" "gesplissen" ; + lin sprechen_V = irregV "sprechen" "spricht" "sprach" "spräche" "gesprochen" ; + lin sprießen_V = irregV "sprießen" "sprießt" "sproß" "sprösse" "gesprossen" ; + lin springen_V = irregV "springen" "springt" "sprang" "spränge" "gesprungen" ; + lin stechen_V = irregV "stechen" "sticht" "stach" "stäche" "gestochen" ; + lin stehen_V = irregV "stehen" "steht" "stand" "stände" "gestanden" ; + lin stehen_u_V = irregV "stehen" "steht" "stand" "stünde" "gestanden" ; + lin stehlen_V = irregV "stehlen" "stiehlt" "stahl" "stähle" "gestohlen" ; lin steigen_V = irregV "steigen" "steigt" "stieg" "stiege" "gestiegen" ; - lin sterben_V = irregV "sterben" "stirbt" "starb" "stürbe" "gestorben" ; - lin stieben_V = irregV "stieben" "stiebt" "stob" "stöbe" "gestoben" ; - lin stinken_V = irregV "stinken" "stinkt" "stank" "stänke" "gestunken" ; - lin stoßen_V = irregV "stoßen" "stößt" "stieß" "stieße" "gestoßen" ; + lin sterben_V = irregV "sterben" "stirbt" "starb" "stürbe" "gestorben" ; + lin stieben_V = irregV "stieben" "stiebt" "stob" "stöbe" "gestoben" ; + lin stinken_V = irregV "stinken" "stinkt" "stank" "stänke" "gestunken" ; + lin stoßen_V = irregV "stoßen" "stößt" "stieß" "stieße" "gestoßen" ; lin streichen_V = irregV "streichen" "streicht" "strich" "striche" "gestrichen" ; lin streiten_V = irregV "streiten" "streitet" "stritt" "stritte" "gestritten" ; - lin tragen_V = irregV "tragen" "trägt" "trug" "trüge" "getragen" ; - lin treffen_V = irregV "treffen" "trifft" "traf" "träfe" "getroffen" ; + lin tragen_V = irregV "tragen" "trägt" "trug" "trüge" "getragen" ; + lin treffen_V = irregV "treffen" "trifft" "traf" "träfe" "getroffen" ; lin treiben_V = irregV "treiben" "treibt" "trieb" "triebe" "getrieben" ; - lin treten_V = irregV "treten" "tritt" "trat" "träte" "getreten" ; - lin trinken_V = irregV "trinken" "trinkt" "trank" "tränke" "getrunken" ; - lin trügen_V = irregV "trügen" "trügt" "trog" "tröge" "getrogen" ; - lin tun_V = irregV "tun" "tut" "tat" "täte" "getan" ; + lin treten_V = irregV "treten" "tritt" "trat" "träte" "getreten" ; + lin trinken_V = irregV "trinken" "trinkt" "trank" "tränke" "getrunken" ; + lin trügen_V = irregV "trügen" "trügt" "trog" "tröge" "getrogen" ; + lin tun_V = irregV "tun" "tut" "tat" "täte" "getan" ; lin verderben_V = irregV "verderben" "verdirbt" "verdarb" "verdarbe" "verdorben" ; - lin verlieren_V = irregV "verlieren" "verliert" "verlor" "verlöre" "verloren" ; - lin wachsen_V = irregV "wachsen" "wächst" "wuchs" "wüchse" "gewachsen" ; - lin wägen_V = irregV "wägen" "wägt" "wog" "woge" "gewogen" ; - lin waschen_V = irregV "waschen" "wäscht" "wusch" "wüsche" "gewaschen" ; - lin weben_V = irregV "weben" "webt" "wob" "wöbe" "gewoben" ; + lin verlieren_V = irregV "verlieren" "verliert" "verlor" "verlöre" "verloren" ; + lin wachsen_V = irregV "wachsen" "wächst" "wuchs" "wüchse" "gewachsen" ; + lin wägen_V = irregV "wägen" "wägt" "wog" "woge" "gewogen" ; + lin waschen_V = irregV "waschen" "wäscht" "wusch" "wüsche" "gewaschen" ; + lin weben_V = irregV "weben" "webt" "wob" "wöbe" "gewoben" ; lin weichen_V = irregV "weichen" "weicht" "wich" "wiche" "gewichen" ; lin weisen_V = irregV "weisen" "weist" "wies" "wiese" "gewiesen" ; lin wenden_V = irregV "wenden" "wendt" "wandte" "wandte" "gewandt" ; - lin werben_V = irregV "werben" "wirbt" "warb" "würbe" "geworben" ; + lin werben_V = irregV "werben" "wirbt" "warb" "würbe" "geworben" ; lin werden_V = M.mkV "werden" "werde" "wirst" "wird" "werdet" "werd" "wurde" "wurdest" "wurden" "wurdet" - "würde" "geworden" [] + "würde" "geworden" [] M.VHaben ** {lock_V = <>} ; - lin werfen_V = irregV "werfen" "wirft" "warf" "würfe" "geworfen" ; - lin wiegen_V = irregV "wiegen" "wiegt" "wog" "wöge" "gewogen" ; - lin winden_V = irregV "winden" "windt" "wand" "wände" "gewunden" ; + lin werfen_V = irregV "werfen" "wirft" "warf" "würfe" "geworfen" ; + lin wiegen_V = irregV "wiegen" "wiegt" "wog" "wöge" "gewogen" ; + lin winden_V = irregV "winden" "windt" "wand" "wände" "gewunden" ; lin wissen_V = M.mkV - "wissen" "weiß" "weißt" "weiß" "wisst" "wisse" + "wissen" "weiß" "weißt" "weiß" "wisst" "wisse" "wusste" "wusstest" "wussten" "wusstet" - "wüsste" "gewusst" [] + "wüsste" "gewusst" [] M.VHaben ** {lock_V = <>} ; lin wollen_V = M.mkV "wollen" "will" "willst" "will" "wollt" "woll" @@ -235,9 +235,9 @@ in { M.VHaben ** {lock_V = <>} ; - lin wringen_V = irregV "wringen" "wringt" "wrang" "wränge" "gewrungen" ; + lin wringen_V = irregV "wringen" "wringt" "wrang" "wränge" "gewrungen" ; lin zeihen_V = irregV "zeihen" "zeiht" "zieh" "ziehe" "geziehen" ; - lin ziehen_V = irregV "ziehen" "zieht" "zog" "zöge" "gezogen" ; - lin zwingen_V = irregV "zwingen" "zwingt" "zwang" "zwänge" "gezwungen" ; + lin ziehen_V = irregV "ziehen" "zieht" "zog" "zöge" "gezogen" ; + lin zwingen_V = irregV "zwingen" "zwingt" "zwang" "zwänge" "gezwungen" ; } diff --git a/lib/src/german/IrregGerAbs.gf b/lib/src/german/IrregGerAbs.gf index fd0c5a092..b7ea561ab 100644 --- a/lib/src/german/IrregGerAbs.gf +++ b/lib/src/german/IrregGerAbs.gf @@ -1,11 +1,11 @@ ---# -coding=latin1 abstract IrregGerAbs = Cat ** { + flags coding=utf8 ; fun backen_V : V ; fun backen_u_V : V ; fun befehlen_V : V ; fun beginnen_V : V ; - fun beißen_V : V ; + fun beißen_V : V ; fun bergen_V : V ; fun bersten_V : V ; fun bewegen_V : V ; @@ -23,10 +23,10 @@ abstract IrregGerAbs = Cat ** { fun dingen_V : V ; fun dreschen_V : V ; fun dringen_V : V ; - fun dürfen_V : V ; + fun dürfen_V : V ; fun empfehlen_V : V ; fun empfehlen_o_V : V ; - fun erlöschen_V : V ; + fun erlöschen_V : V ; fun erkennen_V : V ; fun erschrecken_V : V ; fun essen_V : V ; @@ -38,12 +38,12 @@ abstract IrregGerAbs = Cat ** { fun flechten_V : V ; fun fliegen_V : V ; fun fliehen_V : V ; - fun fließen_V : V ; + fun fließen_V : V ; fun fressen_V : V ; fun frieren_V : V ; - fun gären_V : V ; - fun gären_o_V : V ; - fun gebären_V : V ; + fun gären_V : V ; + fun gären_o_V : V ; + fun gebären_V : V ; fun geben_V : V ; fun gedeihen_V : V ; fun gehen_V : V ; @@ -51,11 +51,11 @@ abstract IrregGerAbs = Cat ** { fun gelten_V : V ; fun gelten_o_V : V ; fun genesen_V : V ; - fun genießen_V : V ; + fun genießen_V : V ; fun geschehen_V : V ; fun gewinnen_V : V ; fun gewinnen_o_V : V ; - fun gießen_V : V ; + fun gießen_V : V ; fun gleichen_V : V ; fun gleiten_V : V ; fun glimmen_V : V ; @@ -63,20 +63,20 @@ abstract IrregGerAbs = Cat ** { fun greifen_V : V ; fun haben_V : V ; fun halten_V : V ; - fun hängen_V : V ; + fun hängen_V : V ; fun hauen_V : V ; fun hauen_te_V : V ; fun heben_V : V ; - fun heißen_V : V ; + fun heißen_V : V ; fun helfen_V : V ; fun kennen_V : V ; fun klimmen_V : V ; fun klingen_V : V ; fun kneifen_V : V ; fun kommen_V : V ; - fun können_V : V ; + fun können_V : V ; fun kriechen_V : V ; - fun küren_V : V ; + fun küren_V : V ; fun laden_V : V ; fun lassen_V : V ; fun laufen_V : V ; @@ -84,14 +84,14 @@ abstract IrregGerAbs = Cat ** { fun leihen_V : V ; fun lesen_V : V ; fun liegen_V : V ; - fun lügen_V : V ; + fun lügen_V : V ; fun mahlen_V : V ; fun meiden_V : V ; fun melken_V : V ; fun messen_V : V ; - fun mißlingen_V : V ; - fun mögen_V : V ; - fun müssen_V : V ; + fun mißlingen_V : V ; + fun mögen_V : V ; + fun müssen_V : V ; fun nehmen_V : V ; fun nennen_V : V ; fun pfeifen_V : V ; @@ -99,7 +99,7 @@ abstract IrregGerAbs = Cat ** { fun quellen_V : V ; fun raten_V : V ; fun reiben_V : V ; - fun reißen_V : V ; + fun reißen_V : V ; fun reiten_V : V ; fun rennen_V : V ; fun riechen_V : V ; @@ -112,20 +112,20 @@ abstract IrregGerAbs = Cat ** { fun schaffen_V : V ; fun scheiden_V : V ; fun scheinen_V : V ; - fun scheißen_V : V ; + fun scheißen_V : V ; fun schelten_V : V ; fun scheren_V : V ; fun schieben_V : V ; - fun schießen_V : V ; + fun schießen_V : V ; fun schinden_V : V ; fun schlafen_V : V ; fun schlagen_V : V ; fun schleichen_V : V ; fun schleifen_V : V ; - fun schleißen_V : V ; - fun schließen_V : V ; + fun schleißen_V : V ; + fun schließen_V : V ; fun schlingen_V : V ; - fun schmeißen_V : V ; + fun schmeißen_V : V ; fun schmelzen_V : V ; fun schneiden_V : V ; fun schreiben_V : V ; @@ -137,7 +137,7 @@ abstract IrregGerAbs = Cat ** { fun schwimmen_o_V : V ; fun schwinden_V : V ; fun schwingen_V : V ; - fun schwören_V : V ; + fun schwören_V : V ; fun sehen_V : V ; fun sein_V : V ; fun senden_V : V ; @@ -150,9 +150,9 @@ abstract IrregGerAbs = Cat ** { fun speien_V : V ; fun spinnen_V : V ; fun spinnen_o_V : V ; - fun spleißen_V : V ; + fun spleißen_V : V ; fun sprechen_V : V ; - fun sprießen_V : V ; + fun sprießen_V : V ; fun springen_V : V ; fun stechen_V : V ; fun stehen_V : V ; @@ -162,7 +162,7 @@ abstract IrregGerAbs = Cat ** { fun sterben_V : V ; fun stieben_V : V ; fun stinken_V : V ; - fun stoßen_V : V ; + fun stoßen_V : V ; fun streichen_V : V ; fun streiten_V : V ; fun tragen_V : V ; @@ -170,12 +170,12 @@ abstract IrregGerAbs = Cat ** { fun treiben_V : V ; fun treten_V : V ; fun trinken_V : V ; - fun trügen_V : V ; + fun trügen_V : V ; fun tun_V : V ; fun verderben_V : V ; fun verlieren_V : V ; fun wachsen_V : V ; - fun wägen_V : V ; + fun wägen_V : V ; fun waschen_V : V ; fun weben_V : V ; fun weichen_V : V ; diff --git a/lib/src/german/LexiconGer.gf b/lib/src/german/LexiconGer.gf index 69e156ea5..6e17c6856 100644 --- a/lib/src/german/LexiconGer.gf +++ b/lib/src/german/LexiconGer.gf @@ -1,5 +1,4 @@ --# -path=.:../common:../abstract:../../prelude ---# -coding=latin1 -- work by Aarne Ranta, Andreas Priesnitz, and Henning Thielemann. @@ -7,128 +6,129 @@ concrete LexiconGer of Lexicon = CatGer ** open Prelude, ParadigmsGer, (Mo = MorphoGer), IrregGer in { flags + coding=utf8 ; optimize=all_subs ; lin - add_V3 = dirV3 (prefixV "hinzu" (regV "fügen")) zu_Prep ; + add_V3 = dirV3 (prefixV "hinzu" (regV "fügen")) zu_Prep ; airplane_N = mkN "Flugzeug" ; already_Adv = mkAdv "schon" ; answer_V2S = mkV2S (regV "antworten") datPrep ; apartment_N = mkN "Wohnung" ; - apple_N = reg2N "Apfel" "Äpfel" masculine ; - art_N = reg2N "Kunst" "Künste" feminine ; + apple_N = reg2N "Apfel" "Äpfel" masculine ; + art_N = reg2N "Kunst" "Künste" feminine ; ask_V2Q = mkV2Q (regV "fragen") accPrep ; baby_N = reg2N "Baby" "Babies" neuter ; ---- bad_A = regA "schlecht" ; bank_N = reg2N "Bank" "Banken" feminine ; - beautiful_A = regA "schön" ; + beautiful_A = regA "schön" ; become_VA = mkVA IrregGer.werden_V ; beer_N = reg2N "Bier" "Biere" neuter ; - beg_V2V = mkV2V (mk6V "bitten" "bittet" "bitte" "bat" "bäte" "gebeten") accPrep ; - big_A = mk3A "groß" "größer" "größte" ; - bike_N = reg2N "Fahrrad" "Fahrräder" neuter ; - bird_N = reg2N "Vogel" "Vögel" masculine ; + beg_V2V = mkV2V (mk6V "bitten" "bittet" "bitte" "bat" "bäte" "gebeten") accPrep ; + big_A = mk3A "groß" "größer" "größte" ; + bike_N = reg2N "Fahrrad" "Fahrräder" neuter ; + bird_N = reg2N "Vogel" "Vögel" masculine ; black_A = regA "schwarz" ; blue_A = regA "blau"; boat_N = reg2N "Boot" "Boote" neuter ; - book_N = reg2N "Buch" "Bücher" neuter ; + book_N = reg2N "Buch" "Bücher" neuter ; boot_N = reg2N "Stiefel" "Stiefel" masculine ; boss_N = reg2N "Chef" "Chefs" masculine ; ---- boy_N = reg2N "Junge" "Jungen" masculine ; bread_N = reg2N "Brot" "Brote" neuter ; break_V2 = dirV2 - (irregV "zerschlagen" "zerschlägt" "zerschlug" "zerschlüge" "zerschlagen") ; + (irregV "zerschlagen" "zerschlägt" "zerschlug" "zerschlüge" "zerschlagen") ; broad_A = regA "breit" ; - brother_N2 = mkN2 (reg2N "Bruder" "Brüder" masculine) von_Prep ; + brother_N2 = mkN2 (reg2N "Bruder" "Brüder" masculine) von_Prep ; brown_A = regA "braun" ; butter_N = reg2N "Butter" "Butter" feminine ; ---- infl buy_V2 = dirV2 (regV "kaufen") ; camera_N = reg2N "Kamera" "Kameras" feminine ; - cap_N = mkN "Mütze" ; + cap_N = mkN "Mütze" ; car_N = mkN "Auto" "Autos" neuter | mkN "Wagen" "Wagen" masculine ; carpet_N = mkN "Teppich" ; cat_N = mkN "Katze" ; - ceiling_N = reg2N "Dach" "Dächer" neuter ; - chair_N = reg2N "Stuhl" "Stühle" masculine ; - cheese_N = mkN "Käse" "Käse" masculine ; + ceiling_N = reg2N "Dach" "Dächer" neuter ; + chair_N = reg2N "Stuhl" "Stühle" masculine ; + cheese_N = mkN "Käse" "Käse" masculine ; child_N = reg2N "Kind" "Kinder" neuter ; church_N = mkN "Kirche" ; - city_N = reg2N "Stadt" "Städte" feminine ; + city_N = reg2N "Stadt" "Städte" feminine ; clean_A = regA "rein" ; - clever_A = mk3A "klug" "klüger" "klügste" ; - close_V2 = dirV2 (irregV "schließen" "schließt" "schloß" "schlösse" "geschlossen") ; + clever_A = mk3A "klug" "klüger" "klügste" ; + close_V2 = dirV2 (irregV "schließen" "schließt" "schloß" "schlösse" "geschlossen") ; coat_N = mkN "Jacke" ; cold_A = regA "kalt" ; - come_V = seinV (mk6V "kommen" "kommt" "komm" "kam" "käme" "gekommen") ; + come_V = seinV (mk6V "kommen" "kommt" "komm" "kam" "käme" "gekommen") ; computer_N = reg2N "Rechner" "Rechner" masculine ; - country_N = reg2N "Land" "Länder" neuter ; + country_N = reg2N "Land" "Länder" neuter ; cousin_N = reg2N "Vetter" "Vetter" masculine ; --- Kusine - cow_N = reg2N "Kuh" "Kühe" feminine ; - die_V = seinV (irregV "sterben" "stirbt" "starb" "stürbe" "gestorben") ; + cow_N = reg2N "Kuh" "Kühe" feminine ; + die_V = seinV (irregV "sterben" "stirbt" "starb" "stürbe" "gestorben") ; distance_N3 = mkN3 (mkN "Entfernung") von_Prep zu_Prep ; dirty_A = regA "schmutzig" ; - do_V2 = dirV2 (irregV "tun" "tut" "tat" "täte" "getan") ; - doctor_N = reg2N "Arzt" "Ärzte" masculine ; + do_V2 = dirV2 (irregV "tun" "tut" "tat" "täte" "getan") ; + doctor_N = reg2N "Arzt" "Ärzte" masculine ; dog_N = mkN "Hund" ; - door_N = reg2N "Tür" "Türen" feminine ; - drink_V2 = dirV2 (irregV "trinken" "trinkt" "trank" "tränke" "getrunken") ; - easy_A2V = mkA2V (regA "leicht") (mkPrep "für" accusative) ; - eat_V2 = dirV2 (irregV "essen" "ißt" "aß" "äße" "gegessen") ; + door_N = reg2N "Tür" "Türen" feminine ; + drink_V2 = dirV2 (irregV "trinken" "trinkt" "trank" "tränke" "getrunken") ; + easy_A2V = mkA2V (regA "leicht") (mkPrep "für" accusative) ; + eat_V2 = dirV2 (irregV "essen" "ißt" "aß" "äße" "gegessen") ; empty_A = regA "leer" ; ---- check infl enemy_N = mkN "Feind" ; factory_N = mkN "Fabrik" "Fabriken" feminine ; - father_N2 = mkN2 (reg2N "Vater" "Väter" masculine) von_Prep ; - fear_VS = mkVS (regV "fürchten") ; - find_V2 = dirV2 (irregV "finden" "findet" "fand" "fände" "gefunden") ; + father_N2 = mkN2 (reg2N "Vater" "Väter" masculine) von_Prep ; + fear_VS = mkVS (regV "fürchten") ; + find_V2 = dirV2 (irregV "finden" "findet" "fand" "fände" "gefunden") ; fish_N = mkN "Fisch" ; - floor_N = reg2N "Fußboden" "Fußböden" masculine ; - forget_V2 = dirV2 (irregV "vergessen" "vergißt" "vergaß" "vergäße" "vergessen") ; - fridge_N = reg2N "Kühlschrank" "Kühlschränke" masculine ; + floor_N = reg2N "Fußboden" "Fußböden" masculine ; + forget_V2 = dirV2 (irregV "vergessen" "vergißt" "vergaß" "vergäße" "vergessen") ; + fridge_N = reg2N "Kühlschrank" "Kühlschränke" masculine ; friend_N = mkN "Freund" ; - fruit_N = reg2N "Frucht" "Früchte" feminine ; + fruit_N = reg2N "Frucht" "Früchte" feminine ; fun_AV = mkAV (regA "toll") ; - garden_N = reg2N "Garten" "Gärten" masculine ; - girl_N = reg2N "Mädchen" "Mädchen" neuter ; + garden_N = reg2N "Garten" "Gärten" masculine ; + girl_N = reg2N "Mädchen" "Mädchen" neuter ; glove_N = mkN "Handschuh" ; gold_N = reg2N "Gold" "Golde" neuter ; ---- infl good_A = mk3A "gut" "besser" "beste" ; go_V = seinV (irregV "gehen" "geht" "ging" "ginge" "gegangen") ; - green_A = regA "grün" ; - harbour_N = reg2N "Hafen" "Häfen" masculine ; + green_A = regA "grün" ; + harbour_N = reg2N "Hafen" "Häfen" masculine ; hate_V2 = dirV2 (regV "hassen") ; - hat_N = reg2N "Hut" "Hüte" masculine ; - hear_V2 = dirV2 (regV "hören") ; - hill_N = mkN "Hügel" ; + hat_N = reg2N "Hut" "Hüte" masculine ; + hear_V2 = dirV2 (regV "hören") ; + hill_N = mkN "Hügel" ; hope_VS = mkVS (regV "hoffen") ; horse_N = reg2N "Pferd" "Pferde" neuter ; - hot_A = regA "heiß" ; - house_N = reg2N "Haus" "Häuser" neuter ; + hot_A = regA "heiß" ; + house_N = reg2N "Haus" "Häuser" neuter ; important_A = regA "wichtig" ; industry_N = mkN "Industrie" ; iron_N = reg2N "Eisen" "Eisen" neuter ; - jump_V = seinV (irregV "springen" "springt" "sprang" "spränge" "gesprungen") ; - king_N = mkN "König" ; - know_V2 = dirV2 (irregV "kennen" "kennt" "kannte" "kännte" "gekannt") ; ---- infl + jump_V = seinV (irregV "springen" "springt" "sprang" "spränge" "gesprungen") ; + king_N = mkN "König" ; + know_V2 = dirV2 (irregV "kennen" "kennt" "kannte" "kännte" "gekannt") ; ---- infl know_VQ = mkVQ wissen_V ; know_VS = mkVS wissen_V ; lake_N = reg2N "See" "Seen" masculine ; --- infl lamp_N = mkN "Lampe"; learn_V2 = dirV2 (regV "lernen") ; leather_N = reg2N "Leder" "Leder" neuter ; - leave_V2 = dirV2 (irregV "verlassen" "verläßt" "verließ" "verließe" "verlassen") ; - like_V2 = dirV2 (irregV "mögen" "mag" "mochte" "möchte" "gemocht") ; - listen_V2 = prepV2 (prefixV "zu" (regV "hören")) datPrep ; ---- dat + leave_V2 = dirV2 (irregV "verlassen" "verläßt" "verließ" "verließe" "verlassen") ; + like_V2 = dirV2 (irregV "mögen" "mag" "mochte" "möchte" "gemocht") ; + listen_V2 = prepV2 (prefixV "zu" (regV "hören")) datPrep ; ---- dat live_V = regV "leben" ; - long_A = mk3A "lang" "länger" "längste" ; - lose_V2 = dirV2 (irregV "verlieren" "verliert" "verlor" "verlöre" "verloren") ; + long_A = mk3A "lang" "länger" "längste" ; + lose_V2 = dirV2 (irregV "verlieren" "verliert" "verlor" "verlöre" "verloren") ; love_N = mkN "Liebe" ; love_V2 = dirV2 (regV "lieben") ; - man_N = reg2N "Mann" "Männer" masculine ; + man_N = reg2N "Mann" "Männer" masculine ; married_A2 = mkA2 (regA "verheiratet") (mkPrep "mit" dative) ; meat_N = reg2N "Fleisch" "Fleische" neuter ; ---- infl milk_N = reg2N "Milch" "Milche" feminine ; ---- infl moon_N = mkN "Mond" ; - mother_N2 = mkN2 (reg2N "Mutter" "Mütter" feminine) von_Prep ; + mother_N2 = mkN2 (reg2N "Mutter" "Mütter" feminine) von_Prep ; mountain_N = mkN "Berg" ; music_N = reg2N "Musik" "Musiken" feminine ; narrow_A = regA "schmal" ; @@ -136,9 +136,9 @@ lin newspaper_N = mkN "Zeitung" ; now_Adv = mkAdv "jetzt" ; number_N = reg2N "Zahl" "Zahlen" feminine ; - oil_N = reg2N "Öl" "Öle" neuter ; - old_A = mk3A "alt" "älter" "älteste" ; - open_V2 = dirV2 (regV "öffnen") ; + oil_N = reg2N "Öl" "Öle" neuter ; + old_A = mk3A "alt" "älter" "älteste" ; + open_V2 = dirV2 (regV "öffnen") ; paint_V2A = mkV2A (regV "malen") accPrep ; paper_N = reg2N "Papier" "Papiere" neuter ; paris_PN = mkPN "Paris" "Paris" ; @@ -151,47 +151,47 @@ lin priest_N = mkN "Priester" ; probable_AS = mkAS (regA "wahrscheinlich") ; put_V2 = dirV2 (regV "setzen") ; - queen_N = reg2N "Königin" "Königinnen" feminine ; + queen_N = reg2N "Königin" "Königinnen" feminine ; radio_N = reg2N "Radio" "Radios" neuter ; ---- rain_V0 = mkV0 (regV "regnen") ; - read_V2 = dirV2 (irregV "lesen" "liest" "las" "läse" "gelesen") ; + read_V2 = dirV2 (irregV "lesen" "liest" "las" "läse" "gelesen") ; red_A = regA "rot" ; religion_N = mkN "Religion" ; restaurant_N = reg2N "Restaurant" "Restaurants" neuter ; - river_N = reg2N "Fluß" "Flüsse" masculine ; + river_N = reg2N "Fluß" "Flüsse" masculine ; rock_N = mkN "Stein" ; - roof_N = reg2N "Dach" "Dächer" neuter ; + roof_N = reg2N "Dach" "Dächer" neuter ; rubber_N = reg2N "Gummi" "Gummis" neuter ; - run_V = seinV (irregV "laufen" "läuft" "lief" "liefe" "gelaufen") ; + run_V = seinV (irregV "laufen" "läuft" "lief" "liefe" "gelaufen") ; say_VS = mkVS (regV "sagen") ; school_N = mkN "Schule"; science_N = reg2N "Wissenschaft" "Wissenschaften" feminine ; sea_N = reg2N "Meer" "Meere" neuter ; seek_V2 = dirV2 (regV "suchen") ; - see_V2 = dirV2 (irregV "sehen" "sieht" "sah" "sähe" "gesehen") ; + see_V2 = dirV2 (irregV "sehen" "sieht" "sah" "sähe" "gesehen") ; sell_V3 = accdatV3 (no_geV (regV "verkaufen")) ; send_V3 = accdatV3 (regV "schicken") ; sheep_N = reg2N "Schaf" "Schafe" neuter ; ship_N = reg2N "Schiff" "Schiffe" neuter ; shirt_N = reg2N "Hemd" "Hemden" neuter ; ---- infl shoe_N = mkN "Schuh" ; - shop_N = reg2N "Laden" "Läden" masculine ; - short_A = mk3A "kurz" "kürzer" "kürzeste" ; + shop_N = reg2N "Laden" "Läden" masculine ; + short_A = mk3A "kurz" "kürzer" "kürzeste" ; silver_N = reg2N "Silber" "Silber" neuter ; ---- infl sister_N = reg2N "Schwester" "Schwestern" feminine ; - sleep_V = irregV "schlafen" "schläft" "schlief" "schliefe" "geschlafen" ; + sleep_V = irregV "schlafen" "schläft" "schlief" "schliefe" "geschlafen" ; small_A = regA "klein" ; snake_N = mkN "Schlange" ; - sock_N = reg2N "Strumpf" "Strümpfe" masculine ; + sock_N = reg2N "Strumpf" "Strümpfe" masculine ; song_N = reg2N "Lied" "Lieder" neuter ; - speak_V2 = dirV2 (irregV "sprechen" "spricht" "sprach" "spräche" "gesprochen") ; + speak_V2 = dirV2 (irregV "sprechen" "spricht" "sprach" "spräche" "gesprochen") ; star_N = mkN "Sterne" ; steel_N = mkN "Stahl" ; stone_N = mkN "Stein" ; - stop_V = seinV (irregV "halten" "hält" "hielt" "hielte" "gehalten") ; + stop_V = seinV (irregV "halten" "hält" "hielt" "hielte" "gehalten") ; stove_N = mkN "Herd" ; student_N = reg2N "Student" "Studenten" masculine ; - stupid_A = mk3A "dumm" "dümmer" "dümmste" ; ---- + stupid_A = mk3A "dumm" "dümmer" "dümmste" ; ---- sun_N = mkN "Sonne" ; switch8off_V2 = dirV2 (prefixV "aus" (regV "schalten")) ; switch8on_V2 = dirV2 (prefixV "ein" (regV "schalten")) ; @@ -201,32 +201,32 @@ lin teach_V2 = dirV2 (no_geV (regV "unterrichten")) ; television_N = reg2N "Fernsehen" "Fernsehen" neuter; thick_A = regA "dick" ; - thin_A = regA "dünn" ; - train_N = reg2N "Zug" "Züge" masculine ; + thin_A = regA "dünn" ; + train_N = reg2N "Zug" "Züge" masculine ; travel_V = regV "reisen" ; - tree_N = reg2N "Baum" "Bäume" masculine ; + tree_N = reg2N "Baum" "Bäume" masculine ; ---- trousers_N = mkN "trousers" ; ---- pl t ! - ugly_A = regA "häßlich" ; + ugly_A = regA "häßlich" ; understand_V2 = - dirV2 (irregV "verstehen" "versteht" "verstand" "verstände" "verstanden") ; - university_N = reg2N "Universität" "Universitäten" feminine ; - village_N = reg2N "Dorf" "Dörfer" neuter ; + dirV2 (irregV "verstehen" "versteht" "verstand" "verstände" "verstanden") ; + university_N = reg2N "Universität" "Universitäten" feminine ; + village_N = reg2N "Dorf" "Dörfer" neuter ; wait_V2 = prepV2 (regV "warten") (mkPrep "auf" accusative) ; walk_V = seinV (irregV "gehen" "geht" "ging" "ginge" "gegangen") ; - warm_A = mk3A "warm" "wärmer" "wärmste" ; + warm_A = mk3A "warm" "wärmer" "wärmste" ; war_N = mkN "Krieg" ; watch_V2 = prepV2 (regV "schauen") (mkPrep "an" accusative) ; water_N = reg2N "Wasser" "Wasser" neuter ; - white_A = regA "weiß" ; + white_A = regA "weiß" ; window_N = reg2N "Fenster" "Fenster" neuter ; wine_N = mkN "Wein" ; - win_V2 = dirV2 (irregV "gewinnen" "gewinnt" "gewann" "gewänne" "gewonnen") ; + win_V2 = dirV2 (irregV "gewinnen" "gewinnt" "gewann" "gewänne" "gewonnen") ; woman_N = reg2N "Frau" "Frauen" feminine ; wonder_VQ = mkVQ (reflV (regV "wundern") accusative) ; - wood_N = reg2N "Holz" "Hölzer" neuter ; + wood_N = reg2N "Holz" "Hölzer" neuter ; write_V2 = dirV2 (irregV "schreiben" "schreibt" "schrieb" "schriebe" "geschrieben") ; yellow_A = regA "gelb" ; - young_A = mk3A "jung" "jünger" "jüngste" ; + young_A = mk3A "jung" "jünger" "jüngste" ; left_Ord = Mo.mkOrd (regA "link") ; right_Ord = Mo.mkOrd (regA "recht") ; far_Adv = mkAdv "weit" ; @@ -235,76 +235,76 @@ lin dull_A = regA "stumpf" ; full_A = regA "voll" ; heavy_A = mkA "schwer" "schwere" "schwerer" "schwerste" ; - near_A = mk3A "nahe" "näher" "nächste" ; + near_A = mk3A "nahe" "näher" "nächste" ; rotten_A = regA "verdorben" ; round_A = regA "rund" ; - sharp_A = mk3A "scharf" "schärfer" "schärfste" ; + sharp_A = mk3A "scharf" "schärfer" "schärfste" ; smooth_A = regA "glatt" ; straight_A = regA "gerade" ; - wet_A = regA "naß" ; + wet_A = regA "naß" ; wide_A = regA "breit" ; animal_N = reg2N "Tier" "Tiere" neuter ; ashes_N = mkN "Asche" ; - back_N = reg2N "Rücken" "Rücken" masculine ; + back_N = reg2N "Rücken" "Rücken" masculine ; bark_N = mkN "Rinde" ; - belly_N = reg2N "Bauch" "Bäuche" masculine ; + belly_N = reg2N "Bauch" "Bäuche" masculine ; blood_N = mkN "Blut" "Blute" neuter ; bone_N = reg2N "Knochen" "Knochen" masculine ; - breast_N = reg2N "Brust" "Brüste" feminine ; + breast_N = reg2N "Brust" "Brüste" feminine ; cloud_N = mkN "Wolke" ; day_N = mkN "Tag" ; - dust_N = reg2N "Staub" "Stäube" masculine ; + dust_N = reg2N "Staub" "Stäube" masculine ; ear_N = mkN "Ohr" "Ohren" neuter ; earth_N = mkN "Erde" ; egg_N = mkN "Ei" "Eier" neuter ; eye_N = mkN "Auge" "Augen" neuter; fat_N = mkN "Fett" "Fetter" neuter ; feather_N = mkN "Feder" "Federn" feminine ; - fingernail_N = reg2N "Fingernagel" "Fingernägel" masculine ; + fingernail_N = reg2N "Fingernagel" "Fingernägel" masculine ; fire_N = mkN "Feuer" "Feuer" neuter ; flower_N = mkN "Blume" ; fog_N = mkN "Nebel" "Nebel" masculine ; - foot_N = reg2N "Fuß" "Füße" masculine ; - forest_N = reg2N "Wald" "Wälder" masculine ; - grass_N = mkN "Gras" "Gräser" neuter ; + foot_N = reg2N "Fuß" "Füße" masculine ; + forest_N = reg2N "Wald" "Wälder" masculine ; + grass_N = mkN "Gras" "Gräser" neuter ; guts_N = mkN "Eingeweide" ; hair_N = mkN "Haar" "Haare" neuter ; - hand_N = mkN "Hand" "Hände" feminine ; - head_N = mkN "Kopf" "Köpfe" masculine ; + hand_N = mkN "Hand" "Hände" feminine ; + head_N = mkN "Kopf" "Köpfe" masculine ; heart_N = mkN "Herz" "Herzen" neuter ; - horn_N = mkN "Horn" "Hörner" neuter ; - husband_N = mkN "Ehemann" "Ehemänner" masculine ; + horn_N = mkN "Horn" "Hörner" neuter ; + husband_N = mkN "Ehemann" "Ehemänner" masculine ; ice_N = mkN "Eis" "Eise" neuter ; knee_N = mkN "Knie" "Knien" neuter ; - leaf_N = reg2N "Blatt" "Blätter" neuter ; + leaf_N = reg2N "Blatt" "Blätter" neuter ; leg_N = mkN "Bein" "Beine" neuter ; liver_N = mkN "Leber" "Lebern" feminine ; - louse_N = reg2N "Laus" "Läuse" feminine ; - mouth_N = mkN "Mund" "Münder" masculine ; + louse_N = reg2N "Laus" "Läuse" feminine ; + mouth_N = mkN "Mund" "Münder" masculine ; name_N = mkN "Name" "Namen" "Namen" "Namens" "Namen" "Namen" masculine ; neck_N = mkN "Nacken" "Nacken" masculine ; - night_N = reg2N "Nacht" "Nächte" feminine ; + night_N = reg2N "Nacht" "Nächte" feminine ; nose_N = mkN "Nase" ; person_N = mkN "Person" "Personen" feminine ; rain_N = mkN "Regen" ; - road_N = mkN "Straße" ; + road_N = mkN "Straße" ; root_N = mkN "Wurzel" "Wurzeln" feminine ; rope_N = mkN "Seil" "Seile" neuter ; salt_N = mkN "Salz" "Salze" neuter ; sand_N = mkN "Sand" ; seed_N = mkN "Same" ; - skin_N = mkN "Haut" "Häute" feminine ; + skin_N = mkN "Haut" "Häute" feminine ; sky_N = mkN "Himmel" ; ---- pl smoke_N = mkN "Rauch" ; snow_N = mkN "Schnee" "Schneen" masculine ; ---- pl - stick_N = mkN "Stock" "Stöcke" masculine ; - tail_N = mkN "Schwanz" "Schwänze" masculine ; + stick_N = mkN "Stock" "Stöcke" masculine ; + tail_N = mkN "Schwanz" "Schwänze" masculine ; tongue_N = mkN "Zunge" ; - tooth_N = mkN "Zahn" "Zähne" masculine ; + tooth_N = mkN "Zahn" "Zähne" masculine ; wife_N = mkN "Ehefrau" "Ehefrauen" feminine ; wind_N = mkN "Wind" ; - wing_N = reg2N "Flügel" "Flügel" masculine ; - worm_N = mkN "Wurm" "Würmer" masculine ; + wing_N = reg2N "Flügel" "Flügel" masculine ; + worm_N = mkN "Wurm" "Würmer" masculine ; year_N = mkN "Jahr" "Jahre" neuter ; blow_V = regV "blasen" ; breathe_V = regV "atmen" ; @@ -312,16 +312,16 @@ lin dig_V = regV "graben" ; fall_V = regV "fallen" ; float_V = regV "treiben" ; - flow_V = regV "fließen" ; + flow_V = regV "fließen" ; fly_V = regV "fliegen" ; freeze_V = regV "frieren" ; - give_V3 = accdatV3 (irregV "geben" "gibt" "gab" "gäbe" "gegeben") ; + give_V3 = accdatV3 (irregV "geben" "gibt" "gab" "gäbe" "gegeben") ; laugh_V = regV "lachen" ; - lie_V = regV "lügen" ; + lie_V = regV "lügen" ; play_V = regV "spielen" ; - sew_V = regV "nähen" ; + sew_V = regV "nähen" ; sing_V = regV "singen" ; - sit_V = irregV "sitzen" "sitzt" "saß" "säße" "gesessen" ; + sit_V = irregV "sitzen" "sitzt" "saß" "säße" "gesessen" ; smell_V = regV "riechen" ; spit_V = regV "spucken" ; stand_V = regV "stehen" ; @@ -331,26 +331,26 @@ lin turn_V = regV "drehen" ; vomit_V = regV "kotzen" ; - bite_V2 = dirV2 (irregV "beißen" "beißt" "biss" "bisse" "gebissen") ; - count_V2 = dirV2 (regV "zählen") ; + bite_V2 = dirV2 (irregV "beißen" "beißt" "biss" "bisse" "gebissen") ; + count_V2 = dirV2 (regV "zählen") ; cut_V2 = dirV2 (irregV "schneiden" "schneidet" "schnitt" "schnitte" "geschnitten") ; - fear_V2 = dirV2 (regV "fürchten") ; - fight_V2 = dirV2 (regV "bekämpfen") ; - hit_V2 = dirV2 (irregV "schlagen" "schlägt" "schlug" "schlüge" "geschlagen") ; - hold_V2 = dirV2 (irregV "halten" "hält" "hielt" "hielte" "gehalten") ; + fear_V2 = dirV2 (regV "fürchten") ; + fight_V2 = dirV2 (regV "bekämpfen") ; + hit_V2 = dirV2 (irregV "schlagen" "schlägt" "schlug" "schlüge" "geschlagen") ; + hold_V2 = dirV2 (irregV "halten" "hält" "hielt" "hielte" "gehalten") ; hunt_V2 = dirV2 (regV "jagen") ; - kill_V2 = dirV2 (regV "töten") ; - pull_V2 = dirV2 (irregV "ziehen" "zieht" "zog" "zöge" "gezogen") ; - push_V2 = dirV2 (irregV "schieben" "schiebt" "schub" "schübe" "geschoben") ; + kill_V2 = dirV2 (regV "töten") ; + pull_V2 = dirV2 (irregV "ziehen" "zieht" "zog" "zöge" "gezogen") ; + push_V2 = dirV2 (irregV "schieben" "schiebt" "schub" "schübe" "geschoben") ; rub_V2 = dirV2 (irregV "reiben" "reibt" "rieb" "riebe" "gerieben") ; scratch_V2 = dirV2 (regV "kratzen") ; split_V2 = dirV2 (prefixV "auf" (regV "teilen")) ; squeeze_V2 = dirV2 (regV "pressen") ; - stab_V2 = dirV2 (irregV "stechen" "sticht" "stach" "stäche" "gestochen") ; + stab_V2 = dirV2 (irregV "stechen" "sticht" "stach" "stäche" "gestochen") ; suck_V2 = dirV2 (regV "saugen") ; - throw_V2 = dirV2 (irregV "werfen" "wirft" "warf" "würfe" "geworfen") ; - tie_V2 = dirV2 (irregV "binden" "bindet" "band" "bände" "gebunden") ; - wash_V2 = dirV2 (irregV "waschen" "wäscht" "wusch" "wüsche" "gewaschen") ; + throw_V2 = dirV2 (irregV "werfen" "wirft" "warf" "würfe" "geworfen") ; + tie_V2 = dirV2 (irregV "binden" "bindet" "band" "bände" "gebunden") ; + wash_V2 = dirV2 (irregV "waschen" "wäscht" "wusch" "wüsche" "gewaschen") ; wipe_V2 = dirV2 (regV "wischen") ; grammar_N = reg2N "Grammatik" "Grammatiken" feminine ; @@ -360,7 +360,7 @@ lin john_PN = regPN "Johann" ; question_N = mkN "Frage" ; ready_A = regA "fertig" ; - reason_N = reg2N "Grund" "Gründe" masculine ; + reason_N = reg2N "Grund" "Gründe" masculine ; today_Adv = mkAdv "heute" ; uncertain_A = regA "unsicher" ; diff --git a/lib/src/german/MorphoGer.gf b/lib/src/german/MorphoGer.gf index eccc4a0f8..492ee11c7 100644 --- a/lib/src/german/MorphoGer.gf +++ b/lib/src/german/MorphoGer.gf @@ -1,9 +1,8 @@ --# -path=.:../common:../../prelude ---# -coding=latin1 -- ----1 A Simple German Resource Morphology ---- ----- Aarne Ranta & Harald Hammarström 2002 -- 2006 +---- Aarne Ranta & Harald Hammarström 2002 -- 2006 ---- ---- This resource morphology contains definitions needed in the resource ---- syntax. To build a lexicon, it is better to use $ParadigmsGer$, which @@ -12,6 +11,7 @@ resource MorphoGer = ResGer ** open Prelude, (Predef=Predef) in { flags optimize=all ; + coding=utf8 ; oper @@ -36,7 +36,7 @@ oper genitS : Bool -> Str -> Str = \flag,hund -> case hund of { _ + ("el" | "en" | "er") => hund + "s" ; - _ + ("s" | "ß" | "sch" | "st" | "x" | "z") => hund + "es" ; + _ + ("s" | "ß" | "sch" | "st" | "x" | "z") => hund + "es" ; _ => hund + case flag of {True => "s"; False => "es"} } ; pluralN : Str -> Str = \hund -> case hund of { @@ -52,14 +52,14 @@ oper -- Duden, p. 119 verbT : Str -> Str = \v -> case v of { - _ + ("t" | "d") => v + "et" ; -- gründen, reden, betten + _ + ("t" | "d") => v + "et" ; -- gründen, reden, betten _ + ("ch" | "k" | "p" | "t" | "g" | "b" | "d" | "f" | "s") + - ("m" | "n") => v + "et" ; -- atmen, widmen, öffnen, rechnen - _ => v + "t" -- lernen, lärmen, qualmen etc + ("m" | "n") => v + "et" ; -- atmen, widmen, öffnen, rechnen + _ => v + "t" -- lernen, lärmen, qualmen etc } ; verbST : Str -> Str = \v -> case v of { - _ + ("s" | "ss" | "ß" | "sch" | "x" | "z") => v + "t" ; + _ + ("s" | "ss" | "ß" | "sch" | "x" | "z") => v + "t" ; _ => v + "st" } ; diff --git a/lib/src/german/NumeralGer.gf b/lib/src/german/NumeralGer.gf index 9920a2b70..1d55382e5 100644 --- a/lib/src/german/NumeralGer.gf +++ b/lib/src/german/NumeralGer.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 concrete NumeralGer of Numeral = CatGer [Numeral,Digits] ** open MorphoGer, Prelude in { flags optimize = all_subs ; + coding=utf8 ; lincat Digit = {s : DForm => CardOrd => Str} ; @@ -12,10 +12,10 @@ lincat lin num x = x ; - n2 = mkDigit "zwei" "zwölf" "zwanzig" "zweite" ; + n2 = mkDigit "zwei" "zwölf" "zwanzig" "zweite" ; n3 = mkDigit "drei" "dreizehn" "dreissig" "dritte" ; n4 = regDigit "vier" ; - n5 = regDigit "fünf" ; + n5 = regDigit "fünf" ; n6 = regDigit "sechs" ; n7 = mkDigit "sieben" "siebzehn" "siebzig" "siebte" ; n8 = mkDigit "acht" "achzehn" "achzig" "achte" ; diff --git a/lib/src/german/ParadigmsGer.gf b/lib/src/german/ParadigmsGer.gf index 63091ca99..602ac714a 100644 --- a/lib/src/german/ParadigmsGer.gf +++ b/lib/src/german/ParadigmsGer.gf @@ -1,9 +1,8 @@ --# -path=.:../common:../abstract:../../prelude ---# -coding=latin1 --1 German Lexical Paradigms -- --- Aarne Ranta, Harald Hammarström and Björn Bringert2003--2007 +-- Aarne Ranta, Harald Hammarström and Björn Bringert2003--2007 -- -- This is an API for the user of the resource grammar -- for adding lexical items. It gives functions for forming @@ -27,6 +26,7 @@ resource ParadigmsGer = open MorphoGer, CatGer in { + flags coding=utf8 ; --2 Parameters @@ -84,7 +84,7 @@ mkN : overload { -- Worst case: give all four singular forms, two plural forms (others + dative), -- and the gender. - mkN : (x1,_,_,_,_,x6 : Str) -> Gender -> N ; -- worst case: mann, mann, manne, mannes, männer, männern + mkN : (x1,_,_,_,_,x6 : Str) -> Gender -> N ; -- worst case: mann, mann, manne, mannes, männer, männern -- compound nouns @@ -150,7 +150,7 @@ mkN : overload { mkA : overload { -- The regular adjective formation works for most cases, and includes --- variations such as "teuer - teurer", "böse - böser". +-- variations such as "teuer - teurer", "böse - böser". mkA : Str -> A ; -- regular adjective, works for most cases @@ -209,11 +209,11 @@ mkV : overload { -- Regular verbs ("weak verbs") need just the infinitive form. - mkV : (führen : Str) -> V ; -- regular verb + mkV : (führen : Str) -> V ; -- regular verb -- Irregular verbs use Ablaut and, in the worst cases, also Umlaut. - mkV : (sehen,sieht,sah,sähe,gesehen : Str) -> V ; -- irregular verb theme + mkV : (sehen,sieht,sah,sähe,gesehen : Str) -> V ; -- irregular verb theme -- The worst-case constructor needs six forms: -- - Infinitive, @@ -225,7 +225,7 @@ mkV : overload { -- -- - mkV : (geben, gibt, gib, gab, gäbe, gegeben : Str) -> V ; -- worst-case verb + mkV : (geben, gibt, gib, gab, gäbe, gegeben : Str) -> V ; -- worst-case verb -- To add a movable prefix e.g. "auf(fassen)". @@ -289,7 +289,7 @@ mkV2 : overload { mkV3 : overload { mkV3 : V -> V3 ; -- geben + acc + dat - mkV3 : V -> Prep -> Prep -> V3 ; -- sprechen + mit + über + mkV3 : V -> Prep -> Prep -> V3 ; -- sprechen + mit + über } ; --3 Other complement patterns diff --git a/lib/src/german/ResGer.gf b/lib/src/german/ResGer.gf index a6589b097..1fe6dab0a 100644 --- a/lib/src/german/ResGer.gf +++ b/lib/src/german/ResGer.gf @@ -1,9 +1,8 @@ --# -path=.:../abstract:../common:prelude ---# -coding=latin1 --1 German auxiliary operations. -- --- (c) 2002-2006 Aarne Ranta and Harald Hammarström +-- (c) 2002-2006 Aarne Ranta and Harald Hammarström -- -- This module contains operations that are needed to make the -- resource syntax work. To define everything that is needed to @@ -13,6 +12,7 @@ resource ResGer = ParamX ** open Prelude in { flags optimize=all ; + coding=utf8 ; --2 For $Noun$ @@ -114,7 +114,7 @@ resource ResGer = ParamX ** open Prelude in { param Order = Main | Inv | Sub ; --- Main clause mood: "es sei, es wäre, es werde sein". +-- Main clause mood: "es sei, es wäre, es werde sein". -- Not relevant for $Fut$. --- Mood = MIndic | MConjunct ; @@ -574,21 +574,21 @@ resource ResGer = ParamX ** open Prelude in { mkV "haben" "habe" "hast" "hat" "habt" "hab" "hatte" "hattest" "hatten" "hattet" - "hätte" "gehabt" + "hätte" "gehabt" [] VHaben ; werden_V : Verb = mkV "werden" "werde" "wirst" "wird" "werdet" "werd" "wurde" "wurdest" "wurden" "wurdet" - "würde" "geworden" + "würde" "geworden" [] VSein ; werdenPass : Verb = mkV "werden" "werde" "wirst" "wird" "werdet" "werd" "wurde" "wurdest" "wurden" "wurdet" - "würde" "worden" + "würde" "worden" [] VSein ; sein_V : Verb = @@ -596,7 +596,7 @@ resource ResGer = ParamX ** open Prelude in { sein = mkV "sein" "bin" "bist" "ist" "seid" "sei" "war" "warst" "waren" "wart" - "wäre" "gewesen" + "wäre" "gewesen" [] VSein in {s = table { diff --git a/lib/src/german/StructuralGer.gf b/lib/src/german/StructuralGer.gf index b22c79dc7..0a47b5f2d 100644 --- a/lib/src/german/StructuralGer.gf +++ b/lib/src/german/StructuralGer.gf @@ -1,14 +1,14 @@ ---# -coding=latin1 concrete StructuralGer of Structural = CatGer ** open MorphoGer, MakeStructuralGer, (X = ConstructX), (P = ParadigmsGer), IrregGer, Prelude in { flags optimize=all ; + coding=utf8 ; lin - above_Prep = mkPrep "über" P.dative ; + above_Prep = mkPrep "über" P.dative ; after_Prep = mkPrep "nach" P.dative ; all_Predet = {s = appAdj (regA "all") ; c = noCase ; a = PAgNone} ; almost_AdA, almost_AdN = ss "fast" ; @@ -25,19 +25,19 @@ concrete StructuralGer of Structural = CatGer ** by8means_Prep = mkPrep "mit" P.dative ; can8know_VV, can_VV = auxVV (mkV - "können" "kann" "kannst" "kann" "könnt" "könn" + "können" "kann" "kannst" "kann" "könnt" "könn" "konnte" "konntest" "konnten" "konntet" - "könnte" "gekonnt" [] + "könnte" "gekonnt" [] VHaben) ; - during_Prep = mkPrep "während" P.genitive ; + during_Prep = mkPrep "während" P.genitive ; either7or_DConj = sd2 "entweder" "oder" ** {n = Sg} ; everybody_NP = nameNounPhrase {s = caselist "jeder" "jeden" "jedem" "jedes"} ; every_Det = detLikeAdj False Sg "jed" ; everything_NP = nameNounPhrase {s = caselist "alles" "alles" "allem" "alles"} ; - everywhere_Adv = ss "überall" ; + everywhere_Adv = ss "überall" ; few_Det = detLikeAdj False Pl "wenig" ; ---- first_Ord = {s = (regA "erst").s ! Posit} ; - for_Prep = mkPrep "für" P.accusative ; + for_Prep = mkPrep "für" P.accusative ; from_Prep = mkPrep "aus" P.dative ; he_Pron = mkPronPers "er" "ihn" "ihm" "seiner" "sein" Masc Sg P3 ; here7to_Adv = ss ["hierher"] ; @@ -58,9 +58,9 @@ concrete StructuralGer of Structural = CatGer ** much_Det = detLikeAdj False Sg "viel" ; must_VV = auxVV (mkV - "müssen" "muß" "mußt" "muß" "müßt" "müß" - "mußte" "mußtest" "mußten" "mußtet" - "müßte" "gemußt" [] + "müssen" "muß" "mußt" "muß" "müßt" "müß" + "mußte" "mußtest" "mußten" "mußtet" + "müßte" "gemußt" [] VHaben) ; --- one_Quant = DEPREC only_Predet = {s = \\_,_,_ => "nur" ; c = noCase ; a = PAgNone} ; @@ -147,12 +147,12 @@ concrete StructuralGer of Structural = CatGer ** nothing_NP = nameNounPhrase {s = \\_ => "nichts"} ; at_least_AdN = ss "wenigstens" ; - at_most_AdN = ss "höchstens" ; - except_Prep = mkPrep "außer" P.dative ; + at_most_AdN = ss "höchstens" ; + except_Prep = mkPrep "außer" P.dative ; as_CAdv = X.mkCAdv "ebenso" "wie" ; have_V2 = P.dirV2 IrregGer.haben_V ; - that_Subj = ss "daß" ; + that_Subj = ss "daß" ; lin language_title_Utt = ss "Deutsch" ; diff --git a/lib/src/german/TerminologyGer.gf b/lib/src/german/TerminologyGer.gf index 8283ca56c..59922d259 100644 --- a/lib/src/german/TerminologyGer.gf +++ b/lib/src/german/TerminologyGer.gf @@ -8,6 +8,7 @@ concrete TerminologyGer of Terminology = CatGer ** open (L = LexiconGer), Prelude in { +flags coding=utf8 ; lincat diff --git a/lib/src/hindi/ConstructionHin.gf b/lib/src/hindi/ConstructionHin.gf index f0c8c16f4..1ca6ca4ec 100644 --- a/lib/src/hindi/ConstructionHin.gf +++ b/lib/src/hindi/ConstructionHin.gf @@ -2,6 +2,7 @@ concrete ConstructionHin of Construction = CatHin ** open SyntaxHin, SymbolicHin, ParadigmsHin, (L = LexiconHin), (E = ExtraHin), (G = GrammarHin), (R = ResHin), (S = StructuralHin), Prelude in { +flags coding=utf8 ; lin diff --git a/lib/src/italian/ConstructionIta.gf b/lib/src/italian/ConstructionIta.gf index 95e7553f2..b13a03433 100644 --- a/lib/src/italian/ConstructionIta.gf +++ b/lib/src/italian/ConstructionIta.gf @@ -4,6 +4,7 @@ concrete ConstructionIta of Construction = CatIta ** open SyntaxIta, SymbolicIta, ParadigmsIta, (L = LexiconIta), (E = ExtraIta), (I = IrregIta), (R = ResIta), (C = CommonRomance), Prelude in { +flags coding=utf8 ; lin diff --git a/lib/src/italian/DiffIta.gf b/lib/src/italian/DiffIta.gf index ee7587783..a54dac6a4 100644 --- a/lib/src/italian/DiffIta.gf +++ b/lib/src/italian/DiffIta.gf @@ -1,9 +1,9 @@ --# -path=.:../romance:../abstract:../common:prelude ---# -coding=latin1 instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelude in { flags optimize=all ; + coding=utf8 ; param Prepos = P_di | P_a | P_da | P_in | P_su | P_con ; @@ -154,7 +154,7 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud quelPron : AAgr => Str = aagrForms "quale" "quale" "quali" "quali" ; - partQIndir = "ciò" ; + partQIndir = "ciò" ; reflPron : Number -> Person -> Case -> Str = let diff --git a/lib/src/italian/DocumentationItaFunctor.gf b/lib/src/italian/DocumentationItaFunctor.gf index a1469748a..5eeb2372b 100644 --- a/lib/src/italian/DocumentationItaFunctor.gf +++ b/lib/src/italian/DocumentationItaFunctor.gf @@ -11,6 +11,7 @@ incomplete concrete DocumentationItaFunctor of Documentation = CatIta ** open Prelude, HTML in { +flags coding=utf8 ; lincat diff --git a/lib/src/italian/MorphoIta.gf b/lib/src/italian/MorphoIta.gf index 6e5d1c568..ece6554ac 100644 --- a/lib/src/italian/MorphoIta.gf +++ b/lib/src/italian/MorphoIta.gf @@ -1,5 +1,4 @@ --# -path=.:../romance:../common:../../prelude ---# -coding=latin1 --1 A Simple Italian Resource Morphology -- @@ -13,6 +12,7 @@ resource MorphoIta = CommonRomance, ResIta ** open PhonoIta, Prelude, Predef in { flags optimize=all ; + coding=utf8 ; @@ -67,7 +67,7 @@ oper ; g = Fem} ; _ + "e" => {s = numForms vino (vin + "i") ; g = Masc} ; - _ + "à" | "ù" => {s = numForms vino vino + _ + "à" | "ù" => {s = numForms vino vino ; g = Fem} ; _ => {s = numForms vino vino ; g = Masc} diff --git a/lib/src/italian/ParadigmsIta.gf b/lib/src/italian/ParadigmsIta.gf index d8cf135d8..437fb1dff 100644 --- a/lib/src/italian/ParadigmsIta.gf +++ b/lib/src/italian/ParadigmsIta.gf @@ -1,5 +1,4 @@ --# -path=.:../romance:../common:../abstract:../../prelude ---# -coding=latin1 --1 Italian Lexical Paradigms -- @@ -34,6 +33,7 @@ resource ParadigmsIta = BeschIta ** CatIta in { flags optimize=all ; + coding=utf8 ; --2 Parameters -- @@ -149,13 +149,13 @@ oper mkA : overload { -- For regular adjectives, all forms are derived from the --- masculine singular. Comparison is formed by "più". +-- masculine singular. Comparison is formed by "più". mkA : (bianco : Str) -> A ; -- predictable adjective -- Five forms are needed in the worst -- case (masc and fem singular, masc plural, adverbial), given that --- comparison is formed by "più". +-- comparison is formed by "più". mkA : (solo,sola,soli,sole,solamente : Str) -> A ; -- irregular adjective @@ -367,7 +367,7 @@ oper {s = table {Posit => a.s ! Posit ; _ => b.s ! Posit} ; isPre = a.isPre ; lock_A = <>} ; compADeg a = - {s = table {Posit => a.s ! Posit ; _ => \\f => "più" ++ a.s ! Posit ! f} ; + {s = table {Posit => a.s ! Posit ; _ => \\f => "più" ++ a.s ! Posit ! f} ; isPre = a.isPre ; lock_A = <>} ; regADeg a = compADeg (regA a) ; @@ -426,7 +426,7 @@ oper mkVQ v = v ** {lock_VQ = <>} ; mkV2Q v p = mk2V2 v p ** {lock_V2Q = <>} ; - mmkV3 : V -> Prep -> Prep -> V3 ; -- parler, à, de + mmkV3 : V -> Prep -> Prep -> V3 ; -- parler, à, de mmkV3 v p q = v ** {c2 = p ; c3 = q ; lock_V3 = <>} ; dirV3 v p = mmkV3 v accusative p ; dirdirV3 v = dirV3 v dative ; @@ -437,7 +437,7 @@ oper mkV3 = overload { mkV3 : V -> V3 = dirdirV3 ; -- donner,_,_ mkV3 : V -> Prep -> V3 = dirV3 ; -- placer,_,sur - mkV3 : V -> Prep -> Prep -> V3 = mmkV3 -- parler, à, de + mkV3 : V -> Prep -> Prep -> V3 = mmkV3 -- parler, à, de } ; mkV2S = overload { diff --git a/lib/src/italian/PhonoIta.gf b/lib/src/italian/PhonoIta.gf index 3effa3d80..f30017cb4 100644 --- a/lib/src/italian/PhonoIta.gf +++ b/lib/src/italian/PhonoIta.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 resource PhonoIta = open Prelude in { + flags coding=utf8 ; --3 Elision -- @@ -8,7 +8,7 @@ resource PhonoIta = open Prelude in { oper vocale : Strs = strs { - "a" ; "e" ; "h" ; "i" ; "o" ; "u" ; "è" ; "y" ; "A" ; "E" ; "I" ; "O" ; "U" ; "H" + "a" ; "e" ; "h" ; "i" ; "o" ; "u" ; "è" ; "y" ; "A" ; "E" ; "I" ; "O" ; "U" ; "H" } ; sImpuro : Strs = strs { diff --git a/lib/src/italian/TerminologyIta.gf b/lib/src/italian/TerminologyIta.gf index 566cfee14..448bc9724 100644 --- a/lib/src/italian/TerminologyIta.gf +++ b/lib/src/italian/TerminologyIta.gf @@ -10,6 +10,7 @@ concrete TerminologyIta of Terminology = CatIta ** open Prelude in { +flags coding=utf8 ; lincat diff --git a/lib/src/norwegian/DiffNor.gf b/lib/src/norwegian/DiffNor.gf index b7f6b7b12..de4829b5d 100644 --- a/lib/src/norwegian/DiffNor.gf +++ b/lib/src/norwegian/DiffNor.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 instance DiffNor of DiffScand = open CommonScand, Prelude in { + flags coding=utf8 ; -- Parameters. @@ -33,7 +33,7 @@ instance DiffNor of DiffScand = open CommonScand, Prelude in { conjThan = "enn" ; conjAnd = "og" ; compMore = "mere" ; - infMark = "å" ; + infMark = "Ã¥" ; subjIf = "hvis" ; @@ -48,7 +48,7 @@ instance DiffNor of DiffScand = open CommonScand, Prelude in { mkVerb9 "ha" "har" "ha" "hadde" "hatt" "haven" "havet" "havne" "havende" ** {part = [] ; isVaere = False} ; verbBe = - mkVerb9 "være" "er" "var" "var" "vært" "væren" "været" "værne" "værende" + mkVerb9 "være" "er" "var" "var" "vært" "væren" "været" "værne" "værende" ** {part = [] ; isVaere = False} ; verbBecome = mkVerb9 "bli" "blir" "bli" "ble" "blitt" "bliven" "blivet" "blivne" "blivende" @@ -79,7 +79,7 @@ instance DiffNor of DiffScand = open CommonScand, Prelude in { RPrep _ => gennumForms "hvilken" "hvilket" "hvilke" ! gennum g n } ; - pronSuch = gennumForms "sådan" "sådant" "sådanne" ; + pronSuch = gennumForms "sÃ¥dan" "sÃ¥dant" "sÃ¥danne" ; reflPron : Agr -> Str = \a -> case of { => "oss" ; diff --git a/lib/src/norwegian/IdiomNor.gf b/lib/src/norwegian/IdiomNor.gf index efbcc8e53..415219709 100644 --- a/lib/src/norwegian/IdiomNor.gf +++ b/lib/src/norwegian/IdiomNor.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 concrete IdiomNor of Idiom = CatNor ** open MorphoNor, ParadigmsNor, IrregNor, Prelude in { flags optimize=all_subs ; + coding=utf8 ; lin @@ -32,7 +32,7 @@ concrete IdiomNor of Idiom = CatNor ** } ; ProgrVP vp = - insertObj (\\a => ["ved å"] ++ infVP vp a) (predV verbBe) ; + insertObj (\\a => ["ved Ã¥"] ++ infVP vp a) (predV verbBe) ; ImpPl1 vp = {s = ["lat oss"] ++ infVP vp {g = Utr ; n = Pl ; p = P1}} ; diff --git a/lib/src/norwegian/IrregNor.gf b/lib/src/norwegian/IrregNor.gf index 1d5995ee1..87a376c94 100644 --- a/lib/src/norwegian/IrregNor.gf +++ b/lib/src/norwegian/IrregNor.gf @@ -1,11 +1,11 @@ --# -path=.:../scandinavian:../common:../abstract:../../prelude ---# -coding=latin1 -- see: http://frodo.bruderhof.com/norskklassen/commonverbs.htm concrete IrregNor of IrregNorAbs = CatNor ** open ParadigmsNor in { flags optimize=values ; + coding=utf8 ; lin be_V = mkV "be" "ber" "bes" "bad" "bedt" "be" ; lin bite_V = irregV "bite" (variants {"bet" ; "beit"}) "bitt" ; @@ -14,27 +14,27 @@ concrete IrregNor of IrregNorAbs = CatNor ** open ParadigmsNor in { lin brenne_V = irregV "brenne" (variants {"brant" ; "brente"}) "brent" ; lin bringe_V = irregV "bringe" "brakte" "brakt" ; lin burde_V = irregV "burde" "burde" "burdet" ; - lin bære_V = irregV "bære" "bar" "båret" ; + lin bære_V = irregV "bære" "bar" "bÃ¥ret" ; lin dra_V = mkV "dra" "drar" "dras" "drog" (variants {"dradd" ; "dratt"}) "dra" ; lin drikke_V = irregV "drikke" "drakk" "drukket" ; lin drive_V = irregV "drive" (variants {"drev" ; "dreiv"}) "drevet" ; - lin dø_V = irregV "dø" (variants {"dødde" ; "døde"}) "dødd" ; - lin eie_V = irregV "eie" (variants {"eide" ; "åtte"}) (variants {"eid" ; "ått"}) ; + lin dø_V = irregV "dø" (variants {"dødde" ; "døde"}) "dødd" ; + lin eie_V = irregV "eie" (variants {"eide" ; "Ã¥tte"}) (variants {"eid" ; "Ã¥tt"}) ; lin falle_V = irregV "falle" "falt" "falt" ; lin finne_V = irregV "finne" "fant" "funnet" ; - lin fly_V = irregV "fly" (variants {"fløy" ; "flaug"}) (variants {"fløyet";"flydd"}) ; - lin flyte_V = irregV "flyte" (variants {"fløte" ; "flaut"}) "flytt" ; + lin fly_V = irregV "fly" (variants {"fløy" ; "flaug"}) (variants {"fløyet";"flydd"}) ; + lin flyte_V = irregV "flyte" (variants {"fløte" ; "flaut"}) "flytt" ; lin foretrekke_V = irregV "foretrekke" "foretrakk" "foretrukket" ; lin forlate_V = irregV "forlate" "forlot" "forlatt" ; - lin forstå_V = irregV "forstå" "forstod" "forstått" ; + lin forstÃ¥_V = irregV "forstÃ¥" "forstod" "forstÃ¥tt" ; lin fortelle_V = irregV "fortelle" "fortalte" "fortalt" ; - lin fryse_V = irregV "fryse" "frøs" "frosset" ; - lin få_V = irregV "få" "fikk" "fått" ; + lin fryse_V = irregV "fryse" "frøs" "frosset" ; + lin fÃ¥_V = irregV "fÃ¥" "fikk" "fÃ¥tt" ; lin gi_V = irregV "gi" "gav" "gitt" ; lin gjelde_V = irregV "gjelde" (variants {"gjaldt" ; "galdt"}) "gjeldt" ; - lin gjøre_V = irregV "gjøre" "gjorde" "gjort" ; + lin gjøre_V = irregV "gjøre" "gjorde" "gjort" ; lin gni_V = irregV "gni" (variants {"gned" ; "gnei" ; "gnidde"}) "gnidd" ; - lin gå_V = irregV "gå" "gikk" "gått" ; + lin gÃ¥_V = irregV "gÃ¥" "gikk" "gÃ¥tt" ; lin ha_V = irregV "ha" "hadde" "hatt" ; lin hente_V = irregV "hente" "hentet" "hendt" ; lin hete_V = irregV "hete" (variants {"het" ; "hette"}) "hett" ; @@ -44,25 +44,25 @@ concrete IrregNor of IrregNorAbs = CatNor ** open ParadigmsNor in { lin kunne_V = irregV "kunne" "kunne" "kunnet" ; lin la_V = irregV "la" "lot" "latt" ; lin legge_V = irregV "legge" "la" "lagt" ; - lin ligge_V = irregV "ligge" "lå" "ligget" ; - lin løpe_V = irregV "løpe" "løp" (variants {"løpt" ; "løpet"}) ; - lin måtte_V = irregV "måtte" "måtte" "måttet" ; + lin ligge_V = irregV "ligge" "lÃ¥" "ligget" ; + lin løpe_V = irregV "løpe" "løp" (variants {"løpt" ; "løpet"}) ; + lin mÃ¥tte_V = irregV "mÃ¥tte" "mÃ¥tte" "mÃ¥ttet" ; lin renne_V = irregV "renne" "rant" "rent" ; - lin se_V = mkV "se" "ser" "ses" "så" "sett" "se" ; + lin se_V = mkV "se" "ser" "ses" "sÃ¥" "sett" "se" ; lin selge_V = irregV "selge" "solgte" "solgt" ; lin sette_V = irregV "sette" "satte" "satt" ; lin si_V = mkV "si" "sier" "sies" "sa" "sagt" "sagd" ; lin sitte_V = irregV "sitte" "satt" "sittet" ; - lin skjære_V = irregV "skjære" "skar" "skåret" ; + lin skjære_V = irregV "skjære" "skar" "skÃ¥ret" ; lin skrive_V = irregV "skrive" "skrev" "skrevet" ; lin skulle_V = irregV "skulle" "skulle" "skullet" ; - lin slå_V = irregV "slå" "slo" "slått" ; - lin slåss_V = mkV "slåss" "slåss" "slåss" "sloss" "slåss" "slåss" ; + lin slÃ¥_V = irregV "slÃ¥" "slo" "slÃ¥tt" ; + lin slÃ¥ss_V = mkV "slÃ¥ss" "slÃ¥ss" "slÃ¥ss" "sloss" "slÃ¥ss" "slÃ¥ss" ; lin sove_V = irregV "sove" "sov" "sovet" ; lin springe_V = irregV "springe" "sprang" "sprunget" ; - lin spørre_V = irregV "spørre" "spurte" "spurt" ; + lin spørre_V = irregV "spørre" "spurte" "spurt" ; lin stikke_V = irregV "stikke" "stakk" "stukket" ; - lin stå_V = irregV "stå" "stod" "stått" ; + lin stÃ¥_V = irregV "stÃ¥" "stod" "stÃ¥tt" ; lin suge_V = irregV "suge" (variants {"sugde" ; "saug"}) "sugd" ; lin synes_V = irregV "synes" "syntes" (variants {"synes" ; "syns"}) ; lin synge_V = irregV "synge" "sang" "sunget" ; diff --git a/lib/src/norwegian/IrregNorAbs.gf b/lib/src/norwegian/IrregNorAbs.gf index dacfa5ed1..585e35c25 100644 --- a/lib/src/norwegian/IrregNorAbs.gf +++ b/lib/src/norwegian/IrregNorAbs.gf @@ -1,16 +1,16 @@ ---# -coding=latin1 abstract IrregNorAbs = Cat ** { + flags coding=utf8 ; fun be_V : V ; fun bite_V : V ; fun bli_V : V ; fun brenne_V : V ; fun bringe_V : V ; fun burde_V : V ; - fun bære_V : V ; + fun bære_V : V ; fun dra_V : V ; fun drikke_V : V ; fun drive_V : V ; - fun dø_V : V ; + fun dø_V : V ; fun eie_V : V ; fun falle_V : V ; fun finne_V : V ; @@ -18,15 +18,15 @@ abstract IrregNorAbs = Cat ** { fun flyte_V : V ; fun foretrekke_V : V ; fun forlate_V : V ; - fun forstå_V : V ; + fun forstÃ¥_V : V ; fun fortelle_V : V ; fun fryse_V : V ; - fun få_V : V ; + fun fÃ¥_V : V ; fun gi_V : V ; fun gjelde_V : V ; - fun gjøre_V : V ; + fun gjøre_V : V ; fun gni_V : V ; - fun gå_V : V ; + fun gÃ¥_V : V ; fun ha_V : V ; fun hente_V : V ; fun hete_V : V ; @@ -37,24 +37,24 @@ abstract IrregNorAbs = Cat ** { fun la_V : V ; fun legge_V : V ; fun ligge_V : V ; - fun løpe_V : V ; - fun måtte_V : V ; + fun løpe_V : V ; + fun mÃ¥tte_V : V ; fun renne_V : V ; fun se_V : V ; fun selge_V : V ; fun sette_V : V ; fun si_V : V ; fun sitte_V : V ; - fun skjære_V : V ; + fun skjære_V : V ; fun skrive_V : V ; fun skulle_V : V ; - fun slå_V : V ; - fun slåss_V : V ; + fun slÃ¥_V : V ; + fun slÃ¥ss_V : V ; fun sove_V : V ; fun springe_V : V ; - fun spørre_V : V ; + fun spørre_V : V ; fun stikke_V : V ; - fun stå_V : V ; + fun stÃ¥_V : V ; fun suge_V : V ; fun synes_V : V ; fun synge_V : V ; diff --git a/lib/src/norwegian/LexiconNor.gf b/lib/src/norwegian/LexiconNor.gf index 66ada41a9..34a17d190 100644 --- a/lib/src/norwegian/LexiconNor.gf +++ b/lib/src/norwegian/LexiconNor.gf @@ -1,10 +1,10 @@ --# -path=.:../scandinavian:../common:../abstract:../../prelude ---# -coding=latin1 concrete LexiconNor of Lexicon = CatNor ** open Prelude, ParadigmsNor, IrregNor in { flags startcat=Phr ; lexer=textlit ; unlexer=text ; + coding=utf8 ; optimize=values ; lin @@ -13,31 +13,31 @@ lin apartment_N = mk2N "leilighet" "leiligheten" ; apple_N = mk2N "eple" "eplet" ; art_N = mk2N "kunst" "kunsten" ; - ask_V2Q = mkV2Q spørre_V noPrep ; + ask_V2Q = mkV2Q spørre_V noPrep ; baby_N = mk2N "baby" "babyen" ; - bad_A = regADeg "dårlig" ; ---- + bad_A = regADeg "dÃ¥rlig" ; ---- bank_N = mk2N "bank" "banken" ; beautiful_A = mk3ADeg "vakker" "vakkert" "vakre" ; become_VA = mkVA (vaereV bli_V) ; - beer_N = regGenN "øl" neutrum ; - beg_V2V = mkV2V be_V noPrep (mkPrep "å") ; - big_A = irregADeg "stor" "større" "størst"; + beer_N = regGenN "øl" neutrum ; + beg_V2V = mkV2V be_V noPrep (mkPrep "Ã¥") ; + big_A = irregADeg "stor" "større" "størst"; bike_N = mkN "sykkel" "sykkelen" "sykler" "syklene" ; bird_N = mk2N "fugl" "fuglen" ; black_A = mk2ADeg "svart" "svart" ; - blue_A = mk2ADeg "blå" "blått"; - boat_N = regGenN "båt" masculine ; - book_N = mkN "bok" "boka" "bøker" "bøkene" ; - boot_N = mkN "støvel" "støvelen" "støvler" "støvlene" ; + blue_A = mk2ADeg "blÃ¥" "blÃ¥tt"; + boat_N = regGenN "bÃ¥t" masculine ; + book_N = mkN "bok" "boka" "bøker" "bøkene" ; + boot_N = mkN "støvel" "støvelen" "støvler" "støvlene" ; boss_N = mk2N "sjef" "sjefen" ; boy_N = regGenN "gutt" masculine ; - bread_N = regGenN "brød" neutrum ; + bread_N = regGenN "brød" neutrum ; break_V2 = dirV2 (mk2V "knuse" "knuste") ; broad_A = regADeg "bred" ; - brother_N2 = mkN2 ( (mkN "bror" "broren" "brødre" "brødrene")) (mkPrep "til") ; + brother_N2 = mkN2 ( (mkN "bror" "broren" "brødre" "brødrene")) (mkPrep "til") ; brown_A = regADeg "brun" ; - butter_N = regGenN "smør" neutrum ; - buy_V2 = dirV2 (mk2V "kjøpe" "kjøpte") ; + butter_N = regGenN "smør" neutrum ; + buy_V2 = dirV2 (mk2V "kjøpe" "kjøpte") ; camera_N = mk2N "kamera" "kameraen" ; ---- cap_N = mk2N "lue" "lua" ; car_N = regGenN "bil" masculine ; @@ -59,12 +59,12 @@ lin country_N = mk2N "land" "landet" ; cousin_N = mk2N "fetter" "fetteren" ; ---- cow_N = mkN "ku" "kua" "kyr" "kyrne" ; ---- - die_V = vaereV IrregNor.dø_V ; + die_V = vaereV IrregNor.dø_V ; dirty_A = mk3ADeg "skitten" "skittent" "skitne" ; ---- distance_N3 = mkN3 (regGenN "avstand" masculine) (mkPrep "fra") (mkPrep "til") ; doctor_N = mk2N "lege" "legen" ; dog_N = regGenN "hund" masculine ; - door_N = regGenN "dør" feminine ; + door_N = regGenN "dør" feminine ; drink_V2 = dirV2 IrregNor.drikke_V ; easy_A2V = mkA2V (regA "grei") (mkPrep "for") ; eat_V2 = dirV2 (mk2V "spise" "spiste") ; @@ -77,7 +77,7 @@ lin fish_N = mk2N "fisk" "fisken" ; floor_N = regGenN "golv" neutrum ; forget_V2 = dirV2 (mkV "glemme" "glemmer" "glemmes" "glemte" "glemt" "glem") ; - fridge_N = regGenN "kjøleskap" neutrum ; + fridge_N = regGenN "kjøleskap" neutrum ; friend_N = mkN "venn" "vennen" "venner" "vennene" ; fruit_N = mk2N "frukt" "frukten" ; fun_AV = mkAV (mkA "morsom" "morsomt" "morsomme") ; @@ -86,14 +86,14 @@ lin glove_N = regGenN "hanske" masculine ; gold_N = regGenN "gull" neutrum ; good_A = mkADeg "god" "godt" "gode" "bedre" "best" ; - go_V = vaereV IrregNor.gå_V ; - green_A = mk2ADeg "grønn" "grønt" ; + go_V = vaereV IrregNor.gÃ¥_V ; + green_A = mk2ADeg "grønn" "grønt" ; harbour_N = regGenN "havn" feminine; hate_V2 = dirV2 (regV "hate") ; hat_N = regGenN "hatt" masculine ; - hear_V2 = dirV2 (mk2V "høre" "hørte") ; + hear_V2 = dirV2 (mk2V "høre" "hørte") ; hill_N = regGenN "haug" masculine ; - hope_VS = mkVS (regV "håpe") ; + hope_VS = mkVS (regV "hÃ¥pe") ; horse_N = regGenN "hest" masculine ; hot_A = regADeg "heit" ; house_N = regGenN "hus" neutrum ; @@ -107,22 +107,22 @@ lin know_VS = mkVS IrregNor.vite_V ; lake_N = regGenN "vann" neutrum ; lamp_N = regGenN "lampe" feminine ; - learn_V2 = dirV2 (mk2V "lære" "lærte") ; - leather_N = regGenN "lær" neutrum ; + learn_V2 = dirV2 (mk2V "lære" "lærte") ; + leather_N = regGenN "lær" neutrum ; leave_V2 = dirV2 forlate_V ; like_V2 = dirV2 (mk2V "like" "likte") ; listen_V2 = dirV2 (regV "lytte") ; live_V = mk2V "leve" "levde" ; long_A = irregADeg "lang" "lengre" "lengst" ; lose_V2 = dirV2 (mk2V "tape" "tapte") ; - love_N = regGenN "kjærlighet" masculine ; + love_N = regGenN "kjærlighet" masculine ; love_V2 = dirV2 (regV "elske") ; man_N = (mkN "mann" "mannen" "menn" "mennen") ; married_A2 = mkA2 (mk2A "gift" "gift") (mkPrep "med") ; - meat_N = regGenN "kjøtt" neutrum ; + meat_N = regGenN "kjøtt" neutrum ; milk_N = regGenN "melk" masculine ; - moon_N = regGenN "måne" masculine ; - mother_N2 = mkN2 (mkN "mor" "moren" "mødre" "mødrene") (mkPrep "til") ; ---- fem + moon_N = regGenN "mÃ¥ne" masculine ; + mother_N2 = mkN2 (mkN "mor" "moren" "mødre" "mødrene") (mkPrep "til") ; ---- fem mountain_N = regGenN "fjell" neutrum ; music_N = mk2N "musikk" "musikken" ; narrow_A = regADeg "smal" ; @@ -130,7 +130,7 @@ lin newspaper_N = regGenN "avis" feminine ; oil_N = regGenN "olje" masculine ; old_A = mkADeg "gammel" "gammelt" "gamle" "eldre" "eldst" ; - open_V2 = dirV2 (regV "åpne") ; + open_V2 = dirV2 (regV "Ã¥pne") ; paint_V2A = mkV2A (regV "male") noPrep ; paper_N = regGenN "papir" neutrum ; ---- paris_PN = regGenPN "Paris" neutrum ; @@ -146,7 +146,7 @@ lin radio_N = regGenN "radio" masculine ; rain_V0 = mkV0 (regV "regne") ; read_V2 = dirV2 (mk2V "lese" "leste") ; - red_A = regADeg "rød" ; + red_A = regADeg "rød" ; religion_N = mk2N "religion" "religionen" ; restaurant_N = mk2N "restaurant" "restauranten" ; river_N = mk2N "elv" "elva" ; @@ -157,53 +157,53 @@ lin say_VS = mkVS si_V ; school_N = regGenN "skole" feminine; science_N = mk2N "vitenskap" "vitenskapen" ; - sea_N = mk2N "sjø" "sjøen" ; + sea_N = mk2N "sjø" "sjøen" ; seek_V2 = mkV2 (mk2V "lete" "lette") (mkPrep "etter") ; see_V2 = dirV2 se_V ; sell_V3 = dirV3 selge_V (mkPrep "til") ; send_V3 = dirV3 (mk2V "sende" "sendte") (mkPrep "til") ; - sheep_N = mk2N "får" "fåret" ; + sheep_N = mk2N "fÃ¥r" "fÃ¥ret" ; ship_N = regGenN "skip" neutrum ; shirt_N = regGenN "skjorte" feminine ; shoe_N = regGenN "sko" masculine ; shop_N = mk2N "butikk" "butikken" ; short_A = regADeg "kort" ; - silver_N = mk2N "sølv" "sølvet"; - sister_N = mkN "søster" "søsteren" "søstrer" "søstrene" ; + silver_N = mk2N "sølv" "sølvet"; + sister_N = mkN "søster" "søsteren" "søstrer" "søstrene" ; sleep_V = irregV "sove" "sov" "sovet" ; - small_A = mkADeg "liten" "lite" "små" "mindre" "minst" ; ---- lille + small_A = mkADeg "liten" "lite" "smÃ¥" "mindre" "minst" ; ---- lille snake_N = regGenN "orm" masculine ; - sock_N = regGenN "strømpe" masculine ; + sock_N = regGenN "strømpe" masculine ; speak_V2 = dirV2 (regV "snakke") ; star_N = regGenN "stjerne" feminine ; - steel_N = regGenN "stål" neutrum ; + steel_N = regGenN "stÃ¥l" neutrum ; stone_N = regGenN "stein" masculine ; stove_N = regGenN "komfyr" masculine ; student_N = mk2N "student" "studenten" ; stupid_A = mk3ADeg "dum" "dumt" "dumme" ; sun_N = regGenN "sol" feminine ; - switch8off_V2 = dirV2 (partV (irregV "slå" "slo" "slått") "av") ; - switch8on_V2 = dirV2 (partV (irregV "slå" "slo" "slått") "på") ; + switch8off_V2 = dirV2 (partV (irregV "slÃ¥" "slo" "slÃ¥tt") "av") ; + switch8on_V2 = dirV2 (partV (irregV "slÃ¥" "slo" "slÃ¥tt") "pÃ¥") ; table_N = regGenN "bord" neutrum ; talk_V3 = mkV3 (regV "snakke") (mkPrep "til") (mkPrep "om") ; - teacher_N = mkN "lærer" "læreren" "lærere" "lærerne" ; + teacher_N = mkN "lærer" "læreren" "lærere" "lærerne" ; teach_V2 = dirV2 (mk2V "undervise" "underviste") ; television_N = mk2N "fjernsyn" "fjernsynet" ; thick_A = mk2ADeg "tykk" "tykt" ; thin_A = mk2ADeg "tynn" "tynt" ; train_N = regGenN "tog" neutrum ; travel_V = vaereV (mk2V "reise" "reiste") ; - tree_N = mkN "tre" "treet" "trær" "træne" ; + tree_N = mkN "tre" "treet" "trær" "træne" ; ---- trousers_N = regGenN "trousers" ; ---- pl t ! ugly_A = mk2ADeg "stygg" "stygt" ; - understand_V2 = dirV2 (irregV "forstå" "forstod" "forstått") ; + understand_V2 = dirV2 (irregV "forstÃ¥" "forstod" "forstÃ¥tt") ; university_N = regGenN "universitet" neutrum ; village_N = mk2N "grend" "grenda" ; - wait_V2 = mkV2 (regV "vente") (mkPrep "på") ; - walk_V = vaereV IrregNor.gå_V ; + wait_V2 = mkV2 (regV "vente") (mkPrep "pÃ¥") ; + walk_V = vaereV IrregNor.gÃ¥_V ; warm_A = regADeg "varm" ; war_N = regGenN "krig" masculine ; - watch_V2 = mkV2 se_V (mkPrep "på") ; + watch_V2 = mkV2 se_V (mkPrep "pÃ¥") ; water_N = mk2N "vatn" "vatnet" ; white_A = regADeg "hvit" ; window_N = mkN "vindu" "vinduet" "vinduer" "vinduene" ; ---- er? @@ -211,13 +211,13 @@ lin win_V2 = dirV2 (irregV "vinne" "vant" "vunnet") ; woman_N = regGenN "kvinne" feminine ; ---- kvinnen wonder_VQ = mkVQ (regV "undre") ; ---- seg - wood_N = mkN "tre" "treet" "trær" "træne" ; + wood_N = mkN "tre" "treet" "trær" "træne" ; write_V2 = dirV2 (irregV "skrive" "skrev" "skrevet") ; yellow_A = regADeg "gul" ; young_A = irregADeg "ung" "yngre" "yngst" ; - do_V2 = dirV2 (irregV "gjøre" "gjorde" "gjort") ; - now_Adv = mkAdv "nå" ; + do_V2 = dirV2 (irregV "gjøre" "gjorde" "gjort") ; + now_Adv = mkAdv "nÃ¥" ; already_Adv = mkAdv "allerede" ; song_N = mk2N "sang" "sangen" ; add_V3 = mkV3 (partV (irregV "legge" "la" "lagt") "til") noPrep (mkPrep "til") ; @@ -227,20 +227,20 @@ lin jump_V = regV "hoppe" ; left_Ord = {s = "venstre" ; isDet = True} ; - right_Ord = {s = "høyre" ; isDet = True} ; + right_Ord = {s = "høyre" ; isDet = True} ; far_Adv = mkAdv "fjern" ; correct_A = regA "riktig" ; - dry_A = mk2A "tørr" "tørt" ; - dull_A = regA "sløv" ; + dry_A = mk2A "tørr" "tørt" ; + dull_A = regA "sløv" ; full_A = regA "full" ; heavy_A = irregADeg "tung" "tyngre" "tyngst" ; - near_A = mkADeg "nære" "nære" "nære" "nærmere" "nærmest" ; - rotten_A = mk3ADeg "råtten" "råttent" "råtne" ; + near_A = mkADeg "nære" "nære" "nære" "nærmere" "nærmest" ; + rotten_A = mk3ADeg "rÃ¥tten" "rÃ¥ttent" "rÃ¥tne" ; round_A = regA "rund" ; sharp_A = mk2A "kvass" "kvast" ; smooth_A = mk2A "slett" "slett" ; straight_A = regA "rak" ; - wet_A = regA "våt" ; + wet_A = regA "vÃ¥t" ; wide_A = regA "bred" ; animal_N = mk2N "dyr" "dyret" ; ashes_N = mk2N "aske" "aska" ; @@ -252,30 +252,30 @@ lin breast_N = mk2N "bryst" "brystet" ; cloud_N = mk2N "sky" "skya" ; day_N = mk2N "dag" "dagen" ; - dust_N = mk2N "støv" "støvet" ; - ear_N = mk2N "øre" "øret" ; + dust_N = mk2N "støv" "støvet" ; + ear_N = mk2N "øre" "øret" ; earth_N = mk2N "jord" "jorda" ; egg_N = mk2N "egg" "egget" ; - eye_N = mkN "øye" "øyet" "øyne" "øynene" ; + eye_N = mkN "øye" "øyet" "øyne" "øynene" ; fat_N = mk2N "fett" "fettet" ; - feather_N = mk2N "fjør" "fjøra" ; + feather_N = mk2N "fjør" "fjøra" ; fingernail_N = mk2N "negl" "neglen" ; fire_N = mk2N "ild" "ilden" ; flower_N = mk2N "blomst" "blomsten" ; - fog_N = mk2N "tåke" "tåka" ; - foot_N = mk2N "fot" "føtter" ; + fog_N = mk2N "tÃ¥ke" "tÃ¥ka" ; + foot_N = mk2N "fot" "føtter" ; forest_N = mk2N "skog" "skogen" ; grass_N = mk2N "gras" "graset" ; guts_N = mk2N "tarm" "tarmen" ; ---- involler - hair_N = mk2N "hår" "håret" ; - hand_N = mk2N "hånd" "hånden" ; + hair_N = mk2N "hÃ¥r" "hÃ¥ret" ; + hand_N = mk2N "hÃ¥nd" "hÃ¥nden" ; head_N = mk2N "hode" "hodet" ; heart_N = mk2N "hjerte" "hjertet" ; horn_N = mk2N "horn" "hornet" ; husband_N = mkN "ektemann" "ektemannen" "ektemenn" "ektemennen" ; ice_N = mk2N "is" "isen" ; - knee_N = mkN "kne" "kneet" "knær" "knæne" ; - leaf_N = mk2N "løv" "løvet" ; + knee_N = mkN "kne" "kneet" "knær" "knæne" ; + leaf_N = mk2N "løv" "løvet" ; leg_N = mk2N "bein" "beinet" ; liver_N = mkN "lever" "leveren" "levrer" "levrene" ; louse_N = mk2N "lus" "lusa" ; @@ -287,15 +287,15 @@ lin person_N = mk2N "person" "personen" ; rain_N = mk2N "regn" "regnet" ; road_N = mk2N "vei" "veien" ; - root_N = mkN "rot" "rota" "røtter" "røttene" ; + root_N = mkN "rot" "rota" "røtter" "røttene" ; rope_N = mk2N "tau" "tauet" ; salt_N = mk2N "salt" "saltet" ; sand_N = mk2N "sand" "sanden" ; - seed_N = mk2N "frø" "frøet" ; + seed_N = mk2N "frø" "frøet" ; skin_N = mk2N "skinn" "skinnet" ; sky_N = mkN "himmel" "himmelen" "himler" "himlene" ; - smoke_N = mk2N "røyk" "røyken" ; - snow_N = mk2N "snø" "snøen" ; + smoke_N = mk2N "røyk" "røyken" ; + snow_N = mk2N "snø" "snøen" ; stick_N = mk2N "pinne" "pinnen" ; tail_N = mk2N "hale" "halen" ; tongue_N = mk2N "tunge" "tunga" ; @@ -304,22 +304,22 @@ lin wind_N = mk2N "vind" "vinden" ; wing_N = mk2N "vinge" "vingen" ; worm_N = mk2N "mark" "marken" ; - year_N = mk2N "år" "året" ; + year_N = mk2N "Ã¥r" "Ã¥ret" ; bite_V2 = dirV2 (IrregNor.bite_V) ; - blow_V = mk2V "blåse" "blåste" ; + blow_V = mk2V "blÃ¥se" "blÃ¥ste" ; burn_V = brenne_V ; count_V2 = dirV2 (regV "regne") ; - cut_V2 = dirV2 (skjære_V) ; + cut_V2 = dirV2 (skjære_V) ; dig_V = mk2V "grave" "gravde" ; fall_V = vaereV falle_V ; fear_V2 = dirV2 (regV "frykte") ; - fight_V2 = dirV2 (slåss_V) ; + fight_V2 = dirV2 (slÃ¥ss_V) ; float_V = flyte_V ; flow_V = renne_V ; fly_V = vaereV IrregNor.fly_V ; freeze_V = fryse_V ; give_V3 = dirV3 gi_V (mkPrep "til"); - hit_V2 = dirV2 (slå_V) ; + hit_V2 = dirV2 (slÃ¥_V) ; hold_V2 = dirV2 (holde_V) ; hunt_V2 = dirV2 (regV "jakte") ; kill_V2 = dirV2 (mk2V "drepe" "drepte") ; @@ -327,18 +327,18 @@ lin lie_V = ligge_V ; play_V = mk2V "leke" "lekte" ; pull_V2 = dirV2 (dra_V) ; - push_V2 = dirV2 (irregV "skyve" "skjøv" "skjøvet") ; + push_V2 = dirV2 (irregV "skyve" "skjøv" "skjøvet") ; rub_V2 = dirV2 (gni_V) ; - scratch_V2 = dirV2 (regV "klø") ; + scratch_V2 = dirV2 (regV "klø") ; sew_V = mk2V "sy" "sydde" ; sing_V = synge_V ; sit_V = sitte_V ; smell_V = regV "lukte" ; spit_V = regV "spytte" ; - split_V2 = dirV2 (mk2V "kløyve" "kløyvde") ; + split_V2 = dirV2 (mk2V "kløyve" "kløyvde") ; squeeze_V2 = dirV2 (mk2V "klemme" "klemte") ; stab_V2 = dirV2 (stikke_V) ; - stand_V = vaereV stå_V ; + stand_V = vaereV stÃ¥_V ; suck_V2 = dirV2 (suge_V) ; swell_V = partV (regV "hovne") "opp" ; swim_V = regV "simme" ; @@ -348,23 +348,23 @@ lin turn_V = mk2V "vende" "vendte" ; vomit_V = partV (regV "kaste") "opp" ; wash_V2 = dirV2 (regV "vaske") ; - wipe_V2 = dirV2 (regV "tørke") ; + wipe_V2 = dirV2 (regV "tørke") ; breathe_V = regV "puste" ; grammar_N = regN "grammatikk" ; - language_N = mk2N "språk" "språket" ; + language_N = mk2N "sprÃ¥k" "sprÃ¥ket" ; rule_N = mkN "regel" "regelen" "regler" "reglene" ; - question_N = mk2N "spørsmål" "spørsmålet" ; ----- ready_A = regA "färdig" ; + question_N = mk2N "spørsmÃ¥l" "spørsmÃ¥let" ; +---- ready_A = regA "färdig" ; ---- reason_N = regN "anledning" ; today_Adv = mkAdv "idag" ; ----- uncertain_A = mk3A "osäker" "osäkert" "osäkra" ; +---- uncertain_A = mk3A "osäker" "osäkert" "osäkra" ; } ; -- a" -> e" 86 --- ö -> ø 66 +-- ö -> ø 66 -- ck -> kk 20 --- ä -> e 44 +-- ä -> e 44 diff --git a/lib/src/norwegian/MorphoNor.gf b/lib/src/norwegian/MorphoNor.gf index 41ce4a107..f0b130f41 100644 --- a/lib/src/norwegian/MorphoNor.gf +++ b/lib/src/norwegian/MorphoNor.gf @@ -1,4 +1,3 @@ ---# -coding=latin1 --1 A Simple Norwegian Resource Morphology -- -- Aarne Ranta 2002 @@ -10,6 +9,7 @@ -- We use the parameter types and word classes defined for morphology. resource MorphoNor = CommonScand, ResNor ** open Prelude, Predef in { + flags coding=utf8 ; -- genders @@ -160,9 +160,9 @@ oper mkTal : (x1,_,_,_,x5 : Str) -> LinDigit = - \två, tolv, tjugo, andra, tolfte -> + \tvÃ¥, tolv, tjugo, andra, tolfte -> {s = table { - ental => cardOrd två andra ; + ental => cardOrd tvÃ¥ andra ; ton => cardOrd tolv tolfte ; tiotal => cardReg tjugo } diff --git a/lib/src/norwegian/NumeralNor.gf b/lib/src/norwegian/NumeralNor.gf index 33c9cb159..763e4d533 100644 --- a/lib/src/norwegian/NumeralNor.gf +++ b/lib/src/norwegian/NumeralNor.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 concrete NumeralNor of Numeral = CatNor ** open MorphoNor in { + flags coding=utf8 ; lincat Digit = {s : DForm => CardOrd => Str} ; @@ -12,17 +12,17 @@ lin n2 = mkTal "to" "tolv" "tjue" "andre" "tolfte" ; n3 = mkTal "tre" "tretten" "tretti" "tredje" "trettende" ; - n4 = mkTal "fire" "fjorten" "førti" "fjerde" "fjortende" ; + n4 = mkTal "fire" "fjorten" "førti" "fjerde" "fjortende" ; n5 = mkTal "fem" "femten" "femti" "femte" "femtende" ; n6 = mkTal "seks" "seksten" "seksti" "sjette" "sextende" ; n7 = mkTal "sju" "sytten" "sytti" "syvende" "syttende" ; - n8 = mkTal "åtte" "atten" "åtti" "åttende" "attende" ; + n8 = mkTal "Ã¥tte" "atten" "Ã¥tti" "Ã¥ttende" "attende" ; n9 = mkTal "ni" "nitten" "nitti" "niende" "nittende" ; pot01 = { s = \\f => table { NCard g => case g of {NNeutr => "ett" ; NUtr _ => "en"} ; ---- ei ? - _ => "første" + _ => "første" } ; n = Sg } ; diff --git a/lib/src/norwegian/ParadigmsNor.gf b/lib/src/norwegian/ParadigmsNor.gf index 1097f3024..56d131c77 100644 --- a/lib/src/norwegian/ParadigmsNor.gf +++ b/lib/src/norwegian/ParadigmsNor.gf @@ -1,5 +1,4 @@ --# -path=.:../scandinavian:../common:../abstract:../../prelude ---# -coding=latin1 --1 Norwegian Lexical Paradigms -- @@ -8,7 +7,7 @@ -- This is an API for the user of the resource grammar -- for adding lexical items. It gives functions for forming -- expressions of open categories: nouns, adjectives, verbs. --- It covers the "bokmål" variant of Norwegian. +-- It covers the "bokmÃ¥l" variant of Norwegian. -- -- Closed categories (determiners, pronouns, conjunctions) are -- accessed through the resource syntax API, $Structural$. @@ -35,6 +34,7 @@ resource ParadigmsNor = MorphoNor, CatNor in { + flags coding=utf8 ; --2 Parameters -- -- To abstract over gender names, we define the following identifiers. @@ -203,11 +203,11 @@ oper ---3 Verbs with 'være' as auxiliary +--3 Verbs with 'være' as auxiliary -- --- By default, the auxiliary is "have". This function changes it to "være". +-- By default, the auxiliary is "have". This function changes it to "være". - vaereV : V -> V ; -- force "være" as auxiliary (default "have") + vaereV : V -> V ; -- force "være" as auxiliary (default "have") @@ -415,7 +415,7 @@ oper mkV0 v = v ** {lock_V0 = <>} ; mkVS v = v ** {lock_VS = <>} ; mkV2S v p = mk2V2 v p ** {lock_V2S = <>} ; - mkVV v = v ** {c2 = mkComplement "å" ; lock_VV = <>} ; + mkVV v = v ** {c2 = mkComplement "Ã¥" ; lock_VV = <>} ; mkV2V v p t = mk2V2 v p ** {c3 = mkComplement t.s ; lock_V2V = <>} ; mkVA v = v ** {lock_VA = <>} ; mkV2A v p = mk2V2 v p ** {lock_V2A = <>} ; diff --git a/lib/src/norwegian/StructuralNor.gf b/lib/src/norwegian/StructuralNor.gf index b9c423275..810b2e3e9 100644 --- a/lib/src/norwegian/StructuralNor.gf +++ b/lib/src/norwegian/StructuralNor.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 concrete StructuralNor of Structural = CatNor ** open MorphoNor, ParadigmsNor, (X = ConstructX), IrregNor, Prelude in { flags optimize=all ; + coding=utf8 ; lin above_Prep = ss "ovenfor" ; @@ -14,10 +14,10 @@ concrete StructuralNor of Structural = CatNor ** always_AdV = ss "altid" ; and_Conj = {s1 = [] ; s2 = "og" ; n = Pl} ; because_Subj = ss "fordi" ; - before_Prep = ss "før" ; + before_Prep = ss "før" ; behind_Prep = ss "bakom" ; between_Prep = ss "mellom" ; - both7and_DConj = sd2 "både" "og" ** {n = Pl} ; + both7and_DConj = sd2 "bÃ¥de" "og" ** {n = Pl} ; but_PConj = ss "men" ; by8means_Prep = ss "med" ; can8know_VV, can_VV = @@ -29,8 +29,8 @@ concrete StructuralNor of Structural = CatNor ** every_Det = {s = \\_,_ => "hver" ; sp = \\_,_ =>"enhver" ; n = Sg ; det = DDef Indef} ; everything_NP = regNP "alt" "alts" Neutr Sg ; everywhere_Adv = ss "overalt" ; - few_Det = {s,sp = \\_,_ => "få" ; n = Pl ; det = DDef Indef} ; ---- first_Ord = {s = "første" ; isDet = True} ; DEPREC + few_Det = {s,sp = \\_,_ => "fÃ¥" ; n = Pl ; det = DDef Indef} ; +--- first_Ord = {s = "første" ; isDet = True} ; DEPREC for_Prep = ss "for" ; from_Prep = ss "fra" ; he_Pron = MorphoNor.mkNP "han" "ham" "hans" "hans" "hans" Utr Sg P3 ; @@ -52,10 +52,10 @@ concrete StructuralNor of Structural = CatNor ** most_Predet = {s = detForms ["den meste"] ["det meste"] ["de fleste"] ; p = [] ; a = PNoAg} ; much_Det = {s,sp = \\_,_ => "mye" ; n = Pl ; det = DDef Indef} ; must_VV = - mkV "måtte" "må" "må" "måtte" "måttet" "mått" ** + mkV "mÃ¥tte" "mÃ¥" "mÃ¥" "mÃ¥tte" "mÃ¥ttet" "mÃ¥tt" ** {c2 = mkComplement [] ; lock_VV = <>} ; no_Utt = ss ["nei"] ; - on_Prep = ss "på" ; + on_Prep = ss "pÃ¥" ; only_Predet = {s = \\_,_ => "kun" ; p = [] ; a = PNoAg} ; or_Conj = {s1 = [] ; s2 = "eller" ; n = Pl} ; @@ -65,7 +65,7 @@ concrete StructuralNor of Structural = CatNor ** possess_Prep = ss "av" ; quite_Adv = ss "temmelig" ; she_Pron = MorphoNor.mkNP "hun" "henne" "hennes" "hennes" "hennes" Utr Sg P3 ; - so_AdA = ss "så" ; + so_AdA = ss "sÃ¥" ; someSg_Det = {s,sp = \\_ => genderForms "noen" "noe" ; n = Sg ; det = DIndef} ; somePl_Det = {s,sp = \\_,_ => "noen" ; n = Pl ; det = DIndef} ; somebody_NP = regNP "noen" "noens" Utr Sg ; @@ -98,11 +98,11 @@ concrete StructuralNor of Structural = CatNor ** want_VV = mkV "ville" "vil" "vill" "ville" "villet" "villed" ** {c2 = mkComplement [] ; lock_VV = <>} ; - we_Pron = MorphoNor.mkNP "vi" "oss" "vår" "vårt" "våre" Utr Pl P1 ; + we_Pron = MorphoNor.mkNP "vi" "oss" "vÃ¥r" "vÃ¥rt" "vÃ¥re" Utr Pl P1 ; whatSg_IP = {s = \\_ => "hva" ; g = Neutr ; n = Sg} ; ---- infl whatPl_IP = {s = \\_ => "hvilke" ; g = Neutr ; n = Pl} ; ---- infl - when_IAdv = ss "når" ; - when_Subj = ss "når" ; + when_IAdv = ss "nÃ¥r" ; + when_Subj = ss "nÃ¥r" ; where_IAdv = ss "hvor" ; which_IQuant = { s = table { diff --git a/lib/src/romance/CatRomance.gf b/lib/src/romance/CatRomance.gf index 99492757e..7b2b7a3bf 100644 --- a/lib/src/romance/CatRomance.gf +++ b/lib/src/romance/CatRomance.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 incomplete concrete CatRomance of Cat = CommonX - [SC,Pol] ** open Prelude, CommonRomance, ResRomance, (R = ParamX) in { flags optimize=all_subs ; + coding=utf8 ; lincat @@ -20,7 +20,7 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol] c2 : Compl } ; - SC = {s : Case => Str} ; -- de dormir / à dormir + SC = {s : Case => Str} ; -- de dormir / à dormir -- Sentence @@ -112,7 +112,7 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol] N3 = Noun ** {c2,c3 : Compl} ; PN = {s : Str ; g : Gender} ; --- tense augmented with passé simple +-- tense augmented with passé simple lincat Temp = {s : Str ; t : RTense ; a : Anteriority} ; Tense = {s : Str ; t : RTense} ; diff --git a/lib/src/romance/CommonRomance.gf b/lib/src/romance/CommonRomance.gf index 0761067b1..6c0f13cba 100644 --- a/lib/src/romance/CommonRomance.gf +++ b/lib/src/romance/CommonRomance.gf @@ -6,10 +6,10 @@ -- which depends on [DiffRomance DiffRomance.html]. -- ---# -coding=latin1 resource CommonRomance = ParamX ** open Prelude in { flags optimize=all ; + coding=utf8 ; --2 Enumerated parameter types for morphology -- @@ -145,7 +145,7 @@ param oper complAgr : Agr -> {g : Gender ; n : Number} = \a -> case a of { Ag g n _ => {g = g ; n = n} ; - AgPol g => {g = g ; n = Sg} -- vous êtes fatiguée + AgPol g => {g = g ; n = Sg} -- vous êtes fatiguée } ; verbAgr : Agr -> {g : Gender ; n : Number ; p : Person} = \a -> case a of { Ag g n p => {g = g ; n = n ; p = p} ; diff --git a/lib/src/romance/DiffRomance.gf b/lib/src/romance/DiffRomance.gf index 4ab94f158..66e0f0cb7 100644 --- a/lib/src/romance/DiffRomance.gf +++ b/lib/src/romance/DiffRomance.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 --1 Differences between Romance languages interface DiffRomance = open CommonRomance, Prelude in { + flags coding=utf8 ; -- The first eight constants show the essential differences -- between French, Italian, and Romance syntaxes (as regards the @@ -18,12 +18,12 @@ interface DiffRomance = open CommonRomance, Prelude in { param Prepos ; -- Which types of verbs exist, in terms of auxiliaries. --- (Fre, Ita "avoir", "être", and refl; Spa only "haber" and refl). +-- (Fre, Ita "avoir", "être", and refl; Spa only "haber" and refl). param VType ; -- Derivatively, if/when the participle agrees to the subject. --- (Fre "elle est partie", Ita "lei è partita", Spa not) +-- (Fre "elle est partie", Ita "lei è partita", Spa not) oper partAgr : VType -> VPAgr ; @@ -89,7 +89,7 @@ interface DiffRomance = open CommonRomance, Prelude in { relPron : Bool => AAgr => Case => Str ; pronSuch : AAgr => Str ; - partQIndir : Str ; -- ce, ciò + partQIndir : Str ; -- ce, ciò reflPron : Number -> Person -> Case -> Str ; -- argPron : Gender -> Number -> Person -> Case -> Str ; @@ -113,7 +113,7 @@ oper clit2 : Str ; -- lui clit3 : Clit3 ; -- y en isNeg : Bool ; -- includes a negative element, such as "rien" - comp : Agr => Str ; -- content(e) ; à ma mère ; hier + comp : Agr => Str ; -- content(e) ; à ma mère ; hier ext : RPolarity => Str ; -- que je dors / que je dorme } ; diff --git a/lib/src/romance/ResRomance.gf b/lib/src/romance/ResRomance.gf index 61d4e7f68..88e54a71a 100644 --- a/lib/src/romance/ResRomance.gf +++ b/lib/src/romance/ResRomance.gf @@ -1,10 +1,10 @@ --1 Romance auxiliary operations. -- ---# -coding=latin1 interface ResRomance = DiffRomance ** open CommonRomance, Prelude in { flags optimize=all ; + coding=utf8 ; --2 Constants uniformly defined in terms of language-dependent constants @@ -124,7 +124,7 @@ oper -- Agreement with preceding relative or interrogative: --- "les femmes que j'ai aimées" +-- "les femmes que j'ai aimées" insertAgr : AAgr -> VP -> VP = \ag,vp -> { s = vp.s ; @@ -292,9 +292,9 @@ oper -- p -cat=Cl -tr "la femme te l' envoie" -- PredVP (DetCN (DetSg DefSg NoOrd) (UseN woman_N)) -- (ComplV3 send_V3 (UsePron he_Pron) (UsePron thou_Pron)) --- la femme te l' a envoyé +-- la femme te l' a envoyé -- -- p -cat=Cl -tr "la femme te lui envoie" -- PredVP (DetCN (DetSg DefSg NoOrd) (UseN woman_N)) -- (ComplV3 send_V3 (UsePron thou_Pron) (UsePron he_Pron)) --- la femme te lui a envoyée +-- la femme te lui a envoyée diff --git a/lib/src/romance/SentenceRomance.gf b/lib/src/romance/SentenceRomance.gf index 78b5eb42a..3191d5da6 100644 --- a/lib/src/romance/SentenceRomance.gf +++ b/lib/src/romance/SentenceRomance.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 incomplete concrete SentenceRomance of Sentence = CatRomance ** open Prelude, CommonRomance, ResRomance in { flags optimize=all_subs ; + coding=utf8 ; lin PredVP np vp = mkClausePol np.isNeg (np.s ! Nom).comp np.hasClit np.isPol np.a vp ; @@ -17,14 +17,14 @@ incomplete concrete SentenceRomance of Sentence = {- SlashVP np vps = - -- agreement decided afterwards: la fille qu'il a trouvée + -- agreement decided afterwards: la fille qu'il a trouvée {s = \\agr => let vp = case of { - => insertAgr agr vps ; -- la fille qu'il a trouvée decided here + => insertAgr agr vps ; -- la fille qu'il a trouvée decided here _ => vps } - in (mkClausePol np.isNeg (np.s ! Nom).comp np.hasClit np.isPol np.a vp).s ; -- à qui montre-t-il sa maison + in (mkClausePol np.isNeg (np.s ! Nom).comp np.hasClit np.isPol np.a vp).s ; -- à qui montre-t-il sa maison c2 = vps.c2 -- np.hasClit decides inversion } ; -} @@ -49,7 +49,7 @@ incomplete concrete SentenceRomance of Sentence = let vp : ResRomance.VP = case of { - => insertAgr agr0 vps ; -- la fille qu'il a trouvée is decided here + => insertAgr agr0 vps ; -- la fille qu'il a trouvée is decided here _ => vps } ; diff --git a/lib/src/romanian/BeschRon.gf b/lib/src/romanian/BeschRon.gf index 9efb10e7b..37912eb1e 100644 --- a/lib/src/romanian/BeschRon.gf +++ b/lib/src/romanian/BeschRon.gf @@ -1,7 +1,7 @@ ---# -coding=latin1 resource BeschRon = open Prelude, MorphoRon,CatRon in { flags optimize=noexpand ; + coding=utf8 ; oper mkNV : Verbe -> V = \ve -> {s = ve.s ; isRefl = \\_ => RNoAg ; nrClit = VNone; pReflClit = Composite ;lock_V = <> } ; oper mkRVAcc : Verbe -> V = \ve -> {s = ve.s ; isRefl = \\a => aRefl a; nrClit = VRefl; pReflClit = Short ;lock_V = <>} ; @@ -14,7 +14,7 @@ oper mkRVDat : Verbe -> V = \ve -> {s = ve.s ; isRefl = \\a => dRefl a; nrClit = -- for Group 3 - verbs ending in e - most verbs have phonetical mutations in the stem, for different -- tenses, difficult to find a pattern that describes this behavior -- default conjugation - covers almost 20% --- for Group 4 - verbs ending in i/î - the default behaviour is the conjugation with "sc", which +-- for Group 4 - verbs ending in i/î - the default behaviour is the conjugation with "sc", which -- characterizes almost 75 % of the verbs -- in general : Group 1 + Group 4 are the most frequent for verbs -- the smart paradigm covers (60-70% cases for a reasonably big database) diff --git a/lib/src/romanian/IdiomRon.gf b/lib/src/romanian/IdiomRon.gf index 9b64412a6..5749e39f6 100644 --- a/lib/src/romanian/IdiomRon.gf +++ b/lib/src/romanian/IdiomRon.gf @@ -1,10 +1,10 @@ ---# -coding=latin1 concrete IdiomRon of Idiom = -- CatRon ** open (P = ParamX), MorphoRon, ParadigmsRon,Prelude CatRon ** open Prelude, ResRon,BeschRon in { flags optimize=all_subs ; + coding=utf8 ; @@ -14,7 +14,7 @@ in { GenericCl vp = mkClause "cineva" False (agrP3 Masc Sg) vp ; -- an exact correspondent does not exist ! ExistNP np = - mkClause "" False np.a (insertSimpObj (\\ag => (np.s ! No ).comp) (useVerb (v_besch20 "existã"))) ; + mkClause "" False np.a (insertSimpObj (\\ag => (np.s ! No ).comp) (useVerb (v_besch20 "existã"))) ; -- v_besch20 "exista" ExistIP ip = { @@ -37,7 +37,7 @@ in { ProgrVP vp = vp; -- for the moment, since there is no particular way to express continuous action, except for the imperfect, which wouldn't work for all tenses ImpPl1 vp = let a = {p = P1 ; n = Pl ; g = Masc} in - { s = "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++vp.comp ! a ++ vp.ext ! Pos }; + { s = "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++vp.comp ! a ++ vp.ext ! Pos }; } diff --git a/lib/src/romanian/PhraseRon.gf b/lib/src/romanian/PhraseRon.gf index a27563926..6f8ee83c6 100644 --- a/lib/src/romanian/PhraseRon.gf +++ b/lib/src/romanian/PhraseRon.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 concrete PhraseRon of Phrase = CatRon ** open ResRon, Prelude in { flags optimize = all_subs ; + coding=utf8 ; lin PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ; @@ -17,7 +17,7 @@ UttIAdv iadv = iadv ; UttNP np = {s = (np.s ! No).comp} ; UttVP vp = let a = agrP3 Masc Sg in - {s = "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++vp.comp ! a ++ vp.ext ! Pos} ; + {s = "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++vp.comp ! a ++ vp.ext ! Pos} ; UttAdv adv = adv ; UttCN cn = {s = cn.s ! Sg ! Indef ! ANomAcc} ; UttAP ap = {s = ap.s ! AF Masc Sg Indef ANomAcc} ; diff --git a/lib/src/romanian/QuestionRon.gf b/lib/src/romanian/QuestionRon.gf index f4e9c78eb..a078d6872 100644 --- a/lib/src/romanian/QuestionRon.gf +++ b/lib/src/romanian/QuestionRon.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 concrete QuestionRon of Question = CatRon ** open ResRon, Prelude in { flags optimize=all_subs ; + coding=utf8 ; lin @@ -11,7 +11,7 @@ concrete QuestionRon of Question = let cls = cl.s ! DDir ! t ! a ! p in table { QDir => cls ! Indic ; - QIndir => "dacã" ++ cls ! Indic + QIndir => "dacã" ++ cls ! Indic } } ; -- doesn't have clitics since it's subject of the phrase diff --git a/lib/src/romanian/RelativeRon.gf b/lib/src/romanian/RelativeRon.gf index e7cc45767..d5147a9ed 100644 --- a/lib/src/romanian/RelativeRon.gf +++ b/lib/src/romanian/RelativeRon.gf @@ -1,13 +1,13 @@ ---# -coding=latin1 concrete RelativeRon of Relative = CatRon ** open Prelude, ResRon in { flags optimize=all_subs ; + coding=utf8 ; lin RelCl cl = { - s = \\ag,t,a,p,m => "astfel" ++ "cã" ++ + s = \\ag,t,a,p,m => "astfel" ++ "cã" ++ cl.s ! DDir ! t ! a ! p ! m ; c = No } ; @@ -52,8 +52,8 @@ concrete RelativeRon of Relative = -- Ac => if_then_Str p.isDir (ss ++ p.s ++ rp.s ! a ! p.c) (ss ++ p.s ++ rp.s ! a ! No) IdRP = { s = \\ag,c => case c of { Da | Ge => case of - { => "cãreia" ; => "cãruia" ; - <_Pl> => "cãrora" + { => "cãreia" ; => "cãruia" ; + <_Pl> => "cãrora" }; _ => "care" } diff --git a/lib/src/romanian/SentenceRon.gf b/lib/src/romanian/SentenceRon.gf index d126cb3d0..98261109c 100644 --- a/lib/src/romanian/SentenceRon.gf +++ b/lib/src/romanian/SentenceRon.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 concrete SentenceRon of Sentence = CatRon ** open Prelude, ResRon in { flags optimize=all_subs ; + coding=utf8 ; lin PredVP np vp = mkClause (np.s ! No).comp np.isPol np.a vp ; @@ -24,8 +24,8 @@ _ => vpr.s ! Imper PlP2 ++ vpr.comp ! agPl ++ vpr.ext ! Pos }; => case n of - {Sg => "sã" ++ clNegSg ++ conjVP vpr agSg ++ vpr.comp ! agSg ++ vpr.ext ! Pos; - Pl => "sã" ++ clNegPl ++ conjVP vpr agPl ++ vpr.comp ! agPl ++ vpr.ext ! Pos + {Sg => "sã" ++ clNegSg ++ conjVP vpr agSg ++ vpr.comp ! agSg ++ vpr.ext ! Pos; + Pl => "sã" ++ clNegPl ++ conjVP vpr agPl ++ vpr.comp ! agPl ++ vpr.ext ! Pos }; => case n of {Sg => "nu" ++ clNegSg ++ vpr.s ! Inf ++ vpr.comp ! agSg ++ vpr.ext ! Pos; @@ -72,7 +72,7 @@ EmbedQS qs = {s = qs.s ! QIndir} ; EmbedVP vp = let a = agrP3 Masc Sg in - { s= "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++vp.comp ! a ++ vp.ext ! Pos }; + { s= "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++vp.comp ! a ++ vp.ext ! Pos }; UseCl t p cl = { s = \\o => t.s ++ p.s ++ cl.s ! DDir ! t.t ! t.a ! p.p ! o diff --git a/lib/src/romanian/VerbRon.gf b/lib/src/romanian/VerbRon.gf index 5b87a277b..b60842c83 100644 --- a/lib/src/romanian/VerbRon.gf +++ b/lib/src/romanian/VerbRon.gf @@ -1,13 +1,13 @@ ---# -coding=latin1 concrete VerbRon of Verb = CatRon ** open Prelude, ResRon in { flags optimize=all_subs ; + coding=utf8 ; lin UseV = useVerb ; - ComplVV v vp =insertSimpObj (\\a => "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++vp.comp ! a ++ vp.ext ! Pos) (useVerb v) ; + ComplVV v vp =insertSimpObj (\\a => "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++vp.comp ! a ++ vp.ext ! Pos) (useVerb v) ; ComplVS v s = insertExtrapos (\\b => conjThat ++ s.s ! (v.m ! b)) (predV v) ; @@ -69,7 +69,7 @@ concrete VerbRon of Verb = -- needs fixing - agreement for the added verb must be made accordingly to what we add in ComplSlash !!! -- fixed with extra parameter ! - SlashV2V v vp = (insertSimpObj (\\a => "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++ vp.comp ! a ++ vp.ext ! Pos) (useVerb v)) ** {needAgr = True ; needClit = True ;c2 = v.c2} ; + SlashV2V v vp = (insertSimpObj (\\a => "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++ vp.comp ! a ++ vp.ext ! Pos) (useVerb v)) ** {needAgr = True ; needClit = True ;c2 = v.c2} ; SlashV2S v s = (insertExtrapos (\\b => conjThat ++ s.s ! Indic) (useVerb v)) ** {needAgr = False; needClit = True ;c2 = v.c2}; @@ -141,7 +141,7 @@ concrete VerbRon of Verb = SlashVV v vp = - insertObjc (\\a => "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++ vp.comp ! a ++ vp.ext ! Pos) ((useVerb v) **{c2=vp.c2; needAgr= vp.needAgr ; needClit = False; lock_VPSlash = <>}) ; + insertObjc (\\a => "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++ vp.comp ! a ++ vp.ext ! Pos) ((useVerb v) **{c2=vp.c2; needAgr= vp.needAgr ; needClit = False; lock_VPSlash = <>}) ; SlashV2VNP v np vp = let s1 = v.c2.s ++(np.s ! (v.c2.c)).comp ; ss = case np.nForm of @@ -193,6 +193,6 @@ insertObjc : (Agr => Str) -> VPSlash -> VPSlash = \obj,vp -> getConjComp : VP -> Agr -> {s: Agr => Str} = \vp,ag -> - {s = \\a => "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp ag ++ vp.comp ! a ++ vp.ext ! Pos}; + {s = \\a => "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp ag ++ vp.comp ! a ++ vp.ext ! Pos}; }; diff --git a/lib/src/scandinavian/CatScand.gf b/lib/src/scandinavian/CatScand.gf index 1fc2e48f3..465b90bc3 100644 --- a/lib/src/scandinavian/CatScand.gf +++ b/lib/src/scandinavian/CatScand.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 incomplete concrete CatScand of Cat = CommonX -[Tense,Temp] ** open (RS = ResScand), Prelude, CommonScand, (R = ParamX) in { flags optimize=all_subs ; + coding=utf8 ; lincat @@ -46,7 +46,7 @@ incomplete concrete CatScand of Cat = a1 : Polarity => Agr => Str ; -- A1 inte ---s3 n2 : Agr => Str ; -- N2 dig ---s5 a2 : Str ; -- A2 idag ---s6 - ext : Str ; -- S-Ext att hon går ---s7 + ext : Str ; -- S-Ext att hon gÃ¥r ---s7 en2,ea2,eext : Bool -- indicate if the field exists } ; VPSlash = CommonScand.VP ** { diff --git a/lib/src/scandinavian/CommonScand.gf b/lib/src/scandinavian/CommonScand.gf index 1147e66eb..1650c0817 100644 --- a/lib/src/scandinavian/CommonScand.gf +++ b/lib/src/scandinavian/CommonScand.gf @@ -3,10 +3,10 @@ -- This module contains operations that are shared by the Scandinavian -- languages, without dependence on parameters. ---# -coding=latin1 resource CommonScand = ParamX ** open Prelude in { flags optimize=all ; + coding=utf8 ; param Species = Indef | Def ; @@ -38,7 +38,7 @@ param | ACompar | ASuperl AFormSup ; --- The $Number$ in $Weak$ only matters in "lilla"/"små". +-- The $Number$ in $Weak$ only matters in "lilla"/"smÃ¥". AFormPos = Strong GenNum | Weak Number ; AFormSup = SupStrong | SupWeak ; @@ -274,10 +274,10 @@ oper fin : Str ; -- V1 har ---s1 inf : Str -- V2 sagt ---s4 } ; - a1 : Polarity => Agr => Str ; -- A1 inte ---s3 själv/själva/självt + a1 : Polarity => Agr => Str ; -- A1 inte ---s3 själv/själva/självt n2 : Agr => Str ; -- N2 dig ---s5 a2 : Str ; -- A2 idag ---s6 - ext : Str ; -- S-Ext att hon går ---s7 + ext : Str ; -- S-Ext att hon gÃ¥r ---s7 --- ea1,ev2, --- these depend on params of v and a1 en2,ea2,eext : Bool -- indicate if the field exists } ; diff --git a/lib/src/scandinavian/DiffScand.gf b/lib/src/scandinavian/DiffScand.gf index e60a896d8..d55ff3632 100644 --- a/lib/src/scandinavian/DiffScand.gf +++ b/lib/src/scandinavian/DiffScand.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 interface DiffScand = open CommonScand, Prelude in { + flags coding=utf8 ; --1 Differences between Scandinavian languages @@ -19,7 +19,7 @@ interface DiffScand = open CommonScand, Prelude in { detDef : Species ; -- Danish and Norwegian verbs, but not Swedish verbs, --- have two possible compound-tense auxiliaries ("have" or "være"). +-- have two possible compound-tense auxiliaries ("have" or "være"). Verb : Type ; @@ -58,7 +58,7 @@ interface DiffScand = open CommonScand, Prelude in { relPron : Gender => Number => RCase => Str ; --- Pronoun "sådan" used in $Relative.RelCl$. +-- Pronoun "sÃ¥dan" used in $Relative.RelCl$. pronSuch : GenNum => Str ; diff --git a/lib/src/scandinavian/ExtraScand.gf b/lib/src/scandinavian/ExtraScand.gf index 2f89a0114..8bab08d2a 100644 --- a/lib/src/scandinavian/ExtraScand.gf +++ b/lib/src/scandinavian/ExtraScand.gf @@ -1,6 +1,6 @@ ---# -coding=latin1 incomplete concrete ExtraScand of ExtraScandAbs = CatScand ** open CommonScand,Coordination,ResScand, ParamX in { + flags coding=utf8 ; lin GenNP np = { s,sp = \\n,_,_,g => np.s ! NPPoss (gennum (ngen2gen g) n) Nom ; @@ -68,7 +68,7 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand ** let verb = vpi.s ! o ! agr in case o of { Main => subj ++ verb ; - Inv => verb ++ subj ; ---- älskar henne och sover jag + Inv => verb ++ subj ; ---- älskar henne och sover jag Sub => subj ++ verb } } ; @@ -111,5 +111,5 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand ** UseFoc t p foc = {s = t.s ++ p.s ++ foc.s ! t.t ! t.a ! p.p} ; - oper NONEXIST : Str = "#¿@§X?X&%/" ; + oper NONEXIST : Str = "#¿@§X?X&%/" ; } diff --git a/lib/src/spanish/ConstructionSpa.gf b/lib/src/spanish/ConstructionSpa.gf index 20ad77ed0..020706e9d 100644 --- a/lib/src/spanish/ConstructionSpa.gf +++ b/lib/src/spanish/ConstructionSpa.gf @@ -4,6 +4,7 @@ concrete ConstructionSpa of Construction = CatSpa ** open SyntaxSpa, SymbolicSpa, ParadigmsSpa, (L = LexiconSpa), (E = ExtraSpa), (I = IrregSpa), (R = ResSpa), (C = CommonRomance), Prelude in { +flags coding=utf8 ; lin diff --git a/lib/src/spanish/DiffSpa.gf b/lib/src/spanish/DiffSpa.gf index b19f618c9..457988be1 100644 --- a/lib/src/spanish/DiffSpa.gf +++ b/lib/src/spanish/DiffSpa.gf @@ -1,9 +1,9 @@ --# -path=.:../romance:../abstract:../common:prelude ---# -coding=latin1 instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelude in { flags optimize=noexpand ; + coding=utf8 ; param Prepos = P_de | P_a ; @@ -135,9 +135,9 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud _ => prepCase c ++ "cuyo" } ; - pronSuch : AAgr => Str = aagrForms "tál" "tál" "tales" "tales" ; + pronSuch : AAgr => Str = aagrForms "tál" "tál" "tales" "tales" ; - quelPron : AAgr => Str = aagrForms "cuál" "cuál" "cuales" "cuales" ; + quelPron : AAgr => Str = aagrForms "cuál" "cuál" "cuales" "cuales" ; partQIndir = [] ; ---- ? @@ -147,7 +147,7 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud case p of { P3 => case c of { Acc | CPrep P_a => "se" ; - _ => "sí" + _ => "sí" } ; _ => pro } ; @@ -165,12 +165,12 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud } ; in \g,n,p -> case < : Gender * Number * Person> of { - <_,Sg,P1> => cases "me" "mí" ; - <_,Sg,P2> => cases "te" "tí" ; + <_,Sg,P1> => cases "me" "mí" ; + <_,Sg,P2> => cases "te" "tí" ; <_,Pl,P1> => cases "nos" "nosotras" ; --- nosotros <_,Pl,P2> => cases "vos" "vosotras" ; --- vosotros => cases3 "la" "le" "ella" ; - <_, Sg,P3> => cases3 "lo" "le" "èl" ; + <_, Sg,P3> => cases3 "lo" "le" "èl" ; => cases3 "las" "les" "ellas" ; <_, Pl,P3> => cases3 "los" "les" "ellos" } ; diff --git a/lib/src/spanish/DocumentationSpaFunctor.gf b/lib/src/spanish/DocumentationSpaFunctor.gf index b575b8ca8..59f2bc9a6 100644 --- a/lib/src/spanish/DocumentationSpaFunctor.gf +++ b/lib/src/spanish/DocumentationSpaFunctor.gf @@ -11,6 +11,7 @@ incomplete concrete DocumentationSpaFunctor of Documentation = CatSpa ** open Prelude, HTML in { +flags coding=utf8 ; lincat diff --git a/lib/src/spanish/ExtraSpa.gf b/lib/src/spanish/ExtraSpa.gf index c6477a9a9..c92510f33 100644 --- a/lib/src/spanish/ExtraSpa.gf +++ b/lib/src/spanish/ExtraSpa.gf @@ -1,11 +1,11 @@ ---# -coding=latin1 concrete ExtraSpa of ExtraSpaAbs = ExtraRomanceSpa ** open CommonRomance, PhonoSpa, MorphoSpa, ParadigmsSpa, ParamX, ResSpa, BeschSpa, Prelude in { + flags coding=utf8 ; lin i8fem_Pron = mkPronoun - "yo" "me" "me" "mí" + "yo" "me" "me" "mí" "mi" "mi" "mis" "mis" Fem Sg P1 ; these8fem_NP = makeNP ["estas"] Fem Pl ; @@ -20,11 +20,11 @@ concrete ExtraSpa of ExtraSpaAbs = ExtraRomanceSpa ** "nosotras" "nos" "nos" "nosotras" "nuestro" "nuestra" "nuestros" "nuestras" Fem Pl P1 ; - whoPl8fem_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Fem Pl} ; - whoSg8fem_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Fem Sg} ; + whoPl8fem_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Fem Pl} ; + whoSg8fem_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Fem Sg} ; youSg8fem_Pron = mkPronoun - "tú" "te" "te" "ti" + "tú" "te" "te" "ti" "tu" "tu" "tus" "tus" Fem Sg P2 ; youPl8fem_Pron = mkPronoun diff --git a/lib/src/spanish/IrregSpaAbs.gf b/lib/src/spanish/IrregSpaAbs.gf index 3d8b0b74e..a1455291c 100644 --- a/lib/src/spanish/IrregSpaAbs.gf +++ b/lib/src/spanish/IrregSpaAbs.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 abstract IrregSpaAbs = Cat ** { + flags coding=utf8 ; fun abarse_V : V ; fun abastecer_V : V ; fun abeldar_V : V ; @@ -15,7 +15,7 @@ abstract IrregSpaAbs = Cat ** { fun absterger_V : V ; fun absterger2_V : V ; fun abstraer_V : V ; - fun abuñolar_V : V ; + fun abuñolar_V : V ; fun acaecer2_V : V ; fun acaecer_V : V ; fun acertar_V : V ; @@ -94,7 +94,7 @@ abstract IrregSpaAbs = Cat ** { fun arbolecer_V : V ; fun arborecer_V : V ; fun arcaizar_V : V ; - fun argüir_V : V ; + fun argüir_V : V ; fun aridecer_V : V ; fun arrecir_V : V ; fun arrendar_V : V ; @@ -112,8 +112,8 @@ abstract IrregSpaAbs = Cat ** { fun aspaventar_V : V ; fun asperger_V : V ; fun asperger2_V : V ; - fun astreñir_V : V ; - fun astriñir_V : V ; + fun astreñir_V : V ; + fun astriñir_V : V ; fun astringir_V : V ; fun atardecer_V : V ; fun atender_V : V ; @@ -135,7 +135,7 @@ abstract IrregSpaAbs = Cat ** { fun bienquerer_V : V ; fun blandir_V : V ; fun blanquecer_V : V ; - fun bruñir_V : V ; + fun bruñir_V : V ; fun bullir_V : V ; fun caber_V : V ; fun caer_V : V ; @@ -144,7 +144,7 @@ abstract IrregSpaAbs = Cat ** { fun canecerse_V : V ; fun carecer_V : V ; fun cegar_V : V ; - fun ceñir_V : V ; + fun ceñir_V : V ; fun cerner_V : V ; fun cernir_V : V ; fun cerrar_V : V ; @@ -198,7 +198,7 @@ abstract IrregSpaAbs = Cat ** { fun consolar_V : V ; fun consonar_V : V ; fun constituir_V : V ; - fun constreñir_V : V ; + fun constreñir_V : V ; fun construir_V : V ; fun contar_V : V ; fun contender_V : V ; @@ -274,7 +274,7 @@ abstract IrregSpaAbs = Cat ** { fun descabullirse_V : V ; fun descaecer_V : V ; fun descaer_V : V ; - fun desceñir_V : V ; + fun desceñir_V : V ; fun descender_V : V ; fun descerrar_V : V ; fun descimentar_V : V ; @@ -334,7 +334,7 @@ abstract IrregSpaAbs = Cat ** { fun desimponer_V : V ; fun desinvernar_V : V ; fun deslendrar_V : V ; - fun desleír_V : V ; + fun desleír_V : V ; fun deslucir_V : V ; fun desmajolar_V : V ; fun desmedirse_V : V ; @@ -348,7 +348,7 @@ abstract IrregSpaAbs = Cat ** { fun desolar_V : V ; fun desoldar_V : V ; fun desollar_V : V ; - fun desoír_V : V ; + fun desoír_V : V ; fun desosar_V : V ; fun desosegar_V : V ; fun desparecer_V : V ; @@ -365,7 +365,7 @@ abstract IrregSpaAbs = Cat ** { fun desproveer_V : V ; fun desquerer_V : V ; fun desraizar_V : V ; - fun desteñir_V : V ; + fun desteñir_V : V ; fun destentar_V : V ; fun desterrar_V : V ; fun destituir_V : V ; @@ -484,7 +484,7 @@ abstract IrregSpaAbs = Cat ** { fun engorar_V : V ; fun engrandecer_V : V ; fun engravecer_V : V ; - fun engreír_V : V ; + fun engreír_V : V ; fun engrosar_V : V ; fun engrumecerse_V : V ; fun engullir_V : V ; @@ -523,7 +523,7 @@ abstract IrregSpaAbs = Cat ** { fun ensarmentar_V : V ; fun ensarnecer_V : V ; fun ensilvecerse_V : V ; - fun ensoñar_V : V ; + fun ensoñar_V : V ; fun ensoberbecer_V : V ; fun ensolver_V : V ; fun ensombrecer_V : V ; @@ -545,7 +545,7 @@ abstract IrregSpaAbs = Cat ** { fun entrecoger2_V : V ; fun entredecir_V : V ; fun entrelucir_V : V ; - fun entreoír_V : V ; + fun entreoír_V : V ; fun entreparecerse_V : V ; fun entrepernar_V : V ; fun entretener_V : V ; @@ -583,7 +583,7 @@ abstract IrregSpaAbs = Cat ** { fun estar_V : V ; fun estatuir_V : V ; fun estregar_V : V ; - fun estreñir_V : V ; + fun estreñir_V : V ; fun estremecer_V : V ; fun europeizar_V : V ; fun evanecer_V : V ; @@ -612,21 +612,21 @@ abstract IrregSpaAbs = Cat ** { fun fotocomponer_V : V ; fun frangir_V : V ; fun fregar_V : V ; - fun freír_V : V ; + fun freír_V : V ; fun fruir_V : V ; fun fruncir_V : V ; fun frutecer_V : V ; fun fulgir_V : V ; fun fungir_V : V ; - fun gañir_V : V ; + fun gañir_V : V ; fun garantir_V : V ; fun gemir_V : V ; fun gernir_V : V ; fun gobernar_V : V ; fun grandisonar_V : V ; - fun gruñir_V : V ; + fun gruñir_V : V ; fun gruir_V : V ; - fun guañir_V : V ; + fun guañir_V : V ; fun guarecer_V : V ; fun guarnecer_V : V ; fun haber_V : V ; @@ -634,7 +634,7 @@ abstract IrregSpaAbs = Cat ** { fun hacer_V : V ; fun hebraizar_V : V ; fun heder_V : V ; - fun heñir_V : V ; + fun heñir_V : V ; fun helar_V : V ; fun henchir_V : V ; fun hender_V : V ; @@ -687,7 +687,7 @@ abstract IrregSpaAbs = Cat ** { fun jimenzar_V : V ; fun judaizar_V : V ; fun jugar_V : V ; - fun juñir_V : V ; + fun juñir_V : V ; fun languidecer_V : V ; fun leer_V : V ; fun licuefacer_V : V ; @@ -721,7 +721,7 @@ abstract IrregSpaAbs = Cat ** { fun mostrar_V : V ; fun mover_V : V ; fun mugir_V : V ; - fun muñir_V : V ; + fun muñir_V : V ; fun mullir_V : V ; fun nacer_V : V ; fun negar_V : V ; @@ -735,7 +735,7 @@ abstract IrregSpaAbs = Cat ** { fun ofrecer_V : V ; fun oler_V : V ; fun oponer_V : V ; - fun oír_V : V ; + fun oír_V : V ; fun oscurecer_V : V ; fun pacer_V : V ; fun padecer_V : V ; @@ -755,7 +755,7 @@ abstract IrregSpaAbs = Cat ** { fun pervertir_V : V ; fun pimpollecer_V : V ; fun placer_V : V ; - fun plañir_V : V ; + fun plañir_V : V ; fun plastecer_V : V ; fun plegar_V : V ; fun poblar_V : V ; @@ -806,13 +806,13 @@ abstract IrregSpaAbs = Cat ** { fun reabrir_V : V ; fun reaparecer_V : V ; fun reapretar_V : V ; - fun reargüir_V : V ; + fun reargüir_V : V ; fun reaventar_V : V ; fun reblandecer_V : V ; fun rebullir_V : V ; fun recaer_V : V ; fun recalentar_V : V ; - fun receñir_V : V ; + fun receñir_V : V ; fun recentar_V : V ; fun recluir_V : V ; fun recocer_V : V ; @@ -835,7 +835,7 @@ abstract IrregSpaAbs = Cat ** { fun recostar_V : V ; fun recrecer_V : V ; fun recrudecer_V : V ; - fun redargüir_V : V ; + fun redargüir_V : V ; fun redecir_V : V ; fun redescontar_V : V ; fun redistribuir_V : V ; @@ -848,15 +848,15 @@ abstract IrregSpaAbs = Cat ** { fun refluir_V : V ; fun reforzar_V : V ; fun refregar_V : V ; - fun refreír_V : V ; + fun refreír_V : V ; fun refringir_V : V ; fun refulgir_V : V ; - fun regañir_V : V ; + fun regañir_V : V ; fun regar_V : V ; fun regimentar_V : V ; fun regir_V : V ; fun regoldar_V : V ; - fun regruñir_V : V ; + fun regruñir_V : V ; fun reguarnecer_V : V ; fun rehacer_V : V ; fun rehenchir_V : V ; @@ -867,7 +867,7 @@ abstract IrregSpaAbs = Cat ** { fun rehuir_V : V ; fun rehumedecer_V : V ; fun reinscribir_V : V ; - fun reñir_V : V ; + fun reñir_V : V ; fun rejuvenecer_V : V ; fun releer_V : V ; fun relentecer_V : V ; @@ -898,7 +898,7 @@ abstract IrregSpaAbs = Cat ** { fun requebrar_V : V ; fun requerir_V : V ; fun rernorder_V : V ; - fun reír_V : V ; + fun reír_V : V ; fun resaber_V : V ; fun resalir_V : V ; fun resarcir_V : V ; @@ -915,16 +915,16 @@ abstract IrregSpaAbs = Cat ** { fun restablecer_V : V ; fun restituir_V : V ; fun restregar_V : V ; - fun restriñir_V : V ; + fun restriñir_V : V ; fun restringir_V : V ; fun resurgir_V : V ; fun retallecer_V : V ; - fun reteñir_V : V ; + fun reteñir_V : V ; fun retemblar_V : V ; fun retener_V : V ; fun retentar_V : V ; - fun retiñir_V : V ; - fun retoñecer_V : V ; + fun retiñir_V : V ; + fun retoñecer_V : V ; fun retorcer_V : V ; fun retostar_V : V ; fun retraducir_V : V ; @@ -969,7 +969,7 @@ abstract IrregSpaAbs = Cat ** { fun serrar_V : V ; fun servir_V : V ; fun ser_V : V ; - fun soñar_V : V ; + fun soñar_V : V ; fun sobrecalentar_V : V ; fun sobrecoger_V : V ; fun sobrecoger2_V : V ; @@ -988,13 +988,13 @@ abstract IrregSpaAbs = Cat ** { fun sobrevestir_V : V ; fun sobrevolar_V : V ; fun socolar_V : V ; - fun sofreír_V : V ; + fun sofreír_V : V ; fun solar_V : V ; fun soldar_V : V ; fun soler_V : V ; fun soltar_V : V ; fun sonar_V : V ; - fun sonreír_V : V ; + fun sonreír_V : V ; fun sorregar_V : V ; fun sosegar_V : V ; fun sostener_V : V ; @@ -1022,10 +1022,10 @@ abstract IrregSpaAbs = Cat ** { fun suscribir_V : V ; fun sustituir_V : V ; fun sustraer_V : V ; - fun tañer_V : V ; + fun tañer_V : V ; fun tallecer_V : V ; fun tardecer_V : V ; - fun teñir_V : V ; + fun teñir_V : V ; fun telecomponer_V : V ; fun teledirigir_V : V ; fun temblar_V : V ; @@ -1052,8 +1052,8 @@ abstract IrregSpaAbs = Cat ** { fun trasfregar_V : V ; fun trasgredir_V : V ; fun traslucir_V : V ; - fun trasoñar_V : V ; - fun trasoír_V : V ; + fun trasoñar_V : V ; + fun trasoír_V : V ; fun trasparecer_V : V ; fun trasponer_V : V ; fun trastrocar_V : V ; @@ -1090,4 +1090,4 @@ abstract IrregSpaAbs = Cat ** { fun zurcir_V : V ; -} \ No newline at end of file +} diff --git a/lib/src/spanish/LexiconSpa.gf b/lib/src/spanish/LexiconSpa.gf index 5a5a45391..5c3a2a471 100644 --- a/lib/src/spanish/LexiconSpa.gf +++ b/lib/src/spanish/LexiconSpa.gf @@ -1,20 +1,20 @@ --# -path=.:../romance:../common:../abstract:../../prelude ---# -coding=latin1 concrete LexiconSpa of Lexicon = CatSpa ** open (M=MorphoSpa), ParadigmsSpa, BeschSpa in { flags + coding=utf8 ; optimize=values ; lin - airplane_N = regN "aeroplano" ; -- avión is masculine + airplane_N = regN "aeroplano" ; -- avión is masculine answer_V2S = mkV2S (regV "responder") dative ; apartment_N = regN "apartamento" ; apple_N = regN "manzana" ; art_N = regN "arte" ; ask_V2Q = mkV2Q (regV "preguntar") dative ; - baby_N = regN "bebé" ; -- can be used for both fem. & masc. + baby_N = regN "bebé" ; -- can be used for both fem. & masc. bad_A = prefA (mkADeg (regA "malo") (regA "peor")) ; bank_N = regN "banco" ; beautiful_A = prefA (regADeg "bello") ; -- bella @@ -23,22 +23,22 @@ lin beg_V2V = mkV2V (mkV "rogar" "ruego") accusative dative ; -- pedir big_A = prefA (regADeg "grande") ; bike_N = regN "bicicleta" ; - bird_N = regN "pájaro" ; + bird_N = regN "pájaro" ; black_A = regADeg "negro" ; -- negra blue_A = regADeg "azul" ; boat_N = regN "bote" ; book_N = regN "libro" ; boot_N = regN "bota" ; boss_N = regN "jefe" ; - boy_N = regN "niño" ; + boy_N = regN "niño" ; bread_N = regN "pan" ; break_V2 = dirV2 (special_ppV (regV "romper") "roto") ; broad_A = regADeg "ancho" ; brother_N2 = deN2 (regN "hermano") ; - brown_A = regADeg "marrón" ; --- * + brown_A = regADeg "marrón" ; --- * butter_N = regN "manteca" ; buy_V2 = dirV2 (regV "comprar") ; - camera_N = regN "cámara" ; -- ["máquina fotográfica"] + camera_N = regN "cámara" ; -- ["máquina fotográfica"] cap_N = regN "gorra" ; car_N = regN "auto" ; carpet_N = regN "alfombra" ; @@ -46,31 +46,31 @@ lin ceiling_N = regN "techo" ; chair_N = regN "silla" ; cheese_N = regN "queso" ; - child_N = regN "niño" ; -- niña + child_N = regN "niño" ; -- niña church_N = regN "iglesia" ; city_N = femN (regN "ciudad") ; -- fem clean_A = regADeg "limpio" ; clever_A = regADeg "inteligente" ; close_V2 = dirV2 (mkV "cerrar" "cierro") ; coat_N = regN "abrigo" ; - cold_A = regADeg "frío" ; -- fría + cold_A = regADeg "frío" ; -- fría come_V = verboV (venir_82 "venir") ; computer_N = regN "ordenador" ; -- also computador, ordenador in Spain - country_N = regN "país" ; -- masc + country_N = regN "país" ; -- masc cousin_N = regN "primo" ; cow_N = regN "vaca" ; die_V = verboV (morir_35b "morir") ; dirty_A = regADeg "sucio" ; distance_N3 = mkN3 (regN "distancia") genitive dative ; - doctor_N = regN "médico" ; -- médica + doctor_N = regN "médico" ; -- médica dog_N = regN "perro" ; -- perra door_N = regN "puerta" ; drink_V2 = dirV2 (regV "tomar") ; -- beber - easy_A2V = mkA2V (regA "fácil") dative genitive ; + easy_A2V = mkA2V (regA "fácil") dative genitive ; eat_V2 = dirV2 (regV "comer") ; - empty_A = regADeg "vacío" ; + empty_A = regADeg "vacío" ; enemy_N = regN "enemigo" ; -- enemiga - factory_N = regN "fábrica" ; + factory_N = regN "fábrica" ; father_N2 = deN2 (regN "padre") ; fear_VS = mkVS (regV "temer") ; find_V2 = dirV2 (verboV (encontrar_38 "encontrar")) ; @@ -81,8 +81,8 @@ lin friend_N = regN "amigo" ; -- amiga fruit_N = regN "fruta" ; fun_AV = mkAV (regA "divertido") genitive ; -- entretenido - garden_N = regN "jardín" ; - girl_N = regN "niña" ; + garden_N = regN "jardín" ; + girl_N = regN "niña" ; glove_N = regN "guante" ; gold_N = regN "oro" ; good_A = prefA (mkADeg (regA "bueno") (regA "mejor")) ; ---- adv? @@ -91,7 +91,7 @@ lin harbour_N = regN "puerto" ; hate_V2 = dirV2 (mkV "odiar" "odio") ; hat_N = regN "sombrero" ; - hear_V2 = dirV2 (mkV (oir_51 "oír")) ; + hear_V2 = dirV2 (mkV (oir_51 "oír")) ; hill_N = regN "colina" ; hope_VS = mkVS (regV "esperar") ; horse_N = regN "caballo" ; @@ -105,7 +105,7 @@ lin know_VQ = mkVQ (verboV (saber_71 "saber")) ; know_VS = mkVS (verboV (saber_71 "saber")) ; lake_N = regN "lago" ; - lamp_N = regN "lámpara" ; + lamp_N = regN "lámpara" ; learn_V2 = dirV2 (regV "aprender") ; leather_N = regN "cuero" ; leave_V2 = dirV2 (regV "partir") ; -- irse, dejar @@ -122,23 +122,23 @@ lin milk_N = femN (regN "leche") ; moon_N = regN "luna" ; mother_N2 = deN2 (mkN "madre" feminine) ; - mountain_N = mkN "montaña" ; - music_N = mkN "música" ; + mountain_N = mkN "montaña" ; + music_N = mkN "música" ; narrow_A = regADeg "estrecho" ; new_A = prefA (regADeg "nuevo") ; - newspaper_N = mkN "periódico" ; -- diario + newspaper_N = mkN "periódico" ; -- diario oil_N = mkN "aceite" ; old_A = prefA (regADeg "viejo") ; open_V2 = dirV2 (special_ppV (regV "abrir") "abierto") ; paint_V2A = mkV2A (regV "pintar") accusative (mkPrep "en") ; paper_N = mkN "papel" ; - paris_PN = mkPN "París" masculine ; + paris_PN = mkPN "París" masculine ; peace_N = mkN "paz" feminine ; pen_N = mkN "lapicera" ; planet_N = mkN "planeta" masculine ; - plastic_N = mkN "plástico" ; + plastic_N = mkN "plástico" ; play_V2 = dirV2 (verboV (jugar_47 "jugar")) ; - policeman_N = mkN "policía" masculine ; -- fem refers to the institution + policeman_N = mkN "policía" masculine ; -- fem refers to the institution priest_N = mkN "cura" masculine ; -- masc probable_AS = mkAS (regA "probable") ; queen_N = mkN "reina" ; @@ -146,11 +146,11 @@ lin radio_N = mkN "radio" feminine ; rain_V0 = mkV0 (verboV (llover_89 "llover")) ; read_V2 = dirV2 (verboV (creer_26 "leer")) ; - reason_N = mkN "razón" feminine ; + reason_N = mkN "razón" feminine ; red_A = regADeg "rojo" ; - religion_N = mkN "religión" "religiones" feminine ; - restaurant_N = mkN "restaurante" ; -- restorán, restaurán, masc - river_N = mkN "río" ; + religion_N = mkN "religión" "religiones" feminine ; + restaurant_N = mkN "restaurante" ; -- restorán, restaurán, masc + river_N = mkN "río" ; rock_N = mkN "roca" ; roof_N = mkN "techo" ; rubber_N = regN "goma" ; @@ -172,7 +172,7 @@ lin silver_N = regN "plata" ; sister_N = regN "hermana" ; sleep_V = verboV (dormir_35 "dormir") ; - small_A = prefA (regADeg "pequeño") ; + small_A = prefA (regADeg "pequeño") ; snake_N = femN (regN "serpiente") ; -- fem sock_N = regN "media" ; speak_V2 = dirV2 (regV "hablar") ; @@ -181,21 +181,21 @@ lin stone_N = regN "piedra" ; stove_N = regN "horno" ; -- estufa student_N = regN "estudiante" ; -- used both for fem & masc - stupid_A = regADeg "estúpido" ; + stupid_A = regADeg "estúpido" ; sun_N = regN "sol" ; switch8off_V2 = dirV2 (regV "apagar") ; switch8on_V2 = dirV2 (regV "prender") ; table_N = regN "mesa" ; talk_V3 = mkV3 (regV "hablar") dative genitive ; teacher_N = regN "maestro" ; -- maestra - teach_V2 = dirV2 (regV "enseñar") ; - television_N = mkN "televisión" feminine ; -- televisor masc + teach_V2 = dirV2 (regV "enseñar") ; + television_N = mkN "televisión" feminine ; -- televisor masc thick_A = regADeg "grueso" ; thin_A = regADeg "fino" ; -- delgado train_N = regN "tren" ; travel_V = regV "viajar" ; - tree_N = regN "árbol" ; - --- trousers_N = regN "pantalón" ; -- masc + tree_N = regN "árbol" ; + --- trousers_N = regN "pantalón" ; -- masc ugly_A = regADeg "feo" ; understand_V2 = dirV2 (mkV "entender" "entiendo") ; university_N = femN (regN "universidad") ; @@ -215,14 +215,14 @@ lin wood_N = regN "madera" ; write_V2 = dirV2 (special_ppV (regV "escribir") "escrito") ; yellow_A = regADeg "amarillo" ; - young_A = prefA (mkA "joven" "joven" "jóvenes" "jóvenes" "jovenamente") ; + young_A = prefA (mkA "joven" "joven" "jóvenes" "jóvenes" "jovenamente") ; do_V2 = dirV2 (verboV (hacer_44 "hacer")) ; now_Adv = mkAdv "ahora" ; already_Adv = mkAdv "ya" ; - song_N = mkN "canción" "canciones" feminine ; + song_N = mkN "canción" "canciones" feminine ; add_V3 = dirV3 (regV "sumar") dative ; - number_N = regN "número" ; + number_N = regN "número" ; put_V2 = dirV2 (verboV (poner_60 "poner")) ; stop_V = regV "parar" ; jump_V = regV "saltar" ; @@ -252,7 +252,7 @@ lin bone_N = regN "hueso" ; breast_N = regN "seno" ; -- pecho cloud_N = femN (regN "nube") ; - day_N = mascN (regN "día") ; + day_N = mascN (regN "día") ; dust_N = regN "polvo" ; ear_N = regN "oreja" ; earth_N = regN "tierra" ; @@ -260,25 +260,25 @@ lin eye_N = regN "ojo" ; fat_N = regN "grasa" ; feather_N = regN "pluma" ; - fingernail_N = regN "uña" ; + fingernail_N = regN "uña" ; fire_N = regN "fuego" ; flower_N = femN (regN "flor") ; fog_N = regN "niebla" ; foot_N = regN "pie" ; forest_N = regN "bosque" ; - grass_N = regN "pasto" ; -- hierba, césped (masc) + grass_N = regN "pasto" ; -- hierba, césped (masc) guts_N = regN "tripa" ; -- gut=intestino ---- pl.t. tripas hair_N = regN "cabello" ; -- pelo hand_N = femN (regN "mano") ; head_N = regN "cabeza" ; - heart_N = mkN "corazón" "corazones" masculine ; + heart_N = mkN "corazón" "corazones" masculine ; horn_N = regN "cuerno" ; husband_N = regN "marido" ; -- esposo ice_N = regN "hielo" ; knee_N = regN "rodilla" ; leaf_N = regN "hoja" ; leg_N = regN "pierna" ; - liver_N = regN "hígado" ; + liver_N = regN "hígado" ; louse_N = regN "piojo" ; mouth_N = regN "boca" ; name_N = regN "nombre" ; @@ -288,7 +288,7 @@ lin person_N = regN "persona" ; rain_N = regN "lluvia" ; road_N = femN (regN "calle") ; -- camino - root_N = femN (regN "raíz") ; + root_N = femN (regN "raíz") ; rope_N = regN "cuerda" ; salt_N = femN (regN "sal") ; sand_N = regN "arena" ; @@ -297,7 +297,7 @@ lin sky_N = regN "cielo" ; smoke_N = regN "humo" ; snow_N = femN (regN "nieve") ; -- fem - stick_N = mkN "bastón" "bastones" masculine ; -- palo + stick_N = mkN "bastón" "bastones" masculine ; -- palo tail_N = regN "cola" ; tongue_N = regN "lengua" ; tooth_N = regN "diente" ; @@ -305,7 +305,7 @@ lin wind_N = regN "viento" ; wing_N = regN "ala" ; worm_N = regN "gusano" ; -- lombriz (fem) - year_N = regN "año" ; + year_N = regN "año" ; bite_V2 = dirV2 (verboV (morder_50b "morder")) ; blow_V = regV "soplar" ; burn_V = regV "quemar" ; @@ -324,7 +324,7 @@ lin hold_V2 = dirV2 (verboV (tener_4 "tener")) ; hunt_V2 = dirV2 (regV "cazar") ; kill_V2 = dirV2 (regV "matar") ; - laugh_V = regV "reir" ; ----V reír_67 + laugh_V = regV "reir" ; ----V reír_67 lie_V = reflV (regV "acostar") ; -- "acostarse" play_V = regV "jugar" ; pull_V2 = dirV2 (regV "tirar") ; @@ -338,7 +338,7 @@ lin spit_V = regV "escupir" ; split_V2 = dirV2 (regV "separar") ; -- dividir,) ; squeeze_V2 = dirV2 (regV "exprimir") ; - stab_V2 = dirV2 (regV "apuñalar") ; + stab_V2 = dirV2 (regV "apuñalar") ; stand_V = verboV (estar_2 "estar") ; ---- "estar de pie" ; suck_V2 = dirV2 (regV "chupar") ; swell_V = regV "tragar" ; @@ -355,7 +355,7 @@ lin john_PN = mkPN "Juan" masculine ; today_Adv = mkAdv "hoy" ; - grammar_N = regN "gramática" ; + grammar_N = regN "gramática" ; language_N = regN "lengua" ; rule_N = regN "regla" ; diff --git a/lib/src/spanish/MorphoSpa.gf b/lib/src/spanish/MorphoSpa.gf index d57d3e543..1a3492c2c 100644 --- a/lib/src/spanish/MorphoSpa.gf +++ b/lib/src/spanish/MorphoSpa.gf @@ -1,5 +1,4 @@ --# -path=.:../romance:../common:../../prelude ---# -coding=latin1 --1 A Simple Spanish Resource Morphology -- @@ -14,6 +13,7 @@ resource MorphoSpa = CommonRomance, ResSpa ** CatSpa in { flags optimize=all ; + coding=utf8 ; --2 Nouns @@ -46,16 +46,16 @@ oper mkNomReg : Str -> Noun = \mec -> case mec of { - _ + ("o" | "e" | "é" | "á") => mkNoun (nomVino mec) Masc ; --bebé, papá; how about other accented vocal endings? champú champúes + _ + ("o" | "e" | "é" | "á") => mkNoun (nomVino mec) Masc ; --bebé, papá; how about other accented vocal endings? champú champúes _ + "a" => mkNoun (nomVino mec) Fem ; _ + "z" => mkNounIrreg mec (init mec + "ces") Fem ; - _ + "ión" => mkNounIrreg mec (tk 2 mec + "ones") Fem ; + _ + "ión" => mkNounIrreg mec (tk 2 mec + "ones") Fem ; _ + "tud" => mkNounIrreg mec (mec + "es") Fem ; - _ + "án" => mkNounIrreg mec (tk 2 mec + "anes") Masc ; - _ + "én" => mkNounIrreg mec (tk 2 mec + "enes") Masc ; - _ + "ín" => mkNounIrreg mec (tk 2 mec + "ines") Masc ; - _ + "ón" => mkNounIrreg mec (tk 2 mec + "ones") Masc ; - _ + "ún" => mkNounIrreg mec (tk 2 mec + "unes") Masc ; + _ + "án" => mkNounIrreg mec (tk 2 mec + "anes") Masc ; + _ + "én" => mkNounIrreg mec (tk 2 mec + "enes") Masc ; + _ + "ín" => mkNounIrreg mec (tk 2 mec + "ines") Masc ; + _ + "ón" => mkNounIrreg mec (tk 2 mec + "ones") Masc ; + _ + "ún" => mkNounIrreg mec (tk 2 mec + "unes") Masc ; _ => mkNoun (nomPilar mec) Masc } ; @@ -87,31 +87,31 @@ oper mkAdj util util utiles utiles (util + "mente") ; -- adjectives that end in consonant but have different masc and fem forms - -- español, hablador ... + -- español, hablador ... adjEspanol : Str -> Str -> Adj = \espanol,espanola -> mkAdj espanol espanola (espanol + "es") (espanol + "as") (espanola + "mente") ; adjBlu : Str -> Adj = \blu -> mkAdj blu blu blu blu blu ; --- - -- francés francesa franceses francesas + -- francés francesa franceses francesas adjEs : Str -> Adj = \francEs -> let franc : Str = Predef.tk 2 francEs ; frances : Str = franc + "es" ; in mkAdj francEs (frances + "a") (frances + "es") (frances + "as") (frances + "amente") ; - -- alemán alemana alemanes alemanas + -- alemán alemana alemanes alemanas adjVn : Str -> Adj = \alemAn -> let alemA : Str = init alemAn ; alem : Str = init alemA ; A : Str = last alemA ; V : Str = case A of { - "á" => "a" ; - "é" => "e" ; - "í" => "i" ; - "ó" => "o" ; - "ú" => "u" + "á" => "a" ; + "é" => "e" ; + "í" => "i" ; + "ó" => "o" ; + "ú" => "u" } ; alemVn : Str = alem + V + "n" ; in mkAdj alemAn (alemVn + "a") (alemVn + "es") @@ -121,8 +121,8 @@ oper case solo of { _ + "o" => adjSolo solo ; _ + ("e" | "a") => adjUtil solo (solo + "s") ; - _ + "és" => adjEs solo ; - _ + ("á" | "é" | "í" | "ó" | "ú") + "n" => adjVn solo ; + _ + "és" => adjEs solo ; + _ + ("á" | "é" | "í" | "ó" | "ú") + "n" => adjVn solo ; _ => adjUtil solo (solo + "es") } ; @@ -174,7 +174,7 @@ oper sa : Str = Predef.drop 1 esa ; sos : Str = Predef.drop 1 esos ; sas : Str = Predef.drop 1 esas ; - E : Str = "é" ; + E : Str = "é" ; attrforms : Number => Gender => Case => Str = table { Sg => \\g,c => prepCase c ++ genForms ese esa ! g ; Pl => \\g,c => prepCase c ++ genForms esos esas ! g ---- diff --git a/lib/src/spanish/NumeralSpa.gf b/lib/src/spanish/NumeralSpa.gf index 1f6924a8f..333860c48 100644 --- a/lib/src/spanish/NumeralSpa.gf +++ b/lib/src/spanish/NumeralSpa.gf @@ -1,6 +1,6 @@ ---# -coding=latin1 concrete NumeralSpa of Numeral = CatSpa [Numeral,Digits] ** open CommonRomance, ResRomance, MorphoSpa, Prelude in { + flags coding=utf8 ; lincat Digit = {s : DForm => CardOrd => Str} ; @@ -13,32 +13,32 @@ lin num x = x ; lin n2 = mkTal "dos" "doce" "veinte" "doscientos" - "segundo" "duodécimo" "vigésimo" "ducentésimo" ; + "segundo" "duodécimo" "vigésimo" "ducentésimo" ; lin n3 = mkTal "tres" "trece" "treinta" "trescientos" - "tercero" "decimotercero" "trigésimo" "tricentesimo" ; + "tercero" "decimotercero" "trigésimo" "tricentesimo" ; lin n4 = mkTal "cuatro" "catorce" "cuarenta" "cuatrocientos" - "cuarto" "decimocuarto" "cuadragésimo" "cuadringentesimo" ; + "cuarto" "decimocuarto" "cuadragésimo" "cuadringentesimo" ; lin n5 = mkTal "cinco" "quince" "cinquenta" "quinientos" - "quinto" "decimoquinto" "quincuagésimo" "guingentésimo" ; + "quinto" "decimoquinto" "quincuagésimo" "guingentésimo" ; lin n6 = - mkTal "seis" "dieciséis" "sesenta" "seiscientos" - "sexto" "decimosexto" "sexagésimo" "sexcentesimo" ; + mkTal "seis" "dieciséis" "sesenta" "seiscientos" + "sexto" "decimosexto" "sexagésimo" "sexcentesimo" ; lin n7 = - mkTal "siete" "diecisiéte" "setenta" "setecientos" - "séptimo" "decimoséptimo" "septuagésimo" "septingentesimo" ; + mkTal "siete" "diecisiéte" "setenta" "setecientos" + "séptimo" "decimoséptimo" "septuagésimo" "septingentesimo" ; lin n8 = mkTal "ocho" "dieciocho" "ochenta" "ochocientos" - "octavo" "decimoctavo" "octogésimo" "octingentésimo" ; + "octavo" "decimoctavo" "octogésimo" "octingentésimo" ; lin n9 = mkTal "nueve" "diecinueve" "noventa" "novecientos" - "noveno" "decimonoveno" "nonagésimo" "noningentésimo" ; + "noveno" "decimonoveno" "nonagésimo" "noningentésimo" ; lin pot01 = - let uno = (mkTal "uno" "once" "diez" "ciento" "primero" "undécimo" - "décimo" "centésimo").s in + let uno = (mkTal "uno" "once" "diez" "ciento" "primero" "undécimo" + "décimo" "centésimo").s in {s =\\f,g => case of { => [] ; => "una" ; @@ -51,7 +51,7 @@ lin pot01 = lin pot0 d = {s = d.s ; n = Pl} ; lin pot110 = spl ((mkTal "diez" [] [] [] "decimo" [] [] []).s ! ental indip) ; -lin pot111 = spl ((mkTal "once" [] [] [] "undécimo" [] [] []).s ! ental indip) ; +lin pot111 = spl ((mkTal "once" [] [] [] "undécimo" [] [] []).s ! ental indip) ; lin pot1to19 d = spl (d.s ! ton) ; lin pot0as1 n = {s = n.s ! ental indip ; n = n.n} ; lin pot1 d = spl (d.s ! tiotal) ; @@ -90,7 +90,7 @@ oper } ; mil : CardOrd -> Str = \g -> - (mkTal "mil" [] [] [] "milésimo" [] [] []).s ! ental indip ! g ; + (mkTal "mil" [] [] [] "milésimo" [] [] []).s ! ental indip ! g ; y_CardOrd : CardOrd -> Str = \co -> case co of { NCard _ => "y" ; diff --git a/lib/src/spanish/ParadigmsSpa.gf b/lib/src/spanish/ParadigmsSpa.gf index 5d020c31b..3f0200c80 100644 --- a/lib/src/spanish/ParadigmsSpa.gf +++ b/lib/src/spanish/ParadigmsSpa.gf @@ -1,5 +1,4 @@ --# -path=.:../romance:../common:../abstract:../../prelude ---# -coding=latin1 --1 Spanish Lexical Paradigms -- @@ -33,6 +32,7 @@ resource ParadigmsSpa = CatSpa in { flags optimize=all ; + coding=utf8 ; --2 Parameters -- @@ -90,11 +90,11 @@ oper --3 Compound nouns -- -- Some nouns are ones where the first part is inflected as a noun but --- the second part is not inflected. e.g. "número de teléfono". +-- the second part is not inflected. e.g. "número de teléfono". -- They could be formed in syntax, but we give a shortcut here since -- they are frequent in lexica. - compN : N -> Str -> N ; -- compound, e.g. "número" + "de teléfono" + compN : N -> Str -> N ; -- compound, e.g. "número" + "de teléfono" --3 Relational nouns @@ -355,7 +355,7 @@ oper {s = table {Posit => a.s ! Posit ; _ => b.s ! Posit} ; isPre = a.isPre ; lock_A = <>} ; compADeg a = - {s = table {Posit => a.s ! Posit ; _ => \\f => "más" ++ a.s ! Posit ! f} ; + {s = table {Posit => a.s ! Posit ; _ => \\f => "más" ++ a.s ! Posit ! f} ; isPre = a.isPre ; lock_A = <>} ; regADeg a = compADeg (regA a) ; @@ -412,7 +412,7 @@ oper - mmkV3 : V -> Prep -> Prep -> V3 ; -- parler, à, de + mmkV3 : V -> Prep -> Prep -> V3 ; -- parler, à, de mmkV3 v p q = v ** {c2 = p ; c3 = q ; lock_V3 = <>} ; dirV3 v p = mmkV3 v accusative p ; dirdirV3 v = dirV3 v dative ; @@ -423,7 +423,7 @@ oper mkV3 = overload { mkV3 : V -> V3 = dirdirV3 ; -- donner,_,_ mkV3 : V -> Prep -> V3 = dirV3 ; -- placer,_,sur - mkV3 : V -> Prep -> Prep -> V3 = mmkV3 -- parler, à, de + mkV3 : V -> Prep -> Prep -> V3 = mmkV3 -- parler, à, de } ; mkV2S = overload { diff --git a/lib/src/spanish/PhonoSpa.gf b/lib/src/spanish/PhonoSpa.gf index da1d4d7c9..2fb988036 100644 --- a/lib/src/spanish/PhonoSpa.gf +++ b/lib/src/spanish/PhonoSpa.gf @@ -1,4 +1,5 @@ resource PhonoSpa = open Prelude in { +flags coding=utf8 ; --3 Elision -- diff --git a/lib/src/spanish/StructuralSpa.gf b/lib/src/spanish/StructuralSpa.gf index af3627a90..1626167bd 100644 --- a/lib/src/spanish/StructuralSpa.gf +++ b/lib/src/spanish/StructuralSpa.gf @@ -1,9 +1,9 @@ ---# -coding=latin1 concrete StructuralSpa of Structural = CatSpa ** open PhonoSpa, MorphoSpa, ParadigmsSpa, BeschSpa, MakeStructuralSpa, (X = ConstructX), Prelude in { flags optimize=all ; + coding=utf8 ; lin -- have_V3 @@ -21,10 +21,10 @@ lin although_Subj = ss "aunque" ** {m = Conjunct} ; and_Conj = {s1 = [] ; s2 = etConj.s ; n = Pl} ; at_least_AdN = ss "al menos" ; - at_most_AdN = ss "a lo más" ; + at_most_AdN = ss "a lo más" ; because_Subj = ss "porque" ** {m = Indic} ; before_Prep = {s = "antes" ; c = MorphoSpa.genitive ; isDir = False} ; - behind_Prep = {s = "detrás" ; c = MorphoSpa.genitive ; isDir = False} ; + behind_Prep = {s = "detrás" ; c = MorphoSpa.genitive ; isDir = False} ; between_Prep = mkPrep "entre" ; both7and_DConj = {s1,s2 = etConj.s ; n = Pl} ; but_PConj = ss "pero" ; @@ -45,32 +45,32 @@ lin from_Prep = complGen ; --- he_Pron = mkPronoun - "él" "lo" "le" "él" + "él" "lo" "le" "él" "su" "su" "sus" "sus" Masc Sg P3 ; - here_Adv = mkAdv "aquí" ; - here7to_Adv = mkAdv ["para aquí"] ; - here7from_Adv = mkAdv ["de aquí"] ; + here_Adv = mkAdv "aquí" ; + here7to_Adv = mkAdv ["para aquí"] ; + here7from_Adv = mkAdv ["de aquí"] ; how_IAdv = ss "como" ; - how8many_IDet = mkIDet "cuántos" "cuántas" Pl ; - how8much_IAdv = ss "cuánto" ; + how8many_IDet = mkIDet "cuántos" "cuántas" Pl ; + how8much_IAdv = ss "cuánto" ; if_Subj = ss "si" ** {m = Indic} ; if_then_Conj = {s1 = "si" ; s2 = "entonces" ; n = Sg ; lock_Conj = <>} ; in8front_Prep = {s = "delante" ; c = MorphoSpa.genitive ; isDir = False} ; i_Pron = mkPronoun - "yo" "me" "me" "mí" + "yo" "me" "me" "mí" "mi" "mi" "mis" "mis" Masc Sg P1 ; in_Prep = mkPrep "en" ; it_Pron = mkPronoun - "él" "lo" "le" "él" + "él" "lo" "le" "él" "su" "su" "sus" "sus" Masc Sg P3 ; less_CAdv = X.mkCAdv "menos" conjThan ; ---- many_Det = mkDeterminer "muchos" "muchas" Pl False ; - more_CAdv = X.mkCAdv "más" conjThan ; + more_CAdv = X.mkCAdv "más" conjThan ; most_Predet = {s = \\_,c => prepCase c ++ ["la mayor parte"] ; c = CPrep P_de ; a = PNoAg} ; much_Det = mkDeterminer "mucho" "mucha" Sg False ; @@ -78,7 +78,7 @@ lin no_Quant = let ningun : ParadigmsSpa.Number => ParadigmsSpa.Gender => Case => Str = table { - Sg => \\g,c => prepCase c ++ genForms "ningún" "ninguna" ! g ; + Sg => \\g,c => prepCase c ++ genForms "ningún" "ninguna" ! g ; Pl => \\g,c => prepCase c ++ genForms "ningunos" "ningunas" ! g } in { @@ -109,13 +109,13 @@ lin so_AdA = ss "tanto" ; somebody_NP = pn2np (mkPN "alguien" Masc) ; somePl_Det = mkDeterminer "algunos" "algunas" Pl False ; - someSg_Det = mkDeterminer "algún" "alguna" Sg False ; + someSg_Det = mkDeterminer "algún" "alguna" Sg False ; something_NP = pn2np (mkPN ["algo"] Masc) ; somewhere_Adv = ss ["en alguna parte"] ; that_Quant = mkQuantifier "ese" "esa" "esos" "esas" ; - there_Adv = mkAdv "allí" ; -- allá - there7to_Adv = mkAdv ["para allí"] ; - there7from_Adv = mkAdv ["de allí"] ; + there_Adv = mkAdv "allí" ; -- allá + there7to_Adv = mkAdv ["para allí"] ; + there7from_Adv = mkAdv ["de allí"] ; therefore_PConj = ss ["por eso"] ; they_Pron = mkPronoun "ellos" "los" "les" "ellos" @@ -133,24 +133,24 @@ lin "nosotros" "nos" "nos" "nosotros" "nuestro" "nuestra" "nuestros" "nuestras" Masc Pl P1 ; - whatSg_IP = {s = \\c => prepCase c ++ ["qué"] ; a = aagr Masc Sg} ; - whatPl_IP = {s = \\c => prepCase c ++ ["qué"] ; a = aagr Masc Pl} ; --- - when_IAdv = ss "cuándo" ; + whatSg_IP = {s = \\c => prepCase c ++ ["qué"] ; a = aagr Masc Sg} ; + whatPl_IP = {s = \\c => prepCase c ++ ["qué"] ; a = aagr Masc Pl} ; --- + when_IAdv = ss "cuándo" ; when_Subj = ss "cuando" ** {m = Indic} ; - where_IAdv = ss "dónde" ; + where_IAdv = ss "dónde" ; which_IQuant = {s = table { - Sg => \\g,c => prepCase c ++ "qué" ; --- cual - Pl => \\g,c => prepCase c ++ "qué" + Sg => \\g,c => prepCase c ++ "qué" ; --- cual + Pl => \\g,c => prepCase c ++ "qué" } } ; - whoPl_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Masc Pl} ; - whoSg_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Masc Sg} ; - why_IAdv = ss ["por qué"] ; + whoPl_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Masc Pl} ; + whoSg_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Masc Sg} ; + why_IAdv = ss ["por qué"] ; without_Prep = mkPrep "sin" ; with_Prep = mkPrep "con" ; - yes_Utt = ss "sí" ; + yes_Utt = ss "sí" ; youSg_Pron = mkPronoun - "tú" "te" "te" "ti" + "tú" "te" "te" "ti" "tu" "tu" "tus" "tus" Masc Sg P2 ; youPl_Pron = @@ -176,6 +176,6 @@ lin that_Subj = {s = "que" ; m = Conjunct} ; - lin language_title_Utt = ss "español" ; + lin language_title_Utt = ss "español" ; } diff --git a/lib/src/spanish/TerminologySpa.gf b/lib/src/spanish/TerminologySpa.gf index 78c7e7384..3260d733c 100644 --- a/lib/src/spanish/TerminologySpa.gf +++ b/lib/src/spanish/TerminologySpa.gf @@ -10,6 +10,7 @@ concrete TerminologySpa of Terminology = CatSpa ** open Prelude in { +flags coding=utf8 ; lincat diff --git a/lib/src/spanish/TextSpa.gf b/lib/src/spanish/TextSpa.gf index f45aa6b1d..8c18e6bd9 100644 --- a/lib/src/spanish/TextSpa.gf +++ b/lib/src/spanish/TextSpa.gf @@ -1,12 +1,12 @@ ---# -coding=latin1 concrete TextSpa of Text = CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** { + flags coding=utf8 ; -- This works for the special punctuation marks of Spanish. lin TEmpty = {s = []} ; TFullStop x xs = {s = x.s ++ "." ++ xs.s} ; - TQuestMark x xs = {s = "¿" ++ x.s ++ "?" ++ xs.s} ; - TExclMark x xs = {s = "¡" ++ x.s ++ "!" ++ xs.s} ; + TQuestMark x xs = {s = "¿" ++ x.s ++ "?" ++ xs.s} ; + TExclMark x xs = {s = "¡" ++ x.s ++ "!" ++ xs.s} ; } diff --git a/lib/src/swedish/ConstructionSwe.gf b/lib/src/swedish/ConstructionSwe.gf index 500df5880..8c0b6f458 100644 --- a/lib/src/swedish/ConstructionSwe.gf +++ b/lib/src/swedish/ConstructionSwe.gf @@ -2,6 +2,7 @@ concrete ConstructionSwe of Construction = CatSwe ** open SyntaxSwe, SymbolicSwe, ParadigmsSwe, (L = LexiconSwe), (E = ExtraSwe), (G = GrammarSwe), (R = ResSwe), (C = CommonScand), Prelude in { +flags coding=utf8 ; lin diff --git a/lib/src/swedish/DiffSwe.gf b/lib/src/swedish/DiffSwe.gf index 53993ab19..78931194e 100644 --- a/lib/src/swedish/DiffSwe.gf +++ b/lib/src/swedish/DiffSwe.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 instance DiffSwe of DiffScand = open CommonScand, Prelude in { + flags coding=utf8 ; -- Parameters. @@ -24,7 +24,7 @@ instance DiffSwe of DiffScand = open CommonScand, Prelude in { -- Strings. conjThat = "att" ; - conjThan = "än" ; + conjThan = "än" ; conjAnd = "och" ; infMark = "att" ; compMore = "mera" ; @@ -35,12 +35,12 @@ instance DiffSwe of DiffScand = open CommonScand, Prelude in { Utr => "en" ; Neutr => "ett" } ; - detIndefPl = "några" ; + detIndefPl = "nÃ¥gra" ; verbHave = mkVerb9 "ha" "har" "ha" "hade" "haft" "havd" "havt" "havda" "havande" ** noPart ; verbBe = - mkVerb9 "vara" "är" "var" "var" "varit" "varen" "varet" "varna" "varande" + mkVerb9 "vara" "är" "var" "var" "varit" "varen" "varet" "varna" "varande" ** noPart ; verbBecome = mkVerb9 "bli" "blir" "bli" "blev" "blivit" "bliven" "blivet" "blivna" "blivande" @@ -71,7 +71,7 @@ instance DiffSwe of DiffScand = open CommonScand, Prelude in { RPrep True => gennumForms "vilken" "vilket" "vilka" ! gennum g n } ; - pronSuch = gennumForms "sådan" "sådant" "sådana" ; + pronSuch = gennumForms "sÃ¥dan" "sÃ¥dant" "sÃ¥dana" ; reflPron : Agr -> Str = \a -> case of { => "oss" ; diff --git a/lib/src/swedish/DocumentationSwe.gf b/lib/src/swedish/DocumentationSwe.gf index 88d3ee8dc..ca95c028a 100644 --- a/lib/src/swedish/DocumentationSwe.gf +++ b/lib/src/swedish/DocumentationSwe.gf @@ -3,7 +3,7 @@ concrete DocumentationSwe of Documentation = CatSwe ** open CommonScand, HTML in { - +flags coding=utf8 ; lincat Inflection = {t : Str; s1,s2 : Str} ; Document = {s : Str} ; diff --git a/lib/src/swedish/ExtraSwe.gf b/lib/src/swedish/ExtraSwe.gf index a112f38a5..a97fd0c7f 100644 --- a/lib/src/swedish/ExtraSwe.gf +++ b/lib/src/swedish/ExtraSwe.gf @@ -1,13 +1,13 @@ --# -path=.:../scandinavian:../abstract:../common:prelude ---# -coding=latin1 concrete ExtraSwe of ExtraSweAbs = ExtraScandSwe - [FocAdv] , ParadigmsSwe - [nominative] ** open CommonScand, ResSwe, ParamX, VerbSwe, Prelude, DiffSwe, StructuralSwe, MorphoSwe, NounSwe, Coordination, AdjectiveSwe, SentenceSwe, AdverbSwe, RelativeSwe in { + flags coding=utf8 ; lincat ReflNP = NP ; - PronAQ = A ; -- 'en sådan' + PronAQ = A ; -- 'en sÃ¥dan' PronAD = A ; -- 'fler' AdvFoc = Adv ; RelVSCl = {s : Agr => RCase => Str}; @@ -96,7 +96,7 @@ lin vf ++ comp ++ (verb.s ! t ! a ! p ! Inv) ++ vp.a1 ! Pos ! agr } ; - oper do_V : V = mkV "göra" "gör" "gör" "gjorde" "gjort" "gjord" ; + oper do_V : V = mkV "göra" "gör" "gör" "gjorde" "gjort" "gjord" ; lin FocAP ap np = @@ -227,13 +227,13 @@ lin lin bara_AdvFoc = mkAdv "bara" ; - sadana_PronAQ = mkA "sådan" ; + sadana_PronAQ = mkA "sÃ¥dan" ; fler_PronAD = mkA "flera" "flera" "flera" "fler" "flest" ; hela_Predet = {s = \\_,_ => "hela" ; p = [] ; a = PNoAg} ; samma_Predet = {s = \\_,_ => "samma" ; p = [] ; a = PNoAg} ; - sjaelva_Quant = {s = \\_,_,_,_ => "själva" ; + sjaelva_Quant = {s = \\_,_,_,_ => "själva" ; sp = \\_,_,_,_ => variants {}; det = DDef Def } ; @@ -241,14 +241,14 @@ lin ena_Det = {s = \\_,_ => "ena" ; sp = \\_ => genderForms ["den ena"] ["det ena"] ; n = Sg ; det = DDef Def}; - baegge_Det = {s,sp = \\_,_ => "bägge" ; n = Pl ; det = DDef Def} ; - baada_Det = {s,sp = \\_,_ => "båda" ; n = Pl ; det = DDef Def} ; + baegge_Det = {s,sp = \\_,_ => "bägge" ; n = Pl ; det = DDef Def} ; + baada_Det = {s,sp = \\_,_ => "bÃ¥da" ; n = Pl ; det = DDef Def} ; varannan_Det = {s,sp = \\_,_ => "varannan" ; n = Sg ; det = DDef Indef} ; somliga_Det = {s,sp = \\_,_ => "somliga" ; n = Pl ; det = DDef Indef} ; dylika_Det = {s,sp = \\_,_ => "dylika" ; n = Pl ; det = DDef Indef} ; - oovriga_Det = {s,sp = \\_,_ => "övriga" ; n = Pl ; det = DDef Indef} ; + oovriga_Det = {s,sp = \\_,_ => "övriga" ; n = Pl ; det = DDef Indef} ; samtliga_Det = {s,sp = \\_,_ => "samtliga" ; n = Pl ; det = DDef Indef} ; - aatskilliga_Det = {s,sp = \\_,_ => "åtskilliga" ; n = Pl ; det = DDef Indef} ; + aatskilliga_Det = {s,sp = \\_,_ => "Ã¥tskilliga" ; n = Pl ; det = DDef Indef} ; varenda_Det = {s = \\_ => genderForms ["varenda"] ["vartenda"] ; sp = \\_ => genderForms ["varenda en"] ["vartenda ett"] ; n = Sg ; det = DDef Indef}; diff --git a/lib/src/swedish/IdiomSwe.gf b/lib/src/swedish/IdiomSwe.gf index d9e4c486d..5aecba669 100644 --- a/lib/src/swedish/IdiomSwe.gf +++ b/lib/src/swedish/IdiomSwe.gf @@ -1,8 +1,8 @@ ---# -coding=latin1 concrete IdiomSwe of Idiom = CatSwe ** open MorphoSwe, ParadigmsSwe, IrregSwe, Prelude in { flags optimize=all_subs ; + coding=utf8 ; oper utr = ParadigmsSwe.utrum ; @@ -51,9 +51,9 @@ concrete IdiomSwe of Idiom = CatSwe ** } ; ProgrVP vp = - insertObj (\\a => "att" ++ infVP vp a) (predV (partV hålla_V "på")) ; + insertObj (\\a => "att" ++ infVP vp a) (predV (partV hÃ¥lla_V "pÃ¥")) ; - ImpPl1 vp = {s = ["låt oss"] ++ infVP vp {g = Utr ; n = Pl ; p = P1}} ; + ImpPl1 vp = {s = ["lÃ¥t oss"] ++ infVP vp {g = Utr ; n = Pl ; p = P1}} ; SelfAdvVP vp = insertObj (\\a => sjalv a.g a.n) vp ; SelfAdVVP vp = insertAdVAgr (\\a => sjalv a.g a.n) vp ; @@ -64,9 +64,9 @@ concrete IdiomSwe of Idiom = CatSwe ** oper sjalv : Gender -> Number -> Str = \g,n -> case of { - => "själv" ; - => "självt" ; - _ => "själva" + => "själv" ; + => "självt" ; + _ => "själva" } ; diff --git a/lib/src/swedish/IrregSwe.gf b/lib/src/swedish/IrregSwe.gf index 8383e23b0..36ff601c5 100644 --- a/lib/src/swedish/IrregSwe.gf +++ b/lib/src/swedish/IrregSwe.gf @@ -1,189 +1,189 @@ --# -path=.:../scandinavian:../common:../abstract:../../prelude ---# -coding=latin1 concrete IrregSwe of IrregSweAbs = CatSwe ** open ParadigmsSwe in { flags optimize=values ; + coding=utf8 ; lin - anfalla_V = irregV "anfalla" "anföll" "anfallit" ; + anfalla_V = irregV "anfalla" "anföll" "anfallit" ; angiva_V = irregV "angiva" "angav" "angivit" ; angripa_V = irregV "angripa" "angrep" "angripit" ; - anhålla_V = irregV "anhålla" "anhäll" "anhållit" ; + anhÃ¥lla_V = irregV "anhÃ¥lla" "anhäll" "anhÃ¥llit" ; antaga_V = irregV "antaga" "antog" "antagit" ; - äta_V = irregV "äta" "åt" "ätit" ; - återfinna_V = irregV "återfinna" "återfann" "återfunnit" ; - avbryta_V = irregV "avbryta" "avbröt" "avbrutit" ; - avfalla_V = irregV "avfalla" "avföll" "avfallit" ; - avhugga_V = irregV "avhugga" "avhögg" "avhuggit" ; + äta_V = irregV "äta" "Ã¥t" "ätit" ; + Ã¥terfinna_V = irregV "Ã¥terfinna" "Ã¥terfann" "Ã¥terfunnit" ; + avbryta_V = irregV "avbryta" "avbröt" "avbrutit" ; + avfalla_V = irregV "avfalla" "avföll" "avfallit" ; + avhugga_V = irregV "avhugga" "avhögg" "avhuggit" ; avlida_V = irregV "avlida" "avled" "avlidit" ; - avnjuta_V = irregV "avnjuta" "avnjöt" "avnjutit" ; + avnjuta_V = irregV "avnjuta" "avnjöt" "avnjutit" ; avsitta_V = irregV "avsitta" "avsatt" "avsuttit" ; avskriva_V = irregV "avskriva" "avskrev" "avskrivit" ; avstiga_V = irregV "avstiga" "avsteg" "avstigit" ; - bära_V = irregV "bära" "bar" "burit" ; + bära_V = irregV "bära" "bar" "burit" ; bedja_V = irregV "be" "bad" "bett" ; bedraga_V = irregV "bedraga" "bedrog" "bedragit" ; bedriva_V = irregV "bedriva" "bedrev" "bedrivit" ; befinna_V = irregV "befinna" "befann" "befunnit" ; begrava_V = irregV "begrava" "begrov" "begravit" ; - behålla_V = irregV "behålla" "behöll" "behållit" ; - beljuga_V = irregV "beljuga" "beljög" "beljugit" ; + behÃ¥lla_V = irregV "behÃ¥lla" "behöll" "behÃ¥llit" ; + beljuga_V = irregV "beljuga" "beljög" "beljugit" ; berida_V = irregV "berida" "bered" "beridit" ; besitta_V = irregV "besitta" "besatt" "besuttit" ; beskriva_V = irregV "beskriva" "beskrev" "beskrivit" ; - besluta_V = irregV "besluta" "beslöt" "beslutit" ; + besluta_V = irregV "besluta" "beslöt" "beslutit" ; bestiga_V = irregV "bestiga" "besteg" "bestigit" ; bestrida_V = irregV "bestrida" "bestred" "bestridit" ; bidraga_V = irregV "bidraga" "bidrog" "bidragit" ; - bifalla_V = irregV "bifalla" "biföll" "bifallit" ; + bifalla_V = irregV "bifalla" "biföll" "bifallit" ; binda_V = irregV "binda" "band" "bundit" ; bita_V = irregV "bita" "bet" "bitit" ; - bjuda_V = irregV "bjuda" "bjöd" "bjudit" ; + bjuda_V = irregV "bjuda" "bjöd" "bjudit" ; bliva_V = irregV "bli" "blev" "blivit" ; borttaga_V = irregV "borttaga" "borttog" "borttagit" ; brinna_V = irregV "brinna" "brann" "brunnit" ; brista_V = irregV "brista" "brast" "brustit" ; - bryta_V = irregV "bryta" "bröt" "brutit" ; - dö_V = irregV "dö" "dog" "dött" ; + bryta_V = irregV "bryta" "bröt" "brutit" ; + dö_V = irregV "dö" "dog" "dött" ; draga_V = mkV "dra" "drar" "dra" "drog" "dragit" "dragen" | mkV "draga" "drog" "dragit" ; dricka_V = irregV "dricka" "drack" "druckit" ; driva_V = irregV "driva" "drev" "drivit" ; - drypa_V = irregV "drypa" "dröp" "drupit" ; - duga_V = irregV "duga" "dög" "dugit" ; - dyka_V = irregV "dyka" "dök" "dukit" ; - erbjuda_V = irregV "erbjuda" "erbjöd" "erbjudit" ; + drypa_V = irregV "drypa" "dröp" "drupit" ; + duga_V = irregV "duga" "dög" "dugit" ; + dyka_V = irregV "dyka" "dök" "dukit" ; + erbjuda_V = irregV "erbjuda" "erbjöd" "erbjudit" ; erfara_V = irregV "erfara" "erfor" "erfarit" ; - erhålla_V = irregV "erhålla" "erhöll" "erhållit" ; - falla_V = irregV "falla" "föll" "fallit" ; - fånga_V = irregV "fånga" "fäng" "fångit" ; + erhÃ¥lla_V = irregV "erhÃ¥lla" "erhöll" "erhÃ¥llit" ; + falla_V = irregV "falla" "föll" "fallit" ; + fÃ¥nga_V = irregV "fÃ¥nga" "fäng" "fÃ¥ngit" ; fara_V = irregV "fara" "for" "farit" ; finna_V = irregV "finna" "fann" "funnit" ; - flyga_V = irregV "flyga" "flög" "flugit" ; - flyta_V = irregV "flyta" "flöt" "flutit" ; - förbehålla_V = irregV "förbehålla" "förbehöll" "förbehållit" ; - förbinda_V = irregV "förbinda" "förband" "förbundit" ; - förbjuda_V = irregV "förbjuda" "förbjöd" "förbjudit" ; - fördriva_V = irregV "fördriva" "fördrev" "fördrivit" ; - föreskriva_V = irregV "föreskriva" "föreskrev" "föreskrivit" ; - företaga_V = irregV "företaga" "företog" "företagit" ; - förfrysa_V = irregV "förfrysa" "förfrös" "förfrusit" ; - förlåta_V = irregV "förlåta" "förlät" "förlåtit" ; - förnimma_V = irregV "förnimma" "förnamm" "förnummit" ; - försitta_V = irregV "försitta" "försatt" "försuttit" ; - försvinna_V = irregV "försvinna" "försvann" "försvunnit" ; - förtiga_V = irregV "förtiga" "förteg" "förtigit" ; - frysa_V = irregV "frysa" "frös" "frusit" ; - få_V = irregV "få" "fick" "fått" ; - gå_V = irregV "gå" "gick" "gått" ; - göra_V = mkV "göra" "gör" "gör" "gjorde" "gjort" "gjord" ; + flyga_V = irregV "flyga" "flög" "flugit" ; + flyta_V = irregV "flyta" "flöt" "flutit" ; + förbehÃ¥lla_V = irregV "förbehÃ¥lla" "förbehöll" "förbehÃ¥llit" ; + förbinda_V = irregV "förbinda" "förband" "förbundit" ; + förbjuda_V = irregV "förbjuda" "förbjöd" "förbjudit" ; + fördriva_V = irregV "fördriva" "fördrev" "fördrivit" ; + föreskriva_V = irregV "föreskriva" "föreskrev" "föreskrivit" ; + företaga_V = irregV "företaga" "företog" "företagit" ; + förfrysa_V = irregV "förfrysa" "förfrös" "förfrusit" ; + förlÃ¥ta_V = irregV "förlÃ¥ta" "förlät" "förlÃ¥tit" ; + förnimma_V = irregV "förnimma" "förnamm" "förnummit" ; + försitta_V = irregV "försitta" "försatt" "försuttit" ; + försvinna_V = irregV "försvinna" "försvann" "försvunnit" ; + förtiga_V = irregV "förtiga" "förteg" "förtigit" ; + frysa_V = irregV "frysa" "frös" "frusit" ; + fÃ¥_V = irregV "fÃ¥" "fick" "fÃ¥tt" ; + gÃ¥_V = irregV "gÃ¥" "gick" "gÃ¥tt" ; + göra_V = mkV "göra" "gör" "gör" "gjorde" "gjort" "gjord" ; genomdriva_V = irregV "genomdriva" "genomdrev" "genomdrivit" ; gilla_V = irregV "gilla" "gall" "gillit" ; giva_V = irregV "ge" "gav" "givit" ; - gjuta_V = irregV "gjuta" "gjöt" "gjutit" ; + gjuta_V = irregV "gjuta" "gjöt" "gjutit" ; glida_V = irregV "glida" "gled" "glidit" ; gnida_V = irregV "gnida" "gned" "gnidit" ; - gråta_V = irregV "gråta" "grät" "gråtit" ; + grÃ¥ta_V = irregV "grÃ¥ta" "grät" "grÃ¥tit" ; gripa_V = irregV "gripa" "grep" "gripit" ; - hålla_V = irregV "hålla" "höll" "hållit" ; + hÃ¥lla_V = irregV "hÃ¥lla" "höll" "hÃ¥llit" ; hinna_V = irregV "hinna" "hann" "hunnit" ; - hugga_V = irregV "hugga" "högg" "huggit" ; + hugga_V = irregV "hugga" "högg" "huggit" ; iakttaga_V = irregV "iakttaga" "iakttog" "iakttagit" ; inbegripa_V = irregV "inbegripa" "inbegrep" "inbegripit" ; - inbjuda_V = irregV "inbjuda" "inbjöd" "inbjudit" ; + inbjuda_V = irregV "inbjuda" "inbjöd" "inbjudit" ; indraga_V = irregV "indraga" "indrog" "indragit" ; - innesluta_V = irregV "innesluta" "inneslöt" "inneslutit" ; + innesluta_V = irregV "innesluta" "inneslöt" "inneslutit" ; inskriva_V = irregV "inskriva" "inskrev" "inskrivit" ; intaga_V = irregV "intaga" "intog" "intagit" ; - känna_V = irregV "känna" "kände" "känt" ; - klämma_V = regV "klämmer" ; + känna_V = irregV "känna" "kände" "känt" ; + klämma_V = regV "klämmer" ; kliva_V = irregV "kliva" "klev" "klivit" ; - klyva_V = irregV "klyva" "klöv" "kluvit" ; + klyva_V = irregV "klyva" "klöv" "kluvit" ; knipa_V = irregV "knipa" "knep" "knipit" ; - knyta_V = irregV "knyta" "knöt" "knutit" ; + knyta_V = irregV "knyta" "knöt" "knutit" ; komma_V = irregV "komma" "kom" "kommit" ; - krypa_V = irregV "krypa" "kröp" "krupit" ; - kunna_V = mkV "kunna" "kan" "kan" "kunde" "kunnat" "känd" ; + krypa_V = irregV "krypa" "kröp" "krupit" ; + kunna_V = mkV "kunna" "kan" "kan" "kunde" "kunnat" "känd" ; kvida_V = irregV "kvida" "kved" "kvidit" ; - låta_V = irregV "låta" "lät" "låtit" ; + lÃ¥ta_V = irregV "lÃ¥ta" "lät" "lÃ¥tit" ; leva_V = irregV "leva" "levde" "levt" ; - ligga_V = irregV "ligga" "låg" "legat" ; - ljuda_V = irregV "ljuda" "ljöd" "ljudit" ; - ljuga_V = irregV "ljuga" "ljög" "ljugit" ; - ljuta_V = irregV "ljuta" "ljöt" "ljutit" ; - lägga_V = irregV "lägga" "lade" "lagt" ; + ligga_V = irregV "ligga" "lÃ¥g" "legat" ; + ljuda_V = irregV "ljuda" "ljöd" "ljudit" ; + ljuga_V = irregV "ljuga" "ljög" "ljugit" ; + ljuta_V = irregV "ljuta" "ljöt" "ljutit" ; + lägga_V = irregV "lägga" "lade" "lagt" ; mottaga_V = irregV "mottaga" "mottog" "mottagit" ; nerstiga_V = irregV "nerstiga" "nersteg" "nerstigit" ; niga_V = irregV "niga" "neg" "nigit" ; - njuta_V = irregV "njuta" "njöt" "njutit" ; + njuta_V = irregV "njuta" "njöt" "njutit" ; omgiva_V = irregV "omgiva" "omgav" "omgivit" ; - överfalla_V = irregV "överfalla" "överföll" "överfallit" ; - övergiva_V = irregV "övergiva" "övergav" "övergivit" ; + överfalla_V = irregV "överfalla" "överföll" "överfallit" ; + övergiva_V = irregV "övergiva" "övergav" "övergivit" ; pipa_V = irregV "pipa" "pep" "pipit" ; rida_V = irregV "rida" "red" "ridit" ; rinna_V = irregV "rinna" "rann" "runnit" ; riva_V = irregV "riva" "rev" "rivit" ; - ryta_V = irregV "ryta" "röt" "rutit" ; - säga_V = irregV "säga" "sade" "sagt" ; - se_V = irregV "se" "såg" "sett" ; + ryta_V = irregV "ryta" "röt" "rutit" ; + säga_V = irregV "säga" "sade" "sagt" ; + se_V = irregV "se" "sÃ¥g" "sett" ; sitta_V = irregV "sitta" "satt" "suttit" ; - sjuda_V = irregV "sjuda" "sjöd" "sjudit" ; - sjunga_V = irregV "sjunga" "sjöng" "sjungit" ; - sjunka_V = irregV "sjunka" "sjönk" "sjunkit" ; - skära_V = mkV "skära" "skär" "skär" "skar" "skurit" "skuren" ; + sjuda_V = irregV "sjuda" "sjöd" "sjudit" ; + sjunga_V = irregV "sjunga" "sjöng" "sjungit" ; + sjunka_V = irregV "sjunka" "sjönk" "sjunkit" ; + skära_V = mkV "skära" "skär" "skär" "skar" "skurit" "skuren" ; skina_V = irregV "skina" "sken" "skinit" ; skita_V = irregV "skita" "sket" "skitit" ; - skjuta_V = irregV "skjuta" "skjöt" "skjutit" ; + skjuta_V = irregV "skjuta" "skjöt" "skjutit" ; skrida_V = irregV "skrida" "skred" "skridit" ; skrika_V = irregV "skrika" "skrek" "skrikit" ; skriva_V = irregV "skriva" "skrev" "skrivit" ; - skryta_V = irregV "skryta" "skröt" "skrutit" ; - slå_V = irregV "slå" "slog" "slagit" ; + skryta_V = irregV "skryta" "skröt" "skrutit" ; + slÃ¥_V = irregV "slÃ¥" "slog" "slagit" ; slinka_V = irregV "slinka" "slank" "slunkit" ; slippa_V = irregV "slippa" "slapp" "sluppit" ; slita_V = irregV "slita" "slet" "slitit" ; - sluta_V = irregV "sluta" "slöt" "slutit" ; - smörja_V = irregV "smörja" "smorjde" "smort" ; + sluta_V = irregV "sluta" "slöt" "slutit" ; + smörja_V = irregV "smörja" "smorjde" "smort" ; smita_V = irregV "smita" "smet" "smitit" ; - snyta_V = irregV "snyta" "snöt" "snutit" ; + snyta_V = irregV "snyta" "snöt" "snutit" ; sova_V = irregV "sova" "sov" "sovit" ; spinna_V = irregV "spinna" "spann" "spunnit" ; spricka_V = irregV "spricka" "sprack" "spruckit" ; sprida_V = irregV "sprida" "spred" "spridit" ; springa_V = irregV "springa" "sprang" "sprungit" ; - stå_V = irregV "stå" "stod" "stått" ; + stÃ¥_V = irregV "stÃ¥" "stod" "stÃ¥tt" ; sticka_V = irregV "sticka" "stack" "stuckit" ; stiga_V = irregV "stiga" "steg" "stigit" ; stinka_V = irregV "stinka" "stank" "stunkit" ; strida_V = irregV "strida" "stred" "stridit" ; - strypa_V = irregV "strypa" "ströp" "strupit" ; - suga_V = irregV "suga" "sög" "sugit" ; - supa_V = irregV "supa" "söp" "supit" ; - svälla_V = irregV "svälla" "svällde" "svällt" ; + strypa_V = irregV "strypa" "ströp" "strupit" ; + suga_V = irregV "suga" "sög" "sugit" ; + supa_V = irregV "supa" "söp" "supit" ; + svälla_V = irregV "svälla" "svällde" "svällt" ; svida_V = irregV "svida" "sved" "svidit" ; svika_V = irregV "svika" "svek" "svikit" ; sy_V = irregV "sy" "sydde" "sytt" ; - sätta_V = irregV "sätta" "satte" "satt" ; + sätta_V = irregV "sätta" "satte" "satt" ; taga_V = mkV "ta" "tar" "ta" "tog" "tagit" "tagen" | mkV "taga" "tog" "tagit" ; tiga_V = irregV "tiga" "teg" "tigit" ; - tillåta_V = irregV "tillåta" "tillät" "tillåtit" ; - tillsluta_V = irregV "tillsluta" "tillslöt" "tillslutit" ; - tjuta_V = irregV "tjuta" "tjöt" "tjutit" ; - tryta_V = irregV "tryta" "tröt" "trutit" ; + tillÃ¥ta_V = irregV "tillÃ¥ta" "tillät" "tillÃ¥tit" ; + tillsluta_V = irregV "tillsluta" "tillslöt" "tillslutit" ; + tjuta_V = irregV "tjuta" "tjöt" "tjutit" ; + tryta_V = irregV "tryta" "tröt" "trutit" ; tvinga_V = irregV "tvinga" "tvang" "tvungit" ; uppfinna_V = irregV "uppfinna" "uppfann" "uppfunnit" ; uppgiva_V = irregV "uppgiva" "uppgav" "uppgivit" ; - upplåta_V = irregV "upplåta" "upplät" "upplåtit" ; + upplÃ¥ta_V = irregV "upplÃ¥ta" "upplät" "upplÃ¥tit" ; uppstiga_V = irregV "uppstiga" "uppsteg" "uppstigit" ; upptaga_V = irregV "upptaga" "upptog" "upptagit" ; - utbjuda_V = irregV "utbjuda" "utbjöd" "utbjudit" ; + utbjuda_V = irregV "utbjuda" "utbjöd" "utbjudit" ; utbrista_V = irregV "utbrista" "utbrast" "utbrustit" ; - utesluta_V = irregV "utesluta" "uteslöt" "uteslutit" ; + utesluta_V = irregV "utesluta" "uteslöt" "uteslutit" ; utskriva_V = irregV "utskriva" "utskrev" "utskrivit" ; veta_V = mk6V "veta" "vet" "vet" "visste" "vetat" "visst" ; - vända_V = irregV "vända" "vände" "vänt" ; + vända_V = irregV "vända" "vände" "vänt" ; vilja_V = mkV "vilja" "vill" "vilj" "ville" "velat" "velad" ; vina_V = irregV "vina" "ven" "vinit" ; vinna_V = irregV "vinna" "vann" "vunnit" ; vrida_V = irregV "vrida" "vred" "vridit" ; -} \ No newline at end of file +} diff --git a/lib/src/swedish/IrregSweAbs.gf b/lib/src/swedish/IrregSweAbs.gf index 90408af88..6a51732f1 100644 --- a/lib/src/swedish/IrregSweAbs.gf +++ b/lib/src/swedish/IrregSweAbs.gf @@ -1,13 +1,13 @@ ---# -coding=latin1 abstract IrregSweAbs = Cat ** { + flags coding=utf8 ; fun anfalla_V : V ; angiva_V : V ; angripa_V : V ; - anhålla_V : V ; + anhÃ¥lla_V : V ; antaga_V : V ; - äta_V : V ; - återfinna_V : V ; + äta_V : V ; + Ã¥terfinna_V : V ; avbryta_V : V ; avfalla_V : V ; avhugga_V : V ; @@ -16,13 +16,13 @@ abstract IrregSweAbs = Cat ** { avsitta_V : V ; avskriva_V : V ; avstiga_V : V ; - bära_V : V ; + bära_V : V ; bedja_V : V ; bedraga_V : V ; bedriva_V : V ; befinna_V : V ; begrava_V : V ; - behålla_V : V ; + behÃ¥lla_V : V ; beljuga_V : V ; berida_V : V ; besitta_V : V ; @@ -40,7 +40,7 @@ abstract IrregSweAbs = Cat ** { brinna_V : V ; brista_V : V ; bryta_V : V ; - dö_V : V ; + dö_V : V ; draga_V : V ; dricka_V : V ; driva_V : V ; @@ -49,38 +49,38 @@ abstract IrregSweAbs = Cat ** { dyka_V : V ; erbjuda_V : V ; erfara_V : V ; - erhålla_V : V ; + erhÃ¥lla_V : V ; falla_V : V ; - fånga_V : V ; + fÃ¥nga_V : V ; fara_V : V ; finna_V : V ; flyga_V : V ; flyta_V : V ; - förbehålla_V : V ; - förbinda_V : V ; - förbjuda_V : V ; - fördriva_V : V ; - föreskriva_V : V ; - företaga_V : V ; - förfrysa_V : V ; - förlåta_V : V ; - förnimma_V : V ; - försitta_V : V ; - försvinna_V : V ; - förtiga_V : V ; + förbehÃ¥lla_V : V ; + förbinda_V : V ; + förbjuda_V : V ; + fördriva_V : V ; + föreskriva_V : V ; + företaga_V : V ; + förfrysa_V : V ; + förlÃ¥ta_V : V ; + förnimma_V : V ; + försitta_V : V ; + försvinna_V : V ; + förtiga_V : V ; frysa_V : V ; - få_V : V ; - gå_V : V ; - göra_V : V ; + fÃ¥_V : V ; + gÃ¥_V : V ; + göra_V : V ; genomdriva_V : V ; gilla_V : V ; giva_V : V ; gjuta_V : V ; glida_V : V ; gnida_V : V ; - gråta_V : V ; + grÃ¥ta_V : V ; gripa_V : V ; - hålla_V : V ; + hÃ¥lla_V : V ; hinna_V : V ; hugga_V : V ; iakttaga_V : V ; @@ -90,8 +90,8 @@ abstract IrregSweAbs = Cat ** { innesluta_V : V ; inskriva_V : V ; intaga_V : V ; - känna_V : V ; - klämma_V : V ; + känna_V : V ; + klämma_V : V ; kliva_V : V ; klyva_V : V ; knipa_V : V ; @@ -100,32 +100,32 @@ abstract IrregSweAbs = Cat ** { krypa_V : V ; kunna_V : V ; kvida_V : V ; - låta_V : V ; + lÃ¥ta_V : V ; leva_V : V ; ligga_V : V ; ljuda_V : V ; ljuga_V : V ; ljuta_V : V ; - lägga_V : V ; + lägga_V : V ; mottaga_V : V ; nerstiga_V : V ; niga_V : V ; njuta_V : V ; omgiva_V : V ; - överfalla_V : V ; - övergiva_V : V ; + överfalla_V : V ; + övergiva_V : V ; pipa_V : V ; rida_V : V ; rinna_V : V ; riva_V : V ; ryta_V : V ; - säga_V : V ; + säga_V : V ; se_V : V ; sitta_V : V ; sjuda_V : V ; sjunga_V : V ; sjunka_V : V ; - skära_V : V ; + skära_V : V ; skina_V : V ; skita_V : V ; skjuta_V : V ; @@ -133,12 +133,12 @@ abstract IrregSweAbs = Cat ** { skrika_V : V ; skriva_V : V ; skryta_V : V ; - slå_V : V ; + slÃ¥_V : V ; slinka_V : V ; slippa_V : V ; slita_V : V ; sluta_V : V ; - smörja_V : V ; + smörja_V : V ; smita_V : V ; snyta_V : V ; sova_V : V ; @@ -146,7 +146,7 @@ abstract IrregSweAbs = Cat ** { spricka_V : V ; sprida_V : V ; springa_V : V ; - stå_V : V ; + stÃ¥_V : V ; sticka_V : V ; stiga_V : V ; stinka_V : V ; @@ -154,28 +154,28 @@ abstract IrregSweAbs = Cat ** { strypa_V : V ; suga_V : V ; supa_V : V ; - svälla_V : V ; + svälla_V : V ; svida_V : V ; svika_V : V ; sy_V : V ; - sätta_V : V ; + sätta_V : V ; taga_V : V ; tiga_V : V ; - tillåta_V : V ; + tillÃ¥ta_V : V ; tillsluta_V : V ; tjuta_V : V ; tryta_V : V ; tvinga_V : V ; uppfinna_V : V ; uppgiva_V : V ; - upplåta_V : V ; + upplÃ¥ta_V : V ; uppstiga_V : V ; upptaga_V : V ; utbjuda_V : V ; utbrista_V : V ; utesluta_V : V ; utskriva_V : V ; - vända_V : V ; + vända_V : V ; veta_V : V ; vilja_V : V ; vina_V : V ; diff --git a/lib/src/swedish/LexiconSwe.gf b/lib/src/swedish/LexiconSwe.gf index edef8e2db..24cb93427 100644 --- a/lib/src/swedish/LexiconSwe.gf +++ b/lib/src/swedish/LexiconSwe.gf @@ -1,45 +1,45 @@ --# -path=.:../scandinavian:../common:../abstract:../../prelude ---# -coding=latin1 concrete LexiconSwe of Lexicon = CatSwe ** open Prelude, ParadigmsSwe, IrregSwe in { flags + coding=utf8 ; optimize=values ; lin airplane_N = regGenN "flygplan" neutrum ; answer_V2S = mkV2S (regV "svarar") (mkPrep "till") ; - apartment_N = mk2N "lägenhet" "lägenheter" ; - apple_N = regGenN "äpple" neutrum ; + apartment_N = mk2N "lägenhet" "lägenheter" ; + apple_N = regGenN "äpple" neutrum ; art_N = mk2N "konst" "konster" ; - ask_V2Q = mkV2Q (regV "frågar") noPrep ; + ask_V2Q = mkV2Q (regV "frÃ¥gar") noPrep ; baby_N = regGenN "bebis" utrum ; - bad_A = irregA "dålig" "sämre" "sämst"; + bad_A = irregA "dÃ¥lig" "sämre" "sämst"; bank_N = mk2N "bank" "banker" ; beautiful_A = mk3A "vacker" "vackert" "vackra" ; become_VA = mkVA (mkV "bli" "blir""bli" "blev" "blivit" "bliven" "blivande") ; - beer_N = regGenN "öl" neutrum ; + beer_N = regGenN "öl" neutrum ; beg_V2V = mkV2V (mkV "be" "ber""be" "bad" "bett" "bedd") ; - big_A = irregA "stor" "större" "störst"; + big_A = irregA "stor" "större" "störst"; bike_N = mk2N "cykel" "cyklar" ; - bird_N = mk2N "fågel" "fåglar" ; + bird_N = mk2N "fÃ¥gel" "fÃ¥glar" ; black_A = mk2A "svart" "svart" ; - blue_A = mk2A "blå" "blått"; - boat_N = regGenN "båt" utrum ; - book_N = mkN "bok" "boken" "böcker" "böckerna" ; - boot_N = mk2N "stövel" "stövlar" ; + blue_A = mk2A "blÃ¥" "blÃ¥tt"; + boat_N = regGenN "bÃ¥t" utrum ; + book_N = mkN "bok" "boken" "böcker" "böckerna" ; + boot_N = mk2N "stövel" "stövlar" ; boss_N = mk2N "chef" "chefer" ; boy_N = regGenN "pojke" utrum ; - bread_N = regGenN "bröd" neutrum ; - break_V2 = dirV2 (partV (mkV "slå" "slår" "slå" "slog" "slagit" "slagen") "sönder") ; + bread_N = regGenN "bröd" neutrum ; + break_V2 = dirV2 (partV (mkV "slÃ¥" "slÃ¥r" "slÃ¥" "slog" "slagit" "slagen") "sönder") ; broad_A = mk2A "bred" "brett" ; - brother_N2 = mkN2 ((mkN "bror" "brodern" "bröder" "bröderna")) (mkPrep "till") ; + brother_N2 = mkN2 ((mkN "bror" "brodern" "bröder" "bröderna")) (mkPrep "till") ; brown_A = regA "brun" ; - butter_N = regGenN "smör" neutrum ; - buy_V2 = dirV2 (mk2V "köpa" "köpte") ; + butter_N = regGenN "smör" neutrum ; + buy_V2 = dirV2 (mk2V "köpa" "köpte") ; camera_N = regGenN "kamera" utrum ; - cap_N = regGenN "mössa" utrum ; + cap_N = regGenN "mössa" utrum ; car_N = regGenN "bil" utrum ; carpet_N = regGenN "matta" utrum ; cat_N = mk2N "katt" "katter" ; @@ -48,90 +48,90 @@ lin cheese_N = regGenN "ost" utrum ; child_N = regGenN "barn" neutrum ; church_N = regGenN "kyrka" utrum ; - city_N = mkN "stad" "staden" "städer" "städerna" ; + city_N = mkN "stad" "staden" "städer" "städerna" ; clean_A = regA "ren" ; clever_A = regA "klok" ; - close_V2 = dirV2 (mk2V "stänga" "stängde") ; + close_V2 = dirV2 (mk2V "stänga" "stängde") ; coat_N = regGenN "rock" utrum ; cold_A = regA "kall" ; come_V = komma_V ; computer_N = mk2N "dator" "datorer" ; - country_N = mkN "land" "landet" "länder" "länderna" ; + country_N = mkN "land" "landet" "länder" "länderna" ; cousin_N = mk2N "kusin" "kusiner" ; cow_N = mk2N "ko" "kor" ; - die_V = (mkV "dö" "dör" "dö" "dog" "dött" "dödd") ; ---- - distance_N3 = mkN3 (mk2N "avstånd" "avstånd") (mkPrep "från") (mkPrep "till") ; + die_V = (mkV "dö" "dör" "dö" "dog" "dött" "dödd") ; ---- + distance_N3 = mkN3 (mk2N "avstÃ¥nd" "avstÃ¥nd") (mkPrep "frÃ¥n") (mkPrep "till") ; dirty_A = regA "smutsig" ; - doctor_N = mk2N "läkare" "läkare" ; + doctor_N = mk2N "läkare" "läkare" ; dog_N = regGenN "hund" utrum ; - door_N = regGenN "dörr" utrum ; + door_N = regGenN "dörr" utrum ; drink_V2 = dirV2 (irregV "dricka" "drack" "druckit") ; - easy_A2V = mkA2V (mk2A "lätt" "lätt") (mkPrep "för") ; - eat_V2 = dirV2 (irregV "äta" "åt" "ätit") ; + easy_A2V = mkA2V (mk2A "lätt" "lätt") (mkPrep "för") ; + eat_V2 = dirV2 (irregV "äta" "Ã¥t" "ätit") ; empty_A = mkA "tom" "tomt" "tomma" "tomma" "tommare" "tommast" "tommaste" ; enemy_N = regGenN "fiende" neutrum ; factory_N = mk2N "fabrik" "fabriker" ; - father_N2 = mkN2 ((mkN "far" "fadern" "fäder" "fäderna")) (mkPrep "till") ; + father_N2 = mkN2 ((mkN "far" "fadern" "fäder" "fäderna")) (mkPrep "till") ; fear_VS = mkVS (regV "fruktar") ; find_V2 = dirV2 (irregV "finna" "fann" "funnit") ; fish_N = mk2N "fisk" "fiskar" ; floor_N = regGenN "golv" neutrum ; - forget_V2 = dirV2 (mkV "glömma" "glömmer" "glöm" "glömde" "glömt" "glömd") ; - fridge_N = regGenN "kylskåp" neutrum ; - friend_N = mkN "vän" "vännen" "vänner" "vännerna" ; + forget_V2 = dirV2 (mkV "glömma" "glömmer" "glöm" "glömde" "glömt" "glömd") ; + fridge_N = regGenN "kylskÃ¥p" neutrum ; + friend_N = mkN "vän" "vännen" "vänner" "vännerna" ; fruit_N = mk2N "frukt" "frukter" ; fun_AV = mkAV (regA "rolig") ; - garden_N = regGenN "trädgård" utrum ; + garden_N = regGenN "trädgÃ¥rd" utrum ; girl_N = regGenN "flicka" utrum ; glove_N = regGenN "handske" utrum ; gold_N = regGenN "guld" neutrum ; - good_A = mkA "god" "gott" "goda" "goda" "bättre" "bäst" "bästa" ; - go_V = (mkV "gå" "går" "gå" "gick" "gått" "gången") ; - green_A = regA "grön" ; + good_A = mkA "god" "gott" "goda" "goda" "bättre" "bäst" "bästa" ; + go_V = (mkV "gÃ¥" "gÃ¥r" "gÃ¥" "gick" "gÃ¥tt" "gÃ¥ngen") ; + green_A = regA "grön" ; harbour_N = regGenN "hamn" utrum; hate_V2 = dirV2 (regV "hatar") ; hat_N = regGenN "hatt" utrum ; - hear_V2 = dirV2 (mkV "höra" "hör" "hör" "hörde" "hört" "hörd") ; + hear_V2 = dirV2 (mkV "höra" "hör" "hör" "hörde" "hört" "hörd") ; hill_N = regGenN "kulle" utrum ; --- hope_VS = mkVS ((regV "önskar")) ; +-- hope_VS = mkVS ((regV "önskar")) ; hope_VS = mkVS (depV (regV "hoppar")) ; - horse_N = regGenN "häst" utrum ; + horse_N = regGenN "häst" utrum ; hot_A = regA "het" ; house_N = regGenN "hus" neutrum ; important_A = regA "viktig" ; industry_N = mk2N "industri" "industrier" ; ---- "ien" ?? - iron_N = regGenN "järn" neutrum ; + iron_N = regGenN "järn" neutrum ; king_N = (regGenN "kung" utrum) ; - know_V2 = mkV2 (mkV "känner") ; + know_V2 = mkV2 (mkV "känner") ; know_VQ = mkVQ (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ; know_VS = mkVS (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ; - lake_N = mkN "sjö" "sjön" "sjöar" "sjöarna" ; + lake_N = mkN "sjö" "sjön" "sjöar" "sjöarna" ; lamp_N = regGenN "lampa" utrum; - learn_V2 = dirV2 (reflV (mkV "lära" "lär" "lär" "lärde" "lärt" "lärd")) ; - leather_N = mkN "läder" "lädret" "läder" "lädren" ; - leave_V2 = dirV2 (regV "lämnar") ; + learn_V2 = dirV2 (reflV (mkV "lära" "lär" "lär" "lärde" "lärt" "lärd")) ; + leather_N = mkN "läder" "lädret" "läder" "lädren" ; + leave_V2 = dirV2 (regV "lämnar") ; like_V2 = mkV2 (mk2V "tycka" "tyckte") (mkPrep "om") ; - listen_V2 = mkV2 (regV "lyssnar") (mkPrep "på") ; + listen_V2 = mkV2 (regV "lyssnar") (mkPrep "pÃ¥") ; live_V = (irregV "leva" "levde" "levt") ; ---- ? - long_A = irregA "lång" "längre" "längst" ; - lose_V2 = dirV2 (regV "förlora") ; - love_N = regGenN "kärlek" utrum ; - love_V2 = dirV2 (regV "älska") ; - man_N = (mkN "man" "mannen" "män" "männen") ; + long_A = irregA "lÃ¥ng" "längre" "längst" ; + lose_V2 = dirV2 (regV "förlora") ; + love_N = regGenN "kärlek" utrum ; + love_V2 = dirV2 (regV "älska") ; + man_N = (mkN "man" "mannen" "män" "männen") ; married_A2 = mkA2 (mk2A "gift" "gift") (mkPrep "med") ; - meat_N = regGenN "kött" neutrum ; - milk_N = regGenN "mjölk" utrum ; ---- -ar? - moon_N = regGenN "måne" utrum ; - mother_N2 = mkN2 (mkN "mor" "modern" "mödrar" "mödrarna") (mkPrep "till") ; + meat_N = regGenN "kött" neutrum ; + milk_N = regGenN "mjölk" utrum ; ---- -ar? + moon_N = regGenN "mÃ¥ne" utrum ; + mother_N2 = mkN2 (mkN "mor" "modern" "mödrar" "mödrarna") (mkPrep "till") ; mountain_N = regGenN "berg" neutrum ; music_N = mk2N "musik" "musiker" ; ---- er ? narrow_A = regA "smal" ; new_A = mkA "ny" "nytt" "nya" "nya" "nyare" "nyast" "nyaste" ; newspaper_N = regGenN "tidning" utrum ; oil_N = regGenN "olja" utrum ; - old_A = mkA "gammal" "gammalt" "gamla" "gamla" "äldre" "äldst" "äldsta" ; - open_V2 = dirV2 (regV "öppna") ; - paint_V2A = mkV2A (regV "måla") noPrep ; + old_A = mkA "gammal" "gammalt" "gamla" "gamla" "äldre" "äldst" "äldsta" ; + open_V2 = dirV2 (regV "öppna") ; + paint_V2A = mkV2A (regV "mÃ¥la") noPrep ; paper_N = mkN "papper" "pappret" "papper" "pappren" ; paris_PN = regGenPN "Paris" neutrum ; peace_N = regGenN "fred" utrum ; ---- ar? @@ -140,107 +140,107 @@ lin plastic_N = mk2N "plast" "plaster" ; play_V2 = dirV2 (regV "spela") ; policeman_N = mk2N "polis" "poliser" ; - priest_N = mk2N "präst" "präster" ; + priest_N = mk2N "präst" "präster" ; probable_AS = mkAS (regA "sannolik") ; queen_N = regGenN "drottning" utrum ; radio_N = mkN "radio" "radion" "radioapparater" "radioapparaterna" ; -- SAOL rain_V0 = mkV0 (regV "regna") ; - read_V2 = dirV2 (mk2V "läsa" "läste") ; - red_A = mk2A "röd" "rött" ; + read_V2 = dirV2 (mk2V "läsa" "läste") ; + red_A = mk2A "röd" "rött" ; religion_N = mk2N "religion" "religioner" ; restaurant_N = mk2N "restaurang" "restauranger" ; - river_N = mkN "å" "ån" "åar" "åarna" ; + river_N = mkN "Ã¥" "Ã¥n" "Ã¥ar" "Ã¥arna" ; rock_N = mkN "sten" "stenen" "stenar" "stenarna" ; roof_N = regGenN "tak" neutrum ; rubber_N = mkN "gummi" "gummit" "gummin" "gummina" ; run_V = (irregV "springa" "sprang" "sprungit") ; - say_VS = mkVS (mkV "säga" "säger" "säg" "sade" "sagt" "sagd") ; + say_VS = mkVS (mkV "säga" "säger" "säg" "sade" "sagt" "sagd") ; school_N = regGenN "skola" utrum; science_N = mk2N "vetenskap" "vetenskaper" ; sea_N = mkN "hav" "hav" ; - seek_V2 = dirV2 (mk2V "söka" "sökte") ; - see_V2 = dirV2 (mkV "se" "ser" "se" "såg" "sett" "sedd") ; - sell_V3 = dirV3 (irregV "sälja" "sålde" "sålt") (mkPrep "till") ; + seek_V2 = dirV2 (mk2V "söka" "sökte") ; + see_V2 = dirV2 (mkV "se" "ser" "se" "sÃ¥g" "sett" "sedd") ; + sell_V3 = dirV3 (irregV "sälja" "sÃ¥lde" "sÃ¥lt") (mkPrep "till") ; send_V3 = dirV3 (regV "skicka") (mkPrep "till") ; - sheep_N = mk2N "får" "får" ; + sheep_N = mk2N "fÃ¥r" "fÃ¥r" ; ship_N = regGenN "skepp" neutrum ; shirt_N = regGenN "skjorta" utrum ; shoe_N = mk2N "sko" "skor" ; - shop_N = mk2N "affär" "affärer" ; + shop_N = mk2N "affär" "affärer" ; short_A = regA "kort" ; silver_N = mkN "silver" "silvret" "silver" "silvren" ; sister_N = mk2N "syster" "systrar" ; sleep_V = (irregV "sova" "sov" "sovit") ; - small_A = mkA "liten" "litet" "lilla" "små" "mindre" "minst" "minsta" ; + small_A = mkA "liten" "litet" "lilla" "smÃ¥" "mindre" "minst" "minsta" ; snake_N = regGenN "orm" utrum ; sock_N = regGenN "strumpa" utrum ; speak_V2 = dirV2 (regV "tala") ; - star_N = regGenN "stjärna" utrum ; - steel_N = regGenN "stål" utrum ; + star_N = regGenN "stjärna" utrum ; + steel_N = regGenN "stÃ¥l" utrum ; stone_N = mkN "sten" "stenen" "stenar" "stenarna" ; stove_N = regGenN "spis" utrum ; student_N = mk2N "student" "studenter" ; stupid_A = mk3A "dum" "dumt" "dumma" ; sun_N = regGenN "sol" utrum ; - switch8off_V2 = dirV2 (partV (irregV "stänga" "stängde" "stängt") "av") ; - switch8on_V2 = dirV2 (partV (irregV "slå" "slog" "slagit") "på") ; + switch8off_V2 = dirV2 (partV (irregV "stänga" "stängde" "stängt") "av") ; + switch8on_V2 = dirV2 (partV (irregV "slÃ¥" "slog" "slagit") "pÃ¥") ; table_N = regGenN "bord" neutrum ; talk_V3 = mkV3 (regV "prata") (mkPrep "till") (mkPrep "om") ; - teacher_N = mk2N "lärare" "lärare" ; + teacher_N = mk2N "lärare" "lärare" ; teach_V2 = dirV2 (regV "undervisa") ; television_N = mk2N "television" "televisioner" ; thick_A = regA "tjock" ; thin_A = mk2A "tunn" "tunt" ; - train_N = regGenN "tåg" neutrum ; + train_N = regGenN "tÃ¥g" neutrum ; travel_V = mk2V "resa" "reste" ; - tree_N = regGenN "träd" neutrum ; + tree_N = regGenN "träd" neutrum ; ---- trousers_N = regGenN "trousers" ; ---- pl t ! ugly_A = regA "ful" ; - understand_V2 = dirV2 (mkV "förstå" "förstår" "förstå" "förstod" "förstått" "förstådd") ; + understand_V2 = dirV2 (mkV "förstÃ¥" "förstÃ¥r" "förstÃ¥" "förstod" "förstÃ¥tt" "förstÃ¥dd") ; university_N = regGenN "universitet" neutrum ; village_N = mkN "by" "byn" "byar" "byarna" ; - wait_V2 = mkV2 (regV "vänta") (mkPrep "på") ; - walk_V = (mkV "gå" "går" "gå" "gick" "gått" "gången") ; + wait_V2 = mkV2 (regV "vänta") (mkPrep "pÃ¥") ; + walk_V = (mkV "gÃ¥" "gÃ¥r" "gÃ¥" "gick" "gÃ¥tt" "gÃ¥ngen") ; warm_A = regA "varm" ; war_N = regGenN "krig" neutrum ; - watch_V2 = mkV2 (regV "titta") (mkPrep "på") ; + watch_V2 = mkV2 (regV "titta") (mkPrep "pÃ¥") ; water_N = mkN "vatten" "vattnet" "vatten" "vattnen" ; white_A = regA "vit" ; - window_N = mkN "fönster" "fönstret" "fönster" "fönstren" ; + window_N = mkN "fönster" "fönstret" "fönster" "fönstren" ; wine_N = mkN "vin" "vinet" "viner" "vinerna" ; ---- win_V2 = dirV2 (irregV "vinna" "vann" "vunnit") ; woman_N = regGenN "kvinna" utrum ; wonder_VQ = mkVQ (regV "undra") ; - wood_N = mkN "trä" "träet" "träen" "träena" ; ---- ? + wood_N = mkN "trä" "träet" "träen" "träena" ; ---- ? write_V2 = dirV2 (irregV "skriva" "skrev" "skrivit") ; yellow_A = regA "gul" ; young_A = irregA "ung" "yngre" "yngst" ; - do_V2 = dirV2 göra_V ; + do_V2 = dirV2 göra_V ; now_Adv = mkAdv "nu" ; already_Adv = mkAdv "redan" ; - song_N = mk2N "sång" "sånger" ; - add_V3 = mkV3 (partV (irregV "lägga" "lade" "lagt") "till") noPrep (mkPrep "till") ; + song_N = mk2N "sÃ¥ng" "sÃ¥nger" ; + add_V3 = mkV3 (partV (irregV "lägga" "lade" "lagt") "till") noPrep (mkPrep "till") ; number_N = mkN "nummer" "numret" "numren" "numren" ; - put_V2 = mkV2 (mkV "sätta" "sätter" "sätt" "satte" "satt" "satt") noPrep ; + put_V2 = mkV2 (mkV "sätta" "sätter" "sätt" "satte" "satt" "satt") noPrep ; stop_V = regV "stanna" ; jump_V = regV "hoppa" ; - left_Ord = {s = "vänstra" ; isDet = True} ; - right_Ord = {s = "högra" ; isDet = True} ; - far_Adv = mkAdv "långt" ; + left_Ord = {s = "vänstra" ; isDet = True} ; + right_Ord = {s = "högra" ; isDet = True} ; + far_Adv = mkAdv "lÃ¥ngt" ; correct_A = regA "riktig" ; dry_A = regA "torr" ; - dull_A = mk2A "slö" "slött"; + dull_A = mk2A "slö" "slött"; full_A = regA "full" ; heavy_A = irregA "tung" "tyngre" "tyngst" ; - near_A = mkA "nära" "nära" "nära" "nära" "närmare" "närmast" "närmaste" ; + near_A = mkA "nära" "nära" "nära" "nära" "närmare" "närmast" "närmaste" ; rotten_A = mk3A "rutten" "ruttet" "ruttna" ; round_A = regA "rund" ; sharp_A = regA "vass" ; - smooth_A = regA "slät" ; + smooth_A = regA "slät" ; straight_A = regA "rak" ; - wet_A = regA "våt" ; + wet_A = regA "vÃ¥t" ; wide_A = mk2A "bred" "brett" ; animal_N = mk2N "djur" "djur" ; ashes_N = mk2N "aska" "askor" ; @@ -249,68 +249,68 @@ lin belly_N = mk2N "mage" "magar" ; blood_N = mk2N "blod" "blod" ; bone_N = mk2N "ben" "ben" ; - breast_N = mk2N "bröst" "bröst" ; + breast_N = mk2N "bröst" "bröst" ; cloud_N = mk2N "moln" "moln" ; day_N = mk2N "dag" "dagar" ; dust_N = mk2N "damm" "damm" ; - ear_N = mkN "öra" "örat" "öron" "öronen" ; + ear_N = mkN "öra" "örat" "öron" "öronen" ; earth_N = mk2N "jord" "jordar" ; - egg_N = mk2N "ägg" "ägg" ; - eye_N = mkN "öga" "ögat" "ögon" "ögonen" ; + egg_N = mk2N "ägg" "ägg" ; + eye_N = mkN "öga" "ögat" "ögon" "ögonen" ; fat_N = mk2N "fett" "fett" ; - feather_N = mk2N "fjäder" "fjädrar" ; + feather_N = mk2N "fjäder" "fjädrar" ; fingernail_N = mkN "nagel" "nageln" "naglar" "naglarna"; fire_N = mk2N "eld" "eldar" ; flower_N = mk2N "blomma" "blommor" ; fog_N = mk2N "dimma" "dimmor" ; - foot_N = mk2N "fot" "fötter" ; + foot_N = mk2N "fot" "fötter" ; forest_N = mk2N "skog" "skogar" ; - grass_N = mk2N "gräs" "gräs" ; - guts_N = mk2N "inälva" "inälvor" ; - hair_N = mk2N "hår" "hår" ; - hand_N = mk2N "hand" "händer" ; + grass_N = mk2N "gräs" "gräs" ; + guts_N = mk2N "inälva" "inälvor" ; + hair_N = mk2N "hÃ¥r" "hÃ¥r" ; + hand_N = mk2N "hand" "händer" ; head_N = mkN "huvud" "huvudet" "huvuden" "huvudena" ; - heart_N = mkN "hjärta" "hjärtat" "hjärtan" "hjärtana" ; + heart_N = mkN "hjärta" "hjärtat" "hjärtan" "hjärtana" ; horn_N = mk2N "horn" "horn" ; husband_N = (mk2N "make" "makar") ; ice_N = mk2N "is" "isar" ; - knee_N = mkN "knä" "knäet" "knän" "knäna" ; - leaf_N = mk2N "löv" "löv" ; + knee_N = mkN "knä" "knäet" "knän" "knäna" ; + leaf_N = mk2N "löv" "löv" ; leg_N = mk2N "ben" "ben" ; liver_N = mkN "lever" "levern" "levrar" "levrarna"; - louse_N = mkN "lus" "lusen" "löss" "lössen" ; + louse_N = mkN "lus" "lusen" "löss" "lössen" ; mouth_N = mkN "mun" "munnen" "munnar" "munnarna" ; name_N = mk2N "namn" "namn" ; neck_N = mk2N "nacke" "nackar" ; - night_N = mk2N "natt" "nätter" ; - nose_N = mk2N "näsa" "näsor" ; + night_N = mk2N "natt" "nätter" ; + nose_N = mk2N "näsa" "näsor" ; person_N = mk2N "person" "personer" ; rain_N = mk2N "regn" "regn" ; - road_N = mk2N "väg" "vägar" ; - root_N = mk2N "rot" "rötter" ; + road_N = mk2N "väg" "vägar" ; + root_N = mk2N "rot" "rötter" ; rope_N = mk2N "rep" "rep" ; salt_N = mkN "salt" "saltet" "salter" "salterna"; sand_N = mk2N "sand" "sander" ; - seed_N = mkN "frö" "fröet" "frön" "fröna" ; + seed_N = mkN "frö" "fröet" "frön" "fröna" ; skin_N = mk2N "skinn" "skinn" ; sky_N = mk2N "himmel" "himlar" ; - smoke_N = mk2N "rök" "rökar" ; - snow_N = mkN "snö" "snön" "snöer" "snöerna" ; + smoke_N = mk2N "rök" "rökar" ; + snow_N = mkN "snö" "snön" "snöer" "snöerna" ; stick_N = mk2N "pinne" "pinnar" ; tail_N = mk2N "svans" "svansar" ; tongue_N = mk2N "tunga" "tungor" ; - tooth_N = mk2N "tand" "tänder" ; + tooth_N = mk2N "tand" "tänder" ; wife_N = mk2N "fru" "fruar" ; wind_N = mk2N "vind" "vindar" ; wing_N = mk2N "vinge" "vingar" ; worm_N = mk2N "mask" "maskar" ; - year_N = mk2N "år" "år" ; + year_N = mk2N "Ã¥r" "Ã¥r" ; bite_V2 = dirV2 (bita_V) ; - blow_V = mk2V "blåsa" "blåste" ; - burn_V = brinna_V ; -- FIXME: bränna? - count_V2 = dirV2 (regV "räkna") ; - cut_V2 = dirV2 (skära_V) ; - dig_V = mk2V "gräva" "grävde" ; + blow_V = mk2V "blÃ¥sa" "blÃ¥ste" ; + burn_V = brinna_V ; -- FIXME: bränna? + count_V2 = dirV2 (regV "räkna") ; + cut_V2 = dirV2 (skära_V) ; + dig_V = mk2V "gräva" "grävde" ; fall_V = falla_V ; fear_V2 = dirV2 (regV "frukta") ; float_V = flyta_V ; @@ -318,10 +318,10 @@ lin fly_V = flyga_V ; freeze_V = frysa_V ; give_V3 = dirV3 (mkV "ge" "ger""ge" "gav" "givit" "given" "givande") (mkPrep "till"); - hit_V2 = dirV2 (slå_V) ; - hold_V2 = dirV2 (hålla_V) ; + hit_V2 = dirV2 (slÃ¥_V) ; + hold_V2 = dirV2 (hÃ¥lla_V) ; hunt_V2 = dirV2 (regV "jaga") ; - kill_V2 = dirV2 (regV "döda") ; + kill_V2 = dirV2 (regV "döda") ; laugh_V = regV "skratta" ; lie_V = ligga_V ; play_V = mk2V "leka" "lekte" ; @@ -335,34 +335,34 @@ lin smell_V = regV "lukta" ; spit_V = regV "spotta" ; split_V2 = dirV2 (klyva_V) ; - squeeze_V2 = dirV2 (klämma_V) ; + squeeze_V2 = dirV2 (klämma_V) ; stab_V2 = dirV2 (sticka_V) ; - stand_V = stå_V ; + stand_V = stÃ¥_V ; suck_V2 = dirV2 (suga_V) ; - swell_V = svälla_V ; + swell_V = svälla_V ; swim_V = regV "simma" ; - think_V = mk2V "tänka" "tänkte" ; + think_V = mk2V "tänka" "tänkte" ; throw_V2 = dirV2 (regV "kasta") ; tie_V2 = dirV2 (knyta_V) ; - turn_V = vända_V ; + turn_V = vända_V ; vomit_V = mk2V "spy" "spydde" ; - wash_V2 = dirV2 (regV "tvätta") ; + wash_V2 = dirV2 (regV "tvätta") ; wipe_V2 = dirV2 (regV "torka") ; breathe_V = depV (regV "anda") ; fight_V2 = - mkV2 (mkV "slåss" "slåss" "slåss" "slogs" "slagits" "slagen") (mkPrep "med") ; + mkV2 (mkV "slÃ¥ss" "slÃ¥ss" "slÃ¥ss" "slogs" "slagits" "slagen") (mkPrep "med") ; grammar_N = mk1N "grammatikerna" ; - language_N = mk2N "språk" "språk" ; + language_N = mk2N "sprÃ¥k" "sprÃ¥k" ; rule_N = mkN "regel" "regeln" "regler" "reglerna" ; john_PN = regPN "Johan" ; - question_N = regN "fråga" ; - ready_A = regA "färdig" ; + question_N = regN "frÃ¥ga" ; + ready_A = regA "färdig" ; reason_N = regN "anledning" ; today_Adv = mkAdv "idag" ; - uncertain_A = mk3A "osäker" "osäkert" "osäkra" ; + uncertain_A = mk3A "osäker" "osäkert" "osäkra" ; } ; diff --git a/lib/src/swedish/MorphoSwe.gf b/lib/src/swedish/MorphoSwe.gf index 378b16631..4dbd8ad2d 100644 --- a/lib/src/swedish/MorphoSwe.gf +++ b/lib/src/swedish/MorphoSwe.gf @@ -1,5 +1,4 @@ --# -path=.:../scandinavian:../common:../../prelude ---# -coding=latin1 --1 A Simple Swedish Resource Morphology -- @@ -10,6 +9,7 @@ -- gives a higher-level access to this module. resource MorphoSwe = CommonScand, ResSwe ** open Prelude, (Predef=Predef) in { + flags coding=utf8 ; -- Verbs @@ -56,9 +56,9 @@ oper cardOrd tio (tio + "nde") ; mkTal : (x1,_,_,_,x5 : Str) -> LinDigit = - \två, tolv, tjugo, andra, tolfte -> + \tvÃ¥, tolv, tjugo, andra, tolfte -> {s = table { - ental => cardOrd två andra ; + ental => cardOrd tvÃ¥ andra ; ton => cardOrd tolv tolfte ; tiotal => cardReg tjugo } diff --git a/lib/src/swedish/NumeralSwe.gf b/lib/src/swedish/NumeralSwe.gf index 4a7e9377c..fc901d808 100644 --- a/lib/src/swedish/NumeralSwe.gf +++ b/lib/src/swedish/NumeralSwe.gf @@ -1,5 +1,5 @@ ---# -coding=latin1 concrete NumeralSwe of Numeral = CatSwe [Numeral,Digits] ** open ResSwe, MorphoSwe, Prelude in { + flags coding=utf8 ; lincat Digit = {s : DForm => CardOrd => Str} ; @@ -10,19 +10,19 @@ lincat lin num x = x ; - n2 = mkTal "två" "tolv" "tjugo" "andra" "tolfte" ; + n2 = mkTal "tvÃ¥" "tolv" "tjugo" "andra" "tolfte" ; n3 = mkTal "tre" "tretton" "trettio" "tredje" "trettonde" ; - n4 = mkTal "fyra" "fjorton" "fyrtio" "fjärde" "fjortonde" ; + n4 = mkTal "fyra" "fjorton" "fyrtio" "fjärde" "fjortonde" ; n5 = mkTal "fem" "femton" "femtio" "femte" "femtonde" ; - n6 = mkTal "sex" "sexton" "sextio" "sjätte" "sextonde" ; + n6 = mkTal "sex" "sexton" "sextio" "sjätte" "sextonde" ; n7 = mkTal "sju" "sjutton" "sjuttio" "sjunde" "sjuttonde" ; - n8 = mkTal "åtta" "arton" "åttio" "åttonde" "artonde" ; + n8 = mkTal "Ã¥tta" "arton" "Ã¥ttio" "Ã¥ttonde" "artonde" ; n9 = mkTal "nio" "nitton" "nittio" "nionde" "nittonde" ; pot01 = { s = \\f => table { NCard g => case g of {Neutr => "ett" ; _ => "en"} ; - _ => "första" + _ => "första" } ; n = Sg } ; diff --git a/lib/src/swedish/ParadigmsSwe.gf b/lib/src/swedish/ParadigmsSwe.gf index 2e38f03d3..b592fd656 100644 --- a/lib/src/swedish/ParadigmsSwe.gf +++ b/lib/src/swedish/ParadigmsSwe.gf @@ -1,5 +1,4 @@ --# -path=.:../scandinavian:../common:../abstract:../../prelude ---# -coding=latin1 --1 Swedish Lexical Paradigms -- @@ -34,6 +33,7 @@ resource ParadigmsSwe = ResSwe, MorphoSwe, CatSwe in { + flags coding=utf8 ; --2 Parameters -- @@ -120,16 +120,16 @@ oper mkN2 : N -> Prep -> N2 -- e.g. syster - till } ; --- Three-place relational nouns ("förbindelse från x till y") +-- Three-place relational nouns ("förbindelse frÃ¥n x till y") -- need two prepositions. - mkN3 : N -> Prep -> Prep -> N3 ; -- e.g. flyg - från - till + mkN3 : N -> Prep -> Prep -> N3 ; -- e.g. flyg - frÃ¥n - till --3 Relational common noun phrases -- -- In some cases, you may want to make a complex $CN$ into a --- relational noun (e.g. "den före detta maken till"). However, $N2$ and +-- relational noun (e.g. "den före detta maken till"). However, $N2$ and -- $N3$ are purely lexical categories. But you can use the $AdvCN$ -- and $PrepNP$ constructions to build phrases like this. @@ -185,7 +185,7 @@ oper -- Adjective with all positive forms the same. - invarA : Str -> A ; -- e.g. äkta + invarA : Str -> A ; -- e.g. äkta ---- Adjective with deviant adverb. @@ -205,12 +205,12 @@ oper -- after the verb. Some can be preverbal in subordinate position -- (e.g. "alltid"). - mkAdv : Str -> Adv ; -- postverbal, e.g. här + mkAdv : Str -> Adv ; -- postverbal, e.g. här mkAdV : Str -> AdV ; -- preverbal, e.g. alltid -- Adverbs modifying adjectives and sentences can also be formed. - mkAdA : Str -> AdA ; -- modify adjective, e.g. tämligen + mkAdA : Str -> AdA ; -- modify adjective, e.g. tämligen --2 Verbs -- @@ -222,38 +222,38 @@ oper -- present tense indicative form. The value is the first conjugation if the -- argument ends with "ar" ("tala" - "talar" - "talade" - "talat"), -- the second with "er" ("leka" - "leker" - "lekte" - "lekt", with the --- variations like in "gräva", "vända", "tyda", "hyra"), and +-- variations like in "gräva", "vända", "tyda", "hyra"), and -- the third in other cases ("bo" - "bor" - "bodde" - "bott"). -- It is also possible to give the infinite form to it; they are treated -- as if they were implicitly suffixed by "r". Moreover, deponent verbs -- are recognized from the final "s" ("hoppas"). - mkV : (stämmer : Str) -> V ; -- predictable verb: use present indicative + mkV : (stämmer : Str) -> V ; -- predictable verb: use present indicative -- Most irregular verbs need just the conventional three forms. - mkV : (slita, slet : Str) -> V ; -- i/e/i, u/ö/u, u/a/u + mkV : (slita, slet : Str) -> V ; -- i/e/i, u/ö/u, u/a/u mkV : (dricka,drack,druckit : Str) -> V ; -- the theme of an irregular verb -- In the worst case, six forms are given. - mkV : (gå,går,gå,gick,gått,gången : Str) -> V ; -- worst case + mkV : (gÃ¥,gÃ¥r,gÃ¥,gick,gÃ¥tt,gÃ¥ngen : Str) -> V ; -- worst case --- Particle verbs, such as "passa på", are formed by adding a string to a verb. +-- Particle verbs, such as "passa pÃ¥", are formed by adding a string to a verb. - mkV : V -> Str -> V -- particle verb, e.g. passa - på + mkV : V -> Str -> V -- particle verb, e.g. passa - pÃ¥ } ; --3 Deponent verbs. -- -- Some words are used in passive forms only, e.g. "hoppas", some as --- reflexive e.g. "ångra sig". Regular deponent verbs are also +-- reflexive e.g. "Ã¥ngra sig". Regular deponent verbs are also -- handled by $mkV$ and recognized from the ending "s". depV : V -> V ; -- deponent verb, e.g. andas - reflV : V -> V ; -- reflexive verb, e.g. ångra sig + reflV : V -> V ; -- reflexive verb, e.g. Ã¥ngra sig --3 Two-place verbs @@ -438,7 +438,7 @@ oper "ar" => decl2Noun bil ; "er" => case bil of { _ + "or" => mk4N bil (bil + "n") bilar (bilar + "na") ; -- motor,motorn - _ => decl3gNoun bil bilar -- fot, fötter + _ => decl3gNoun bil bilar -- fot, fötter } ; "en" => decl4Noun bil ; -- rike, riken _ => mk4N bil (bil + "et") bilar (bilar + "n") -- centrum, centra @@ -453,10 +453,10 @@ oper decl2Noun : Str -> N = \bil -> let bb : Str * Str = case bil of { - br + ("o" | "u" | "ö" | "å") => ; + br + ("o" | "u" | "ö" | "Ã¥") => ; pojk + "e" => ; hi + "mme" + l@("l" | "r") => ; - nyck@(_ + ("a"|"e"|"i"|"o"|"u"|"y"|"å"|"ä"|"ö") + _) + "e" + l@("l" | "r") => ; + nyck@(_ + ("a"|"e"|"i"|"o"|"u"|"y"|"Ã¥"|"ä"|"ö") + _) + "e" + l@("l" | "r") => ; sock + "e" + "n" => ; _ => } ; @@ -465,13 +465,13 @@ oper decl3Noun : Str -> N = \sak -> case last sak of { "e" => mk4N sak (sak + "n") (sak +"r") (sak + "rna") ; - "y" | "å" | "é" | "y" => mk4N sak (sak + "n") (sak +"er") (sak + "erna") ; + "y" | "Ã¥" | "é" | "y" => mk4N sak (sak + "n") (sak +"er") (sak + "erna") ; _ => mk4N sak (sak + "en") (sak + "er") (sak + "erna") } ; decl3gNoun : Str -> Str -> N = \sak,saker -> case last sak of { "e" => mk4N sak (sak + "n") saker (saker + "na") ; - "y" | "å" | "é" | "y" => mk4N sak (sak + "n") saker (saker + "na") ; + "y" | "Ã¥" | "é" | "y" => mk4N sak (sak + "n") saker (saker + "na") ; _ => mk4N sak (sak + "en") saker (saker + "na") } ; @@ -579,18 +579,18 @@ oper mkAdA x = ss x ** {lock_AdA = <>} ; mkV = overload { - mkV : (stämmer : Str) -> V = regV ; + mkV : (stämmer : Str) -> V = regV ; mkV : (slita, slet : Str) -> V = reg2V ; mkV : (dricka,drack,druckit : Str) -> V = irregV ; - mkV : (supa,super,sup,söp,supit,supen : Str) -> V = mk6V ; - mkV : (supa,super,sup,söp,supit,supen,supande : Str) -> V = mk7V ; + mkV : (supa,super,sup,söp,supit,supen : Str) -> V = mk6V ; + mkV : (supa,super,sup,söp,supit,supen,supande : Str) -> V = mk7V ; mkV : V -> Str -> V = partV } ; mk6V = \finna,finner,finn,fann,funnit,funnen -> let finnande : Str = case finna of { _ + "a" => finna + "nde" ; - _ => finna + "ende" -- gående; but bli - blivande must be given separately + _ => finna + "ende" -- gÃ¥ende; but bli - blivande must be given separately } in mk7V finna finner finn fann funnit funnen finnande ; @@ -610,7 +610,7 @@ oper lek + "er" => conj2 (lek + "a") ; bo + "r" => conj3 bo ; ret + "as" => depV (conj1 (ret + "a")) ; - n + ("os" | "ys" | "ås" | "ös") => depV (conj3 (init leker)) ; + n + ("os" | "ys" | "Ã¥s" | "ös") => depV (conj3 (init leker)) ; ret + "s" => depV (conj2 (ret + "a")) ; _ => conj3 leker } ; @@ -650,8 +650,8 @@ oper reg2V : Str -> Str -> V = \sliter,slet -> (case of { <_ + "i" + ? + "a", sl + "e" + ?> => irregV slita slet (init slita + "it") ; - <_ + "u" + ? + "a", sl + "ö" + ?> => irregV slita slet (init slita + "it") ; - <_ + "u" + ? + ? + "a", sl + "ö" + ? + ?> => irregV slita slet (init slita + "it") ; + <_ + "u" + ? + "a", sl + "ö" + ?> => irregV slita slet (init slita + "it") ; + <_ + "u" + ? + ? + "a", sl + "ö" + ? + ?> => irregV slita slet (init slita + "it") ; <_ + "i" + ? + ? + "a", sl + "a" + pp@(? + ?)> => irregV slita slet (sl + "u" + pp ++ "it") ; _ => regV sliter } where { @@ -661,19 +661,19 @@ oper } }) ; - irregV = \sälja, sålde, sålt -> + irregV = \sälja, sÃ¥lde, sÃ¥lt -> let - säljer = case last sälja of { - "a" => conj2 sälja ; - _ => conj3 sälja + säljer = case last sälja of { + "a" => conj2 sälja ; + _ => conj3 sälja } ; - såld = case Predef.dp 2 sålt of { - "it" => Predef.tk 2 sålt + "en" ; - "tt" => Predef.tk 2 sålt + "dd" ; - _ => init sålt + "d" + sÃ¥ld = case Predef.dp 2 sÃ¥lt of { + "it" => Predef.tk 2 sÃ¥lt + "en" ; + "tt" => Predef.tk 2 sÃ¥lt + "dd" ; + _ => init sÃ¥lt + "d" } in - mk6V sälja (säljer.s ! VF (VPres Act)) (säljer.s ! (VF (VImper Act))) sålde sålt såld + mk6V sälja (säljer.s ! VF (VPres Act)) (säljer.s ! (VF (VImper Act))) sÃ¥lde sÃ¥lt sÃ¥ld ** {s1 = [] ; lock_V = <>} ; partV v p = case p of { @@ -685,14 +685,14 @@ oper reflV v = {s = v.s ; part = v.part ; vtype = VRefl ; lock_V = <>} ; mkV2 = overload { - mkV2 : (läser : Str) -> V2 = \v -> dirV2 (regV v) ; + mkV2 : (läser : Str) -> V2 = \v -> dirV2 (regV v) ; mkV2 : V -> V2 = dirV2 ; mkV2 : Str -> Prep -> V2 = \v -> mmkV2 (regV v) ; mkV2 : V -> Prep -> V2 = mmkV2 ; mkV2 : (slita, slet : Str) -> V2 = \x,y -> dirV2 (reg2V x y) ; mkV2 : (dricka,drack,druckit : Str) -> V2 = \x,y,z -> dirV2 (irregV x y z) ; - mkV2 : (supa,super,sup,söp,supit,supen : Str) -> V2 = \x,y,z,u,v,w -> dirV2 (mk6V x y z u v w) ; - mkV2 : (supa,super,sup,söp,supit,supen,supande : Str) -> V2 = \x,y,z,u,v,w,s -> dirV2 (mk7V x y z u v w s) ; + mkV2 : (supa,super,sup,söp,supit,supen : Str) -> V2 = \x,y,z,u,v,w -> dirV2 (mk6V x y z u v w) ; + mkV2 : (supa,super,sup,söp,supit,supen,supande : Str) -> V2 = \x,y,z,u,v,w,s -> dirV2 (mk7V x y z u v w s) ; } ; @@ -781,8 +781,8 @@ oper mk3cA : (galen,galet,galna : Str) -> Bool -> A = \x,y,z,b -> lin A {s = (mk3A x y z).s ; isComp = b} ; - mk7V : (supa,super,sup,söp,supit,supen,supande : Str) -> V ; - mk6V : (supa,super,sup,söp,supit,supen : Str) -> V ; + mk7V : (supa,super,sup,söp,supit,supen,supande : Str) -> V ; + mk6V : (supa,super,sup,söp,supit,supen : Str) -> V ; regV : (talar : Str) -> V ; mk2V : (leka,lekte : Str) -> V ; irregV : (dricka, drack, druckit : Str) -> V ; diff --git a/lib/src/swedish/StructuralSwe.gf b/lib/src/swedish/StructuralSwe.gf index d13cedfbe..48e34fc49 100644 --- a/lib/src/swedish/StructuralSwe.gf +++ b/lib/src/swedish/StructuralSwe.gf @@ -1,24 +1,24 @@ ---# -coding=latin1 concrete StructuralSwe of Structural = CatSwe ** open MorphoSwe, ParadigmsSwe, MakeStructuralSwe, (X = ConstructX), Prelude in { flags optimize=all ; + coding=utf8 ; lin - above_Prep = ss "ovanför" ; + above_Prep = ss "ovanför" ; after_Prep = ss "efter" ; by8agent_Prep = ss "av" ; all_Predet = {s = detForms "all" "allt" "alla" ; p = [] ; a = PNoAg} ; - almost_AdA, almost_AdN = ss "nästan" ; + almost_AdA, almost_AdN = ss "nästan" ; although_Subj = ss "fast" ; always_AdV = ss "alltid" ; and_Conj = {s1 = [] ; s2 = "och" ; n = Pl} ; because_Subj = ss "eftersom" ; - before_Prep = ss "före" ; + before_Prep = ss "före" ; behind_Prep = ss "bakom" ; between_Prep = ss "mellan" ; - both7and_DConj = sd2 "både" "och" ** {n = Pl} ; + both7and_DConj = sd2 "bÃ¥de" "och" ** {n = Pl} ; but_PConj = ss "men" ; by8means_Prep = ss "med" ; can8know_VV, can_VV = @@ -34,33 +34,33 @@ concrete StructuralSwe of Structural = CatSwe ** det = DIndef } ; everything_NP = regNP "allting" "alltings" Neutr Sg ; - everywhere_Adv = ss "överallt" ; - few_Det = {s,sp = \\_,_ => "få" ; n = Pl ; det = DDef Indef} ; ---- first_Ord = {s = "första" ; isDet = True} ; - for_Prep = ss "för" ; - from_Prep = ss "från" ; + everywhere_Adv = ss "överallt" ; + few_Det = {s,sp = \\_,_ => "fÃ¥" ; n = Pl ; det = DDef Indef} ; +--- first_Ord = {s = "första" ; isDet = True} ; + for_Prep = ss "för" ; + from_Prep = ss "frÃ¥n" ; he_Pron = MorphoSwe.mkNP "han" "honom" "hans" "hans" "hans" Utr Sg P3 ; - here_Adv = ss "här" ; + here_Adv = ss "här" ; here7to_Adv = ss "hit" ; - here7from_Adv = ss "härifrån" ; + here7from_Adv = ss "härifrÃ¥n" ; how_IAdv = ss "hur" ; how8much_IAdv = ss "hur mycket" ; - how8many_IDet = {s = \\_ => ["hur många"] ; n = Pl ; det = DDef Indef} ; + how8many_IDet = {s = \\_ => ["hur mÃ¥nga"] ; n = Pl ; det = DDef Indef} ; if_Subj = ss "om" ; - in8front_Prep = ss "framför" ; + in8front_Prep = ss "framför" ; i_Pron = MorphoSwe.mkNP "jag" "mig" "min" "mitt" "mina" Utr Sg P1 ; in_Prep = ss "i" ; it_Pron = MorphoSwe.regNP "det" "dess" Neutr Sg ; - less_CAdv = X.mkCAdv "mindre" "än" ; - many_Det = {s,sp = \\_,_ => "många" ; n = Pl ; det = DDef Indef} ; - more_CAdv = X.mkCAdv "mer" "än" ; + less_CAdv = X.mkCAdv "mindre" "än" ; + many_Det = {s,sp = \\_,_ => "mÃ¥nga" ; n = Pl ; det = DDef Indef} ; + more_CAdv = X.mkCAdv "mer" "än" ; most_Predet = {s = detForms ["den mesta"] ["det mesta"] ["de flesta"] ; p = [] ; a = PNoAg} ; much_Det = {s,sp = \\_,_ => "mycket" ; n = Pl ; det = DDef Indef} ; must_VV = - mkV "få" "måste" "få" "fick" "måst" "måst" ** + mkV "fÃ¥" "mÃ¥ste" "fÃ¥" "fick" "mÃ¥st" "mÃ¥st" ** {c2 = mkComplement [] ; lock_VV = <>} ; no_Utt = ss ["nej"] ; - on_Prep = ss "på" ; + on_Prep = ss "pÃ¥" ; --- one_Quant = {s = \\_,_ => genderForms ["en"] ["ett"] ; n = Sg ; det = DIndef} ; only_Predet = {s = \\_,_ => "bara" ; p = [] ; a = PNoAg} ; or_Conj = {s1 = [] ; s2 = "eller" ; n = Sg} ; @@ -70,44 +70,44 @@ concrete StructuralSwe of Structural = CatSwe ** possess_Prep = ss "av" ; quite_Adv = ss "ganska" ; she_Pron = MorphoSwe.mkNP "hon" "henne" "hennes" "hennes" "hennes" Utr Sg P3 ; - so_AdA = ss "så" ; - someSg_Det = {s,sp = \\_ => genderForms "någon" "något" ; n = Sg ; det = DIndef} ; - somePl_Det = {s,sp = \\_,_ => "några" ; n = Pl ; det = DIndef} ; - somebody_NP = regNP "någon" "någons" Utr Sg ; - something_NP = regNP "något" "någots" Neutr Sg ; - somewhere_Adv = ss "någonstans" ; + so_AdA = ss "sÃ¥" ; + someSg_Det = {s,sp = \\_ => genderForms "nÃ¥gon" "nÃ¥got" ; n = Sg ; det = DIndef} ; + somePl_Det = {s,sp = \\_,_ => "nÃ¥gra" ; n = Pl ; det = DIndef} ; + somebody_NP = regNP "nÃ¥gon" "nÃ¥gons" Utr Sg ; + something_NP = regNP "nÃ¥got" "nÃ¥gots" Neutr Sg ; + somewhere_Adv = ss "nÃ¥gonstans" ; that_Quant = {s,sp = table { - Sg => \\_,_ => genderForms ["den där"] ["det där"] ; - Pl => \\_,_,_ => ["de där"] + Sg => \\_,_ => genderForms ["den där"] ["det där"] ; + Pl => \\_,_,_ => ["de där"] } ; det = DDef Def } ; - there_Adv = ss "där" ; + there_Adv = ss "där" ; there7to_Adv = ss "dit" ; - there7from_Adv = ss "därifrån" ; - therefore_PConj = ss "därför" ; + there7from_Adv = ss "därifrÃ¥n" ; + therefore_PConj = ss "därför" ; they_Pron = MorphoSwe.mkNP "de" "dem" "deras" "deras" "deras" Utr Pl P1 ; this_Quant = {s,sp = table { - Sg => \\_,_ => genderForms ["den här"] ["det här"] ; - Pl => \\_,_,_ => ["de här"] + Sg => \\_,_ => genderForms ["den här"] ["det här"] ; + Pl => \\_,_,_ => ["de här"] } ; det = DDef Def } ; through_Prep = ss "genom" ; - too_AdA = ss "för" ; + too_AdA = ss "för" ; to_Prep = ss "till" ; under_Prep = ss "under" ; very_AdA = ss "mycket" ; want_VV = mkV "vilja" "vill" "vilj" "ville" "velat" "velad" ** {c2 = mkComplement [] ; lock_VV = <>} ; - we_Pron = MorphoSwe.mkNP "vi" "oss" "vår" "vårt" "våra" Utr Pl P1 ; + we_Pron = MorphoSwe.mkNP "vi" "oss" "vÃ¥r" "vÃ¥rt" "vÃ¥ra" Utr Pl P1 ; whatSg_IP = {s = \\_ => "vad" ; g = Neutr ; n = Sg} ; ---- infl, g whatPl_IP = {s = \\_ => "vilka" ; g = Neutr ; n = Pl} ; ---- infl, g - when_IAdv = ss "när" ; - when_Subj = ss "när" ; + when_IAdv = ss "när" ; + when_Subj = ss "när" ; that_Subj = ss "att" ; where_IAdv = ss "var" ; which_IQuant = { @@ -119,7 +119,7 @@ concrete StructuralSwe of Structural = CatSwe ** } ; whoSg_IP = {s = vem.s ; g = Utr ; n = Sg} ; whoPl_IP = {s = \\_ => "vilka" ; g = Utr ; n = Pl} ; - why_IAdv = ss "varför" ; + why_IAdv = ss "varför" ; without_Prep = ss "utan" ; with_Prep = ss "med" ; yes_Utt = ss ["ja"] ; @@ -142,12 +142,12 @@ lin det = DIndef } ; - if_then_Conj = {s1 = "om" ; s2 = "så" ; n = singular} ; + if_then_Conj = {s1 = "om" ; s2 = "sÃ¥" ; n = singular} ; nobody_NP = regNP "ingen" "ingens" Utr Sg ; nothing_NP = regNP "inget" "ingets" Neutr Sg ; at_least_AdN = ss "minst" ; - at_most_AdN = ss "högst" ; + at_most_AdN = ss "högst" ; except_Prep = ss "utom" ;