diff --git a/doc/index.html b/doc/index.html index 06b52930a..9659ed824 100644 --- a/doc/index.html +++ b/doc/index.html @@ -24,19 +24,19 @@ Beta version of GF2 now available:

-Sources +Sources

-Example grammars +Example grammars

-Linux binary (with fudgets) +Linux binary (with fudgets)

-Sun binary (without fudgets; +Sun binary (without fudgets; use Java GUI from src/java)

@@ -49,6 +49,11 @@ use Java GUI from src/java) See GF Homepage for more information on GF. +

+ +This is a beta version! Please report on problems, +and don't expect stability. Thank you for testing GF2! + diff --git a/lib/resource-0.6/abstract/additions.txt b/lib/resource-0.6/abstract/additions.txt new file mode 100644 index 000000000..6d0f7fb8b --- /dev/null +++ b/lib/resource-0.6/abstract/additions.txt @@ -0,0 +1,123 @@ +-- added 19/11/2003 -- 21/11 + +-- Combinations.gf +cat + Prep ; -- pre/postposition and/or case e.g. + Num ; -- numeral, e.g. "three", "879" + VV ; -- verb-compl. verb, e.g. "can", "want" + VG ; -- verbal group + +fun + ThereIsCN : CN -> S ; -- "there is a bar", "there are bars" + ThereAreCN : Num -> CN -> S ; -- "there are 86 bars" + PrepNP : Prep -> NP -> AdV ; -- "in London", "after the war" (replace LocNP) + MassNP : CN -> NP ; -- "wine" + PredAdV : AdV -> VP ; -- "is everywhere", "is not in France" + AdjAdv : AP -> AdV ; -- "freely", "more consciously than you" + IsThereCN,AreThereCN : CN -> Qu ; -- "is there a bar", "are there bars" + PosVG,NegVG : VG -> VP ; -- + + + -- merged PosX and NegX to PredX, for the following + PredV : V -> VG ; -- "walk", "doesn't walk" + PredPassV : V -> VG ; -- "is seen", "is not seen" + PredTV : TV -> NP -> VG ; -- "sees John", "doesn't see John" + PredVS : VS -> S -> VG ; -- "says that I run", "doesn't say..." + PredVV : VV -> VG -> VG ; -- "can run", "can't run", "tries to run" + PredV3 : V3 -> NP -> NP -> VG ; -- "prefers wine to beer" + + PredNP : NP -> VG ; -- "is John", "is not John" + PredAdV : AdV -> VG ; -- "is everywhere", "is not in France" + PredAP : AP -> VG ; -- "is old", "isn't old" + PredCN : CN -> VG ; -- "is a man", "isn't a man" + VTrans : TV -> V ; -- "loves" + + + -- changed type signatures: added Num + IndefManyNP : Num -> CN -> NP ; -- "houses", "86 houses" + DefManyNP : Num -> CN -> NP ; -- "the cars", "the 86 cars" + ModGenMany : Num -> NP -> CN -> NP ; -- "John's cars", "John's 86 cars" + + UseInt : Int -> Num ; -- "32" --- assumes i > 1 + NoNum : Num ; -- no numeral modifier + + IsThereCN, AreThereCN : CN -> Qu ;-- "is there a bar", "are there bars" + +-- from Hajo's work + +AdvAP + +AdvS + +AppFun2 + +CNthatS + +ConsPhr + +ItNP + +NegPassV + +NegV3 + +OnePhr + +OneVP + +OtherwiseAdv + +PosPassV + +PosV3 + +SubjVP + +ThereforeAdv + +TooAdv + +VTrans + +VeryAdv + + +-- Structural.gf + +-- Some of these are just changes to Num -> Det|NP. + AllDet : Det ; -- sg all + AllsDet, WhichsDet, -- pl all, which (86) + SomesDet, AnysDet, NosDet, -- pl some, any, no + TheseDet, ThoseDet : Num -> Det ; -- these, those (86) + ThisNP, TheseNP : NP ; -- this, that + TheseNP, ThoseNP : Num -> NP ; -- these, those (86) + INP, ThouNP, HeNP, SheNP, ItNP : NP ; -- personal pronouns in singular + WeNP, YeNP : Num -> NP ; -- these pronouns can take numeral + + EverybodyNP, SomebodyNP, NobodyNP, -- everybody, somebody, nobody + EverythingNP, SomethingNP, NothingNP : NP ; -- everything, something, nothing + EverywhereNP, SomewhereNP, NowhereNP : Adv ;-- everywhere, somewhere, nowhere + AlthoughSubj : Subj ; -- although + AlmostAdv, QuiteAdv : AdA ; -- almost, quite + InPrep, OnPrep, ToPrep, FromPrep, -- spatial relations + ThroughPrep, AbovePrep, UnderPrep, + InFrontPrep, BehindPrep, BetweenPrep : Prep ; + BeforePrep, DuringPrep, AfterPrep : Prep ; -- temporal relations + WithPrep, WithoutPrep, ByMeansPrep : Prep ; -- some other relations + PartPrep : Prep ; -- partitive "of" ("bottle of wine") + AgentPrep : Prep ; -- agent "by" in passive constructions + + + +American + +Connection + +Finnish + +Give + +Married + +Prefer + diff --git a/src/GF.hs b/src/GF.hs index 970008829..c153b55b6 100644 --- a/src/GF.hs +++ b/src/GF.hs @@ -68,7 +68,8 @@ welcomeMsg = "Welcome to " ++ authorMsg ++++ welcomeArch ++ "\n\nType 'h' for help." authorMsg = unlines [ - "Grammatical Framework, Version 2.0-- (incomplete functionality)", + "Grammatical Framework, Version 2-beta (incomplete functionality)", + "November 25, 2003", --- "Compiled March 26, 2003", "Compiled " ++ today, "Copyright (c) Markus Forsberg, Thomas Hallgren, Harald Hammarström,", diff --git a/src/Today.hs b/src/Today.hs index 2b5b00c2e..921d7fd2e 100644 --- a/src/Today.hs +++ b/src/Today.hs @@ -1 +1 @@ -module Today where today = "Tue Nov 25 16:53:53 CET 2003" +module Today where today = "Tue Nov 25 17:48:12 CET 2003"