From 654f717e4e8c0f1ef6e45f08a620ac4916d27da4 Mon Sep 17 00:00:00 2001
From: katieschmirler <schmirle@ualberta.ca>
Date: Wed, 5 Feb 2025 16:54:29 -0700
Subject: [PATCH] updates to remodelling of prestem complex, yaml for prestem
 testing, foma compilation script adapted from hfst script.

---
 .../resplit/bla_foma_compilation.xfscript     |  28 ++
 src/fst/morphology/incoming/resplit/root.lexc | 406 +++++++++---------
 .../incoming/resplit/verb_prefixes_new.lexc   |  12 +-
 .../test/gt-norm-yamls/prestems_gt-norm.yaml  |  19 +
 4 files changed, 260 insertions(+), 205 deletions(-)
 create mode 100644 src/fst/morphology/incoming/resplit/bla_foma_compilation.xfscript
 create mode 100644 src/fst/test/gt-norm-yamls/prestems_gt-norm.yaml

diff --git a/src/fst/morphology/incoming/resplit/bla_foma_compilation.xfscript b/src/fst/morphology/incoming/resplit/bla_foma_compilation.xfscript
new file mode 100644
index 0000000..68f32b2
--- /dev/null
+++ b/src/fst/morphology/incoming/resplit/bla_foma_compilation.xfscript
@@ -0,0 +1,28 @@
+read lexc lexicon.lexc
+save stack lexicon.fsm
+#load lexicon.fsm
+define Morph
+
+
+source ../../phonology.xfscript
+save stack phonology.fsm
+#load phonology.fsm
+define Phon
+
+set flag-is-epsilon ON
+regex [ Morph .o. Phon ];
+#twosided flag-diacritics
+
+save stack analyzer-gt-norm.fsm
+invert net
+save stack generator-gt-norm.fsm
+#invert net
+#define Norm
+
+#source ../../../orthography/spellrelax_weighted.xfscript
+#define X
+
+#regex [ Norm .o. SpellRelaxWeighted ];
+#twosided flag-diacritics
+#invert net
+#save stack analyzer-gt-desc.hfst
\ No newline at end of file
diff --git a/src/fst/morphology/incoming/resplit/root.lexc b/src/fst/morphology/incoming/resplit/root.lexc
index 3c3ea98..baa9207 100644
--- a/src/fst/morphology/incoming/resplit/root.lexc
+++ b/src/fst/morphology/incoming/resplit/root.lexc
@@ -105,26 +105,26 @@ Nonaff+
 ! Prenoun tags
 PS/a's+
 PS/aahs+
-PS/aaká+
-PS/aamsskááp+
-PS/aapám+
-PS/aapát+
-PS/áápi+
+PS/aaka+
+PS/aamsskaap+
+PS/aapam+
+PS/aapat+
+PS/aapi+
 PS/aatow+
 PS/ahkiaap+
 PS/aiist+
-PS/aká+
+PS/aka+
 PS/akim+
 PS/akkaw+
 PS/anao'k+
 PS/apak+
 PS/apoyi+
 PS/atso't+
-PS/áwatt+
+PS/awatt+
 PS/ayaam+
-PS/i'nák+
-PS/i'táám+
-PS/i'táám+
+PS/i'nak+
+PS/i'taam+
+PS/i'taam+
 PS/i'tsin+
 PS/i'tsk+
 PS/i'tsk+
@@ -133,7 +133,7 @@ PS/iinohk+
 PS/iitaam+
 PS/iitaam+
 PS/iitoom+
-PS/ííyik+
+PS/iiyik+
 PS/ikaw+
 PS/ikaw+
 PS/ikaaw+
@@ -174,7 +174,7 @@ PS/ipi'k+
 PS/ipiiw+
 PS/ipiihk+
 PS/ipisat+
-PS/ipíttsik+
+PS/ipittsik+
 PS/ipow+
 PS/ipoohsap+
 PS/ippat+
@@ -188,7 +188,7 @@ PS/iso+
 PS/iss+
 PS/issk+
 PS/isskihta'+
-PS/isspí+
+PS/isspi+
 PS/isspik+
 PS/istaaht+
 PS/istot+
