diff --git a/download/index.txt b/download/index.txt index f1612c3d5..861f5f1c9 100644 --- a/download/index.txt +++ b/download/index.txt @@ -7,6 +7,19 @@ Grammatical Framework Download and Installation ==Latest release== +- GF 3.0 beta3 MacOS X binary package (Intel Mac with MacOS X Leopard) + [GF-3.0-beta2-i386-apple-leopard.tgz] + +- [GF 3.0 beta2 Windows package gf-3.0-beta2.zip] (includes libraries) + +- [GF 3.0 beta2 sources GF-3.0-beta2.tgz] (both system and library) + +- [GF libraries v 1.4 gf-lib-1.4.tgz] (compiled resource grammar libraries) + + + +==Previous release== + - [GF 3.0 beta2 Linux binary package GF-3.0-beta2-i686-pc-linux-gnu.tgz] (Intel, Ubuntu) - GF 3.0 beta2 MacOS X binary package: diff --git a/examples/attempto/LexAttemptoEng.gf b/examples/attempto/LexAttemptoEng.gf index ad54d6de9..b2b9c3d4b 100644 --- a/examples/attempto/LexAttemptoEng.gf +++ b/examples/attempto/LexAttemptoEng.gf @@ -25,9 +25,9 @@ oper that_Subj = M.mkSubj "that" ; - comma_and_Conj = M.mkConj [] ", and" plural ; - comma_or_Conj = M.mkConj [] ", or" singular ; - slash_Conj = M.mkConj [] "/" singular ; + comma_and_Conj = mkConj [] ", and" plural ; + comma_or_Conj = mkConj [] ", or" singular ; + slash_Conj = mkConj [] "/" singular ; whose_IDet = M.mkIDet "whose" singular ; diff --git a/examples/bronzeage/BronzeageEng.gf b/examples/bronzeage/BronzeageEng.gf index 7cb878ea1..162a41705 100644 --- a/examples/bronzeage/BronzeageEng.gf +++ b/examples/bronzeage/BronzeageEng.gf @@ -1,4 +1,4 @@ ---# -path=.:minimal:present +--# -path=.:present concrete BronzeageEng of Bronzeage = SwadeshEng ** BronzeageI with (Syntax = SyntaxEng) ** open ResEng in { diff --git a/examples/tutorial/resource-foods/Foods.gf b/examples/tutorial/resource-foods/Foods.gf new file mode 100644 index 000000000..bbb2770dd --- /dev/null +++ b/examples/tutorial/resource-foods/Foods.gf @@ -0,0 +1,16 @@ +abstract Foods = { + + flags startcat=Phrase ; + + cat + Phrase ; Item ; Kind ; Quality ; + + fun + Is,Isnt : Item -> Quality -> Phrase ; + This, That, These, Those : Kind -> Item ; + QKind : Quality -> Kind -> Kind ; + Wine, Cheese, Fish, Pizza : Kind ; + Very : Quality -> Quality ; + Fresh, Warm, Italian, Expensive, Delicious, Boring : Quality ; + +} diff --git a/examples/tutorial/resource-foods/FoodsI.gf b/examples/tutorial/resource-foods/FoodsI.gf index 0f0c7a5c3..0847f9dfb 100644 --- a/examples/tutorial/resource-foods/FoodsI.gf +++ b/examples/tutorial/resource-foods/FoodsI.gf @@ -1,4 +1,4 @@ ---# -path=.:../foods:present:prelude +--# -path=.:present incomplete concrete FoodsI of Foods = open Syntax, LexFoods in { lincat @@ -8,6 +8,7 @@ incomplete concrete FoodsI of Foods = open Syntax, LexFoods in { Quality = AP ; lin Is item quality = mkUtt (mkCl item quality) ; + Isnt item quality = mkUtt (mkS negativePol (mkCl item quality)) ; This kind = mkNP this_Quant kind ; That kind = mkNP that_Quant kind ; These kind = mkNP this_Quant plNum kind ; diff --git a/examples/tutorial/resource-foods/FoodsSwe.gf b/examples/tutorial/resource-foods/FoodsSwe.gf index a77f924ad..920ea4add 100644 --- a/examples/tutorial/resource-foods/FoodsSwe.gf +++ b/examples/tutorial/resource-foods/FoodsSwe.gf @@ -1,4 +1,4 @@ ---# -path=.:../foods:present +--# -path=.:present concrete FoodsSwe of Foods = FoodsI with (Syntax = SyntaxSwe), diff --git a/next-lib/src/english/MakeStructuralEng.gf b/next-lib/src/english/MakeStructuralEng.gf index eeaee1dcf..e2662ba88 100644 --- a/next-lib/src/english/MakeStructuralEng.gf +++ b/next-lib/src/english/MakeStructuralEng.gf @@ -3,8 +3,8 @@ resource MakeStructuralEng = open CatEng, ParadigmsEng, ResEng, MorphoEng, Prelude in { oper - mkConj : Str -> Str -> Number -> Conj = \x,y,n -> - {s1 = x ; s2 = y ; n = n ; lock_Conj = <>} ; +-- mkConj : Str -> Str -> Number -> Conj = \x,y,n -> +-- {s1 = x ; s2 = y ; n = n ; lock_Conj = <>} ; mkSubj : Str -> Subj = \x -> {s = x ; lock_Subj = <>} ; mkNP : Str -> Number -> NP = \s,n -> diff --git a/next-lib/src/english/StructuralEng.gf b/next-lib/src/english/StructuralEng.gf index 1f0715fc5..ba3c58e23 100644 --- a/next-lib/src/english/StructuralEng.gf +++ b/next-lib/src/english/StructuralEng.gf @@ -1,5 +1,6 @@ concrete StructuralEng of Structural = CatEng ** - open MorphoEng, ResEng, ParadigmsEng, (C = ConstructX), Prelude in { + open MorphoEng, ResEng, ParadigmsEng, MakeStructuralEng, + (C = ConstructX), Prelude in { flags optimize=all ; diff --git a/next-lib/src/french/StructuralFre.gf b/next-lib/src/french/StructuralFre.gf index 2bdaeb577..0293db257 100644 --- a/next-lib/src/french/StructuralFre.gf +++ b/next-lib/src/french/StructuralFre.gf @@ -1,7 +1,9 @@ --# -path=.:../abstract:../romance:../common:prelude concrete StructuralFre of Structural = CatFre ** - open PhonoFre, MorphoFre, ParadigmsFre, IrregFre, (X = ConstructX), Prelude in { + open PhonoFre, MorphoFre, ParadigmsFre, IrregFre, (X = ConstructX), + MakeStructuralFre, + Prelude in { flags optimize=all ; coding=utf8 ; diff --git a/next-lib/src/swedish/StructuralSwe.gf b/next-lib/src/swedish/StructuralSwe.gf index 1ec38c245..06883b912 100644 --- a/next-lib/src/swedish/StructuralSwe.gf +++ b/next-lib/src/swedish/StructuralSwe.gf @@ -1,5 +1,6 @@ concrete StructuralSwe of Structural = CatSwe ** - open MorphoSwe, ParadigmsSwe, (X = ConstructX), Prelude in { + open MorphoSwe, ParadigmsSwe, MakeStructuralSwe, + (X = ConstructX), Prelude in { flags optimize=all ;