toki preverb

src/toki-pona/CatTok.gf

@@ -93,7 +93,7 @@ concrete CatTok of Cat = CommonX ** open ResTok, Coordination, Prelude in {
     V = ResTok.LinV ;
 
     VV     -- verb-phrase-complement verb         e.g. "want"
-      = SS ;
+      = ResTok.Preverb ;
 
     V2A,   -- verb with NP and AP complement      e.g. "paint"
     V2V,   -- verb with NP and V complement       e.g. "cause"

src/toki-pona/LexiconTok.gf

@@ -256,7 +256,7 @@ lin love_N = mkN "olin" ;
 -- lin open_V2 = mkV2 "" ;
 -- lin paint_V2A = mkV2A (mkV "") ;
 -- lin paper_N = mkN "" ;
-lin paris_PN = mkPN "ma" "Pawi" ;
+lin paris_PN = mkPN "ma tomo" "Paki" ;
 -- lin peace_N = mkN "" ;
 -- lin pen_N = mkN "" ;
 lin person_N = mkN "jan" ;

src/toki-pona/ResTok.gf

@@ -258,4 +258,8 @@ oper
 
   linCl : LinCl -> Str = \cl -> cl.subj ++ cl.pred ;
 
+
+-- Preverb, VV  
+
+  Preverb = SS ;
 }

src/toki-pona/StructuralTok.gf

@@ -157,10 +157,10 @@ lin language_title_Utt = ss "toki pona" ;
 
 -- lin have_V2 =
 
--- lin can8know_VV =  -- can (capacity)
--- lin can_VV =  -- can (possibility)
+lin can8know_VV = ss "ken" ;
+lin can_VV = ss "ken" ;
 -- lin must_VV =
--- lin want_VV =
+lin want_VV = ss "wile" ;
 
 ------
 -- Voc

src/toki-pona/VerbTok.gf

@@ -10,16 +10,16 @@ lin
   -- This will most likely change when you start working with VPs
   UseV v = v ;
 
-{-
   --  : V2 -> VP ;
-  PassV2 v2 =
+  -- PassV2 v2 =
 
   -- : VPSlash -> VP ;
-  ReflVP vps =
+  -- ReflVP vps =
 
   -- : VV  -> VP -> VP ;
-  ComplVV vv vp =
+  ComplVV vv vp = { s = vv.s ++ vp.s ;} ;
 
+{-
   -- : VS  -> S  -> VP ;
   ComplVS vs s =