diff --git a/doc/gf3-release.html b/doc/gf3-release.html new file mode 100644 index 000000000..4f81e8a55 --- /dev/null +++ b/doc/gf3-release.html @@ -0,0 +1,73 @@ + + + + +GF 3.0 + +

GF 3.0

+ +Krasimir Angelov, Björn Bringert, and Aarne Ranta
+
+ +

+GF Version 3.0 is a major revision of GF. The source language is a superset of the +language in 2.9, which means backward compatibility. But the target languages, the +compiler implementation, and the functionalities (e.g. the shell) have undergone +radical changes. +

+

+The release of GF 3.0 is projected for 27 June. As usual, the developing sources +are available all the time via Darcs. +

+

New features

+

+Here is a summary of the main novelties visible to the user: +

+ + +

Non-supported features

+

+There are some features of GF 2.9 that will not work in the 2.7 June release. +

+ + +

+Users who want to have these features are welcome to contact us, +and even more welcome to contribute code that restores them! +

+

GF language extensions

+

+Operations for defining patterns. +

+

+Inheritance of overload groups. +

+ + + + diff --git a/examples/tutorial/hello/hello.gfs b/examples/tutorial/hello/hello.gfs index 783919e0e..3a18fee52 100644 --- a/examples/tutorial/hello/hello.gfs +++ b/examples/tutorial/hello/hello.gfs @@ -1,4 +1,4 @@ import HelloEng.gf import HelloFin.gf import HelloIta.gf -linearize -multi Hello World +linearize Hello World diff --git a/examples/tutorial/semantics/Base.gf b/examples/tutorial/semantics/Base.gf index 4586c3106..85868d7ac 100644 --- a/examples/tutorial/semantics/Base.gf +++ b/examples/tutorial/semantics/Base.gf @@ -30,7 +30,7 @@ fun -- lexicon - UseInt : Int -> PN ; + UseInt : Int -> PN ; Number : CN ; Even, Odd, Prime : AP ; diff --git a/examples/tutorial/semantics/BaseI.gf b/examples/tutorial/semantics/BaseI.gf index ec967e443..b7ed86666 100644 --- a/examples/tutorial/semantics/BaseI.gf +++ b/examples/tutorial/semantics/BaseI.gf @@ -32,7 +32,7 @@ lin And = and_Conj ; Or = or_Conj ; - UseInt i = symb i ; + UseInt i = symb (i ** {lock_Int = <>}) ; ---- terrible to need this Number = mkCN number_N ; @@ -46,15 +46,15 @@ lin Sum = prefix sum_N2 ; Product = prefix product_N2 ; - GCD nps = mkNP (mkDet (mkQuantSg defQuant) (mkOrd great_A)) + GCD nps = mkNP (mkDet DefArt (mkOrd great_A)) (mkCN common_A (mkCN divisor_N2 (mkNP and_Conj nps))) ; WhatIs np = mkPhr (mkQS (mkQCl whatSg_IP (mkVP np))) ; - WhichAre cn ap = mkPhr (mkQS (mkQCl (mkIP whichPl_IDet cn) (mkVP ap))) ; + WhichAre cn ap = mkPhr (mkQS (mkQCl (mkIP which_IQuant cn) (mkVP ap))) ; QuestS s = mkPhr (mkQS (mkQCl s)) ; - Yes = yes_Phr ; - No = no_Phr ; + Yes = mkPhr yes_Utt ; + No = mkPhr no_Utt ; Value np = mkPhr (mkUtt np) ; Many list = mkNP and_Conj list ; @@ -65,6 +65,6 @@ lin oper prefix : G.N2 -> G.ListNP -> G.NP = \n2,nps -> - mkNP defSgDet (mkCN n2 (mkNP and_Conj nps)) ; + mkNP DefArt (mkCN n2 (mkNP and_Conj nps)) ; } diff --git a/examples/tutorial/smart/SmartEng.gf b/examples/tutorial/smart/SmartEng.gf index 384e50060..eff8a000a 100644 --- a/examples/tutorial/smart/SmartEng.gf +++ b/examples/tutorial/smart/SmartEng.gf @@ -1,6 +1,6 @@ --# -path=.:prelude -concrete Toy1Eng of Toy1 = open Prelude in { +concrete SmartEng of Smart = open Prelude in { -- grammar Toy1 from the Regulus book diff --git a/examples/tutorial/smart/SmartFre.gf b/examples/tutorial/smart/SmartFre.gf index c5d903519..95b219b60 100644 --- a/examples/tutorial/smart/SmartFre.gf +++ b/examples/tutorial/smart/SmartFre.gf @@ -1,6 +1,6 @@ --# -path=.:prelude -concrete Toy1Fre of Toy1 = open Prelude in { +concrete SmartFre of Smart = open Prelude in { -- grammar Toy1 from the Regulus book diff --git a/examples/tutorial/syntax/Syntax.gf b/examples/tutorial/syntax/Syntax.gf index 31f3fc127..e5b27504d 100644 --- a/examples/tutorial/syntax/Syntax.gf +++ b/examples/tutorial/syntax/Syntax.gf @@ -10,17 +10,17 @@ oper mkS = overload { mkS : Pol -> NP -> VP -> S - = PredVP ; + = \p,np,vp -> UseCl p (PredVP np vp) ; mkS : NP -> VP -> S - = PredVP PPos ; + = \np,vp -> UseCl PPos (PredVP np vp) ; mkS : Pol -> NP -> V2 -> NP -> S - = \p,np,v,o -> PredVP p np (ComplV2 v o) ; + = \p,np,v,o -> UseCl p (PredVP np (ComplV2 v o)) ; mkS : NP -> V2 -> NP -> S - = \np,v,o -> PredVP PPos np (ComplV2 v o) ; + = \np,v,o -> UseCl PPos (PredVP np (ComplV2 v o)) ; mkS : Pol -> NP -> AP -> S - = \p,np,ap -> PredVP p np (ComplAP ap) ; + = \p,np,ap -> UseCl p (PredVP np (ComplAP ap)) ; mkS : NP -> AP -> S - = \np,ap -> PredVP PPos np (ComplAP ap) ; + = \np,ap -> UseCl PPos (PredVP np (ComplAP ap)) ; } ; mkNP : Det -> CN -> NP diff --git a/homepage.html b/homepage.html index 6e392a5a5..69d70d92e 100644 --- a/homepage.html +++ b/homepage.html @@ -52,6 +52,14 @@ December 21, 2007.

News

+June 25, 2008. +GF 3.0 +coming soon! Version 2.9f is now frozen and no longer +available in darcs. But here is a tarball +with the final version of 2.9 sources. + +

+ March 20, 2008. Ten years of GF!