From 0e929098627fefc83604197822e36d47d5aad5f4 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Wed, 24 May 2006 15:40:15 +0000
Subject: [PATCH] updated dialogue to multimodal ; bug fixes in grammar
 compilation

---
 resource-1.0/common/CommonX.gf      | 25 +++++++++++++------------
 resource-1.0/common/ConstructX.gf   | 24 ++++++++++++------------
 resource-1.0/multimodal/MultiEng.gf |  4 +---
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/resource-1.0/common/CommonX.gf b/resource-1.0/common/CommonX.gf
index 27781459b..3133ceea4 100644
--- a/resource-1.0/common/CommonX.gf
+++ b/resource-1.0/common/CommonX.gf
@@ -1,18 +1,19 @@
 concrete CommonX of Common = open (R = ParamX) in {
 
   lincat
-    Text, Phr = {s : Str} ;
-    Utt = {s : Str} ;
-    Voc = {s : Str} ;
-    SC  = {s : Str} ;
-    Adv = {s : Str} ; 
-    AdV = {s : Str} ; 
-    AdA = {s : Str} ; 
-    AdS = {s : Str} ; 
-    AdN = {s : Str} ;
-    IAdv = {s : Str} ;
-    CAdv = {s : Str} ;
-    PConj = {s : Str} ;
+    Text = {s : Str ; lock_Text : {}} ;
+    Phr = {s : Str ; lock_Phr : {}} ;
+    Utt = {s : Str ; lock_Utt : {}} ;
+    Voc = {s : Str ; lock_Voc : {}} ;
+    SC  = {s : Str ; lock_SC : {}} ;
+    Adv = {s : Str ; lock_Adv : {}} ;
+    AdV = {s : Str ; lock_AdV : {}} ;
+    AdA = {s : Str ; lock_AdA : {}} ;
+    AdS = {s : Str ; lock_AdS : {}} ;
+    AdN = {s : Str ; lock_AdN : {}} ;
+    IAdv = {s : Str ; lock_IAdv : {}} ;
+    CAdv = {s : Str ; lock_CAdv : {}} ;
+    PConj = {s : Str ; lock_PConj : {}} ;
 
     Tense = {s : Str ; t : R.Tense} ;
     Ant   = {s : Str ; a : R.Anteriority} ;
diff --git a/resource-1.0/common/ConstructX.gf b/resource-1.0/common/ConstructX.gf
index 387267c05..f3ee9e7e5 100644
--- a/resource-1.0/common/ConstructX.gf
+++ b/resource-1.0/common/ConstructX.gf
@@ -3,16 +3,16 @@ resource ConstructX = open CommonX in {
   oper
     mkText : Str -> Text = \s -> {s = s ; lock_Text = <>} ; 
     mkPhr  : Str -> Phr  = \s -> {s = s ; lock_Phr = <>} ; 
-    Utt = {s : Str} ;
-    Voc = {s : Str} ;
-    SC  = {s : Str} ;
-    Adv = {s : Str} ; 
-    AdV = {s : Str} ; 
-    AdA = {s : Str} ; 
-    AdS = {s : Str} ; 
-    AdN = {s : Str} ;
-    IAdv = {s : Str} ;
-    CAdv = {s : Str} ;
-    PConj = {s : Str} ;
+    mkUtt : Str -> Utt  = \s -> {s = s ; lock_Utt = <>} ;
+    mkVoc : Str -> Voc  = \s -> {s = s ; lock_Voc = <>} ;
+    mkSC : Str -> SC  = \s -> {s = s ; lock_SC = <>} ;
+    mkAdv : Str -> Adv  = \s -> {s = s ; lock_Adv = <>} ;
+    mkAdV : Str -> AdV  = \s -> {s = s ; lock_AdV = <>} ;
+    mkAdA : Str -> AdA  = \s -> {s = s ; lock_AdA = <>} ;
+    mkAdS : Str -> AdS  = \s -> {s = s ; lock_AdS = <>} ;
+    mkAdN : Str -> AdN  = \s -> {s = s ; lock_AdN = <>} ;
+    mkIAdv : Str -> IAdv  = \s -> {s = s ; lock_IAdv = <>} ;
+    mkCAdv : Str -> CAdv  = \s -> {s = s ; lock_CAdv = <>} ;
+    mkPConj : Str -> PConj  = \s -> {s = s ; lock_PConj = <>} ;
 
-}
\ No newline at end of file
+}
diff --git a/resource-1.0/multimodal/MultiEng.gf b/resource-1.0/multimodal/MultiEng.gf
index 16a3e6d4e..75bc660fe 100644
--- a/resource-1.0/multimodal/MultiEng.gf
+++ b/resource-1.0/multimodal/MultiEng.gf
@@ -1,6 +1,4 @@
---# -path=.:../english:../abstract:../common:prelude
-
--- --# -path=.:present:prelude
+--# -path=.:alltenses:prelude
 
 concrete MultiEng of Multi =
   LangEng - [