diff --git a/doc/gf-history.html b/doc/gf-history.html index 3b53842b4..fef775d3b 100644 --- a/doc/gf-history.html +++ b/doc/gf-history.html @@ -14,7 +14,23 @@ Changes in functionality since May 17, 2005, release of GF Version 2.2

-20/12 (AR) Support for full disjunctive patterns (P | Q) i.e. +

+ +22/12 Release of GF 2.4. + +

+ +21/12 (AR) It now works to parse escaped string literals from command +line, and also string literals with spaces: +

+  gf examples/tram0/TramEng.gf
+  > p -lexer=literals "I want to go to \"Gustaf Adolfs torg\" ;"
+  QInput (GoTo (DestNamed "Gustaf Adolfs torg"))
+
+ +

+ +20/12 (AR) Support for full disjunctive patterns (P|Q) i.e. not just on top level.

@@ -258,6 +274,7 @@ statistics of gfc compilation result. To be extended with new information. The most important stats now are the top-40 sized definitions.

+

1/7 Release of GF 2.3. diff --git a/index.html b/index.html index 80e50a0bc..6a25e31cf 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ -GF Version 2.3+ +GF Version 2.4 @@ -9,9 +9,9 @@

Grammatical Framework

-

Version 2.3

+

Version 2.4

-July 1, 2005. +December 22, 2005. @@ -20,17 +20,24 @@ July 1, 2005.

News

-December 21, 2005. Forthcoming very soon: GF 2.4. Some highlights: +December 22, 2005. GF 2.4 released. Some highlights: -See GF history for more details. Also see the -New Tutorial, now up to date for version 2.4. +See GF history for more details. +Download from +SourceForge. +Also see the New Tutorial, +now up to date for version 2.4.

+ + + December 9, 2005. MCFG/GF library for Prolog, by @@ -39,12 +46,12 @@ This means that you can use GF grammars as parts of Prolog programs (in the same way as in Java and Haskell before). -

+
December 8, 2005. A structured Documentation page on GF. -

+
December 1, 2005. Publicly accessible @@ -52,7 +59,7 @@ Publicly accessible Darcs repository for latest sources and documents. The snapshots are no longer updated. -

+
September 22, 2005. @@ -65,7 +72,7 @@ Use the Darcs repository instead! -

+
July 1, 2005. GF 2.3 released. Download from @@ -73,22 +80,20 @@ Download from The GF history lists changes. The source package on SourceForge also contains a new GUI and some new grammars. -

- - +
June 3, 2005. Started a page on history of changes. These changes will appear soon in releases. -

+
May 17, 2005. Version 2.2 released. See highlights. Download from SourceForge. -

+
May 12, 2005. GF now has a mailing list, to which you can register here. @@ -98,7 +103,7 @@ href="https://sourceforge.net/projects/gf-tools"> https://sourceforge.net/projects/gf-tools, but this page does not yet have much content. -

+
May 9, 2005. PhD Thesis by @@ -106,7 +111,7 @@ PhD Thesis by Formal and Informal Software Specifications. -

+
March 15, 2005. @@ -120,7 +125,7 @@ GF grammars that can be used as parts of Java programs. And a href="http://www.cs.chalmers.se/~bringert/misc/tramdemo.avi">demo film of a multimodal dialogue system built with embedded grammars. -

+
November 9, 2004. @@ -129,7 +134,7 @@ PhD Thesis by Expressivity and Complexity of the Grammatical Framework. -

+
November 8, 2004. GF 2.1 released. Here are the GF compilation chart gives a summary of the supported input and output formats (the nodes in ellipses). -

