tram using compiled resources

7 files changed, 15 insertions, 8 deletions

diff --git a/examples/tram/Tram.gf b/examples/tram/Tram.gf
index 6a7fa1763..1e437d5ed 100644
--- a/examples/tram/Tram.gf
+++ b/examples/tram/Tram.gf
@@ -1,4 +1,4 @@
-abstract Tram = {
+abstract Tram = PredefAbs ** {
 
 cat
   Dep ;    -- from here, from Angered
diff --git a/examples/tram/TramEng.gf b/examples/tram/TramEng.gf
index a9dc1543f..994c0fcdc 100644
--- a/examples/tram/TramEng.gf
+++ b/examples/tram/TramEng.gf
@@ -1,5 +1,4 @@
---# -path=.:compiled
--- --# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/multimodal:resource-1.0/english:prelude:resource-1.0/mathematical
+--# -path=.:compiled:prelude
 
 concrete TramEng of Tram = TramI with 
   (Multimodal = MultimodalEng),
diff --git a/examples/tram/TramFin.gf b/examples/tram/TramFin.gf
new file mode 100644
index 000000000..b7d861d12
--- /dev/null
+++ b/examples/tram/TramFin.gf
@@ -0,0 +1,5 @@
+--# -path=.:compiled:prelude
+
+concrete TramFin of Tram = TramI with 
+  (Multimodal = MultimodalFin),
+  (Symbol = SymbolFin) ;
diff --git a/examples/tram/TramFre.gf b/examples/tram/TramFre.gf
index 8c3cb7529..32e992717 100644
--- a/examples/tram/TramFre.gf
+++ b/examples/tram/TramFre.gf
@@ -1,4 +1,6 @@
---# -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=.: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
 
 concrete TramFre of Tram = TramI with 
   (Multimodal = MultimodalFre), 
diff --git a/examples/tram/TramGer.gf b/examples/tram/TramGer.gf
index fb97452cb..1d1fb3281 100644
--- a/examples/tram/TramGer.gf
+++ b/examples/tram/TramGer.gf
@@ -1,4 +1,5 @@
---# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/mathematical:resource-1.0/multimodal:resource-1.0/german:prelude
+--# -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
 
 concrete TramGer of Tram = TramI with 
   (Multimodal = MultimodalGer),
diff --git a/examples/tram/TramI.gf b/examples/tram/TramI.gf
index 90c5e5261..1d505fc58 100644
--- a/examples/tram/TramI.gf
+++ b/examples/tram/TramI.gf
@@ -31,8 +31,8 @@ lin
   DestClick   = here7to_MAdv ;
   DepHere     = DemAdv here7from_Adv ;
   DestHere    = DemAdv here7to_Adv ;
----  DepNamed s  = MPrepNP from_Prep (DemNP (UsePN (SymbPN (MkSymb s)))) ;
----  DestNamed s = MPrepNP to_Prep (DemNP (UsePN (SymbPN (MkSymb s)))) ;
+  DepNamed s  = MPrepNP from_Prep (DemNP (UsePN (SymbPN (MkSymb s)))) ;
+  DestNamed s = MPrepNP to_Prep (DemNP (UsePN (SymbPN (MkSymb s)))) ;
 
   CCoord x y = {point = "(" ++ x.s ++ "," ++ y.s ++ ")" ; lock_Point = <>} ;
 
diff --git a/examples/tram/TramSwe.gf b/examples/tram/TramSwe.gf
index 59d0ff7f0..3d4814791 100644
--- a/examples/tram/TramSwe.gf
+++ b/examples/tram/TramSwe.gf
@@ -1,4 +1,4 @@
---# -path=.:compiled
+--# -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