@@ -212,27 +212,27 @@ PS/ksikk+
 PS/ksis+
 PS/ma'k+
 PS/maan+
-PS/maká+
-PS/máóhk+
-PS/matóóm+
+PS/maka+
+PS/maohk+
+PS/matoom+
 PS/matsiw+
 PS/mattsi+
 PS/mi'ki+
 PS/mii+
 PS/miinohk+
-PS/míístap+
+PS/miistap+
 PS/mikksk+
 PS/misam+
 PS/mokamo't+
 PS/naam+
-PS/náám+
+PS/naam+
 PS/naatow+
 PS/naatsa+
 PS/naaw+
-PS/ni'tóóhk+
+PS/ni'toohk+
 PS/niit+
 PS/nimm+
-PS/noohkíít+
+PS/noohkiit+
 PS/o'k+
 PS/o'kstsik+
 PS/o't+
@@ -257,7 +257,7 @@ PS/ohtssap+
 PS/ok+
 PS/okaki+
 PS/okamo't+
-PS/ómahk+
+PS/omahk+
 PS/omat+
 PS/omatap+
 PS/omia'nist+
@@ -275,16 +275,16 @@ PS/otats+
 PS/otoom+
 PS/otsik+
 PS/otsistap+
-PS/ótssko+
+PS/otssko+
 PS/ottapit+
 PS/pa'ksik+
 PS/paahk+
-PS/paahksíst+
+PS/paahksist+
 PS/paaht+
 PS/paahtsi+
 PS/pi'k+
-PS/pinááp+
-PS/pisát+
+PS/pinaap+
+PS/pisat+
 PS/pisst+
 PS/poohsap+
 PS/sa+
@@ -313,7 +313,7 @@ PS/sik+
 PS/sikaapi+
 PS/sikim+
 PS/sikotahko+
-PS/sisákk+
+PS/sisakk+
 PS/sisik+
 PS/sistsik+
 PS/sitok+
@@ -331,7 +331,7 @@ PS/ssk+
 PS/sski+
 PS/sskihta+
 PS/sskohto+
-PS/sskonát+
+PS/sskonat+
 PS/sso+
 PS/ssp+
 PS/sspi+
@@ -342,9 +342,9 @@ PS/sstsim+
 PS/wa'kot+
 PS/wa's+
 PS/wa'sok+
-PS/waahkiááp+
+PS/waahkiaap+
 PS/waaist+
-PS/waaká+
+PS/waaka+
 PS/waami't+
 PS/waamis+
 PS/waamohs+
@@ -363,7 +363,7 @@ PS/waawow+
 PS/waist+
 PS/wattsi+
 PS/wayam+
-PS/yááhs+
+PS/yaahs+
 PS/yaam+
 PS/yaam+
 PS/yaam+
@@ -377,13 +377,13 @@ PS/yootsip+
 ! Preverb tags
 PS/ohpok+
 PS/saw+
-PS/áákssta'+
-PS/ááhkssta'+
-PS/kátá'+
-PS/wayák+
-PS/yáak+
-PS/ayáak+
-PS/ayáakak+
+PS/aakssta'+
+PS/aahkssta'+
+PS/kata'+
+PS/wayak+
+PS/yaak+
+PS/ayaak+
+PS/ayaakak+
 PS/akaa+
 PS/omohp+
 PS/omoht+
@@ -393,27 +393,27 @@ PS/poohsap+
 PS/ipoohsap+
 PS/it+
 PS/ist+
-PS/ípssit+
+PS/ipssit+
 PS/ohkit+
 PS/miistap+
 PS/yiistap+
 PS/saaki+
-PS/omá+
-PS/iimá+
-PS/á'+
-PS/á+
-PS/ááhk+
+PS/oma+
+PS/iima+
+PS/a'+
+PS/a+
+PS/aahk+
 PS/iiht+
 PS/oht+
 PS/omoht+
-PS/á'+
-PS/á'+
+PS/a'+
+PS/a'+
 PS/ikkam+
 PS/oohk+
 PS/ipp+
 PS/iik+
 PS/sska'+
