directories of precompiled libraries under lib

21 files changed, 33 insertions, 26 deletions

diff --git a/doc/gf-history.html b/doc/gf-history.html
index 620688f22..22961e7ec 100644
--- a/doc/gf-history.html
+++ b/doc/gf-history.html
@@ -14,6 +14,12 @@ Changes in functionality since May 17, 2005, release of GF Version 2.2
 
 <p>
 
+25/2 (AR) The flag <tt>preproc</tt> of the <tt>i</tt> command (and thereby
+to <tt>gf</tt> itself) causes GF to apply a preprocessor to each sourcefile
+it reads.
+
+<p>
+
 8/2 (AR) The command <tt>tb = tree_bank</tt> for creating and testing against
 multilingual treebanks. Example uses:
 <pre>
diff --git a/examples/bronzeage/BronzeageEng.gf b/examples/bronzeage/BronzeageEng.gf
index c2f14d3ff..6ca4afa36 100644
--- a/examples/bronzeage/BronzeageEng.gf
+++ b/examples/bronzeage/BronzeageEng.gf
@@ -1,4 +1,4 @@
---# -path=.:resource-1.0/present:prelude:compiled
+--# -path=.:present:prelude
 
 concrete BronzeageEng of Bronzeage = CatEng, SwadeshEng ** BronzeageI with
   (Lang = LangEng),
diff --git a/examples/bronzeage/BronzeageFin.gf b/examples/bronzeage/BronzeageFin.gf
index ff4e9cbe0..f06eab40e 100644
--- a/examples/bronzeage/BronzeageFin.gf
+++ b/examples/bronzeage/BronzeageFin.gf
@@ -1,4 +1,4 @@
---# -path=.:resource-1.0/present:prelude
+--# -path=.:present:prelude
 
 concrete BronzeageFin of Bronzeage = CatFin, SwadeshFin **  BronzeageI with
   (Lang = LangFin),
diff --git a/examples/bronzeage/BronzeageFre.gf b/examples/bronzeage/BronzeageFre.gf
index 3105decf6..91f787dd0 100644
--- a/examples/bronzeage/BronzeageFre.gf
+++ b/examples/bronzeage/BronzeageFre.gf
@@ -1,4 +1,4 @@
---# -path=.:resource-1.0/present:prelude:compiled
+--# -path=.:present:prelude
 
 concrete BronzeageFre of Bronzeage = CatFre, SwadeshFre **  BronzeageI with
   (Lang = LangFre),
diff --git a/examples/bronzeage/BronzeageGer.gf b/examples/bronzeage/BronzeageGer.gf
index 23ba21665..39d434da7 100644
--- a/examples/bronzeage/BronzeageGer.gf
+++ b/examples/bronzeage/BronzeageGer.gf
@@ -1,4 +1,4 @@
---# -path=.:resource-1.0/present:prelude:compiled
+--# -path=.:present:prelude
 
 concrete BronzeageGer of Bronzeage = CatGer, SwadeshGer **  BronzeageI with
   (Lang = LangGer),
diff --git a/examples/bronzeage/BronzeageIta.gf b/examples/bronzeage/BronzeageIta.gf
index adebd04a3..07861fda0 100644
--- a/examples/bronzeage/BronzeageIta.gf
+++ b/examples/bronzeage/BronzeageIta.gf
@@ -1,4 +1,4 @@
---# -path=.:resource-1.0/present:prelude:compiled
+--# -path=.:present:prelude
 
 concrete BronzeageIta of Bronzeage = CatIta, SwadeshIta **  BronzeageI with
   (Lang = LangIta),
diff --git a/examples/bronzeage/BronzeageNor.gf b/examples/bronzeage/BronzeageNor.gf
index 5b64d38b9..395ff4325 100644
--- a/examples/bronzeage/BronzeageNor.gf
+++ b/examples/bronzeage/BronzeageNor.gf
@@ -1,4 +1,4 @@
---# -path=.:resource-1.0/present:prelude:compiled
+--# -path=.:present:prelude
 
 concrete BronzeageNor of Bronzeage = CatNor, SwadeshNor **  BronzeageI with
   (Lang = LangNor),
