bug fix in Shell commands at, wt

lib/resource-1.0/abstract/Basic.gf

@@ -215,9 +215,4 @@ abstract Basic = Cat ** {
   stop_V : V ;
   jump_V : V ;
 
-  here7to_Adv : Adv ;
-  here7from_Adv : Adv ;
-  there_Adv : Adv ;
-  there7to_Adv : Adv ;
-  there7from_Adv : Adv ;
 }

lib/resource-1.0/abstract/Structural.gf

@@ -42,6 +42,8 @@ abstract Structural = Cat ** {
   from_Prep : Prep ;
   he_Pron : Pron ; -- NP
   here_Adv : Adv ; --
+  here7to_Adv : Adv ;
+  here7from_Adv : Adv ;
   how_IAdv : IAdv ;
   how8many_IDet : IDet ;
   i_Pron : Pron ; -- NP
@@ -74,6 +76,9 @@ abstract Structural = Cat ** {
   somewhere_Adv : Adv ;
   that_Quant : Quant ; -- Det
   that_NP : NP ;
+  there_Adv : Adv ;
+  there7to_Adv : Adv ;
+  there7from_Adv : Adv ;
   therefore_PConj : PConj ; -- AdC
   these_Quant : Quant ; -- NDet
 --  they8fem_NP : NP ;

lib/resource-1.0/english/BasicEng.gf

@@ -222,9 +222,4 @@ lin
   stop_V = regDuplV "stop" ;
   jump_V = regV "jump" ;
 
-  here7to_Adv = mkAdv ["to here"] ;
-  here7from_Adv = mkAdv ["from here"] ;
-  there_Adv = mkAdv "there" ;
-  there7to_Adv = mkAdv "there" ;
-  there7from_Adv = mkAdv ["from there"] ;
 } ;

lib/resource-1.0/english/StructuralEng.gf

@@ -30,6 +30,8 @@ concrete StructuralEng of Structural = CatEng **
   from_Prep = ss "from" ;
   he_Pron = mkNP "he" "him" "his" Sg P3 ;
   here_Adv = ss "here" ;
+  here7to_Adv = ss ["to here"] ;
+  here7from_Adv = ss ["from here"] ;
   how_IAdv = ss "how" ;
   how8many_IDet = mkDeterminer Pl ["how many"] ;
   if_Subj = ss "if" ;
@@ -61,6 +63,9 @@ concrete StructuralEng of Structural = CatEng **
   somewhere_Adv = ss "somewhere" ;
   that_Quant = mkDeterminer Sg "that" ;
   that_NP = regNP "that" Sg ;
+  there_Adv = ss "there" ;
+  there7to_Adv = ss "there" ;
+  there7from_Adv = ss ["from there"] ;
   therefore_PConj = ss "therefore" ;
   these_Quant = mkDeterminer Pl "these" ;
   they_Pron = mkNP "they" "them" "their" Pl P3 ; 

lib/resource-1.0/multimodal/Demonstrative.gf

@@ -31,6 +31,13 @@ abstract Demonstrative = Cat, Tense ** {
     DemV2  : V2 -> DNP -> MVP ;       -- takes this (here)
     DemVV  : VV -> MVP -> MVP ;       -- wants to fly (here)
 
+    DemComp : DComp -> MVP ;          -- is here ; is bigger than this
+
+    DCompAP  : DAP  -> DComp ;        -- bigger than this
+    DCompNP  : DNP  -> DComp ;        -- the price of this
+    DCompAdv : DAdv -> DComp ;        -- here
+
+
 -- Adverbial modification of a verb phrase.
 
     AdvMVP : MVP -> DAdv -> MVP ;      
@@ -39,8 +46,8 @@ abstract Demonstrative = Cat, Tense ** {
 
     this_DNP    : Point -> DNP ;        -- this
     that_DNP    : Point -> DNP ;        -- that
-    thisDet_DNP : Point -> CN -> DNP ;  -- this car
+    thisDet_DNP : CN -> Point -> DNP ;  -- this car
-    thatDet_DNP : Point -> CN -> DNP ;  -- that car
+    thatDet_DNP : CN -> Point -> DNP ;  -- that car
 
 -- Demonstrative adverbs.
 

lib/resource-1.0/multimodal/DemonstrativeI.gf

@@ -26,18 +26,24 @@ incomplete concrete DemonstrativeI of Demonstrative = Cat, TenseX **
     DemV2 verb obj = mkDem VP (ComplV2 verb obj) obj ;
     DemVV vv vp    = mkDem VP (ComplVV vv vp) vp ;
 
+    DemComp comp = mkDem Comp (UseComp comp) ;
+    DCompAP 
+     
+
     AdvMVP vp adv =
       mkDem VP (AdvVP vp adv) (concatPoint vp adv) ;
 
     this_DNP = mkDem NP this_NP ;
     that_DNP = mkDem NP that_NP ;
 
---    thisDet_DNP p cn = mkDem (DetNP this_Det cn) p ;
+    thisDet_DNP cn = 
---    thatDet_DNP p cn = mkDem (DetNP that_Det cn) p ;
+      mkDem NP (DetCN (MkDet NoPredet this_Quant NoNum NoOrd) cn) ;
+    thatDet_DNP p cn = mkDem (DetNP that_Det cn) ;
+      mkDem NP (DetCN (MkDet NoPredet that_Quant NoNum NoOrd) cn) ;
 
     here_DAdv      = mkDem Adv here_Adv ;
---    here7from_DAdv = mkDem here7from_Adv ;
+    here7from_DAdv = mkDem Adv here7from_Adv ;
---    here7to_DAdv   = mkDem here7to_Adv ;
+    here7to_DAdv   = mkDem Adv here7to_Adv ;
 
     PrepDNP p np   = mkDem Adv (PrepNP p np) np ;
 

src/GF/Shell.hs

@@ -300,8 +300,8 @@ execC co@(comm, opts0) sa@(sh@(st,(h,_,_,_)),a) = checkOptions st co >> case com
 
   CPutTerm -> changeArg (opTT2CommandArg (optTermCommand opts gro)  . s2t) sa
 
-  CWrapTerm f -> changeArg (opTT2CommandArg (return . wrapByFun opts gro f)) sa
+  CWrapTerm f -> changeArg (opTT2CommandArg (return . wrapByFun opts gro f) . s2t) sa
-  CApplyTransfer f -> changeArg (opTT2CommandArg (return . applyTransfer opts gro transfs f)) sa
+  CApplyTransfer f -> changeArg (opTT2CommandArg (return . applyTransfer opts gro transfs f) . s2t) sa
   CMorphoAnalyse -> changeArg (AString . morphoAnalyse opts gro . prCommandArg) sa
   CTestTokenizer -> changeArg (AString . optTokenizer opts gro . prCommandArg) sa