diff --git a/doc/old-news.html b/doc/old-news.html index 5a86d27fa..2e6505142 100644 --- a/doc/old-news.html +++ b/doc/old-news.html @@ -4,6 +4,38 @@

GF News 2004-2006

+

+ +October 13, 2006. +PhD defence by Janna Khegai at Chalmers. Thesis + + Language engineering in Grammatical Framework (GF). + +

+ +June 22, 2006. +Release of GF version 2.6. Highlights: +

+ +

+ +March 29, 2006. +GF Quick Reference. Also available in +pdf. + +

+ +June 21, 2006. GF 2.5 released. Some highlights: +

+ + January 25, 2006. Emacs mode for GF, written by Johan Bockgård. diff --git a/examples/logic/ArithmEng.gf b/examples/logic/ArithmEng.gf index 21b68dd03..716350186 100644 --- a/examples/logic/ArithmEng.gf +++ b/examples/logic/ArithmEng.gf @@ -1,4 +1,4 @@ ---# -path=.:mathematical:present:resource-1.0/api:prelude +--# -path=.:mathematical:present:api:prelude concrete ArithmEng of Arithm = LogicEng ** open diff --git a/index.html b/index.html index 927aaa0d2..e9068377a 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ -GF Version 2.6 +GF Version 2.7 @@ -9,9 +9,9 @@

Grammatical Framework

-

Version 2.6

+

Version 2.7

-June 22, 2006. +December 22, 2006.

@@ -19,8 +19,6 @@ June 22, 2006.

-Shortcuts: - Documentation | @@ -60,33 +58,13 @@ Shortcuts:

-October 13, 2006. -PhD defence by Janna Khegai at Chalmers. Thesis - - Language engineering in Grammatical Framework (GF). -

- -June 22, 2006. -Release of GF version 2.6. Highlights: +December 22, 2006. GF 2.7 released. Some highlights:

- -

- -March 29, 2006. -GF Quick Reference. Also available in -pdf. - -

- -March 21, 2006. GF 2.5 released. Some highlights: -

See GF history for more details. Download from @@ -95,7 +73,7 @@ Download from

-News before 2.5. +News before 2.7.

What is GF?

diff --git a/lib/index.txt b/lib/index.txt index cd0a0ff26..9abeca10f 100644 --- a/lib/index.txt +++ b/lib/index.txt @@ -24,13 +24,15 @@ give some introduction to this idea. This library covers basic linguistic structures of different languages. -[Version 1.0 resource-1.0/doc] released 22 June 2006. +[Version 1.1 resource-1.0/doc] released 22 December 2006 +(enhanced version of 1.0). Covers Danish, English, Finnish, French, German, Italian, Norwegian, Russian, Spanish, and Swedish. -[Version 0.9 resource/]. - -[Version 0.6 resource-0.6/]. Old version with 7 languages. +Two older versions are also available: +[Version 0.9 resource/] +and +[Version 0.6 resource-0.6/]. diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile index bb9e3906f..9304973fa 100644 --- a/lib/resource-1.0/Makefile +++ b/lib/resource-1.0/Makefile @@ -3,8 +3,8 @@ RTS=+RTS -M800M -K100M RTSS=+RTS -M1000M -K100M #may need this on amd64 -#RTS=+RTS -M2000M -K200M -#RTSS=+RTS -M2000M -K200M +RTS=+RTS -M2000M -K200M +RTSS=+RTS -M2000M -K200M GFCA=$(GF) -nocf GFCC=$(GF) -nocf -make @@ -47,9 +47,9 @@ langs: echo "s ;; pm | wf langs.gfcm" | $(GFCA) -path=alltenses:prelude ../alltenses/Lang???.gfc $(RTSS) api: - $(GFC) api/Constructors???.gf - $(GFC) api/Combinators???.gf - $(GFC) api/Symbolic???.gf + $(GFCC) api/Constructors???.gf + $(GFCC) api/Combinators???.gf + $(GFCC) api/Symbolic???.gf cp -p api/*.gfc api/*.gfr ../api present: diff --git a/lib/resource-1.0/api/Combinators.gf b/lib/resource-1.0/api/Combinators.gf index 4cb19d93a..4ee43028d 100644 --- a/lib/resource-1.0/api/Combinators.gf +++ b/lib/resource-1.0/api/Combinators.gf @@ -1,7 +1,86 @@ +--1 Combinators: a High-Level Syntax API + +-- This module defines some "grammatical functions" that give shortcuts to +-- typical constructions. [``Constructors`` Constructors.html] and the +-- language-specific ``Paradigms`` modules are usually needed +-- to construct arguments of these functions. + incomplete resource Combinators = open Grammar in { oper +--2 Predication + + pred : overload { + pred : V -> NP -> Cl ; + pred : V2 -> NP -> NP -> Cl ; + pred : V3 -> NP -> NP -> NP -> Cl ; + pred : V -> NP -> NP -> Cl ; + pred : A -> NP -> Cl ; + pred : A2 -> NP -> NP -> Cl ; + pred : A -> NP -> NP -> Cl ; + pred : N -> NP -> Cl ; + pred : CN -> NP -> Cl ; + pred : NP -> NP -> Cl ; + pred : N -> NP -> NP -> Cl ; + pred : Adv -> NP -> Cl ; + pred : Prep -> NP -> NP -> Cl + } ; + +--2 Function application + + app : overload { + app : N -> NP ; + app : N2 -> NP -> NP ; + app : N3 -> NP -> NP -> NP ; + app : N2 -> NP -> NP -> NP ; + app : N2 -> N -> CN + } ; + +--2 Coordination + + coord : overload { + coord : Conj -> Adv -> Adv -> Adv ; + coord : Conj -> AP -> AP -> AP ; + coord : Conj -> NP -> NP -> NP ; + coord : Conj -> S -> S -> S ; + coord : DConj -> Adv -> Adv -> Adv ; + coord : DConj -> AP -> AP -> AP ; + coord : DConj -> NP -> NP -> NP ; + coord : DConj -> S -> S -> S ; + coord : Conj -> ListAdv -> Adv ; + coord : Conj -> ListAP -> AP ; + coord : Conj -> ListNP -> NP ; + coord : Conj -> ListS -> S ; + coord : DConj -> ListAdv -> Adv ; + coord : DConj -> ListAP -> AP ; + coord : DConj -> ListNP -> NP ; + coord : DConj -> ListS -> S + + } ; + +--2 Modification + + mod : overload { + mod : A -> N -> CN ; + mod : AP -> CN -> CN ; + mod : AdA -> A -> AP ; + mod : Quant -> N -> NP ; + mod : Quant -> CN -> NP ; + mod : Predet -> N -> NP ; + mod : Numeral -> N -> NP + + + } ; + +--2 Text append + +-- This is not in ground API, because it would destroy parsing. + + appendText : Text -> Text -> Text ; + +--. + pred = overload { pred : V -> NP -> Cl = \v,np -> PredVP np (UseV v) ; diff --git a/lib/resource-1.0/api/Symbolic.gf b/lib/resource-1.0/api/Symbolic.gf index cf7681df2..4d0c127c9 100644 --- a/lib/resource-1.0/api/Symbolic.gf +++ b/lib/resource-1.0/api/Symbolic.gf @@ -1,3 +1,5 @@ +--1 Symbolic: Noun Phrases with mathematical symbols + incomplete resource Symbolic = open Symbol, Grammar in { oper