+
For instance, if you want to create a finite-state automaton in the HTK SLF format (to use for speech recognition), all you have to do @@ -383,6 +388,6 @@ Or just get the sources and start hacking. Last modified by Aarne Ranta, -December 1, 2005. +December 22, 2005. diff --git a/lib/resource/abstract/Test.gf b/lib/resource/abstract/Test.gf deleted file mode 100644 index 2655baf9a..000000000 --- a/lib/resource/abstract/Test.gf +++ /dev/null @@ -1,9 +0,0 @@ ---# -path=.:../../prelude - -abstract Test = - Rules, - Clause, - Structural [and_Conj,i_NP,he_NP, if_Subj, in_Prep,want_VV,which8one_IDet], - Minimal - ** { -} ; diff --git a/lib/resource/abstract/TestResource.gf b/lib/resource/abstract/TestResource.gf deleted file mode 100644 index 941e6cfde..000000000 --- a/lib/resource/abstract/TestResource.gf +++ /dev/null @@ -1,37 +0,0 @@ -abstract TestResource = - Rules, ----- Verbphrase, - Clause, - Structural ** { - --- a random sample of lexicon to test resource grammar with - -fun - Big, Happy, Small, Old, Young : ADeg ; - American, Finnish : A ; - Married : A2 ; - Man, Woman, Car, House, Light, Bar, Bottle, Wine : N ; - Walk, Run : V ; - Send, Wait, Love, Drink, SwitchOn, SwitchOff : V2 ; - Give, Prefer : V3 ; - Say, Prove : VS ; - Mother, Uncle : N2 ; - Connection : N3 ; - Well, Always : Adv ; - John, Mary : PN ; - - AlreadyAdv, NowAdv : Adv ; -- already, now - Paint : V2A ; - Green : ADeg ; - Beg : V2V ; - Promise : V2V ; - Try : VV ; - Wonder : VQ ; - Ask : V2Q ; - Tell : V2S ; - Look : VA ; - Important : A2S ; - Probable : AS ; - Easy : A2V ; - Rain : V0 ; -} ; diff --git a/lib/resource/danish/TestResourceDan.gf b/lib/resource/danish/TestResourceDan.gf deleted file mode 100644 index 32b0c1cfa..000000000 --- a/lib/resource/danish/TestResourceDan.gf +++ /dev/null @@ -1,76 +0,0 @@ ---# -path=.:../scandinavian:../abstract:../../prelude - -concrete TestResourceDan of TestResource = RulesDan, ClauseDan, StructuralDan ** - open Prelude, MorphoDan, SyntaxDan in { - -flags startcat=Phr ; lexer=text ; unlexer=text ; - - optimize=values ; - --- a random sample from the lexicon - -lin - Big = mkAdjective "stor" "stort" "store" "større" "størst" ; - Small = mkAdjective "lille" "lille" "små" "mindre" "mindst" ; - Old = mkAdjective "gammel" "gammelt" "gamle" "ældre" "ældst" ; - Young = mkAdjective "ung" "ungt" "unge" "yngre" "yngst" ; - American = extAdjective (aRod "amerikansk") ; - Finnish = extAdjective (aRod "finsk") ; - Happy = aRod "lykkelig" ; - Married = extAdjective (aAbstrakt "gift") ** {s2 = "med"} ; - Man = extCommNoun (mkSubstantive "mand" "manden" "mænd" "mænden" ** {h1 = Utr}) ; - Bar = extCommNoun (nBil "bar") ; ---- ? - Bottle = extCommNoun (nUge "flaske") ; - Woman = extCommNoun (nUge "kvinde") ; - Car = extCommNoun (nBil "bil") ; - House = extCommNoun (nHus "hus") ; - Light = extCommNoun (nHus "lys") ; - Wine = extCommNoun (nHus "vin") ; ---- ? - Walk = mkVerb "gå" "går" "gås" "gik" "gået" "gå" ** {s1 = []} ; - Run = mkVerb "springe" "springer" "springes" "sprang" "sprunget" "spring" ** {s1 = []} ; - Drink = extTransVerb (mkVerb "drikke" "drikker" "drikkes" "drak" "drukket" "drikk" ** {s1 = []}) [] ; - Love = extTransVerb (vNopart (vHusk "ælsk")) [] ; - Send = extTransVerb (vNopart (vSpis "send")) [] ; ---- ? - Wait = extTransVerb (vNopart (vSpis "vent")) "på" ; - Give = extTransVerb (vNopart (mkVerb "give" "giver" "gives" "gav" "givet" "giv")) [] ** {s3 = "til"} ; - Prefer = extTransVerb (vNopart (vSpis "foretrækk")) [] ** {s3 = "for"} ; - - Say = vNopart (mkVerb "sige" "siger" "siges" "sagde" "sagt" "sig") ; - Prove = vNopart (vSpis "bevis") ; - SwitchOn = mkDirectVerb (vHusk "lukk" ** {s1 = "op"}) ; - SwitchOff = mkDirectVerb (vHusk "slukk" ** {s1 = []}) ; - - Mother = mkFun (extCommNoun (mkSubstantive "moder" "moderen" "mødre" - "mødrene" ** {h1 = Utr})) "til" ; ---- ? - Uncle = mkFun (extCommNoun (mkSubstantive "onkel" "onkelen" "onkler" "onklene" ** {h1 = Utr})) "til" ; ---- ? - Connection = mkFun (extCommNoun (nUge "forbindelse")) "fra" ** {s3 = "til"} ; - - Always = advPre "altid" ; - Well = advPost "godt" ; - - John = mkProperName "Johan" NUtr ; - Mary = mkProperName "Maria" NUtr ; - ---- next - AlreadyAdv = advPre "allerede" ; - NowAdv = advPre "nu" ; - - Paint = extTransVerb (vNopart (vHusk "mål")) [] ; - Green = mkAdjective "grøn" "grønt" "grøne" "grønnere" "grønnest" ; - - Beg = extTransVerb (mkVerb "bede" "beder" "bedes" "bad" "bedt" "bed") [] ** {s3 = "at"} ; - Promise = extTransVerb (vNopart (vSpis "lov")) [] ** {s3 = "att"} ; - Wonder = extTransVerb (vNopart (vHusk "undr")) [] ; - Ask = extTransVerb (mkVerb "spørge" "spørger""spørges""spurgte""spurgt""spørg") [] ; - Tell = extTransVerb (mkVerb "fortælle" "fortæller" "fortælles" - "fortalte" "fortalt" "fortæll") [] ; - Look = extTransVerb (mkVerb "se" "ser" "ses" "så" "set" "sedd") [] - ; ---- ut - - Try = extTransVerb (vNopart (vSpis "forsøg")) [] ** {isAux = False} ; - Important = extAdjective (aAbstrakt "viktig") ** {s2 = "for"} ; - Probable = extAdjective (aAbstrakt "sandsynlig") ; - Easy = extAdjective (aRod "let") ** {s2 = "for"} ; - Rain = extTransVerb (vNopart (vHusk "regn")) [] ; - -} ; diff --git a/lib/resource/english/TestEng.gf b/lib/resource/english/TestEng.gf deleted file mode 100644 index 218f9dda1..000000000 --- a/lib/resource/english/TestEng.gf +++ /dev/null @@ -1,9 +0,0 @@ ---# -path=.:../abstract:../../prelude - -concrete TestEng of Test = - RulesEng, - ClauseEng, - StructuralEng, - MinimalEng - ** { -} ; diff --git a/lib/resource/english/TestResourceEng.gf b/lib/resource/english/TestResourceEng.gf deleted file mode 100644 index 9f16cb54f..000000000 --- a/lib/resource/english/TestResourceEng.gf +++ /dev/null @@ -1,70 +0,0 @@ ---# -path=.:../abstract:../../prelude - -concrete TestResourceEng of TestResource = RulesEng, ClauseEng, StructuralEng ** - open Prelude, SyntaxEng, OldParadigmsEng in { - -flags startcat=Phr ; lexer=textlit ; parser=chart ; unlexer=text ; - --- a random sample from the lexicon - -lin - Big = adjDegrIrreg "big" "bigger" "biggest"; - Happy = adjDegrReg "happy" ; - Small = adjDegrReg "small" ; - Old = adjDegrReg "old" ; - Young = adjDegrReg "young" ; - American = regAdjective "American" ; - Finnish = regAdjective "Finnish" ; - Married = regAdjective "married" ** {s2 = "to"} ; - Man = cnHum (mkNoun "man" "men" "man's" "men's") ; - Woman = cnHum (mkNoun "woman" "women" "woman's" "women's") ; - Car = cnNoHum (nounReg "car") ; - House = cnNoHum (nounReg "house") ; - Light = cnNoHum (nounReg "light") ; - Bar = cnNoHum (nounReg "bar") ; - Bottle = cnNoHum (nounReg "bottle") ; - Wine = cnNoHum (nounReg "wine") ; - Walk = verbNoPart (regVerbP3 "walk") ; - Run = verbNoPart (mkVerb "run" "ran" "run") ; - Say = verbNoPart (mkVerb "say" "said" "said") ; - Prove = verbNoPart (verbP3e "prove") ; - Send = mkTransVerbDir (verbNoPart (mkVerb "send" "sent" "sent")) ; - Love = mkTransVerbDir (verbNoPart (verbP3e "love")) ; - Wait = mkTransVerb (verbNoPart (regVerbP3 "wait")) "for" ; - Drink = mkTransVerbDir (verbNoPart (mkVerb "drink" "drank" "drunk")) ; - Give = mkDitransVerb (verbNoPart (mkVerb "give" "gave" "given")) [] [] ; - Prefer = mkDitransVerb - (verbNoPart (mkVerb "prefer" "preferred" "preferred")) [] "to" ; - Mother = funOfReg "mother" human ; - Uncle = funOfReg "uncle" human ; - Connection = cnNoHum (nounReg "connection") ** {s2 = "from" ; s3 = "to"} ; - - Always = ss "always" ; - Well = ss "well" ; - - SwitchOn = mkTransVerbPart (verbP3s "switch") "on" ; - SwitchOff = mkTransVerbPart (verbP3s "switch") "off" ; - - John = nameReg "John" Masc ; - Mary = nameReg "Mary" Fem ; - ---- next - AlreadyAdv = ss "already" ; - NowAdv = ss "now" ; - - Paint = mkTransVerbDir (verbNoPart (regVerbP3 "paint")) ; - Green = adjDegrReg "green" ; - Beg = mkTransVerbDir (verbNoPart (regVerbP3 "ask")) ** {s4 = "to"} ; - Promise = mkTransVerbDir (verbNoPart (verbP3e "promise")) ** {s4 = "to"} ; - Wonder = verbNoPart (regVerbP3 "wonder") ; - Ask = mkTransVerbDir (verbNoPart (regVerbP3 "ask")) ; - Tell = mkTransVerbDir (verbNoPart (mkVerb "tell" "told" "told")) ; - Look = verbNoPart (regVerbP3 "look") ; - - Try = mkTransVerbDir (verbNoPart (verbP3y "tr")) ** {isAux = False} ; - Important = regAdjective "important" ** {s2 = "for"} ; - Probable = regAdjective "probable" ; ---- reg - Easy = regAdjective "easy" ** {s2 = "for"} ; - Rain = verbNoPart (regVerbP3 "rain") ; - -} ; diff --git a/lib/resource/french/TestResourceFre.gf b/lib/resource/french/TestResourceFre.gf deleted file mode 100644 index fb604c550..000000000 --- a/lib/resource/french/TestResourceFre.gf +++ /dev/null @@ -1,52 +0,0 @@ ---# -path=.:../romance:../abstract:../../prelude - -concrete TestResourceFre of TestResource = - RulesFre, - ClauseFre, - StructuralFre - ** - open Prelude, TypesFre, MorphoFre, SyntaxFre in { - -flags startcat=Phr ; lexer=text ; parser=chart ; unlexer=text ; -optimize=all ; - -lin - Big = mkAdjDegrReg "grand" adjPre ; - American = mkAdjective (adjGrand "américain") adjPost ; - Finnish = mkAdjective (adjGrand "finlandais") adjPost ; - Married = mkAdjCompl (adjJoli "marié") adjPost (complementCas dative) ; - Small = mkAdjDegrReg "petit" adjPre ; - Old = mkAdjDegrLong (mkAdj "vieux" "vieux" "vieille" "vieillement") adjPre ; - Young = mkAdjDegrLong (adjJeune "jeune") adjPre ; - Happy = mkAdjDegrLong (adjHeureux "heureux") adjPre ; - Wine = mkCNomReg "vin" Masc ; - Bar = mkCNomReg "bar" Masc ; - Man = mkCNomReg "homme" Masc ; - Woman = mkCNomReg "femme" Fem ; - Car = mkCNomReg "voiture" Fem ; - Light = mkCNomReg "lumière" Fem ; - House = mkCNomReg "maison" Fem ; - Bottle = mkCNomReg "bouteille" Fem ; - Walk = verbPres (conj1aimer "marcher") AHabere ; - Run = verbPres (conj3courir "courir") AHabere ; - Send = mkTransVerbDir (verbPres (conj1envoyer "envoyer") AHabere) ; - Love = mkTransVerbDir (verbPres (conj1aimer "aimer") AHabere) ; - Drink = mkTransVerbDir (verbPres (conj3boire "boire") AHabere) ; - Wait = mkTransVerbDir (verbPres (conj3rendre "attendre") AHabere) ; - Give = mkDitransVerb (verbPres (conj1aimer "donner") AHabere) [] dative [] accusative ; - Prefer = mkDitransVerb (verbPres (conj1céder "préférer") AHabere) [] accusative [] dative ; - Say = verbSent (verbPres (conj3dire "dire") AHabere) Ind Ind ; - Prove = verbSent (verbPres (conj1aimer "démontrer") AHabere) Ind Ind ; - SwitchOn = mkTransVerbDir (verbPres (conj1aimer "allumer") AHabere) ; - SwitchOff = mkTransVerbDir (verbPres (conj3peindre "éteindre") AHabere) ; - Mother = funDe (mkCNomReg "mère" Fem) ; - Uncle = funDe (mkCNomReg "oncle" Masc) ; - Connection = mkCNomReg "connection" Fem ** - {s2 = [] ; c = genitive ; s3 = [] ; c3 = dative} ; - - Well = ss "bien" ; - Always = ss "toujours" ; - - John = mkProperName "Jean" Masc ; - Mary = mkProperName "Marie" Fem ; -} diff --git a/lib/resource/french/TestVerbesAbs.gf b/lib/resource/french/TestVerbesAbs.gf deleted file mode 100644 index 025b01d9f..000000000 --- a/lib/resource/french/TestVerbesAbs.gf +++ /dev/null @@ -1,4 +0,0 @@ -abstract TestVerbesAbs = TestResource, VerbesAbs ** { - fun UseVN : VN -> V ; - fun UseVN2 : VN2 -> V2 ; -} diff --git a/lib/resource/french/TestVerbesFre.gf b/lib/resource/french/TestVerbesFre.gf deleted file mode 100644 index 3f5a94950..000000000 --- a/lib/resource/french/TestVerbesFre.gf +++ /dev/null @@ -1,9 +0,0 @@ ---# -path=.:../romance:../abstract:../../prelude - -concrete TestVerbesFre of TestVerbesAbs = - TestResourceFre, VerbesFre ** open TypesFre in { - - lin UseVN ve = verbPres ve.s ve.aux ; - lin UseVN2 ve = verbPres ve.s ve.aux ** {s2 = [] ; c = ve.c} ; - -} diff --git a/lib/resource/french/TestVerbsFre.gf b/lib/resource/french/TestVerbsFre.gf deleted file mode 100644 index dc7962aa1..000000000 --- a/lib/resource/french/TestVerbsFre.gf +++ /dev/null @@ -1,9 +0,0 @@ ---# -path=.:../romance:../oldabstract:../abstract:../../prelude - -concrete TestVerbsFre of TestVerbsFreAbs = - TestResourceFre, VerbsFre ** open TypesFre in { - - lin UseVN ve = verbPres ve.s ve.aux ; - lin UseVN2 ve = verbPres ve.s ve.aux ** {s2 = [] ; c = ve.c} ; - -} diff --git a/lib/resource/french/TestVerbsFreAbs.gf b/lib/resource/french/TestVerbsFreAbs.gf deleted file mode 100644 index de219d8fb..000000000 --- a/lib/resource/french/TestVerbsFreAbs.gf +++ /dev/null @@ -1,4 +0,0 @@ -abstract TestVerbsFreAbs = TestResource, VerbsFreAbs ** { - fun UseVN : VN -> V ; - fun UseVN2 : VN2 -> V2 ; -} diff --git a/lib/resource/italian/TestResourceIta.gf b/lib/resource/italian/TestResourceIta.gf deleted file mode 100644 index 6997c0961..000000000 --- a/lib/resource/italian/TestResourceIta.gf +++ /dev/null @@ -1,48 +0,0 @@ ---# -path=.:../romance:../oldabstract:../abstract:../../prelude - -concrete TestResourceIta of TestResource = - RulesIta, StructuralIta ** open Prelude, TypesIta, MorphoIta, SyntaxIta in { - -flags startcat=Phr ; lexer=text ; parser=chart ; unlexer=text ; - -lin - Big = mkAdjDegrTale "grande" adjPre ; - Small = mkAdjDegrSolo "piccolo" adjPre ; - Old = mkAdjDegrLong (mkAdj "vecchio" "vecchia" "vecchi" "vecchie" "vecchiamente") - adjPre ; - Young = mkAdjDegrTale "giovane" adjPre ; - Happy = mkAdjDegrTale "felice" adjPost ; - American = mkAdjective (adjSolo "americano") adjPost ; - Finnish = mkAdjective (adjTale "finlandese") adjPost ; - Married = mkAdjCompl (adjSolo "sposato") adjPost {s2 = [] ; c = dative} ; - Man = mkCNom (numForms "uomo" "uomini") Masc ; - Woman = mkCNom (nomRana "donna") Fem ; - Car = mkCNom (nomRana "macchina") Fem ; - Light = mkCNom (nomSale "luce") Fem ; - House = mkCNom (nomRana "casa") Fem ; - Wine = mkCNom (nomVino "vino") Masc ; - Bottle = mkCNom (nomRana "bottiglia") Fem ; - Bar = mkCNom (nomTram "bar") Masc ; - Walk = verbPres (amare_7 "camminare") AHabere ; - Run = (verbPres (correre_41 "correre") AHabere) ; - Send = mkTransVerbDir (verbPres (amare_7 "mandare") AHabere) ; - Love = mkTransVerbDir (verbPres (amare_7 "amare") AHabere) ; - Wait = mkTransVerbCas (verbPres (amare_7 "aspettare") AHabere) dative ; - Drink = mkTransVerbDir (verbPres (bere_29 "bere") AHabere) ; - Give = mkDitransVerb (verbPres (dare_17 "dare") AHabere) [] dative [] accusative ; - Prefer = mkDitransVerb (verbPres (finire_103 "preferire") AHabere) [] accusative [] dative ; - Say = verbSent (verbPres (dire_44 "dire") AHabere) Ind Ind ; - Prove = verbSent (verbPres (amare_7 "dimostrare") AHabere) Ind Ind ; - SwitchOn = mkTransVerbDir (verbPres (amare_7 "allumare") AHabere) ; - SwitchOff = mkTransVerbDir (verbPres (spegnere_89 "spegnere") AHabere) ; - Mother = funGen (mkCNom (nomSale "madre") Fem) ; - Uncle = funGen (mkCNom (nomVino "zio") Masc) ; - Connection = mkCNom (nomSale "connessione") Fem ** - {s2 = [] ; c = CPrep P_da ; s3 = [] ; c3 = dative} ; - - Well = ss "bene" ; - Always = ss "sempre" ; - - John = mkProperName "Giovanni" Masc ; - Mary = mkProperName "Maria" Fem ; -} diff --git a/lib/resource/norwegian/TestResourceNor.gf b/lib/resource/norwegian/TestResourceNor.gf deleted file mode 100644 index a528f072b..000000000 --- a/lib/resource/norwegian/TestResourceNor.gf +++ /dev/null @@ -1,74 +0,0 @@ ---# -path=.:../scandinavian:../abstract:../../prelude - -concrete TestResourceNor of TestResource = RulesNor, ClauseNor, StructuralNor ** - open Prelude, MorphoNor, SyntaxNor in { - -flags startcat=Phr ; lexer=text ; unlexer=text ; - --- a random sample from the lexicon - -lin - Big = mkAdjective "stor" "stort" "store" "større" "størst" ; - Small = mkAdjective "liten" "litet" "små" "mindre" "minst" ; ---- ? - Old = mkAdjective "gammel" "gammelt" "gamle" "eldre" "eldst" ; - Young = mkAdjective "ung" "ungt" "unge" "yngre" "yngst" ; - American = extAdjective (aAbstrakt "amerikansk") ; - Finnish = extAdjective (aAbstrakt "finsk") ; - Happy = aAbstrakt "heldig" ; - Married = extAdjective (aAbstrakt "gift") ** {s2 = "med"} ; - Man = extCommNoun (mkSubstantive "mann" "mannen" "menn" "mennen" ** {h1 = masc}) ; - Bar = extCommNoun (nBil "bar") ; ---- ? - Bottle = extCommNoun (nUke "flaske") ; - Woman = extCommNoun (nUke "kvinne") ; - Car = extCommNoun (nBil "bil") ; - House = extCommNoun (nHus "hus") ; - Light = extCommNoun (nHus "lys") ; - Wine = extCommNoun (nHus "vin") ; ---- ? - Walk = mkVerb "gå" "går" "gås" "gikk" "gått" "gå" ** {s1 = []} ; - Run = mkVerb "springe" "springer" "springes" "sprang" "sprunget" "spring" ** {s1 = []} ; - Drink = extTransVerb (mkVerb "drikke" "drikker" "drikkes" "drakk" "drukket" "drikk" ** {s1 = []}) [] ; - Love = extTransVerb (vNopart (vHusk "elsk")) [] ; - Send = extTransVerb (vNopart (vSpis "send")) [] ; ---- ? - Wait = extTransVerb (vNopart (vSpis "vent")) "på" ; - Give = extTransVerb (vNopart (mkVerb "gi" "gir" "gives" "gav" "givet" "gi")) [] ** {s3 = "til"} ; ---- ? - Prefer = extTransVerb (vNopart (vSpis "foretrekk")) [] ** {s3 = "for"} ; - - Say = vNopart (mkVerb "si" "sier" "sies" "sa" "sagt" "sig") ; ---- ? - Prove = vNopart (vSpis "bevis") ; - SwitchOn = mkDirectVerb (vHusk "lukk" ** {s1 = "opp"}) ; - SwitchOff = mkDirectVerb (vHusk "slukk" ** {s1 = []}) ; - - Mother = mkFun (extCommNoun (mkSubstantive "mor" "moderen" "mødre" "mødrene" ** {h1 = fem})) "til" ; ---- ? - Uncle = mkFun (extCommNoun (mkSubstantive "onkel" "onkelen" "onkler" "onklene" ** {h1 = masc})) "til" ; ---- ? - Connection = mkFun (extCommNoun (nUke "forbindelse")) "fra" ** {s3 = "til"} ; - - Always = advPre "altid" ; - Well = advPost "godt" ; - - John = mkProperName "Johan" (NUtr Masc) ; - Mary = mkProperName "Maria" (NUtr NoMasc) ; - ---- next - AlreadyAdv = advPre "allerede" ; - NowAdv = advPre "nå" ; - - Paint = extTransVerb (vNopart (vHusk "mål")) [] ; - Green = mkAdjective "grønn" "grønt" "grøne" "grønnere" "grønnest" ; - - Beg = extTransVerb (mkVerb "be" "ber" "bes" "bad" "bedt" "be") [] ** {s3 = "at"} ; - Promise = extTransVerb (vNopart (vSpis "lov")) [] ** {s3 = "att"} ; - Wonder = extTransVerb (vNopart (vHusk "undr")) [] ; - Ask = extTransVerb (mkVerb "spørre" "spør""spørs""spurde""spurt""spør") [] ; - Tell = extTransVerb (mkVerb "fortelle" "forteller" "fortelles" - "fortalte" "fortalt" "fortell") [] ; - Look = extTransVerb (mkVerb "se" "ser" "ses" "så" "sett" "sedd") [] - ; ---- ut - - Try = extTransVerb (vNopart (vSpis "forsøk")) [] ** {isAux = False} ; - Important = extAdjective (aAbstrakt "viktig") ** {s2 = "for"} ; - Probable = extAdjective (aAbstrakt "sannsynlig") ; - Easy = extAdjective (aRod "grei") ** {s2 = "for"} ; - Rain = extTransVerb (vNopart (vHusk "regn")) [] ; - - -} ; diff --git a/lib/resource/russian/TestResourceRus.gf b/lib/resource/russian/TestResourceRus.gf deleted file mode 100644 index d9b9dfaf6..000000000 --- a/lib/resource/russian/TestResourceRus.gf +++ /dev/null @@ -1,53 +0,0 @@ --- use this path to read the grammar from the same directory ---# -path=.:../abstract:../../prelude -concrete TestResourceRus of TestResource = RulesRus, StructuralRus ** open SyntaxRus in { - -flags - coding=utf8 ; - startcat=Phr ; lexer=text ; parser=chart ; unlexer=text ; - --- a random sample from the lexicon - -lin - Big = bolshoj ; - Small = malenkij ; - Old = staruj ; - Young = molodoj ; - - Connection = (noun2CommNounPhrase (doroga) )** {s2 = "из" ; c = Gen; s3 = "в"; c2=Acc} ; - American = ij_EndK_G_KH_Decl "американÑк" ; -- adj1Malenkij from Paradigms - Finnish = ij_EndK_G_KH_Decl "финÑк" ; -- adj1Malenkij from Paradigms - Married = adjInvar "замужем" ** {s2 = "за"; c = Inst} ; -- adjinvar from Paradigms - Give = mkDitransVerb verbDavat Acc Dat; - Prefer = mkDitransVerb verbPredpochitat Acc Dat ; - Bar = bar ; - Bottle = butyulka ; - Wine = vino ; - Drink = mkDirectVerb verbPit ; - Happy = schastlivyuj ; - - Man = muzhchina ; - Woman = zhenchina ; - Car = mashina ; - House = dom ; - Level = uroven ; - Light = svet ; - Walk = verbGulyat ; - Run = verbBegat ; - Love = mkDirectVerb verbLubit ; - Send = mkDirectVerb verbOtpravlyat ; - Wait = mkDirectVerb verbZhdat ; - Say = verbGovorit ; --- works in present tense... - Prove = verbDokazuvat ; - SwitchOn = mkDirectVerb verbVkluchat ; - SwitchOff = mkDirectVerb verbVukluchat ; - - Mother = funGen mama ; - Uncle = funGen dyadya ; - - Always = vsegda ; - Well = chorosho ; - - John = mkProperNameMasc "Иван" Animate ; - Mary = mkProperNameFem "Маш" Animate ; -}; diff --git a/lib/resource/spanish/TestResourceSpa.gf b/lib/resource/spanish/TestResourceSpa.gf deleted file mode 100644 index 609c8c972..000000000 --- a/lib/resource/spanish/TestResourceSpa.gf +++ /dev/null @@ -1,48 +0,0 @@ ---# -path=.:../romance:../abstract:../../prelude - -concrete TestResourceSpa of TestResource = - RulesSpa, ClauseSpa, StructuralSpa ** open Prelude, TypesSpa, - MorphoSpa, BeschSpa, SyntaxSpa in { - -flags startcat=Phr ; lexer=text ; parser=chart ; unlexer=text ; - -lin - Big = mkAdjDegrUtil "grande" "grandes"adjPre ; - Small = mkAdjDegrSolo "pequeño" adjPre ; - Old = mkAdjDegrSolo "viejo" adjPre ; - Young = mkAdjDegrUtil "joven" "jovenes"adjPre ; - Happy = mkAdjDegrUtil "feliz" "felices" adjPost ; - American = mkAdjective (adjSolo "americano") adjPost ; - Finnish = mkAdjective (adjUtil "finlandes" "finlandeses") adjPost ; - Married = mkAdjCompl (adjSolo "casado") adjPost {s2 = "con" ; c = accusative} ; - Man = mkCNom (nomVino "hombre") Masc ; - Woman = mkCNom (nomPilar "mujer") Fem ; - Car = mkCNom (nomVino "coche") Masc ; - Light = mkCNom (numForms "luz" "luces") Fem ; - House = mkCNom (nomVino "casa") Fem ; - Wine = mkCNom (nomVino "vino") Masc ; - Bottle = mkCNom (nomVino "botella") Fem ; - Bar = mkCNom (nomTram "bar") Masc ; - Walk = verbPres (cortar_5 "pasear") AHabere ; ----- Run = (verbPres (correre_41 "correre") AHabere) ; - Send = mkTransVerbDir (verbPres (cortar_5 "mandar") AHabere) ; - Love = mkTransVerbDir (verbPres (cortar_5 "amar") AHabere) ; - Wait = mkTransVerbCas (verbPres (cortar_5 "esperar") AHabere) dative ; ----- Drink = mkTransVerbDir (verbPres (bere_29 "bere") AHabere) ; ----- Give = mkDitransVerb (verbPres (dare_17 "dare") AHabere) [] dative [] accusative ; - Prefer = mkDitransVerb (verbPres (vivir_7 "preferir") AHabere) [] accusative [] dative ; ----- Say = verbSent (verbPres (dire_44 "dire") AHabere) Ind Ind ; - Prove = verbSent (verbPres (cortar_5 "demonstrar") AHabere) Ind Ind ; - SwitchOn = mkTransVerbDir (verbPres (deber_6 "enciender") AHabere) ; ---- - SwitchOff = mkTransVerbDir (verbPres (cortar_5 "apagar") AHabere) ; - Mother = funGen (mkCNom (nomVino "madre") Fem) ; - Uncle = funGen (mkCNom (nomVino "tío") Masc) ; - Connection = mkCNom (nomPilar "connexión") Fem ** - {s2 = [] ; c = CPrep P_de ; s3 = [] ; c3 = dative} ; - - Well = ss "bien" ; - Always = ss "siempre" ; - - John = mkProperName "Juan" Masc ; - Mary = mkProperName "Maria" Fem ; -} diff --git a/lib/resource/swedish/TestResourceSwe.gf b/lib/resource/swedish/TestResourceSwe.gf deleted file mode 100644 index 803faad02..000000000 --- a/lib/resource/swedish/TestResourceSwe.gf +++ /dev/null @@ -1,77 +0,0 @@ ---# -path=.:../scandinavian:../abstract:../../prelude - -concrete TestResourceSwe of TestResource = -RulesSwe, -ClauseSwe, -StructuralSwe -** - open Prelude, MorphoSwe, SyntaxSwe in { - -flags startcat=Phr ; lexer=text ; unlexer=text ; - --- a random sample from the lexicon - -lin - Big = stor_25 ; - Small = liten_1146 ; - Old = gammal_16 ; - Young = ung_29 ; - American = extAdjective (aFin "amerikansk") ; - Finnish = extAdjective (aFin "finsk") ; - Happy = aFin "lycklig" ; - Married = extAdjective (aAbstrakt "gift") ** {s2 = "med"} ; - Man = extCommNoun man_1144 ; - Bar = extCommNoun (sSak "bar") ; - Bottle = extCommNoun (sApa "flask") ; - Woman = extCommNoun (sApa "kvinn") ; - Car = extCommNoun (sBil "bil") ; - House = extCommNoun (sHus "hus") ; - Light = extCommNoun (sHus "ljus") ; - Wine = extCommNoun (sParti "vin") ; - Walk = vNopart (mkVerb "gå" "går" "gå" "gick" "gått" "gången") ; - Run = vNopart (vFinna "spring" "sprang" "sprung") ; - Drink = extTransVerb (vFinna "drick" "drack" "druck") [] ; - Love = extTransVerb (vNopart (vTala "älsk")) [] ; - Send = extTransVerb (vNopart (vTala "skick")) [] ; - Wait = extTransVerb (vNopart (vTala "vänt")) "på" ; - Give = extTransVerb (vNopart (mkVerb "ge" "ger" "ge" "gav" "givit" "given")) [] ** {s3 = "till"} ; - Prefer = extTransVerb (vNopart (vFinna "föredrag" "föredrog" "föredrag")) [] ** - {s3 = "framför"} ; --- föredra - - Say = vNopart (mkVerb "säga" "säger" "säg" "sade" "sagt" "sagd") ; - Prove = vNopart (vTala "bevis") ; - SwitchOn = mkDirectVerb (vFinna "sätt" "satte" "satt" ** {s1 = "på"}) ; - SwitchOff = mkDirectVerb (vLeka "stäng" ** {s1 = "av"}) ; - - Mother = mkFun (extCommNoun mor_1) "till" ; - Uncle = mkFun (extCommNoun farbror_8) "till" ; - Connection = mkFun (extCommNoun (sVarelse "förbindelse")) "från" ** - {s3 = "till"} ; - - Always = advPre "alltid" ; - Well = advPost "bra" ; - - John = mkProperName "Johan" (NUtr Masc) ; - Mary = mkProperName "Maria" (NUtr NoMasc) ; - ---- next - AlreadyAdv = advPre "redan" ; - NowAdv = advPre "nu" ; - - Paint = extTransVerb (vNopart (vTala "mål")) [] ; - Green = aFin "grön" ; - Beg = extTransVerb (mkVerbPart "be" "ber" "be" "bad" "bett" "bedd" []) [] ** {s3 = "att"} ; - Promise = extTransVerb (vNopart (vTala "lov")) [] ** {s3 = "att"} ; - Wonder = extTransVerb (vNopart (vTala "undr")) [] ; - Ask = extTransVerb (vNopart (vTala "fråg")) [] ; - Tell = extTransVerb (vNopart (vTala "berätt")) [] ; - Look = extTransVerb (mkVerbPart "se" "ser" "se" "såg" "sett" "sedd" "ut") [] ; - - Try = extTransVerb (vNopart (vLeka "försök")) [] ** {isAux=False} ; - Important = extAdjective (aFin "viktig") ** {s2 = "för"} ; - Probable = extAdjective (aFin "sannolik") ; - Easy = extAdjective (aAbstrakt "lätt") ** {s2 = "för"} ; - Rain = extTransVerb (vNopart (vTala "regn")) [] ; - - -} ; diff --git a/src/GF.hs b/src/GF.hs index 8a1e3c91c..223fa6fc9 100644 --- a/src/GF.hs +++ b/src/GF.hs @@ -112,8 +112,7 @@ helpMsg = unlines [ welcomeMsg = "Welcome to " ++ authorMsg ++++ - "If the letters ä (a-umlaut) and ö (u-umlaut) look strange" ++ - "\nin the above message, try 'h -coding'." ++ + "If ä and ö (umlaut letters) look strange, see 'h -coding'." ++ "\n\nType 'h' for help, and 'h [Command] for more detailed help." authorMsg = unlines [