diff --git a/examples/bronzeage/BronzeageSpa.gf b/examples/bronzeage/BronzeageSpa.gf
index 3d0d67b42..3b492a6ab 100644
--- a/examples/bronzeage/BronzeageSpa.gf
+++ b/examples/bronzeage/BronzeageSpa.gf
@@ -1,4 +1,4 @@
---# -path=.:resource-1.0/present:prelude:compiled
+--# -path=.:present:prelude
 
 concrete BronzeageSpa of Bronzeage = CatSpa, SwadeshSpa **  BronzeageI with
   (Lang = LangSpa),
diff --git a/examples/bronzeage/BronzeageSwe.gf b/examples/bronzeage/BronzeageSwe.gf
index 22f1a7659..0414f3d42 100644
--- a/examples/bronzeage/BronzeageSwe.gf
+++ b/examples/bronzeage/BronzeageSwe.gf
@@ -1,4 +1,4 @@
---# -path=.:resource-1.0/present:prelude:compiled
+--# -path=.:present:prelude
 
 concrete BronzeageSwe of Bronzeage = CatSwe, SwadeshSwe **  BronzeageI with
   (Lang = LangSwe),
diff --git a/examples/bronzeage/README b/examples/bronzeage/README
index 3d647a047..02b430c7b 100644
--- a/examples/bronzeage/README
+++ b/examples/bronzeage/README
@@ -14,7 +14,7 @@ To build the run-time grammar:
 Before this, you have to have compiled the libraries:
 
   cd <whatever you need>GF/lib/resource-1.0
-  make langs
+  make present
   make install
 
 To work with the grammar
@@ -25,6 +25,10 @@ Once in GF, you can do translation,
 
   p -mcfg -lang=BronzeageEng "Don't eat that thick snake!" | tb
 
+spoken-language translation (requires ATK),
+
+  si -lang=BronzeageEng -tr | p -mcfg -lang=BronzeageEng | tb
+
 random generation,
 
   gr | tb
diff --git a/examples/bronzeage/Swadesh.gf b/examples/bronzeage/Swadesh.gf
index 4057d1ab4..4566d3238 100644
--- a/examples/bronzeage/Swadesh.gf
+++ b/examples/bronzeage/Swadesh.gf
@@ -240,4 +240,4 @@ abstract Swadesh = Cat ** {
     wash_V : V2 ;
     wipe_V : V2 ;
 
-}
\ No newline at end of file
+}
diff --git a/examples/bronzeage/SwadeshEng.gf b/examples/bronzeage/SwadeshEng.gf
index d85de74e2..04a332ae5 100644
--- a/examples/bronzeage/SwadeshEng.gf
+++ b/examples/bronzeage/SwadeshEng.gf
@@ -242,4 +242,4 @@ concrete SwadeshEng of Swadesh = CatEng
     wash_V = dirV2 (regV "wash") ;
     wipe_V = dirV2 (regV "wipe") ;
 
-}
\ No newline at end of file
+}
diff --git a/examples/tram/README b/examples/tram/README
index f8753dfbb..2376afaf8 100644
--- a/examples/tram/README
+++ b/examples/tram/README
@@ -16,10 +16,12 @@ This works in eight languages.
 Notice that the compilation of the grammars uses precompiled 
 resources, located in 
 
-  GF/lib/compiled
+  GF/lib/
 
 To produce them, use 'make' and 'make install' in GF/lib/resource-1.0.
+You moreover have to set your GF_LIB_PATH to point to your GF/lib/.
 
-AR 7/11/2005 -- 23/2/2006
+
+AR 7/11/2005 -- 25/2/2006
 
 
diff --git a/examples/tram/TramEng.gf b/examples/tram/TramEng.gf
index 994c0fcdc..ce2f4e845 100644
--- a/examples/tram/TramEng.gf
+++ b/examples/tram/TramEng.gf
@@ -1,4 +1,4 @@
---# -path=.:compiled:prelude
+--# -path=.:present:multimodal:mathematical:prelude
 
 concrete TramEng of Tram = TramI with 
   (Multimodal = MultimodalEng),