-PS/sstónnat+
+PS/sstonnat+
 PS/ikkam+
 PS/iitsiksist+
 PS/ii+
@@ -422,7 +422,7 @@ PS/hkana+
 PS/ikkina+
 PS/iiyik+
 PS/ipoina+
-PS/poína+
+PS/poina+
 PS/sok+
 PS/niit+
 PS/anist+
@@ -432,30 +432,30 @@ PS/iksistt+
 PS/mato+
 PS/oto+
 PS/ohkott+
-PS/ssáak+
+PS/ssaak+
 PS/ohko+
-PS/á+
 PS/a+
-PS/á'+
+PS/a+
+PS/a'+
 PS/a'kooh+
-PS/á'p+
-PS/ááhk+
-PS/ááhkamá'p+
+PS/a'p+
+PS/aahk+
+PS/aahkama'p+
 PS/aahksikkam+
-PS/ááhksikkama'p+
+PS/aahksikkama'p+
 PS/aahs+
-PS/áák+
+PS/aak+
 PS/aaksta'+
 PS/aanist+
-PS/ai'tamáak+
-PS/áísooka+
+PS/ai'tamaak+
+PS/aisooka+
 PS/aisskahs+
-PS/áka+
-PS/ákáá+
-PS/akisspí+
+PS/aka+
+PS/akaa+
+PS/akisspi+
 PS/akk+
 PS/akoksska+
-PS/ákstam+
+PS/akstam+
 PS/ama+
 PS/amo'tap+
 PS/ana+
@@ -464,7 +464,7 @@ PS/ano+
 PS/anow+
 PS/anow+
 PS/anootap+
-PS/ao'tamáak+
+PS/ao'tamaak+
 PS/apa'p+
 PS/aso+
 PS/assaak+
@@ -474,7 +474,7 @@ PS/ayaak+
 PS/ayak+
 PS/i'ssk+
 PS/i'tsk+
-PS/iámoohk+
+PS/iamoohk+
 PS/ihta+
 PS/iihk+
 PS/iihtsitok+
@@ -494,7 +494,7 @@ PS/iitaisap+
 PS/iitsiksist+
 PS/iitskimaan+
 PS/iiyik+
-PS/íka+
+PS/ika+
 PS/ika'+
 PS/ika'to+
 PS/ikaap+
@@ -509,7 +509,7 @@ PS/ikimm+
 PS/ikimmat+
 PS/ikipp+
 PS/ikippa'+
-PS/ikíppoa+
+PS/ikippoa+
 PS/ikkam+
 PS/ikkam+
 PS/ikkan+
@@ -530,12 +530,12 @@ PS/inikk+
 PS/innaahkoot+
 PS/ipahkitap+
 PS/ipahtsik+
-PS/ipákkssa+
+PS/ipakkssa+
 PS/ipakska+
 PS/ipana+
 PS/ipann+
 PS/ipapa+
-PS/ipiitsiiyóóhk+
+PS/ipiitsiiyoohk+
 PS/ipiitsiw+
 PS/ipo't+
 PS/ipoina+
@@ -543,7 +543,7 @@ PS/ipp+
 PS/ippita+
 PS/ippoa+
 PS/ippssa'kapp+
-PS/ipsstsík+
+PS/ipsstsik+
 PS/ipsstsikatt+
 PS/isimi+
 PS/isinap+
@@ -560,57 +560,57 @@ PS/istto't+
 PS/isttsikohpo+
 PS/isttsitsa+
 PS/isttssi+
-PS/itáak+
+PS/itaak+
 PS/ito't+
 PS/iton+
 PS/itsisa+
 PS/itsk+
 PS/itsst+
-PS/káák+
+PS/kaak+
 PS/kaat+
-PS/káátsisto+
-PS/káátsisto+
+PS/kaatsisto+
+PS/kaatsisto+
 PS/kakanott+
 PS/kam+
 PS/kan+
-PS/káta'+
-PS/kínnak+
+PS/kata'+
+PS/kinnak+
 PS/kipita+
 PS/kipp+
 PS/kotski+
 PS/ksisttoyi+
 PS/maak+
-PS/máak+
+PS/maak+
 PS/maam+
 PS/maat+
