cleaned up in multimodal and dialogue

15 files changed, 30 insertions, 24 deletions

diff --git a/examples/dialogue/AgendaEng.gf b/examples/dialogue/AgendaEng.gf
index 5686e704e..519f90c8d 100644
--- a/examples/dialogue/AgendaEng.gf
+++ b/examples/dialogue/AgendaEng.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
 
 concrete AgendaEng of Agenda = 
-  DialogueEng, WeekdayEng ** open LangEng, ParadigmsEng in {
+  DialogueEng, WeekdayEng ** open MultiEng, ParadigmsEng in {
 
   lin
     Day       = UseN (regN "day") ;
diff --git a/examples/dialogue/AgendaFin.gf b/examples/dialogue/AgendaFin.gf
index fac8220a4..67074acad 100644
--- a/examples/dialogue/AgendaFin.gf
+++ b/examples/dialogue/AgendaFin.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
 
 concrete AgendaFin of Agenda = 
-  DialogueFin, WeekdayFin ** open LangFin, ParadigmsFin in {
+  DialogueFin, WeekdayFin ** open MultiFin, ParadigmsFin in {
 
   lin
     Day       = UseN (regN "päivä") ;
diff --git a/examples/dialogue/AgendaFre.gf b/examples/dialogue/AgendaFre.gf
index 02871f928..e435e0428 100644
--- a/examples/dialogue/AgendaFre.gf
+++ b/examples/dialogue/AgendaFre.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
 
 concrete AgendaFre of Agenda = 
-  DialogueFre, WeekdayFre ** open LangFre, ParadigmsFre, IrregFre in {
+  DialogueFre, WeekdayFre ** open MultiFre, ParadigmsFre, IrregFre in {
 
   lin
     Day       = UseN (regN "jour") ;
diff --git a/examples/dialogue/AgendaSwe.gf b/examples/dialogue/AgendaSwe.gf
index 53d616c4f..1e7bf93dc 100644
--- a/examples/dialogue/AgendaSwe.gf
+++ b/examples/dialogue/AgendaSwe.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
 
 concrete AgendaSwe of Agenda = 
-  DialogueSwe, WeekdaySwe ** open LangSwe, ParadigmsSwe, IrregSwe in {
+  DialogueSwe, WeekdaySwe ** open MultiSwe, ParadigmsSwe, IrregSwe in {
 
   lin
     Day       = UseN (regN "dag") ;
diff --git a/examples/dialogue/AuxFin.gf b/examples/dialogue/AuxFin.gf
index c3e321b31..cb72b447c 100644
--- a/examples/dialogue/AuxFin.gf
+++ b/examples/dialogue/AuxFin.gf
@@ -1,2 +1,2 @@
-instance AuxFin of AuxDialogue = open LangFin in {
+instance AuxFin of AuxDialogue = open MultiFin in {
 }
\ No newline at end of file
diff --git a/examples/dialogue/AuxFre.gf b/examples/dialogue/AuxFre.gf
index 178a60f25..b663e3650 100644
--- a/examples/dialogue/AuxFre.gf
+++ b/examples/dialogue/AuxFre.gf
@@ -1,2 +1,2 @@
-instance AuxFre of AuxDialogue = open LangFre in {
+instance AuxFre of AuxDialogue = open MultiFre in {
 }
\ No newline at end of file
diff --git a/examples/dialogue/AuxSwe.gf b/examples/dialogue/AuxSwe.gf
index be3e1a117..acd7907b0 100644
--- a/examples/dialogue/AuxSwe.gf
+++ b/examples/dialogue/AuxSwe.gf
@@ -1,2 +1,2 @@
-instance AuxSwe of AuxDialogue = open LangSwe in {
-}
\ No newline at end of file
+instance AuxSwe of AuxDialogue = open MultiSwe in {
+}
diff --git a/examples/dialogue/DialogueFin.gf b/examples/dialogue/DialogueFin.gf
index d2de99587..9ef44d02c 100644
--- a/examples/dialogue/DialogueFin.gf
+++ b/examples/dialogue/DialogueFin.gf
@@ -1,4 +1,4 @@
---# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
 
 concrete DialogueFin of Dialogue = DialogueI with 
-  (Lang = LangFin) ;
+  (Multi = MultiFin) ;
diff --git a/examples/dialogue/DialogueFre.gf b/examples/dialogue/DialogueFre.gf
index fcd755a78..9fc908dee 100644
--- a/examples/dialogue/DialogueFre.gf
+++ b/examples/dialogue/DialogueFre.gf
@@ -1,4 +1,4 @@
---# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
 
 concrete DialogueFre of Dialogue = DialogueI with 
-  (Lang = LangFre) ;
+  (Multi = MultiFre) ;
diff --git a/examples/dialogue/DialogueI.gf b/examples/dialogue/DialogueI.gf
index 9337638c9..dea67bc2f 100644
--- a/examples/dialogue/DialogueI.gf
+++ b/examples/dialogue/DialogueI.gf
@@ -1,5 +1,7 @@
 incomplete concrete DialogueI of Dialogue = open Multi, Prelude in {
 
+  flags optimize = all_subs ;
+
   lincat
     Move   = Phr ;
     Action = {s : ActType => Str ; point : Str} ;
diff --git a/examples/dialogue/DialogueSwe.gf b/examples/dialogue/DialogueSwe.gf
index 28a81cd69..b23d761bc 100644
--- a/examples/dialogue/DialogueSwe.gf
+++ b/examples/dialogue/DialogueSwe.gf
@@ -1,4 +1,4 @@
---# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
 
 concrete DialogueSwe of Dialogue = DialogueI with 
-  (Lang = LangSwe) ;
+  (Multi = MultiSwe) ;
diff --git a/examples/dialogue/LightsFin.gf b/examples/dialogue/LightsFin.gf
index 5e51e0951..75c46ff49 100644
--- a/examples/dialogue/LightsFin.gf
+++ b/examples/dialogue/LightsFin.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
 
 concrete LightsFin of Lights = 
-  DialogueFin ** open LangFin, ParadigmsFin, AuxFin in {
+  DialogueFin ** open MultiFin, ParadigmsFin, AuxFin in {
 
   lin
     Light       = UseN (regN "valo") ;
diff --git a/examples/dialogue/LightsFre.gf b/examples/dialogue/LightsFre.gf
index 50f959d0e..dc86cce2b 100644
--- a/examples/dialogue/LightsFre.gf
+++ b/examples/dialogue/LightsFre.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
 
 concrete LightsFre of Lights = 
-  DialogueFre ** open LangFre, ParadigmsFre, IrregFre, AuxFre in {
+  DialogueFre ** open MultiFre, ParadigmsFre, IrregFre, AuxFre in {
 
   lin
     Light       = UseN (regN "lampe") ;
diff --git a/examples/dialogue/LightsSwe.gf b/examples/dialogue/LightsSwe.gf
index 695c3aa41..e2daaa36b 100644
--- a/examples/dialogue/LightsSwe.gf
+++ b/examples/dialogue/LightsSwe.gf
@@ -1,7 +1,8 @@
---# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
+
 
 concrete LightsSwe of Lights = 
-  DialogueSwe ** open LangSwe, ParadigmsSwe, AuxSwe in {
+  DialogueSwe ** open MultiSwe, ParadigmsSwe, AuxSwe in {
 
   lin
     Light       = UseN (regN "lampa") ;
diff --git a/examples/dialogue/README.txt b/examples/dialogue/README.txt
index 68ec539a9..db14dad96 100644
--- a/examples/dialogue/README.txt
+++ b/examples/dialogue/README.txt
@@ -2,6 +2,9 @@ Dialogue system grammars using GF resource.
 
 AR 16/5/2006
 
+
+24/5 Added multimodality.
+
 ==Functionality and purpose==
 
 Dialogue system abstract syntax + concrete syntaxes for