diff --git a/examples/tram/TramFin.gf b/examples/tram/TramFin.gf
index b7d861d12..ae7a7e4ad 100644
--- a/examples/tram/TramFin.gf
+++ b/examples/tram/TramFin.gf
@@ -1,4 +1,4 @@
---# -path=.:compiled:prelude
+--# -path=.:present:multimodal:mathematical:prelude
 
 concrete TramFin of Tram = TramI with 
   (Multimodal = MultimodalFin),
diff --git a/examples/tram/TramFre.gf b/examples/tram/TramFre.gf
index 32e992717..43039e420 100644
--- a/examples/tram/TramFre.gf
+++ b/examples/tram/TramFre.gf
@@ -1,6 +1,4 @@
---# -path=.:compiled:prelude
-
--- --# -path=.:resource-1.0/abstract:resource-1.0/french:resource-1.0/common:resource-1.0/multimodal:resource-1.0/romance:prelude:resource-1.0/mathematical
+--# -path=.:present:multimodal:mathematical:prelude
 
 concrete TramFre of Tram = TramI with 
   (Multimodal = MultimodalFre), 
diff --git a/examples/tram/TramGer.gf b/examples/tram/TramGer.gf
index 1d1fb3281..678974a52 100644
--- a/examples/tram/TramGer.gf
+++ b/examples/tram/TramGer.gf
@@ -1,5 +1,4 @@
---# -path=.:compiled:prelude
--- --# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/mathematical:resource-1.0/multimodal:resource-1.0/german:prelude
+--# -path=.:present:multimodal:mathematical:prelude
 
 concrete TramGer of Tram = TramI with 
   (Multimodal = MultimodalGer),
diff --git a/examples/tram/TramIta.gf b/examples/tram/TramIta.gf
index 656d64dbb..581ab6ad1 100644
--- a/examples/tram/TramIta.gf
+++ b/examples/tram/TramIta.gf
@@ -1,4 +1,4 @@
---# -path=.:compiled:prelude
+--# -path=.:present:multimodal:mathematical:prelude
 
 concrete TramIta of Tram = TramI with 
   (Multimodal = MultimodalIta), 
diff --git a/examples/tram/TramNor.gf b/examples/tram/TramNor.gf
index e7ba6aadd..70392de35 100644
--- a/examples/tram/TramNor.gf
+++ b/examples/tram/TramNor.gf
@@ -1,4 +1,4 @@
---# -path=.:compiled:prelude
+--# -path=.:present:multimodal:mathematical:prelude
 
 concrete TramNor of Tram = TramI with 
   (Multimodal = MultimodalNor), 
diff --git a/examples/tram/TramSpa.gf b/examples/tram/TramSpa.gf
index 7915a0331..822adad9d 100644
--- a/examples/tram/TramSpa.gf
+++ b/examples/tram/TramSpa.gf
@@ -1,4 +1,4 @@
---# -path=.:compiled:prelude
+--# -path=.:present:multimodal:mathematical:prelude
 
 concrete TramSpa of Tram = TramI with 
   (Multimodal = MultimodalSpa), 
diff --git a/examples/tram/TramSwe.gf b/examples/tram/TramSwe.gf
index 3d4814791..98886d5c5 100644
--- a/examples/tram/TramSwe.gf
+++ b/examples/tram/TramSwe.gf
@@ -1,6 +1,4 @@
---# -path=.:compiled:prelude
-
--- --# -path=.:resource-1.0/abstract:resource-1.0/swedish:resource-1.0/common:resource-1.0/multimodal:resource-1.0/scandinavian:prelude:resource-1.0/mathematical
+--# -path=.:present:multimodal:mathematical:prelude
 
 concrete TramSwe of Tram = TramI with 
   (Multimodal = MultimodalSwe),