-PS/máát+
-PS/máátaommita'p+
+PS/maat+
+PS/maataommita'p+
 PS/mak+
-PS/máo'k+
+PS/mao'k+
 PS/mato+
-PS/matsowá'p+
+PS/matsowa'p+
 PS/matt+
-PS/mátt+
-PS/mattsistá'+
-PS/máttsit+
+PS/matt+
+PS/mattsista'+
+PS/mattsit+
 PS/mi'kotsi+
 PS/miiksist+
 PS/miin+
 PS/min+
 PS/missk+
 PS/misst+
-PS/mo'tóí+
+PS/mo'toi+
 PS/naat+
 PS/nai't+
-PS/niistsikáp+
+PS/niistsikap+
 PS/niit+
 PS/niit+
-PS/niitá'p+
-PS/níítaak+
+PS/niita'p+
+PS/niitaak+
 PS/niitsi+
 PS/niitsskimaan+
 PS/noohk+
-PS/noohkátt+
+PS/noohkatt+
 PS/o'kia'p+
 PS/o'kio+
 PS/o'tap+
@@ -647,7 +647,7 @@ PS/otomohk+
 PS/piin	+
 PS/piitsiyoohk+
 PS/pin+
-PS/po'kí+
+PS/po'ki+
 PS/poina+
 PS/sa+
 PS/sa+
@@ -655,13 +655,13 @@ PS/saa+
 PS/saaki+
 PS/saapo'kit+
 PS/saipa'+
-PS/sáótat+
+PS/saotat+
 PS/sipi+
 PS/sook+
 PS/sootam+
-PS/sotám+
+PS/sotam+
 PS/soyi+
-PS/ssáak+
+PS/ssaak+
 PS/ssap+
 PS/sska'+
 PS/sspi+
@@ -681,10 +681,10 @@ PS/waaksisto+
 PS/waanaoyit+
 PS/waanook+
 PS/waapiiwaan+
-PS/wáyák+
-PS/wayákiit+
-PS/yáak+
-PS/yámoohk+
+PS/wayak+
+PS/wayakiit+
+PS/yaak+
+PS/yamoohk+
 PS/yoisstsikina+
 PS/yook+
 
@@ -692,18 +692,18 @@ PS/yook+
 PS/a'kooht+
 PS/a+
 PS/aahksikkam+
-PS/ááhkamá'p+
-PS/ááhk+
+PS/aahkama'p+
+PS/aahk+
 PS/aahs+
 PS/aaksta'+
 PS/aanist+
-PS/ai'tamáak+
+PS/ai'tamaak+
 PS/aisskahs+
 PS/akaa+
-PS/akisspí+
+PS/akisspi+
 PS/akk+
 PS/akoksska+
-PS/áka+
+PS/aka+
 PS/ama+
 PS/amo'tap+
 PS/ana+
@@ -712,7 +712,7 @@ PS/anist+
 PS/ano+
 PS/anootap+
 PS/anow+
-PS/ao'tamáak+
+PS/ao'tamaak+
 PS/apa'p+
 PS/aso+
 PS/assaak+
@@ -720,7 +720,7 @@ PS/att+
 PS/awa'+
 PS/ayaak+
 PS/ayak+
-PS/ayáak+
+PS/ayaak+
 PS/hkana+
 PS/i'sskaan+
 PS/i'tsk+
@@ -740,7 +740,7 @@ PS/iikska'+
 PS/iima+
 PS/iimaa+
 PS/iimat+
-PS/iimá+
+PS/iima+
 PS/iin+
 PS/iina+
 PS/iinao'k+
@@ -758,7 +758,7 @@ PS/ikaiksist+
 PS/ikak+
 PS/ikamo't+
 PS/ikapo+
-PS/ikátá'+
+PS/ikata'+
 PS/ikayiss+
 PS/ikia'ya+
 PS/ikihkiht+
@@ -776,7 +776,7 @@ PS/iksist+
 PS/iksksowa'+
 PS/ikssto+
 PS/ikstsina'+
-PS/ikíppoa+
+PS/ikippoa+
 PS/imaat+
 PS/imak+
 PS/immoyi+
