From ecdc0a85f68874ced265bcb1a1b2f753f3ce80c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Sun, 5 Apr 2026 09:33:54 -0600 Subject: [PATCH] toki preverb --- src/toki-pona/CatTok.gf | 2 +- src/toki-pona/LexiconTok.gf | 2 +- src/toki-pona/ResTok.gf | 4 ++++ src/toki-pona/StructuralTok.gf | 6 +++--- src/toki-pona/VerbTok.gf | 8 ++++---- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/toki-pona/CatTok.gf b/src/toki-pona/CatTok.gf index fccaf9607..5f93a4278 100644 --- a/src/toki-pona/CatTok.gf +++ b/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" diff --git a/src/toki-pona/LexiconTok.gf b/src/toki-pona/LexiconTok.gf index eb3ceff1b..bbeadda27 100644 --- a/src/toki-pona/LexiconTok.gf +++ b/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" ; diff --git a/src/toki-pona/ResTok.gf b/src/toki-pona/ResTok.gf index 1c7a4555b..a6795474b 100644 --- a/src/toki-pona/ResTok.gf +++ b/src/toki-pona/ResTok.gf @@ -258,4 +258,8 @@ oper linCl : LinCl -> Str = \cl -> cl.subj ++ cl.pred ; + +-- Preverb, VV + + Preverb = SS ; } diff --git a/src/toki-pona/StructuralTok.gf b/src/toki-pona/StructuralTok.gf index 5aa0dd4c8..a5fbb6bfe 100644 --- a/src/toki-pona/StructuralTok.gf +++ b/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 diff --git a/src/toki-pona/VerbTok.gf b/src/toki-pona/VerbTok.gf index 3d21da803..b3c990074 100644 --- a/src/toki-pona/VerbTok.gf +++ b/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 =