diff --git a/bin/jgf2 b/bin/jgf2
index 9b2ac7152..d702c8076 100644
--- a/bin/jgf2
+++ b/bin/jgf2
@@ -1,11 +1,11 @@
#! /bin/sh
# change the value of GFHOME to the directory where you have the gf binary
-GFHOME=/home/aarne/GF/bin
+GFHOME=/home/aarne/GF2/bin
# /.../chalmers.se/fs/cab/cs/.users/markus/home/GF1
JGUILIB=$GFHOME/java/
-GF=/usr/local/bin/gf
+GF=$GFHOME/gf2
JGUI=GFEditor2
java -cp $JGUILIB $JGUI "$GF -java $*"
diff --git a/doc/gf2-highlights.html b/doc/gf2-highlights.html
index bb950fb84..c61afade5 100644
--- a/doc/gf2-highlights.html
+++ b/doc/gf2-highlights.html
@@ -10,7 +10,7 @@ Highlights, preliminary version
-13/10/2003 - 25/11 - 24/3/2004
+13/10/2003 - 25/11 - 2/4/2004
@@ -56,11 +56,14 @@ An accurate language specification is now available.
Pattern variables can be used on lhs's of oper definitions.
New Unicode transliterations (by Harad Hammarström).
-New parser (forthcoming)
+New shell commands
+
+ pi = print_info: information on an identifier in scope.
+ h = help now in long or short form,
+ and on individual commands.
+ All commands have both long and short names (see help). Long names
+ are a handy way to make scripts more readable.
- By Peter Ljunglöf, based on MCFG
- Much more efficient for morphology and discontinuous constituents
- Treatment of cyclic rules
New editor features
@@ -75,6 +78,13 @@ An accurate language specification is now available.
Lexican rules sorted out by option -cflexer for efficient
parsing with large lexica.
+New parser (forthcoming)
+
+ By Peter Ljunglöf, based on MCFG
+ Much more efficient for morphology and discontinuous constituents
+ Treatment of cyclic rules
+
+
@@ -119,17 +129,39 @@ There is some room for improvement.
Soundness checking of module depencencies and completeness is not
complete. This means that some errors may show up too late.
+
+
+Latex and XML printing of grammars do not work yet.
How to use GF 1.* files
-The import command i is given the option -old. E.g.
+Backward compatibility with respect to old GF grammars has been
+a central goal. All GF grammars, from version 0.9, should work in
+the old way in GF2. The main exception is the package system
+introduced in GF 1.2, which would interfere too much with the new
+module system.
+
+
+
+Very old GF grammars (from versions before 0.9), with the completely
+different notation, do not work. They should be first converted to
+GF1 by using GF version 1.2.
+
+
+
+The import command i can be given the option -old. E.g.
i -old tut1.Eng.g2
-This generates, internally, three modules:
+But this is no more necessary: GF2 detects automatically if a grammar
+is in the GF1 format.
+
+
+
+Importing a set of GF2 files generates, internally, three modules:
abstract tut1 = ...
resource ResEng = ...
@@ -137,6 +169,7 @@ This generates, internally, three modules:
(The names are different if the file name has fewer parts.)
+
The option -o causes GF2 to write these modules into files.
@@ -179,6 +212,11 @@ with a variant where the last letter is replaced by Z, e.g.
instance is replaced by instancZ. This method is of course
unsafe and should be replaced by something better.
+
+
+The package format of GF 1.2 is made obsolete
+by the module system. It is not handled properly by GF2.
+
@@ -322,6 +360,18 @@ taken into account. Thus a module need not be read from a file if the
module is in the memory and the file has not been modified.
+
+
+To force compilation:
+
+- The flag -src in the import command forces compilation from
+ source even if more recent object files exist. This is useful
+ when testing new versions of GF.
+
- The flag -retain in the import command forces reading in
+ gfr files in addition to gfc files. This is useful
+ when testing operations with the cc command.
+
+
diff --git a/src/INSTALL b/src/INSTALL
new file mode 100644
index 000000000..1478a254f
--- /dev/null
+++ b/src/INSTALL
@@ -0,0 +1,43 @@
+To make and install GF2 (Version 2-beta, 2/4/2004).
+
+1. Unpack GF2 and go to the source directory (the place where this
+ INSTALL file is!)
+
+ tar tgz gf2-beta.tgz
+ cd GF2/src
+
+2. Make sure you have GHC (Glasgow Haskell Compiler), version 5.02 or later.
+ In Windows, you also need Cygwin.
+
+ ghc --version
+
+3. Compile with make, either of
+
+ make unix -- for Linux, Solaris, Mac OSX
+ make windows -- for MS Windows
+
+ The binary is sent to the file GF2/bin/gf2
+
+4. For a quick test: start GF2, load a grammar and parse a string:
+
+ cd GF2/grammars/basic
+ ../../bin/gf2
+
+ -- when GF2 has started and shows the prompt >:
+ > p "every number is even or odd"
+ -- this is the response from GF2:
+ PredA1 (Every Number) (DisjA1 Even Odd)
+
+5. If you want to run the Java GUI, also do
+
+ make install-java
+
+ Then edit the file GF2/bin/jgf2 by changing
+ the value of GFHOME to the location of your GF2/bin directory. Test the
+ GUI with some grammars:
+
+ cd GF2/grammars/letter
+ ../../bin/gf2