@@ -789,7 +789,7 @@ PS/ipakska+
 PS/ipana+
 PS/ipann+
 PS/ipapa+
-PS/ipiitsiiyóóhk+
+PS/ipiitsiiyoohk+
 PS/ipiitsiy+
 PS/ipo't+
 PS/ipoina+
@@ -799,8 +799,8 @@ PS/ippita+
 PS/ippoa+
 PS/ippssa'kapp+
 PS/ipsstsikatt+
-PS/ipsstsík+
-PS/ipákkssa+
+PS/ipsstsik+
+PS/ipakkssa+
 PS/isimi+
 PS/isinap+
 PS/isitsip+
@@ -823,8 +823,8 @@ PS/ito't+
 PS/iton+
 PS/itsisa+
 PS/itsst+
-PS/itáak+
-PS/iámoohk+
+PS/itaak+
+PS/iamoohk+
 PS/kaat+
 PS/kakanott+
 PS/kam+
@@ -833,22 +833,22 @@ PS/kipita+
 PS/kipp+
 PS/kotski+
 PS/ksisttoyi+
-PS/káta'+
-PS/káák+
-PS/káátsisto+
-PS/kínnak+
+PS/kata'+
+PS/kaak+
+PS/kaatsisto+
+PS/kinnak+
 PS/maat+
 PS/matt+
-PS/mattsistá'+
-PS/mátt+
-PS/máttsit+
-PS/máát+
-PS/máátaommita'p+
+PS/mattsista'+
+PS/matt+
+PS/mattsit+
+PS/maat+
+PS/maataommita'p+
 PS/maak+
 PS/maam+
 PS/mak+
 PS/mato+
-PS/matsowá'p+
+PS/matsowa'p+
 PS/mi'kotsi+
 PS/miiksist+
 PS/miin+
@@ -856,20 +856,20 @@ PS/miistap+
 PS/min+
 PS/missk+
 PS/misst+
-PS/mo'tóí+
-PS/máak+
-PS/máo'k+
+PS/mo'toi+
+PS/maak+
+PS/mao'k+
 PS/na+
 PS/naat+
 PS/nai't+
-PS/niistsikáp+
+PS/niistsikap+
 PS/niit+
 PS/niitsi+
 PS/niitsskimaan+
-PS/niitá'p+
+PS/niita'p+
 PS/noohk+
-PS/noohkátt+
-PS/níítaak+
+PS/noohkatt+
+PS/niitaak+
 PS/o'kia'p+
 PS/o'kio+
 PS/o'tap+
@@ -898,7 +898,7 @@ PS/omo'tap+
 PS/omohp+
 PS/omoht+
 PS/omoht+
-PS/omá+
+PS/oma+
 PS/on+
 PS/ona'+
 PS/onai't+
@@ -914,10 +914,10 @@ PS/otomohk+
 PS/piin+
 PS/piitsiyoohk+
 PS/pin+
-PS/po'kí+
+PS/po'ki+
 PS/poina+
 PS/poohsap+
-PS/poína+
+PS/poina+
 PS/sa+
 PS/saa+
 PS/saaki+
@@ -928,7 +928,7 @@ PS/sipi+
 PS/sok+
 PS/sook+
 PS/sootam+
-PS/sotám+
+PS/sotam+
 PS/soyi+
 PS/ssap+
 PS/sska'+
@@ -938,10 +938,10 @@ PS/sstahpik+
 PS/sstok+
 PS/sstonnat+
 PS/sstsina'+
-PS/sstónnat+
-PS/ssáak+
+PS/sstonnat+
+PS/ssaak+
 PS/stam+
-PS/sáótat+
+PS/saotat+
 PS/tatsiki+
 PS/waahki+
 PS/waahko+
@@ -953,28 +953,28 @@ PS/waaksisto+
 PS/waanaoyit+
 PS/waanook+
 PS/waapiiwaan+
-PS/wayák+
-PS/wayákiit+
-PS/wáyák+
+PS/wayak+
+PS/wayakiit+
+PS/wayak+
 PS/yaahs+
 PS/yiistap+
 PS/yoisstsikina+
 PS/yook+
