diff --git a/stemlib/Latin/stemsrc/irreg.vbs.src b/stemlib/Latin/stemsrc/irreg.vbs.src index a78900ce..7e6fd8c8 100755 --- a/stemlib/Latin/stemsrc/irreg.vbs.src +++ b/stemlib/Latin/stemsrc/irreg.vbs.src @@ -221,41 +221,71 @@ auferr@emsub irreg_pp1 imperf subj :le:effero#1 :vb:effe^ro_ irreg_pp1 1st sg pres ind act +:vb:ec-fe^ro_ irreg_pp1 1st sg pres ind act orth :vb:effe^rs irreg_pp1 2nd sg pres ind act +:vb:ec-fe^rs irreg_pp1 2nd sg pres ind act orth :vb:effe^rt irreg_pp1 3rd sg pres ind act +:vb:ec-fe^rt irreg_pp1 3rd sg pres ind act orth :vb:effe^rimus irreg_pp1 1st pl pres ind act +:vb:ec-fe^rimus irreg_pp1 1st pl pres ind act orth :vb:effe^rtis irreg_pp1 2nd pl pres ind act +:vb:ec-fe^rtis irreg_pp1 2nd pl pres ind act orth :vb:effe^runt irreg_pp1 3rd pl pres ind act +:vb:ec-fe^runt irreg_pp1 3rd pl pres ind act orth :vb:effe^ror irreg_pp1 1st sg pres ind pass +:vb:ec-fe^ror irreg_pp1 1st sg pres ind pass orth :vb:effe^rris irreg_pp1 2nd sg pres ind pass +:vb:ec-fe^rris irreg_pp1 2nd sg pres ind pass orth :vb:effe^rtur irreg_pp1 3rd sg pres ind pass +:vb:ec-fe^rtur irreg_pp1 3rd sg pres ind pass orth :vb:effe^rimur irreg_pp1 1st pl pres ind pass +:vb:ec-fe^rimur irreg_pp1 1st pl pres ind pass orth :vb:effe^rimini_ irreg_pp1 2nd pl pres ind pass +:vb:ec-fe^rimini_ irreg_pp1 2nd pl pres ind pass orth :vb:effe^runtur irreg_pp1 3rd pl pres ind pass +:vb:ec-fe^runtur irreg_pp1 3rd pl pres ind pass orth :vb:effe^r irreg_pp1 2nd sg pres imperat act +:vb:ec-fe^r irreg_pp1 2nd sg pres imperat act orth :vb:effe^rte irreg_pp1 2nd pl pres imperat act +:vb:ec-fe^rte irreg_pp1 2nd pl pres imperat act orth :vb:effe^rto_ irreg_pp1 2nd sg fut imperat act +:vb:ec-fe^rto_ irreg_pp1 2nd sg fut imperat act orth :vb:effe^rto_ irreg_pp1 3rd sg fut imperat act +:vb:ec-fe^rto_ irreg_pp1 3rd sg fut imperat act orth :vb:effe^rto_te irreg_pp1 2nd pl fut imperat act +:vb:ec-fe^rto_te irreg_pp1 2nd pl fut imperat act orth :vb:effe^runto_ irreg_pp1 3rd pl fut imperat act +:vb:ec-fe^runto_ irreg_pp1 3rd pl fut imperat act orth :vb:effe^rre irreg_pp1 2nd sg pres imperat pass +:vb:ec-fe^rre irreg_pp1 2nd sg pres imperat pass orth :vb:effe^rimini_ irreg_pp1 2nd pl pres imperat pass +:vb:ec-fe^rimini_ irreg_pp1 2nd pl pres imperat pass orth :vb:effe^rtor irreg_pp1 2nd sg fut imperat pass +:vb:ec-fe^rtor irreg_pp1 2nd sg fut imperat pass orth :vb:effe^rtor irreg_pp1 3rd sg fut imperat pass +:vb:ec-fe^rtor irreg_pp1 3rd sg fut imperat pass orth :vb:aufe^runtor irreg_pp1 3rd pl fut imperat pass :vs:effer conj3 gerundive +:vs:ec-fer conj3 gerundive orth :vs:effe^r conj3 imperf ind +:vs:ec-fe^r conj3 imperf ind orth efferr@emsub irreg_pp1 imperf subj +ec-ferr@emsub irreg_pp1 imperf subj orth :vs:effe^r conj3 fut +:vs:ec-fe^r conj3 fut orth :vs:effe^r conj3 subj pres +:vs:ec-fe^r conj3 subj pres orth :vs:effe^r conj3 part +:vs:ec-fe^r conj3 part orth :vb:efferre irreg_pp1 pres inf act +:vb:ec-ferre irreg_pp1 pres inf act orth :vb:efferri_ irreg_pp1 pres inf pass +:vb:ec-ferri_ irreg_pp1 pres inf pass orth :vs: :vs:ex-tul perfstem :vs:e_-la_t pp4 @@ -441,7 +471,7 @@ pro_der@ofut fut ind act :vb:pro_desse irreg_pp1 pres inf act :vs:pro_fut pp4 fut part -:le:supersum#1 +:le:supersum # :vb:supersum irreg_pp1 1st sg pres ind act :vb:superes irreg_pp1 2nd sg pres ind act @@ -632,3 +662,51 @@ dui@basvb2 irreg_pp1 pres subj act early :le:cedo#2 :vb:cedo irreg_pp1 2nd sg pres imperat act :vb:cette irreg_pp1 2nd pl pres imperat act + + +:le:subsum +# +:vb:subsum irreg_pp1 1st sg pres ind act +:vb:subes irreg_pp1 2nd sg pres ind act +:vb:subest irreg_pp1 3rd sg pres ind act +:vb:subsumus irreg_pp1 1st pl pres ind act +:vb:subestis irreg_pp1 2nd pl pres ind act +:vb:subsunt irreg_pp1 3rd pl pres ind act +# +subsi@basvb2 irreg_pp1 pres subj act +subsie@basvb2 irreg_pp1 pres subj act early +:vb:a_fuam irreg_pp1 1st sg pres subj act early +:vb:a_fua_s irreg_pp1 2nd sg pres subj act early +:vb:a_fuat irreg_pp1 3rd sg pres subj act early +:vb:a_fuant irreg_pp1 3rd pl pres subj act early +:vb:subfuam irreg_pp1 1st sg pres subj act early +:vb:subfua_s irreg_pp1 2nd sg pres subj act early +:vb:subfuat irreg_pp1 3rd sg pres subj act early +:vb:subfuant irreg_pp1 3rd pl pres subj act early +# +subera@basvb2 irreg_pp1 imperf ind act +subesse@basvb2 irreg_pp1 imperf subj act +suber@ofut irreg_pp1 fut ind act +:vs:a_fu perfstem +:vs:subfu perfstem +# +:vb:subes irreg_pp1 2nd sg pres imperat act +:vb:subeste irreg_pp1 2nd pl pres imperat act + +# +:vb:subesto_ irreg_pp1 2nd sg fut imperat act +:vb:subesto_ irreg_pp1 3rd sg fut imperat act +:vb:subesto_te irreg_pp1 2nd pl fut imperat act +:vb:subsunto_ irreg_pp1 3rd pl fut imperat act +# +:vb:subesse irreg_pp1 pres inf act +:vb:a_fore irreg_pp1 fut inf act +:vb:subfore irreg_pp1 fut inf act +a_fore@basvb2 irreg_pp1 imperf subj act early +subfore@basvb2 irreg_pp1 imperf subj act early +:vs:a_fut pp4 fut part +:vs:subfut pp4 fut part +subse_ns irreg_pp1 pres part masc/fem/neut nom/voc sg +subse_ns irreg_pp1 pres part neut acc sg +subsente irreg_pp1 pres part masc/fem/neut abl sg +subsent@decl3_i irreg_pp1 pres part masc fem neut \ No newline at end of file diff --git a/stemlib/Latin/stemsrc/ls.nom b/stemlib/Latin/stemsrc/ls.nom index dd8d0bc7..02c7784e 100755 --- a/stemlib/Latin/stemsrc/ls.nom +++ b/stemlib/Latin/stemsrc/ls.nom @@ -18412,12 +18412,6 @@ astu_tu^lus :aj:a_stu_tu^l us_a_um -astus -:le:astus -:aj:a_st us_a_um - - -astu_tus astu_te_ Asty^a^ges :le:Astyages :aj:Asty^a^g es_is masc @@ -48141,12 +48135,13 @@ convi_ci^o^lum :no:convi_ci^o^l us_i neut -con-vi_ci^um convi_ti^um :le:convicium :no:con-vi_c ius_i neut -:no:convi_t ius_i neut orth +:le:convitium +:no:convi_t ius_i neut + convicti^o#1 :le:convictio#1 diff --git a/stemlib/Latin/stemsrc/vbs.cmp.ml b/stemlib/Latin/stemsrc/vbs.cmp.ml index 53bd9d2f..5ef6907d 100755 --- a/stemlib/Latin/stemsrc/vbs.cmp.ml +++ b/stemlib/Latin/stemsrc/vbs.cmp.ml @@ -10,8 +10,6 @@ #a-creo#1 acra #a-creo#1 acro #a-creo#1 acror -#a-dedo adedo -#a-dito adito #a-do ador #a-do#2 ador #a-edo#2 aedes @@ -48,17 +46,11 @@ #a-palo#2 apala #a-pico apica #a-pio apio -#a-piscor apiscor #a-plano aplanes #a-quatio aquatio #a-reno#1 arena #a-ruro arura -#a-scribo ascribo -#a-specio aspicio -#a-spicio aspicio -#a-spiro aspiro #a-strigo astriger -#a-stringo astringo #a-ululo aulula #a-uro auris #a-uto autor @@ -70,113 +62,36 @@ #ab-arceo abarcet #ab-beo abba #ab-beo abbas -#ab-caedo abcido -#ab-do abdo -#ab-do#2 abdo #ab-emo abemito -#ab-eo#1 abeo #ab-grego abgregare #ab-hiemo abhiemo -#ab-horreo abhorreo -#ab-jacio abicio #ab-luto#1 ablutor -#ab-oleo#1 aboleo -#ab-repo arrepo -#ab-rumpo abrumpo #ab-struo abstruo -#ab-sum#1 absum #ab-torqueo abtorqueo -#ab-uto abutor -#ab-utor abutor -#abs-sum#1 absum -#abs-teneo abstineo -#ad-aperio adaperio #ad-arceo adarce -#ad-augeo adaugeo #ad-cano accano -#ad-clamito acclamito -#ad-colo#2 accola -#ad-congero#1 accongero -#ad-decet addecet #ad-ducto adductor -#ad-edo adedo -#ad-edo#2 adedo -#ad-eo#1 adeo#1 -#ad-expeto adexpeto -#ad-facio afficio -#ad-fero affero -#ad-figo affigo #ad-finio affinis -#ad-flecto afflecto -#ad-fligo affligo -#ad-flo afflo #ad-fluento affluenter -#ad-for affor -#ad-frico affrico -#ad-fulgeo affulgeo -#ad-fundo#1 affundo -#ad-fundo#2 affundo #ad-gestio#2 aggestio -#ad-gnosco agnosco -#ad-gradior aggredior -#ad-habito adhabito -#ad-horreo adhorreo -#ad-indo adindo -#ad-ito adito #ad-jacio adicio -#ad-jubeo adjubeo -#ad-labor#1 allabor -#ad-lambo allambo #ad-livesco allivescit -#ad-loquor alloquor #ad-monito admonitor #ad-nasco adnascor #ad-nasco annascor -#ad-nascor adnascor #ad-nascor annascor #ad-nato adnato -#ad-navigo adnavigo #ad-necto adnecto #ad-neo#1 anne #ad-niteo adnitendus -#ad-nitor#1 annitor -#ad-no#1 adnato -#ad-nosco agnosco -#ad-opino adopinor -#ad-opinor adopinor -#ad-pareo appareo #ad-parito apparitor -#ad-pendo appendo #ad-penso appensor -#ad-plaudo applaudo -#ad-plico applico -#ad-plodo applodo -#ad-pono appono -#ad-porto apporto -#ad-prendo apprendo -#ad-propero appropero -#ad-propinquo appropinquo -#ad-quaero acquiro -#ad-quiesco adquiesco -#ad-repo arrepo #ad-saturo assatura -#ad-sector#2 assector #ad-sedo assedo -#ad-sisto assisto -#ad-soleo assoleo -#ad-sto asto -#ad-suesco assuesco -#ad-sum#1 adsum -#ad-surgo assurgo -#ad-tribulo attribulo #ad-uto adutor #ad-utor adutor -#ad-vereor advereor -#ad-verro adverro #amb-ago ambages #amb-ago ambago -#amb-edo ambedo -#amb-edo#2 ambedo #amb-ito ambitor #ante-ago anteago #ante-ambulo anteambulo @@ -184,43 +99,25 @@ #ante-curso antecursor #ante-dico#1 antedico #ante-dico#2 antedico -#ante-eo#1 anteeo -#ante-fero antefero #ante-paro#1 anteparo #ante-paro#2 anteparo #ante-po antepes #ante-rideo anterides #circum-colo#2 circumcola -#circum-do circumdo -#circum-do#2 circumdo #circum-ducto circumductor -#circum-eo#1 circumeo -#circum-fero circumfero -#circum-fodio circumfodio #circum-fosso circumfossor -#circum-gradior circumgredior #circum-ito circuitor -#circum-jaceo circumjaceo -#circum-jacio circumjacio -#circum-lavo circumlavo -#circum-linio circumlinio -#circum-loquor circumloquor -#circum-sedeo circumsideo -#circum-specio circumspicio #circum-tondeo circumtondeo #circum-tremo circumtremo #circum-vento circumventor #circum-verro circumverro #co-adjuto coadjutor #co-adjutor#1 coadjutor -#co-alesco coalesco -#co-aresco coaresco #co-cio cocio #co-co coco #co-do coda #co-do#2 coda #co-eno coena -#co-eo#1 coeo #co-liceo#1 colice #co-liceor colice #co-lineo colina @@ -230,293 +127,114 @@ #co-po copo #co-stabilio costabilis #co-sto costa -#co-uto coutor -#co-utor coutor #con-caedo concaedes #con-capio#1 concapit -#con-cateno concateno #con-clavo conclavo #con-colo#1 concolor #con-colo#2 concolor -#con-comito concomitor -#con-comitor concomitor #con-cubito concubitor -#con-cubo concubo -#con-custodio concustodio -#con-decet condecet #con-decurio#1 condecurio #con-denseo condenseo #con-ducto conductor -#con-eo#1 coeo -#con-fabrico confabricor -#con-fabricor confabricor -#con-fabulo confabulor -#con-fabulor confabulor #con-facio confacio -#con-fero confero #con-fero conferte -#con-fervesco confervesco #con-feto confeta #con-fibulo confibula -#con-figuro configuro #con-finio confinis -#con-fio conficio #con-flato conflator -#con-foedero confoedero -#con-frequento confrequento -#con-frio confrio #con-fugo confuga #con-gestio#2 congestio -#con-gratulor congratulor -#con-jacio conicio -#con-labor#1 collabor #con-lecto collector #con-lego#1 collega -#con-libet collibet -#con-libo#1 collibet -#con-luceo colluceo #con-monito commonitor #con-munito communiter -#con-necto connecto #con-nitor#1 connitor #con-pedo#1 compedes #con-pedo#2 compedes -#con-pluo compluit #con-poto compotor -#con-preco comprecor -#con-precor comprecor -#con-prehendo comprehendo -#con-quaero conquaero #con-rugio corrugis -#con-rugo corrugo -#con-sacro consacro -#con-saepio consaepio #con-satio#1 consatio -#con-scindo conscindo -#con-sepelio consepelio #con-sitio consitio #con-solido consolida -#con-solido consolido -#con-sopio consopio #con-sortio consortio #con-sortior consortio -#con-spargo#1 conspargo #con-specto conspector #con-sponso consponsor -#con-spuo conspuo -#con-spurco conspurco -#con-subigo consubigo -#con-sueo consueo #con-sum#1 consum #con-tago contages -#con-temero contemero #con-tento contemptor -#con-tero contero -#con-tono contonat -#con-torqueo contorqueo #con-torto contortor -#con-tribulo contribulo -#con-tueo contueor -#con-tueor contueor -#con-vesco convescor -#con-vitio convitio -#con-voveo convoveo -#con-vulnero convolnero -#de-ambulo deambulo -#de-armo dearmo #de-calceo decalco #de-calco decalco #de-calefacio decalefacio #de-calesco decalesco -#de-carmino#1 decarmino -#de-carmino#2 decarmino #de-cesso decessor -##de-cieo decies -##de-cio decies +#de-cieo decies +#de-cio decies #de-co decas #de-co deceris #de-co decor #de-curo decures -#de-curro decurro -#de-curto decurto -#de-duco deduco #de-ducto deductor -#de-eo#1 deeo -#de-erro#1 deerro -#de-fatisco defatiscor -#de-fero defero #de-fio defio #de-forio deforis -#de-fraudo defraudo -#de-fremo defremo -#de-frico defrico -#de-fruor defruor -#de-fungor defungor -#de-glabro deglabro -#de-glubo deglubo -#de-grandino degrandinat -#de-gravo degravo -#de-grunnio degrunnio -#de-hisco dehisco #de-indo deinde #de-ito deitas -#de-jacio deicio #de-jugo#2 dejugis #de-lanio#1 delaniare -#de-lavo delavo -#de-libro delibro -#de-liquo deliquo #de-lito delitor #de-meio demeio -#de-mordeo demordeo -#de-moveo demoveo -#de-nasco denascor -#de-nascor denascor -#de-operio deoperio #de-pacisco depaciscor -#de-paciscor depaciscor -#de-pango depango -#de-pecto depecto -#de-pleo depleo -#de-polio#1 depolio #de-potio#2 depotitur #de-potior#1 depotitur #de-prenso deprensa -#de-promo depromo -#de-pudeo depudet #de-pulpo depulpo -#de-purgo depurgo #de-queo deque -#de-saevio desaevio -#de-sicco desicco -#de-signo designo -#de-spicio despicio #de-spico despica #de-sponso desponsor -#de-sugo desugo -#de-sum#1 desum #de-supo desuper -#de-tendo detendo #de-tento detentor -#de-torno detorno -#de-uto deutor -#de-utor deutor -#de-vasto devasto -#de-vello devello -#de-verso devorsor -#de-vesco devescor -#dis-bucino dibucino #dis-colo#1 discolor #dis-colo#2 discolor -#dis-crucio discrucio -#dis-fateor diffiteor -#dis-fero differo -#dis-fido diffido -#dis-findo diffindo #dis-gestio#2 digestio #dis-gnosco dignosco #dis-lecto dilector -#dis-lorico dilorico -#dis-moveo dimoveo #dis-neo#1 dine -#dis-nosco dignosco -#dis-pando#1 dispando -#dis-pando#2 dispando -#dis-partio#2 dispartio #dis-partior dispartio -#dis-pergo dispergo -#dis-plodo displodo -#dis-po dispando -#dis-pono dispono -#dis-pudeo dispudet -#dis-rapio diripio -#dis-rego dirigo #dis-repto direptor -#dis-rigo dirigo -#dis-rumpo disrumpo -#dis-seco disseco -#dis-sipo dissipo -#dis-suo dissuo -#dis-taedeo distaedet #dis-tracto distractor -#dis-verto divorto #dis-viso divisor #dis-vitio divitia -#ex-cieo excio #ex-consulo exconsularis -#ex-creo excreo #ex-cubito excubitor -#ex-dico#2 edico #ex-dito editor #ex-ducto eductor -#ex-edo exedo #ex-edo exesto -#ex-edo#2 exedo -#ex-eo#1 exeo -#ex-fero effero#1 -#ex-fervesco effervesco #ex-fio effio -#ex-fleo effleo -#ex-fodio effodio -#ec-freno effreno -#ex-freno effreno -#ex-frico effrico #ex-gestio#2 egestio -#ex-gurgito exgurgito -#ex-jacio eicio -#ex-labo elabor -#ex-labor#1 elabor #ex-lateo elate #ex-latito elatites #ex-laudo elaudare #ex-liceo#1 elices #ex-liceor elices -#ex-marcesco emarcesco -#ex-molio emolior -#ex-molior emolior -#ex-molo#1 emolo -#ex-moveo emoveo -#ex-nasco enascor -#ex-nascor enascor -#ex-neco eneco -#ex-nitesco enitesco -#ex-nitor#1 enitor -#ex-notesco enotesco -#ex-ordior exordior -#ex-orior exorior -#ex-patior expatior #ex-plico explicate -#ex-plico explico #ex-presso expressor -#ex-pungo expungo -#ex-rapio eripio #ex-reor eremus #ex-reor eres #ex-repto ereptor #ex-rogo exrogare -#ex-ruo eruo -#ex-scindo exscindo -#ex-seco exseco #ex-sector#2 exsector -#ex-spargo#1 exspargo -#ex-stinguo exstinguo #ex-torto extortor #ex-tremo extremo #ex-ungo exungo #ex-verso eversor #ex-versor eversor -#ex-video evideor #in-acerbo inacerbo -#in-aresco inaresco -#in-assero#1 inassero -#in-assero#2 inassero -#in-audio inaudio #in-auspico inauspicato #in-beo imber #in-calo incalanto #in-censeo incense #in-censeo#1 incense -#in-cohibeo incohibeo #in-comito incomitem #in-comito incomiter #in-comitor incomiter @@ -525,31 +243,20 @@ #in-como#1 incomis #in-credo incredendus #in-credo incredundus -#in-cubo incubo -#in-cresco incresco #in-doleo indoles #in-dolo#1 indoles #in-ducto inductor -#in-eo#1 ineo #in-fateor infiteri -#in-fatigo infatigo -#in-fero infero -#in-flecto inflecto -#in-fligo infligo #in-for infandus #in-for infer #in-for inferne #in-frequento infrequenter -#in-generasco ingenerasco #in-gestio#2 ingestio -#in-gradior ingredior #in-humano inhumano #in-jugo#2 injugis -#in-ludo illudo #in-merito#2 immerito #in-mobilito immobilitas #in-munito immunitas -#in-obscuro inobscuro #in-orior inorior #in-orior inoris #in-paeniteo impaenitendus @@ -558,22 +265,15 @@ #in-pasco impascor #in-pascor impascor #in-pigreo impigre -#in-plico implico #in-po impes #in-provideo improvide #in-proviso#2 improviso #in-pulso impulsor #in-punior impunis -#in-rado inrado -#in-rideo irrideo -#in-rumpo irrumpo -#in-saepio insaepio #in-saluto insalutaris -#in-signo insigno #in-similo insimilo #in-sitio insitio #in-somnio insomnia -#in-sum#1 insum #in-supo insuper #in-temero intemerandus #in-termino intermino @@ -582,188 +282,78 @@ #in-tuto intuta #in-tuto#2 intuta #in-unguo inunguo -#in-urgeo inurgeo #in-vecto invector #in-vento inventor -#in-vilito invilito -#in-violo inviolo #inter-amento interamenta #inter-aperio interaperio #inter-caedo intercisi -#inter-calceo intercalco -#inter-calco intercalco #inter-cesso intercessor #inter-dicto interdictor -#inter-do interdo #inter-do#2 interdo #inter-edo interest -#inter-emo interimo -#inter-eo#1 intereo #inter-facio interfacio -#inter-fio interfio -#inter-fugio interfugio -#inter-fundo interfundo -#inter-lucesco interlucesco #inter-mino intermino #inter-neo#1 interne #inter-no#1 interna #inter-no#1 internas #inter-polio#1 interpolis -#inter-premo interpremo -#inter-sileo intersileo -#inter-sum#1 intersum #inter-trituro intertritura #inter-vento interventor -#inter-verto intervorto -#intro-eo#1 introeo #ob-acerbo obacerbat #ob-caedo occaedes -#ob-cano occano -#ob-coepio occoepi -#ob-curro occurro -#ob-duco obduco -#ob-dulcesco obdulcesco -#ob-edo obedo -#ob-edo#2 obedo -#ob-eo#1 obeo #ob-esco obescet #ob-esito obesitas -#ob-facio officio -#ob-fero offero #ob-flo offla #ob-for offa -#ob-fuco offuco -#ob-fundo#1 offundo -#ob-fundo#2 offundo #ob-herbesco obherbescere -#ob-irasco obirascor -#ob-irascor obirascor #ob-ito obiter -#ob-jurgo objurgo -#ob-lineo oblino -#ob-linio oblinio #ob-liqueo oblique #ob-lito oblitor #ob-necto obnectere -#ob-nitor#1 obnitor -#ob-pingo oppingo -#ob-pono oppono -#ob-porto opporto #ob-presso oppressor -#ob-ruo obruo #ob-saluto obsalutare -#ob-servio observito -#ob-sto obsto #ob-stupeo obstupendus -#ob-stupesco obstupesco -#ob-sum#1 obsum -#ob-torpeo obtorpeo #ob-tracto obtractat -#ob-tueo obtueor -#ob-tueor obtueor -#ob-violo obviolo -#op-fero offero -#per-aresco peraresco #per-audio peraudiendus -#per-caedo percaedo -#per-cedo#1 percedo #per-celo perceler #per-cerno percernis -#per-clamo perclamo -#per-cludo percludo #per-como#1 percomis -#per-cupio percupio #per-dito perditor #per-domito perdomitor -#per-domo perdomo -#per-eo#1 pereo #per-excrucio perexcrucio #per-exilio perexilis #per-extimesco perextimesco -#per-fero perfero -#per-fingo perfingo #per-fosso perfossor -#per-frico perfrico -#per-frigeo perfrigeo #per-fugo perfuga -#per-fungor perfungor #per-grandio pergrandis #per-indo perinde #per-insignio perinsignis -#per-libet perlibet -#per-libo#1 perlibet -#per-liceo#1 perlicet -#per-liceor perlicet -#per-lineo perlino #per-miro permirandus #per-miror permirandus #per-mollio permollis -#per-moneo permoneo -#per-morior permorior -#per-moro permoror -#per-moror#1 permoror -#per-moror#2 permoror #per-multo#2 permulto -#per-narro pernarro #per-no#1 perna -#per-nosco pernosco -#per-nuntio pernuntio -#per-odi perodi #per-opto peroptato -#per-ploro perploro #per-po perpes -#per-suo persuo #per-taedeo pertaedeo -#per-taedeo pertaedet -#per-tumesco pertumesco #per-ungo perungo -#per-urgeo perurgeo #per-valeo pervaleo #per-vecto pervector #per-vento perventor -#prae-acuo praeacuo -#prae-aequo praeaequo -#prae-carpo praecarpo #prae-celo praeceler #prae-cesso praecessor #prae-co praeco -#prae-coepio praecoepi -#prae-crudesco praecrudesco #prae-curso praecursor -#prae-eo#1 praeeo -#prae-fero praefero -#prae-gigno praegigno #prae-grandio praegrandis -#prae-jacio praejacio #prae-lecto praelector #prae-monito praemonitor -#prae-oro praeoro -#prae-ostendo praeostendo -#prae-patior praepatior -#prae-plecto#2 praeplecto #prae-po praepes -#prae-possum praepossum -#prae-propero praepropero #prae-repto praereptor -#prae-sido praesidero -#prae-specio praespicio -#prae-spicio praespicio #prae-stabilio praestabilis -#prae-stinguo praestinguo -#prae-sum#1 praesum -#prae-suo praesuo -#prae-tento praetempto #prae-ungo praeungo #prae-varico praevarico #prae-vento praeventor -#prae-verno praevernat -#praeter-ago praeterago -#praeter-eo#1 praetereo -#praeter-fero praeterfero #praeter-ito praeterita -#praeter-rado praeterrado -#praeter-sum#1 praetersum -#praeter-veho praetervehor #pro-aucto proauctor #pro-calo procalare #pro-capio#1 procapis @@ -772,88 +362,44 @@ #pro-cito#2 procitare #pro-co proceres #pro-consulo proconsularis -#pro-creo procreo #pro-dito proditor -#pro-emineo proemineo -##pro-fateor profiteor -#pro-fero profero +#pro-fateor profiteor #pro-fluento profluenter #pro-fugo profuga #pro-fundito profunditas -#pro-gigno progigno -#pro-geniculo progeniculo -#pro-lugeo prolugeo #pro-mello promellere #pro-monstro promonstra -#pro-mutuo promutuor -#pro-mutuo#2 promutuor -#pro-mutuor promutuor #pro-neo#1 prone -#pro-patior propatior #pro-plasmo proplasma #pro-po propes #pro-polio#1 propolis -#pro-purgo propurgo #pro-reto proreta #pro-rigo proriga #pro-sapio prosapies #pro-sector#2 prosector #pro-sedo proseda #pro-sopio prosopis -#pro-specio prospicio #pro-spico prospica #pro-sumo prosumo #pro-vecto provector -#pro-vegeo provegeo -#pro-vendo provendo -#pro-verto proverto -#prod-eo#1 prodeo #prod-ito proditor -#re-bullio rebullio -#re-calefacio recalefacio -#re-canto recanto -#re-cingo recingo #re-claudo reclaudo -#re-claudo#1 reclaudo -#re-claudo#2 reclaudo -#re-creo recreo -#re-eo#1 redeo #re-fero refero -##re-fero refert -#re-frico refrico #re-fugo refuga #re-galeo regales -#re-liceo#1 reliceor -#re-liceor reliceor -#re-lucesco relucesco #re-moro remores -#re-mundo remundo #re-nancio renancitur #re-nancior renancitur -#re-nasco renascor -#re-nascor renascor -#re-nitor#1 renitor -#re-pecto repecto #re-po repandus #re-presso repressor -#re-salvo resalvare #re-socio resociandus #re-sum#1 resum -#re-teneo retineo #re-tero retero #re-tero retero -#re-vello revello #re-vereor reverendus -#re-vereor revereor #re-vero revera #re-verto reverto -#re-verto revorto -#re-vivisco revivisco -#re-volvo revolvo #red-dito redditor -#red-eo#1 redeo -#red-operio redoperio -#retro-specio retrospicio #se-caleo secale #se-co secundae #se-co secundum @@ -867,96 +413,559 @@ #se-meo semet #se-nato senator #se-pio sepia -#se-pio sepio #se-rapio serapias #se-reneo serene #se-rivo seriva #se-simo#1 sesima #sub-adjuvo subadjuva -#sub-aduno subaduno #sub-alo subalare #sub-alo subalaris #sub-cesso successor #sub-co succo #sub-curso succursor #sub-doleo subdole -#sub-edo subedo -#sub-edo#2 subedo -#sub-eo#1 subeo -#sub-erigo suberigo -#sub-fero suffero #sub-for suffes #sub-gestio#2 suggestio #sub-grandio suggrandis #sub-inanio subinanis #sub-influo subinfluo -#sub-irasco subirascor -#sub-irascor subirascor #sub-lateo sublate #sub-limito sublimitas #sub-limito sublimiter -#sub-lugeo sublugeo #sub-malo summalis #sub-meo summa #sub-meo summas #sub-minio#1 summinia -#sub-mitto summitto #sub-moto summotor -#sub-necto subnecto #sub-oculo subocularis -#sub-pedo#1 suppedo -#sub-pedo#2 suppedo #sub-presso suppressor -#sub-pudeo suppudet -#sub-rapio surripio -#sub-rego surgo -#sub-ringor surringor -#sub-ruo surruo #sub-sipo subsipere -#sub-sum#1 subsum -#sub-uro suburo #sub-vado#1 subvades #sub-vado#2 subvades -#sub-vereor subvereor -#super-curro supercurro -#super-effero#2 supereffero -#super-egredior superegredior -#super-emorior superemorior #super-facio superficies -#super-fero superfero -#super-figo superfigo -#super-fio superfio -#super-fugio superfugio #super-gradior supergradior -#super-gradior supergredior -#super-impleo superimpleo -#super-inspicio superinspicio #super-intento superintentor -#super-labo superlabor -#super-labor#1 superlabor #super-molo#1 supermolaris #super-neo#1 superne #super-no#1 supernas -#super-perspicio superperspicio -#super-ruo superruo -#super-stringo superstringo -#super-sum#1 supersum #super-vacuo supervacuo #trans-dito traditor -#trans-duco traduco #trans-ducto traductor -#trans-eo#1 transeo -#trans-fero transfero #trans-fugo transfuga #trans-ito transitor -#trans-jungo transjungo -#trans-loquor traloquor -#trans-moveo transmoveo -#trans-sero#1 transsero -#trans-sero#2 transsero -#trans-sero#3 transsero #trans-sitio transitio -#trans-sumo transsumo #trans-supplodo transsero -#trans-vendo transvendo - +a-dedo adedo +a-dito adito +a-piscor apiscor +a-specio aspicio +a-spicio aspicio +a-spiro aspiro +ab-caedo abcido +ab-do abdo +ab-do#2 abdo +ab-eo#1 abeo +ab-horreo abhorreo +ab-jacio abicio +ab-oleo#1 aboleo +ab-repo arrepo +ab-rumpo abrumpo +ab-sum#1 absum +ab-uto abutor +ab-utor abutor +abs-sum#1 absum +abs-teneo abstineo +ad-aperio adaperio +ad-augeo adaugeo +ad-clamito acclamito +ad-colo#1 accolo +ad-colo#2 accolo +ad-congero#1 accongero +ad-decet addecet +ad-edo adedo +ad-edo#2 adedo +ad-eo#1 adeo#1 +ad-expeto adexpeto +ad-facio afficio +ad-fero affero +ad-figo affigo +ad-flecto afflecto +ad-fligo affligo +ad-flo afflo +ad-for affor +ad-frico affrico +ad-fulgeo affulgeo +ad-fundo#1 affundo +ad-fundo#2 affundo +ad-gnosco agnosco +ad-gradior aggredior +ad-habito adhabito +ad-horreo adhorreo +ad-indo adindo +ad-ito adito +ad-jubeo adjubeo +ad-labor#1 allabor +ad-lambo allambo +ad-loquor alloquor +ad-nascor agnascor +ad-navigo adnavigo +ad-nitor#1 annitor +ad-no#1 anno#1 +ad-nosco agnosco +ad-opino adopinor +ad-opinor adopinor +ad-pareo appareo +ad-pendo appendo +ad-plaudo applaudo +ad-plico applico +ad-plodo applaudo +ad-pono appono +ad-porto apporto +ad-prehendo apprehendo +ad-propero appropero +ad-propinquo appropinquo +ad-quaero acquiro +ad-quiesco acquiesco +ad-repo arrepo +ad-scribo ascribo +ad-sector#2 assector +ad-sisto assisto +ad-soleo assoleo +ad-spiro aspiro +ad-sto asto +ad-stringo astringo +ad-suesco assuesco +ad-sum#1 adsum +ad-surgo assurgo +ad-tribulo attribulo +ad-vereor advereor +ad-verro adverro +amb-edo ambedo +amb-edo#2 ambedo +ante-eo#1 anteeo +ante-fero antefero +as-spiro aspiro +circum-do circumdo +circum-do#2 circumdo +circum-eo#1 circumeo +circum-fero circumfero +circum-fodio circumfodio +circum-gradior circumgredior +circum-jaceo circumjaceo +circum-jacio circumicio +circum-lavo circumlavo +circum-linio circumlinio +circum-loquor circumloquor +circum-sedeo circumsedeo +circum-specio circumspicio +co-alesco coalesco +co-aresco coaresco +co-eo#1 coeo +co-uto coutor +co-utor coutor +con-cateno concateno +con-comito concomitor +con-comitor concomitor +con-cubo concubo +con-custodio concustodio +con-decet condecet +con-eo#1 coeo +con-fabrico confabricor +con-fabricor confabricor +con-fabulo confabulor +con-fabulor confabulor +con-fero confero +con-fervesco confervesco +con-figuro configuro +con-fio conficio +con-foedero confoedero +con-frequento confrequento +con-frio confrio +con-gratulor congratulor +con-jacio conicio +con-labor#1 collabor +con-libet collibet +con-libo#1 collibet +con-luceo colluceo +con-necto conecto +con-nitor#1 conitor +con-pluo compluit +con-preco comprecor +con-precor comprecor +con-prehendo comprehendo +con-quaero conquiro +con-rugo corrugo +con-sacro consecro +con-saepio consaepio +con-scindo conscindo +con-sepelio consepelio +con-solido consolido +con-sopio consopio +con-spargo#1 conspergo +con-spuo conspuo +con-spurco conspurco +con-subigo consubigo +con-sueo consueo +con-temero contemero +con-tero contero +con-tono contonat +con-torqueo contorqueo +con-tribulo contribulo +con-tueo contueor +con-tueor contueor +con-vesco convescor +con-vitio convitio +con-voveo convoveo +con-vulnero convulnero +de-ambulo deambulo +de-armo dearmo +de-carmino#1 decarmino +de-carmino#2 decarmino +de-curro decurro +de-curto decurto +de-duco deduco +de-eo#1 deeo +de-erro#1 deerro +de-fatisco defetiscor +de-fero defero +de-fraudo defraudo +de-fremo defremo +de-frico defrico +de-fruor defruor +de-fungor defungor +de-glabro deglabro +de-glubo deglubo +de-grandino degrandinat +de-gravo degravo +de-grunnio digrunnio +de-hisco dehisco +de-jacio deicio +de-lavo delavo +de-libro delibro +de-liquo deliquo +de-mordeo demordeo +de-moveo demoveo +de-nasco denascor +de-nascor denascor +de-operio deoperio +de-paciscor depeciscor +de-pango depango +de-pecto depecto +de-pleo depleo +de-polio#1 depolio +de-promo depromo +de-pudeo depudet +de-purgo depurgo +de-saevio desaevio +de-sicco desicco +de-signo designo +de-spicio despicio +de-sugo desugo +de-sum#1 desum +de-tendo detendo +de-torno detorno +de-uto deutor +de-utor deutor +de-vasto devasto +de-vello devello +de-verso deversor#1 +de-verto deverto +de-vesco devescor +dis-bucino dibucino +dis-crucio discrucio +dis-fateor diffiteor +dis-fero differo +dis-fido diffido +dis-findo diffindo +dis-lorico dilorico +dis-moveo dimoveo +dis-nosco dinosco +dis-pando#1 dispando +dis-pando#2 dispando +dis-partio#2 dispertio +dis-pergo dispergo +dis-plodo displodo +dis-po dispando +dis-pono dispono +dis-pudeo dispudet +dis-rapio diripio +dis-rego dirigo +dis-rigo dirigo +dis-rumpo dirumpo +dis-seco disseco +dis-sipo dissipo +dis-suo dissuo +dis-taedet distaedet +dis-verto diverto +ec-freno effreno +ex-cieo excio +ex-creo#1 excreo +ex-dico#2 edico +ex-edo exedo +ex-edo#2 exedo +ex-eo#1 exeo +ex-fero effero#1 +ex-fervesco effervesco +ex-fleo effleo +ex-fodio effodio +ex-freno effreno +ex-frico effrico +ex-gurgito egurgito +ex-jacio eicio +ex-labo elabor +ex-labor#1 elabor +ex-marcesco emarcesco +ex-molio emolior +ex-molior emolior +ex-molo#1 emolo +ex-moveo emoveo +ex-nasco enascor +ex-nascor enascor +ex-neco eneco +ex-nitesco enitesco +ex-nitor#1 enitor +ex-notesco enotesco +ex-ordior exordior +ex-orior exorior +ex-patior exspatior +ex-plico explico +ex-pungo expungo +ex-rapio eripio +ex-ruo eruo +ex-scindo exscindo +ex-seco exseco +ex-spargo#1 exspergo +ex-stinguo exstinguo +ex-video evideor +in-aresco inaresco +in-assero#1 inassero +in-assero#2 inassero +in-audio inaudio +in-cohibeo incohibeo +in-cresco incresco +in-cubo incubo#1 +in-eo#1 ineo +in-fatigo infatigo +in-fero infero +in-flecto inflecto +in-fligo infligo +in-generasco ingenerasco +in-gradior ingredior +in-ludo illudo +in-obscuro inobscuro +in-plico implico +in-rado irrado +in-rideo irrideo +in-rumpo irrumpo +in-saepio insaepio +in-signo insigno +in-sum#1 insum +in-urgeo inurgeo +in-vilito invilito +in-violo inviolo +inter-calceo interculco +inter-calco interculco +inter-do interdo +inter-emo interimo +inter-eo#1 intereo +inter-fio interfio +inter-fugio interfugio +inter-fundo interfundo +inter-lucesco interlucesco +inter-premo interprimo +inter-sileo intersileo +inter-sum#1 intersum +inter-verto interverto +intro-eo#1 introeo +ob-cano occano +ob-coepio occipio +ob-curro occurro +ob-duco obduco +ob-dulcesco obdulcesco +ob-edo obedo +ob-edo#2 obedo +ob-eo#1 obeo +ob-facio officio +ob-fero offero +ob-fuco offoco +ob-fundo#1 offundo +ob-fundo#2 offundo +ob-irasco obirascor +ob-irascor obirascor +ob-jurgo objurgo +ob-lineo oblino +ob-linio oblinio +ob-nitor#1 obnitor +ob-pango oppango +ob-porto opporto +ob-ruo obruo +ob-servio observito +ob-sto obsto +ob-stupesco obstipesco +ob-sum#1 obsum +ob-torpeo obtorpeo +ob-tueo obtueor +ob-tueor obtueor +ob-violo obviolo +op-fero offero +op-pango oppango +op-pingo oppango +op-pono oppono +per-aresco peraresco +per-caedo percaedo +per-cedo#1 percedo +per-clamo perclamo +per-cludo percludo +per-cupio percupio +per-domo perdomo +per-eo#1 pereo +per-fero perfero +per-fingo perfingo +per-frico perfrico +per-frigeo perfrigeo +per-fungor perfungor +per-libet perlibet +per-libo#1 perlibet +per-liceo#1 perlicet +per-liceor perlicet +per-lineo perlino +per-linio perlinio +per-lino perlino +per-moneo permoneo +per-morior permorior +per-moro permoror +per-moror#1 permoror +per-moror#2 permoror +per-narro pernarro +per-nosco pernosco +per-nuntio pernuntio +per-odi perodi +per-ploro perploro +per-suo persuo +per-taedeo pertaedet +per-tumesco pertumesco +per-urgeo perurgeo +prae-acuo praeacuo +prae-aequo praeaequo +prae-carpo praecerpo +prae-coepio praecoepi +prae-crudesco praecrudesco +prae-eo#1 praeeo +prae-fero praefero +prae-gigno praegigno +prae-jacio praeicio +prae-oro praeoro +prae-ostendo praeostendo +prae-patior praepatior +prae-plecto#2 praeplecto +prae-possum praepossum +prae-propero praepropero +prae-sido praesidero +prae-specio praespicio +prae-spicio praespicio +prae-stinguo praestinguo +prae-sum#1 praesum +prae-suo praesuo +prae-tento praetento +prae-verno praevernat +praeter-ago praeterago +praeter-eo#1 praetereo +praeter-fero praeterfero +praeter-rado praeterrado +praeter-sum#1 praetersum +praeter-veho praetervehor +pro-creo#1 procreo +pro-emineo proemineo +pro-eo#1 prodeo +pro-fero profero +pro-geniculo progeniculo +pro-gigno progigno +pro-lugeo prolugeo +pro-mutuo promutuor +pro-mutuo#2 promutuor +pro-mutuor promutuor +pro-patior propatior +pro-purgo propurgo +pro-specio prospicio +pro-vegeo provegeo +pro-vendo provendo +pro-verto proverto +re-bullio rebullio +re-calefacio recalfacio +re-canto recanto +re-cingo recingo +re-claudo#1 recludo +re-claudo#2 recludo +re-creo#1 recreo +re-eo#1 redeo +re-fero refert +re-frico refrico +re-liceo#1 reliceor +re-liceor reliceor +re-lucesco relucesco +re-mundo remundo +re-nasco renascor +re-nascor renascor +re-nitor#1 renitor +re-operio redoperio +re-pecto repecto +re-salvo resalvare +re-teneo retineo +re-vello revello +re-vereor revereor +re-verto reverto +re-vivesco revivisco +re-volvo revolvo +red-eo#1 redeo +retro-specio retrospicio +se-pio saepio +sub-aduno subaduno +sub-edo subedo +sub-edo#2 subedo +sub-eo#1 subeo +sub-erigo suberigo +sub-fero suffero +sub-irasco subirascor +sub-irascor subirascor +sub-lugeo sublugeo +sub-mitto summitto +sub-necto subnecto +sub-pedo#1 suppedo +sub-pedo#2 suppedo +sub-pudeo suppudet +sub-rapio surripio +sub-rego surgo +sub-ringor surringor +sub-ruo surruo +sub-sum#1 subsum +sub-uro suburo +sub-vereor subvereor +super-curro supercurro +super-effero#1 supereffero +super-effero#2 supereffero +super-egredior superegredior +super-emorior superemorior +super-fero superfero +super-figo superfigo +super-fio superfio +super-fugio superfugio +super-gradior supergredior +super-impleo superimpleo +super-inspicio superinspicio +super-labo superlabor +super-labor#1 superlabor +super-perspicio superperspicio +super-ruo superruo +super-stringo superstringo +super-sum#1 supersum +trans-duco traduco +trans-eo#1 transeo +trans-fero transfero +trans-jungo transjungo +trans-loquor traloquor +trans-moveo transmoveo +trans-sero#1 transero +trans-sero#2 transero +trans-sero#3 transero +trans-sumo transsumo +trans-vendo transvendo diff --git a/stemlib/Latin/stemsrc/vbs.latin b/stemlib/Latin/stemsrc/vbs.latin index 229271ba..c178d657 100755 --- a/stemlib/Latin/stemsrc/vbs.latin +++ b/stemlib/Latin/stemsrc/vbs.latin @@ -1,4 +1,4 @@ -:le:adicio +:le:adjicio :vs:adic conj3_io :vs:adjic conj3_io :vs:adje_c perfstem @@ -721,7 +721,7 @@ :le:aggravo :de:ag-gra^v are_vb :le:aggredio -:vs:ag-gre^d conj3_io +:vs:ag-gre^d conj3_io act :le:aggredior :vs:ag-gre^d conj3_io dep :vs:ag-gress pp4 @@ -933,7 +933,8 @@ :de:a^ni^m are_vb :le:annato :de:an-na^t are_vb -:le:annavigo +:de:ad-na^t are_vb orth +:le:adnavigo :de:an-na_vi^g are_vb :le:annecto :vs:an-nect conj3 @@ -947,8 +948,6 @@ :vs:an-ni_t conj3 dep :vs:ad-ni_t conj3 orth :vs:an-ni_s pp4 -:le:anno#1 -:de:an-n are_vb :le:anno#2 :de:ann are_vb :le:annodo @@ -1040,6 +1039,8 @@ :vs:a^pert pp4 :le:aperto :de:a^pert are_vb +:le:apio +:vs:a^p conj3_io :le:apo :vs:a^p conj3 :le:apolactizo @@ -1106,10 +1107,6 @@ :de:ap-postu^l are_vb :le:apprecor :de:ap-pre^c are_vb dep -:le:apprehendo -:vs:ap-pre^hend conj3 -:vs:ap-pre^hend perfstem -:vs:ap-pre^hens pp4 :le:apprenso :de:apprens are_vb :le:appretio @@ -1330,9 +1327,8 @@ :de:as-so^l are_vb :le:assono :de:as-so^n are_vb -:le:asspiro -:de:as-spi_r are_vb -:de:aspi_r are_vb orth +:le:aspiro +:de:a-spi_r are_vb :le:assudasso :vs:as-su_dass conj3 :le:assudesco @@ -2066,6 +2062,8 @@ :le:circumlino :vs:circum-li^n conj3 :vs:circum-li^t pp4 +:le:circumlinio +:vs:circum-li^n conj4 :le:circumluo :vs:circum-lu^ conj3 :le:circumlustro @@ -2280,7 +2278,7 @@ :de:cla_thr are_vb :le:claudeo :vs:claud conj2 -:le:claudo +:le:claudo#2 :vs:claud conj3 :vs:claus pp4 :le:claudico @@ -3042,6 +3040,7 @@ :de:con-demn are_vb :le:condenso :de:condens are_vb +:vs:condens conj2 orth :le:condepso :vs:con-deps conj3 :vs:con-depsu^ perfstem @@ -5227,15 +5226,17 @@ :vs:dis-perdi^t pp4 :le:dispereo :vs:dis-pe^r conj4 -:vs:dis-pe^ri perfstem :le:dispergo :vs:di-sperg conj3 :vs:di-spers perfstem :vs:du-spers pp4 :le:disperno :vs:di-spern conj3 +:le:dispertio +:vs:dispert conj4 +:vs:dispert perfstem :le:dispertior -:de:dispert ire_vb +:de:dispert ire_vb dep :le:dispesco :vs:dis-pe_sc conj3 :vs:dis-pest pp4 @@ -5576,8 +5577,11 @@ :de:effe_t are_vb :le:efficio :vs:ef-fi^c conj3_io +:vs:ec-fa^c conj3_io orth :vs:ef-fe_c perfstem +:vs:ec-fe_c perfstem orth :vs:ef-fect pp4 +:vs:ec-fect pp4 orth :le:effigio :de:effi^gi are_vb :le:effindo @@ -6470,7 +6474,6 @@ :vs:expergi_sc conj3 dep :vs:experre_ct pp4 :le:expergo -:vs:experg conj3 :vs:experg perfstem :vs:expergi^t pp4 :le:expetesso @@ -8512,7 +8515,8 @@ :le:insigno :de:in-sign are_vb :le:insimulo -:de:in-si^mu^l are_vb +:de:in-si^mi^l are_vb +:de:in-si^mu^l are_vb orth :le:insinuo :de:in-si^nu^ are_vb :le:insipo @@ -10182,9 +10186,9 @@ :le:nascor :vs:na_sc conj3 dep :le:nasco -:vs:na_sc conj3 -:vs:na_t pp4 -:vs:gna_t pp4 orth +:vs:na_sc conj3 not_in_comp +:vs:na_t pp4 not_in_comp +:vs:gna_t pp4 orth not_in_comp :le:natinor :de:na^ti^n are_vb dep :le:natito @@ -10846,6 +10850,7 @@ :vs:offlect conj3 :le:offoco :de:offo_c are_vb +:de:ob-fo_c are_vb orth :le:offringo :vs:offring conj3 :vs:offre_g perfstem @@ -10915,10 +10920,6 @@ :vs:oppand conj3 :vs:oppand perfstem :vs:oppans pp4 -:le:oppango -:vs:oppang conj3 -:vs:oppe_g perfstem -:vs:oppa_ct pp4 :le:oppecto :vs:oppect conj3 :le:oppedo @@ -11011,7 +11012,7 @@ :le:pacificor :de:pa_ci^fi^c are_vb dep :le:pacisco -:vs:pa^ci_sc conj3 +:vs:pa^ci_sc conj3 act :le:paciscor :vs:pa^ci_sc conj3 dep :vs:pact pp4 @@ -11585,8 +11586,6 @@ :vs:per-li^c conj2 :le:perlimo :de:per-li_m are_vb -:le:perlino -:de:per-li^n ire_vb :le:perlito :de:per-li^t are_vb :le:perluceo @@ -12186,6 +12185,10 @@ :vs:plaud conj3 :vs:plaus perfstem :vs:plaus pp4 +:le:plodo +:vs:plod conj3 +:vs:plos perfstem +:vs:plos pp4 :le:plausito :de:plausi^t are_vb :le:plecto#1 @@ -13144,7 +13147,7 @@ :vs:pro^fect pp4 :le:proficisco :vs:pro^fi^ci_sc conj3 -:le:pro^fiteor +:le:profiteor :vs:pro^fi^t conj2 dep :vs:pro^fess pp4 :le:profligo#1 @@ -17013,7 +17016,8 @@ :le:undo :de:und are_vb :le:ungo -:vs:ung conj3 +:vs:ung conj3 not_in_comp +:vs:ungu^ conj3 not_in_comp :vs:unx perfstem :vs:unct pp4 :le:unguento @@ -17321,6 +17325,7 @@ :de:vi^tu^pe^r are_vb :le:vivesco :vs:vi_ve_sc conj3 +:vs:vi_vi_sc conj3 orth :vs:vi_x perfstem :le:vivido :de:vi_vi^d are_vb @@ -17374,4 +17379,4 @@ :le:zelo :de:ze_l are_vb :le:zinzilulo -:de:zinzi^lu^l are_vb +:de:zinzi^lu^l are_vb \ No newline at end of file diff --git a/stemlib/Latin/stemsrc/vbs.latin.bas b/stemlib/Latin/stemsrc/vbs.latin.bas index c4df473e..e90a5495 100755 --- a/stemlib/Latin/stemsrc/vbs.latin.bas +++ b/stemlib/Latin/stemsrc/vbs.latin.bas @@ -870,3 +870,74 @@ :le:vulnero :de:volner are_vb orth + +:le:ascribo +:vs:a-scri_b conj3 +:vs:a-scri_ps perfstem +:vs:a-scri_pt pp4 + +:le:astringo +:vs:a-string conj3 +:vs:a-strinx perfstem +:vs:a-strict pp4 + +:le:displodo +:vs:dis-plod conj3 +:vs:dis-plos pp4 + +:le:exungo +:vs:ex-ung^ conj3 +:vs:ex-unx perfstem +:vs:ex-unct pp4 + +:le:percaedo +:vs:pe^r-caed conj3 not_in_comp +:vs:pe^r-ceci_d perfstem has_redupl not_in_comp +:vs:pe^r-caes pp4 has_redupl not_in_comp + +:le:inunguo +:vs:in-ungu^ conj3 +:vs:in-unx perfstem +:vs:in-unct pp4 + +:le:linio +:vs:li^n conj4 +:vs:li^ni_v perfstem +:vs:li^ni_t pp4 +:le:lino +:vs:li^n conj3 +:vs:le_v perfstem +:vs:li^t pp4 + +:le:percludo +:vs:pe^r-clu_d conj3 +:vs:pe^r-clu_s perfstem +:vs:pe^r-clu_s pp4 + +:le:perunguo +:vs:pe^r-ungu^ conj3 +:vs:pe^r-unx perfstem +:vs:pe^r-unct pp4 +:le:perungo +:vs:pe^r-ung^ conj3 +:vs:pe^r-unx perfstem +:vs:pe^r-unct pp4 + +:le:praeungo +:vs:prae-ung^ conj3 +:vs:prae-unx perfstem +:vs:prae-unct pp4 + +:le:revertor +:vs:re^-vert conj3 dep +:vs:re^-vort conj3 dep orth +:vs:re^-vert perfstem +:vs:re^-vort perfstem orth + +:le:reverto +:vs:re^-vert conj3 +:vs:re^-vort conj3 orth +:vs:re^-vert perfstem +:vs:re^-vort perfstem orth +:vs:re^-vers pp4 +:vs:re^-vors pp4 orth \ No newline at end of file diff --git a/tests/README_ASSERTIONS.md b/tests/README_ASSERTIONS.md new file mode 100644 index 00000000..12fb27ed --- /dev/null +++ b/tests/README_ASSERTIONS.md @@ -0,0 +1,22 @@ +## Lemma assertion tests (latin_assertions_*.txt) + +Format: `form lemma1 lemma2 ...`, optional trailing +`(commentary)` ignored by the harness. Multiple lines for the +same form are unioned into one expected set. + +File names reflect which stemsrc file was under investigation +when the regression was found and NOT which file the underlying +fix lives in. A single word's analysis is often split across +several stemsrc files (nom.latin.bas, ls.nom, vbs.latin, ...), +so there is no clean one-file-per-source mapping. + +Before adding a new assertion, grep all existing +latin_assertions_*.txt for the headword -- it may already be +tracked under a different file's name. Occasionally run: +```bash + awk '/^#|^$/{next} { sub(/\(.*/,""); if (NF<2) next; if (!seen[$1 SUBSEP FILENAME]++) filecount[$1]++ } END { for (w in filecount) if (filecount[w]>1) print w }' tests/latin_assertions*.txt +``` +to catch a form asserted in more than one file. + +New investigative work gets its own new latin_assertions_.txt +-- the run_tests.sh loop picks up any matching file automatically. \ No newline at end of file diff --git a/tests/latin_assertions_vbs_cmp_ml.txt b/tests/latin_assertions_vbs_cmp_ml.txt new file mode 100644 index 00000000..e6979aec --- /dev/null +++ b/tests/latin_assertions_vbs_cmp_ml.txt @@ -0,0 +1,1057 @@ +# form required lemma + +abstineo abstineo + +accolo accolo +adcolo accolo + +adnasco "" +adnascor agnascor +annascor "" +annascor agnascor +annascor "" +agnascor agnascor + +adnavigo adnavigo +annavigo adnavigo + +adnecto annecto +annecto annecto + +annitor annitor +adnitor annitor + +adnato annato +adnato anno#1 +annato annato +annato anno#1 +annato anno#2 (no 'ad-' version since this one comes from 'annus') + +adno anno#1 +annare anno#1 +annare anno#2 + +adplaudo applaudo +applaudo applaudo +applodo applaudo + +adprendo apprehendo +apprendo apprehendo +apprehendo apprehendo + +adquiesco acquiesco +acquiesco acquiesco + +adquiro acquiro +acquiro acquiro + +adedo adedo + +adito adito +adito adeo#1 + +affluo affluo +adfluo affluo + +apiscor apiscor + +adicio adjicio +adjicio adjicio + +adscribo ascribo +ascribo ascribo +asscribo ascribo + +aspicio aspicio + +adspiro aspiro +aspiro aspiro +asspiro aspiro + +adstringo astringo +astringo astringo +asstringo astringo + +abcido abcido + +abdo abdo + +abeo abeo + +abhorreo abhorreo + +abicio abicio + +aboleo aboleo + +arrepo arrepo + +abrumpo abrumpo + +absum absum + +abutor abutor + +adaperio adaperio + +adaugeo adaugeo + +acclamito acclamito + +accongero accongero + +addecet addecet + +adeo adeo#1 +adeo adeo#2 (thus) + +adexpeto adexpeto + +afficio afficio + +affero affero + +affigo affigo + +afflecto afflecto + +affligo affligo + +afflo afflo + +affor affor + +affrico affrico + +affulgeo affulgeo + +affundo affundo + +agnosco agnosco + +aggredio aggredio +aggredior aggredior + +adhabito adhabito + +adhorreo adhorreo + +adindo adindo + +adjubeo adjubeo + +allabor allabor + +allambo allambo + +alloquor alloquor + +annitor annitor + +adopinor adopinor + +appareo appareo + +appendo appendo + +applaudo applaudo + +applico applico + +appono appono + +apporto apporto + +appropero appropero + +appropinquo appropinquo + +acquiro acquiro + +assector assector + +assisto assisto + +assoleo assoleo + +asto asto +asto astus#1 (shrewd) + +assuesco assuesco + +adsum adsum + +assurgo assurgo + +attribulo attribulo + +advereor advereor + +adverro adverro + +ambedo ambedo + +anteeo anteeo + +antefero antefero + +circumdo circumdo + +circumeo circumeo + +circumfero circumfero + +circumfodio circumfodio + +circumgredior circumgredior + +circumjaceo circumjaceo + +circumjacio circumicio +circumicio circumicio +circumjicio circumicio + +circumlavo circumlavo + +circumlinio circumlinio +circumlino circumlino + +circumloquor circumloquor + +circumsedeo circumsedeo +circumsideo circumsedeo + +circumspicio circumspicio + +coalesco coalesco + +coaresco coaresco + +coeo coeo + +concateno concateno + +concomitor concomitor + +concubo concubo + +concustodio concustodio + +condecet condecet + +condenseo condenso + +confabricor confabricor + +confabulor confabulor + +confacio confacio + +confero confero + +confercio confercio + +confervesco confervesco + +configuro configuro + +conficio conficio + +conflo conflo + +confoedero confoedero + +confrequento confrequento + +confrio confrio + +congratulor congratulor + +conicio conicio + +connecto conecto +conecto conecto + +connitor conitor +conitor conitor + +collabor collabor + +collibet collibet + +colluceo colluceo + +compluit compluit + +comprecor comprecor + +comprehendo comprehendo + +corrugo corrugo +corrugo corrugus (a canal) + +consaepio consaepio + +conscindo conscindo + +consepelio consepelio + +consolido consolido + +consopio consopio + +conspuo conspuo + +conspurco conspurco + +consueo consueo + +contemero contemero + +contero contero + +contonat contonat + +contorqueo contorqueo + +contribulo contribulo + +conquaero conquiro +conquiro conquiro + +consacro consecro +consecro consecro + +conspargo conspergo +conspergo conspergo + +consubigo consubigo + +convolnero convulnero +convulnero convulnero + +contueor contueor + +convescor convescor + +convitio convitio +convitio convitium (a loud noise) + +convoveo convoveo + +coutor coutor + +deambulo deambulo + +dearmo dearmo + +decarmino decarmino + +decuriare decurio#1 + +decurro decurro + +decurto decurto + +deduco deduco + +deeo deeo + +deerro deerro + +defero defero + +defatiscor defetiscor +defetiscor defetiscor + +defraudo defraudo + +defremo defremo + +defrico defrico + +defruor defruor + +defungor defungor + +deglabro deglabro + +deglubo deglubo + +degrandinat degrandinat + +degravo degravo + +degrunnio digrunnio +digrunnio digrunnio + +dehisco dehisco + +deicio deicio + +delavo delavo + +delibro delibro + +deliquo deliquo +deliquo deliquus (wanting) + +demordeo demordeo + +demoveo demoveo + +denascor denascor + +deoperio deoperio + +depaciscor depeciscor +depeciscor depeciscor + +depango depango + +depecto depecto + +depleo depleo + +depolio depolio + +depromo depromo + +depudet depudet + +depurgo depurgo + +desaevio desaevio + +desicco desicco + +designo designo + +despicio despicio + +desugo desugo + +desum desum + +detendo detendo + +detorno detorno + +deutor deutor + +devasto devasto + +devello devello + +devescor devescor + +devorsor deversor#1 +deversor deversor#1 + +devorto deverto +deverto deverto + +dibucino dibucino + +discrucio discrucio + +diffiteor diffiteor + +differo differo + +diffido diffido + +diffindo diffindo + +dignosco dinosco +dinosco dinosco + +dilorico dilorico + +dimoveo dimoveo + +dispando dispando + +dispartio dispertio +dispertio dispertio + +dispergo dispergo + +displodo displodo +displosus displodo + +dispono dispono + +dispudet dispudet + +disrumpo dirumpo +dirumpo dirumpo + +diripio diripio + +dirigo dirigo + +disseco disseco + +dissipo dissipo + +dissuo dissuo + +distaedet distaedet + +divorto diverto +diverto diverto + +efficio efficio +ecfacio efficio + +excio excio + +excreo excreo + +edico edico + +exedo exedo +exedo exedum (a plant) + +exeo exeo + +ecfero effero#1 +effero effero#1 +effero effero#2 +effero efferus (very wild) + +effervesco effervesco + +effleo effleo + +effodio effodio + +effreno effreno +effreno effrenus (free from the bridle) + +effrico effrico + +exgurgito egurgito +egurgito egurgito + +eicio eicio + +elabor elabor + +emarcesco emarcesco + +emolior emolior + +emolo emolo + +emoveo emoveo + +enascor enascor + +eneco eneco + +enitesco enitesco + +enitor enitor + +enotesco enotesco + +exordior exordior + +exorior exorior + +explico explico + +expungo expungo + +expatior exspatior +exspatior exspatior + +explico explico + +expergo exspergo +exspargo exspergo +exspergo exspergo + +eripio eripio + +eruo eruo +eruo ervum (bitter vetch) + +exscindo exscindo + +exseco exseco + +exstinguo exstinguo + +exunguo "" +exungo exungo + +evideor evideor + +inaresco inaresco + +inassero inassero + +inaudio inaudio + +incohibeo incohibeo + +incresco incresco + +incubare incubo#1 + +ineo ineo + +infatigo infatigo + +infero infero +infero inferus (that is below) + +inflecto inflecto + +infligo infligo + +ingenerasco ingenerasco + +ingredior ingredior + +illudo illudo + +inobscuro inobscuro + +implico implico + +irrideo irrideo + +irrumpo irrumpo + +inrado irrado +irrado irrado + +insaepio insaepio + +insigno insigno + +insimilo insimulo +insimulo insimulo + +insum insum + +intercalco interculco +interculco interculco + +interdo interdo + +intersum intersum + +interpremo interprimo +interprimo interprimo + +intervorto interverto +interverto interverto + +inungo "" +inunguo inunguo + +inurgeo inurgeo + +invilito invilito + +inviolo inviolo + +interimo interimo + +intereo intereo + +interfio interfio + +interfugio interfugio + +interfundo interfundo + +interlucesco interlucesco + +intersileo intersileo + +intersum intersum + +introeo introeo + +occano occano + +occurro occurro + +obduco obduco + +obdulcesco obdulcesco + +obeo obeo + +occipio occipio +occoepi occipio +occepi occipio + +obedo obedo + +offuco offoco +offoco offoco +obfoco offoco + +oppango oppango +obpango oppango +oppingo oppango + +obstipesco obstipesco +obstupesco obstipesco + +officio officio +officio officium (a voluntary service) + +offero offero + +offundo offundo + +obirascor obirascor + +objurgo objurgo + +oblino oblino + +oblinio oblinio + +obnitor obnitor + +oppono oppono + +opporto opporto + +obruo obruo + +observito observito + +obsto obsto + +obsum obsum + +obtorpeo obtorpeo + +obtueor obtueor + +obviolo obviolo + +peraresco peraresco + +percaedo percaedo + +percedo percedo + +perclamo perclamo + +percludo percludo + +percupio percupio + +perdomo perdomo + +pereo pereo + +perextimeo perextimeo + +perextimesco perextimesco + +perfero perfero +perfero perferus (very wild) + +perfingo perfingo + +perfrico perfrico + +perfrigeo perfrigeo + +perfungor perfungor + +perlibet perlibet + +perlicet perlicet + +perlinio perlinio +perlinivi perlinio +perlinitum perlinio +perlino perlino +perlevisti perlino +perlitum perlino + +permoneo permoneo + +permorior permorior + +permoror permoror + +pernarro pernarro + +pernosco pernosco + +pernuntio pernuntio + +perodi perodi + +perploro perploro + +persuo persuo + +pertaedeo pertaedet +pertaedet pertaedet + +pertumesco pertumesco + +perungo perungo +perunguo perunguo + +perurgeo perurgeo + +praeacuo praeacuo + +praeaequo praeaequo + +praecarpo praecerpo +praecerpo praecerpo + +praecoepi praecoepi + +praecrudesco praecrudesco + +praeeo praeeo + +praefero praefero + +praegigno praegigno + +praejacio praeicio +praejicio praeicio +praeicio praeicio + +praeoro praeoro + +praeostendo praeostendo + +praepatior praepatior + +praeplecto praeplecto + +praepossum praepossum + +praepropero praepropero +praepropero praeproperus (too quick or hasty) + +praesidero praesidero + +praespicio praespicio + +praestinguo praestinguo + +praesum praesum + +praesuo praesuo + +praeunguo "" +praeungo praeungo + +praevernat praevernat + +praetemptare praetento +praetentare praetento + +praeterago praeterago + +praetereo praetereo + +praeterfero praeterfero + +praeterrado praeterrado + +praetersum praetersum + +praetervehor praetervehor + +procreo procreo + +proemineo proemineo + +profiteor profiteor + +profero profero + +profluere profluo + +progigno progigno + +progeniculo progeniculo + +prolugeo prolugeo + +promutuor promutuor + +propatior propatior + +propurgo propurgo + +prospicio prospicio + +provegeo provegeo + +provendo provendo + +proverto proverto + +prodeo prodeo + +rebullio rebullio + +recanto recanto + +recalefacio recalfacio +recalfacio recalfacio + +reclaudo recludo +recludo recludo + +recingo recingo + +recreo recreo + +redeo redeo + +refert refert +refert refero + +refrico refrico + +reliceor reliceor + +relucesco relucesco + +remundo remundo + +renascor renascor + +renitor renitor + +repecto repecto + +resalvare resalvare + +retineo retineo + +revello revello + +revereor revereor + +revivesco revivisco +revivisco revivisco + +revolvo revolvo + +revorto reverto +reverto reverto + +revortor reverto +revortor revertor +revertor revertor +revertor reverto + +redoperio redoperio + +retrospicio retrospicio + +saepio saepio +sepio saepio + +subaduno subaduno + +subedo subedo + +subeo subeo + +suberigo suberigo + +suffero suffero + +subirascor subirascor + +sublugeo sublugeo + +summitto summitto + +subnecto subnecto + +supereffero supereffero + +superfio superfio + +supergredior supergredior +supergradior supergredior + +suppedo suppedo + +suppudet suppudet + +surripio surripio + +surgo surgo + +surringor surringor + +surruo surruo + +subsum subsum + +suburo suburo + +subvereor subvereor + +supercurro supercurro + +superegredior superegredior + +superemorior superemorior + +superfero superfero + +superfigo superfigo + +superfugio superfugio + +superimpleo superimpleo + +superinspicio superinspicio + +superlabor superlabor + +superperspicio superperspicio + +superruo superruo + +superstringo superstringo + +supersum supersum + +traduco traduco + +transeo transeo + +transfero transfero + +transjungo transjungo + +transsero transero +transero transero + +traloquor traloquor + +transmoveo transmoveo + +transsumo transsumo + +transvendo transvendo diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 548e9d3a..aa39acc8 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -69,6 +69,70 @@ run_cruncher_test() { rm -f /tmp/morpheus_test_$$.txt } +run_assert_test() { + local flags="$1" file="$2" + [ -f "$file" ] || return + + local filename + filename=$(basename "$file") + echo "=== Assertions: $filename ===" + + # AWK: Group lemmas, skip comments, chop '(', and handle "" for empty sets + local aggregated + aggregated=$(awk '/^#|^$/ {next} { + + # 1. Ignore everything from "(" to the end of the line + sub(/\(.*/, "") + + if (NF < 2) next + + word = $1 + if (!(word in map)) { + order[++count] = word + map[word] = "" # Initialize empty in case it is just "" + } + for(i=2; i<=NF; i++) { + # Skip arrow and our empty set marker + if ($i == "->") continue + if ($i == "\"\"") continue + + map[word] = map[word] " " $i + } + } END { + for(i=1; i<=count; i++) { + print order[i] map[order[i]] + } + }' "$file") + + # Loop through the grouped data + while read -r form expected_str; do + [ -z "$form" ] && continue + + # Get actual output, remove 'form:', sort alphabetically, format as one line + actual=$(echo "$form" | "$CRUNCHER" $flags 2>/dev/null | grep -v '^form:' | sort | tr '\n' ' ' | sed 's/ *$//') + + # Format the expected string (sort alphabetically and remove duplicates) + expected=$(echo "$expected_str" | tr ' ' '\n' | sort | uniq | tr '\n' ' ' | sed 's/ *$//') + + # Format for display so empty strings show up as "" in the terminal logs + disp_expected=${expected:-\"\"} + disp_actual=${actual:-\"\"} + + if [ "$actual" = "$expected" ]; then + echo "PASS: '$form' -> $disp_expected" + else + echo "FAIL: $form" + echo " expected: [$disp_expected]" + echo " got: [$disp_actual]" + FAILURES=$((FAILURES + 1)) + fi + done <<< "$aggregated" + echo "" +} + +for assert_file in "$SCRIPT_DIR"/latin_assertions*.txt; do + run_assert_test "-Ll" "$assert_file" +done GP="$SCRIPT_DIR/greek_probe.txt" LP="$SCRIPT_DIR/latin_probe.txt"