-PS/yáak+
-PS/yámoohk+
-PS/á'p+
-PS/á+
-PS/á'+
-PS/áka+
-PS/ákstam+
-PS/ákáá+
-PS/ááhk+
-PS/ááhkamá'p+
-PS/ááhksikkama'p+
-PS/áák+
-PS/áísooka+
-PS/íka+
-PS/ípssit+
+PS/yaak+
+PS/yamoohk+
+PS/a'p+
+PS/a+
+PS/a'+
+PS/aka+
+PS/akstam+
+PS/akaa+
+PS/aahk+
+PS/aahkama'p+
+PS/aahksikkama'p+
+PS/aak+
+PS/aisooka+
+PS/ika+
+PS/ipssit+
 
 ! Flag diacritics to be used
 @U.person.NI@
@@ -1067,56 +1067,56 @@ PS/ípssit+
 @P.neg.NEG@
 
 ! Constraining preverb recycling
-@D.PScount@
-@P.PScount.1@
-@P.PScount.2@
-@P.PScount.3@
-@P.PScount.4@
-@P.PScount.5@
-@R.PScount.1@
-@R.PScount.2@
-@R.PScount.3@
-@R.PScount.4@
-@R.PScount.5@
-@D.PScountf@
-@P.PScountf.1@
-@P.PScountf.2@
-@P.PScountf.3@
-@R.PScountf.1@
-@R.PScountf.2@
-@R.PScountf.3@
+@D.pvcount@
+@P.pvcount.1@
+@P.pvcount.2@
+@P.pvcount.3@
+@P.pvcount.4@
+@P.pvcount.5@
+@R.pvcount.1@
+@R.pvcount.2@
+@R.pvcount.3@
+@R.pvcount.4@
+@R.pvcount.5@
+@D.pvcountf@
+@P.pvcountf.1@
+@P.pvcountf.2@
+@P.pvcountf.3@
+@R.pvcountf.1@
+@R.pvcountf.2@
+@R.pvcountf.3@
 ! Constraining preverb recycling
-@D.PScount@
-@P.PScount.1@
-@P.PScount.2@
-@P.PScount.3@
-@P.PScount.4@
-@P.PScount.5@
-@P.PScount.6@
-@P.PScount.7@
-@P.PScount.8@
-@R.PScount.1@
-@R.PScount.2@
-@R.PScount.3@
-@R.PScount.4@
-@R.PScount.5@
-@R.PScount.6@
-@R.PScount.7@
-@D.PScountf@
-@P.PScountf.1@
-@P.PScountf.2@
-@P.PScountf.3@
-@P.PScountf.4@
-@R.PScountf.1@
-@R.PScountf.2@
-@R.PScountf.3@
-@D.PScount@
-@P.PScount.1@
-@P.PScount.2@
-@P.PScount.3@
-@R.PScount.1@
-@R.PScount.2@
-@R.PScount.3@
+@D.pvcount@
+@P.pvcount.1@
+@P.pvcount.2@
+@P.pvcount.3@
+@P.pvcount.4@
+@P.pvcount.5@
+@P.pvcount.6@
+@P.pvcount.7@
+@P.pvcount.8@
+@R.pvcount.1@
+@R.pvcount.2@
+@R.pvcount.3@
+@R.pvcount.4@
+@R.pvcount.5@
+@R.pvcount.6@
+@R.pvcount.7@
+@D.pvcountf@
+@P.pvcountf.1@
+@P.pvcountf.2@
+@P.pvcountf.3@
+@P.pvcountf.4@
+@R.pvcountf.1@
+@R.pvcountf.2@
+@R.pvcountf.3@
+@D.pvcount@
+@P.pvcount.1@
+@P.pvcount.2@
+@P.pvcount.3@
+@R.pvcount.1@
+@R.pvcount.2@
+@R.pvcount.3@
 @D.encount@
 @P.encount.1@
 @P.encount.2@
@@ -1134,8 +1134,8 @@ PS/ípssit+
 ! Special_characters
 i2
 i3
-í2
-í3
+i2
+i3
 a2
 a3
 a4
diff --git a/src/fst/morphology/incoming/resplit/verb_prefixes_new.lexc b/src/fst/morphology/incoming/resplit/verb_prefixes_new.lexc
index 5d2e053..bcb6d79 100644
--- a/src/fst/morphology/incoming/resplit/verb_prefixes_new.lexc
+++ b/src/fst/morphology/incoming/resplit/verb_prefixes_new.lexc
@@ -78,7 +78,7 @@ PS/ohko+:ohko PSBOUND2 ; ! "contrary, undesirable"; "have the wherewithal for"
 PS/omaa+:omaa PSBOUND2 ; ! "yet"; considerable allomorphy
 PS/iik+:i2ik PSBOUND2 ; ! "intensifier, very"
 PS/aahs+:aahs PSBOUND2 ; ! "always", could this be in an earlier slot? 
-PS/aapám+:aapám	PSBOUND2 ; ! "across water"
+PS/aapam+:aapam	PSBOUND2 ; ! "across water"
 PS/ahkiaap+:ahkiaap	PSBOUND2 ; ! "homeward"
 PS/aiist+:aiist	PSBOUND2 ; ! "to location"
 PS/akkaw+:akkaw	PSBOUND2 ; ! "voluminous", w ~ y variation check phonology
@@ -87,7 +87,15 @@ PS/atso't+:atso't	PSBOUND2 ; ! "from all sides, from more than one direction"
 PS/i2'nak+:i'nak	PSBOUND2 ; ! "small"; breaking, no deletion (i'nakawaatsi)
 PS/i'tsin+:i'tsin	PSBOUND2 ; ! "everything"; no breaking, no deletion (i'tsinihkaa)
 PS/sstsina'+:sstsina' PSBOUND2 ; ! "need to, have to VERB before doing something else"; maybe initial i2?; s-connection instead of i2?
-	
+PS/aisskahs+:aisskahs PSBOUND2 ; ! "always"
+PS/noohkatt+:noohkatt PSBOUND2 ; ! "too, also";
+PS/itap+:itap PSBOUND2 ; ! "toward, to"; rel root
+PS/ssp+:ssp	PSBOUND2 ; ! "up, high"
+PS/iksisap+:i2ksisap	PSBOUND2 ; ! "down"
+PS/it+:it	PSBOUND2 ; ! "then, there"
+PS/matt+:^SPi2matt	PSBOUND2 ; ! "again"
+PS/ssk+:ssk	PSBOUND2 ; ! "back"
+
 LEXICON PSBOUND2
 0:%< PVGATE2 ;
 
diff --git a/src/fst/test/gt-norm-yamls/prestems_gt-norm.yaml b/src/fst/test/gt-norm-yamls/prestems_gt-norm.yaml
new file mode 100644
index 0000000..a715356
--- /dev/null
+++ b/src/fst/test/gt-norm-yamls/prestems_gt-norm.yaml
@@ -0,0 +1,19 @@
+Config:
+  hfst:
+    Gen: ../../../src/generator-gt-norm.hfst
+    Morph: ../../../src/analyser-gt-norm.hfst
+  xerox:
+    Gen: ../../../src/generator-gt-norm.xfst
+    Morph: ../../../src/analyser-gt-norm.xfst
+    App: lookup
+
+Tests:
+  
+  Verb - various - ok : # with different preverbs
+     PS/matt+PS/it+itapssi+VAI+Ind+1Pl: [nimattsitsitapssspinnaana, nimattsitsitapssspinnaan]
+     PS/maat+PS/a+itapssi+VAI+Ind+3Pl: maataitapssiyi
+     PS/apoyi+PS/a+itapssi+VAI+Ind+1Pl: [nitapoyaitapssspinnaan, nitapoyaitapssspinnaana]
+     PS/maat+PS/ssk+itapssi+VAI+Ind+3Sg: maatssskitapssiwa
+     PS/noohkatt+PS/itap+waami+VAI+Ind+3Sg: noohkattsitapaamiwa
+     PS/noohkatt+PS/itap+PS/ssp+waami+VAI+Ind+3Sg: noohkattsitapssspaamiwa
+     PS/it+PS/ssk+PS/iksisap+waami+VAI+Ind+3Pl: itsssksiksisapaamiyi
\ No newline at end of file