Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
chore: augment and refactor metadata (#1488)
Andrew Dunbar77769188c285
diff --git a/harper-core/affixes.json b/harper-core/affixes.jsonindex 71e1d764c..783420b4d 100644--- a/harper-core/affixes.json+++ b/harper-core/affixes.json@@ -610,8 +610,18 @@"pronoun": {}}},+ "0": {+ "#": "singular noun property",+ "//": "mnemonic: the closest digit to single '1' that's not used for grammatical person",+ "metadata": {+ "noun": {+ "is_singular": true+ }+ }+ },"9": {"#": "plural noun property",+ "//": "mnemonic: the biggest, most plural digit","metadata": {"noun": {"is_plural": true@@ -720,7 +730,7 @@}}},- "m": {+ "A": {"#": "auxiliary verb property","//": "see also l: linking verb property","metadata": {@@ -789,6 +799,23 @@"is_personal": true}}+ },+ "m": {+ "#": "mass noun (only) property",+ "metadata": {+ "noun": {+ "is_mass": true+ }+ }+ },+ "w": {+ "#": "mass + countable noun property",+ "metadata": {+ "noun": {+ "is_countable": true,+ "is_mass": true+ }+ }}}}diff --git a/harper-core/dictionary.dict b/harper-core/dictionary.dictindex 42b3081b8..efc514fa6 100644--- a/harper-core/dictionary.dict+++ b/harper-core/dictionary.dict@@ -825,7 +825,7 @@ Azerbaijan/OgAzerbaijani/NOJgSAzores/OgAzov/Og-Aztec/NOJSg # ancient civilization+Aztec/NOJSg # ancient civilizationAztecan/JNgAztlan/OgB/NOgnT@@ -2060,7 +2060,7 @@ Cherie/OgChernenko/gChernobyl/ONgChernomyrdin/g-Cherokee/NOgS+Cherokee/NOg09S # singular and plural, but also has plural in -sCherry/ONgCheryl/OgChesapeake/NOg@@ -2279,7 +2279,7 @@ Columbia/OgColumbine/ONgColumbus/ONVgCom-Comanche/NJOgS+Comanche/NJOg09S # singular and plural, but also has plural in -sCombs/OgComdrComintern/Og@@ -2445,7 +2445,7 @@ Crayola/OgCreation/gCreator/OgCrecy/Og-Cree/ONdSg+Cree/ONdSg09 # singular and plural, but also has plural in -sCreek/NOJSgCreighton/OgCreole/NJOSg@@ -4635,7 +4635,7 @@ Hooters/gHoover/ONVgSHope/OgHopewell/Og-Hopi/NOSg+Hopi/NOSg09 # singular and plural, but also has plural in -sHopkins/OgHopper/OgHorace/Og@@ -4904,7 +4904,7 @@ Irishwomen/9gIrkutsk/OgIrma/OgIroquoian/JNSg-Iroquois/NOg+Iroquois/NOg09 # singular and pluralIrrawaddy/OgIrtish/gIrvin/Og@@ -5480,7 +5480,7 @@ Kinko'sKinney/OgKinsey/ONgKinshasa/Og-Kiowa/NOgS+Kiowa/NOgS09 # singular and plural, but also has plural in -sKip/OgKipling/OgKirby/Og@@ -6882,7 +6882,7 @@ Minsky/OgMintaka/OgMinuit/gMinuteman/g-Miocene/JOg # geological period+Miocene/JOg # geological periodMir/OgMira/OgMirabeau/g@@ -6915,7 +6915,7 @@ Mitsubishi/NgS # car companyMitterrand/g # presidentMitty/gMitzi/Og-Mixtec/NJOg # ethnicity+Mixtec/NJOg # ethnicityMizar/OgMk/NMlle/N@@ -7276,7 +7276,7 @@ Nativity/OgNaugahyde/NgNauru/OgNautilus/g-Navajo/NOSg+Navajo/NOSg09 # singular and plural, but also has plural in -sNavajoes/NNavarre/OgNavarro/Og@@ -7382,7 +7382,7 @@ Nichole/OgNichols/OgNicholson/OgNick/Og-Nickelodeon/Ng # media company+Nickelodeon/Ng # media companyNicklaus/gNickolas/OgNicobar/JNg@@ -7592,7 +7592,7 @@ Oglethorpe/OgOhio/OJgOhioan/NJSgOise/Og-Ojibwa/OSg+Ojibwa/OSg09 # singular and plural, but also has plural in -sOkayama/OOkeechobee/OgOkefenokee/Og@@ -9389,7 +9389,7 @@ Singh/OgSingleton/OgSinhalese/JNgSinkiang/Og-Sioux/Og+Sioux/Og09 # singular and pluralSir/NOSgSirius/OgSistine/Jg@@ -10907,7 +10907,7 @@ X/ONJgXEmacs/gXL/NJgXML/O-XMPP/ONV # chat protocol+XMPP/ONV # chat protocolXS/NJXXL/NJXamarin/g@@ -11103,7 +11103,7 @@ Zubeneschamali/OgZukor/OgZulu/NOJSgZululand/O-Zuni/JNOg+Zuni/JNOg09SZurich/OgZwingli/OgZworykin/g@@ -11673,7 +11673,7 @@ advertisement/~NgSadvertiser/~Ngadvertising/~NVgadvertorial/NSg-advice/~NVg+advice/~Nmgadvisability/Nigadvisable/Jiadvisably/R@@ -11901,7 +11901,7 @@ airbox/NSgairbrush/NVgdSGairbus/~NgSaircon/Ng-aircraft/~N9g # singular and plural+aircraft/~N09g # singular and pluralaircraftman/Naircraftmen/9aircrew/~NS@@ -12402,7 +12402,7 @@ anesthetize/VGdSaneurysm/~NSganew/~angel/~NVgS-angelfish/N9gS+angelfish/N9gS09 # singular and plural, also has a plural in -sangelic/~Jangelica/~Ngangelical/JY@@ -12771,7 +12771,7 @@ appetizing/JNVYapplaud/NVZGd>Sapplauder/Ngapplause/~Ng-apple/~NgS+apple/~NwgSapplejack/Ngapplesauce/Ngapplet/NgS@@ -13742,7 +13742,7 @@ bagpipe/NVgZ>Sbagpiper/Ngbaguette/NgSbah/~N-baht/~NPSg+baht/~NPSg09 # singular and plural, also has a plural in -sbail/~NVSBGgdbailey/~NSbailiff/~NS@@ -14094,7 +14094,7 @@ bazillion/NSbazooka/NVSgbbl/Nbdrm/N-be/~mN+be/~ANbeach/~NVgdSGbeachcomber/NSgbeachfront/JN@@ -14217,7 +14217,7 @@ beeline/NVgSbeen/~VNbeep/NVSZGgd>beeper/Ng-beer/~NVg+beer/~NmVgbeery/JT>beeswax/NVgbeet/~NVSg@@ -14420,7 +14420,7 @@ bespeak/VNSGbespectacled/Jbespoke/~JVbespoken/VJ-best/~JNVSGgdum+best/~JNVSGgduAbestial/JNYbestiality/Ngbestiary/NSg@@ -14456,7 +14456,7 @@ betroth/VdGbetrothal/~NSgbetrothed/~VJNgbetroths/V-better/~JNVgdGLScm+better/~JNVgdGLScAbetter/~JNgdGLSbetterment/Ngbetting/~JVN@@ -14504,8 +14504,8 @@ bicarb/NgSbicarbonate/~NgSbicentenary/NSgbicentennial/~JNSg-bicep/Ng-biceps/N9g # singular and plural+bicep/Ng0 # biceps is the standard/traditional singular but bicep has become accepted+biceps/N09g # singular and pluralbicker/VNgd>ZGSbickerer/Ngbiconcave/J@@ -14700,7 +14700,7 @@ bisexuality/Ngbishop/~NVgSbishopric/~NSgbismuth/~Ng-bison/~Ng+bison/~Ng09 # singular and pluralbisque/NJVgbistro/NVgSbit/~NVeSgG@@ -14964,7 +14964,7 @@ blueberry/~NJVSgbluebird/~NgSbluebonnet/NSgbluebottle/NSg-bluefish/N9gS+bluefish/N9gS09 # singular and plural, also has a plural in -sbluegill/NgSbluegrass/~Ngblueish/J@@ -15131,7 +15131,7 @@ bondsman/Ngbondsmen/9bondwoman/Ngbondwomen/9-bone/~NJVd>SgZG+bone/~NwJVd>SgZGbonehead/NSgdboneless/Jboner/Ng@@ -15721,7 +15721,7 @@ budget/~NJVSGgdbudgetary/~Jbudgie/NSgbuff/~NJVrgdGS-buffalo/~NVgdG+buffalo/~NVgdG09 # singular and plural, also has a plural in -s belowbuffaloes/~NVbuffer/~NJVSgdGbuffet/~NVSgdGz@@ -16186,8 +16186,8 @@ campsite/~NSgcampus/~NVgScampy/JT>camshaft/~NSg-can/~mNSgd>ZG-can't/~m+can/~ANSgd>ZG+can't/~Acanal/~NVgScanalisation/Ng!_canalise/VGdS!_@@ -16225,7 +16225,7 @@ candlestick/~NVgScandlewick/NSgcandor/Ngcandour/Ng!@_-candy/~NVGdSg+candy/~NwVGdSgcandyfloss/Ncane/~NVSgcanebrake/NgS@@ -16249,7 +16249,7 @@ cannibalize/VGdScannily/URcanniness/Ngcanning/~VN-cannon/~NVJGgdS+cannon/~NVJGgdS09 # singular and plural, also has a plural in -scannonade/NVgGdScannonball/~NVSgcannot/~VN@@ -16473,7 +16473,7 @@ carousal/NSgcarouse/VNd>SgZGcarousel/~NVSgcarouser/Ng-carp/~NVSZGgd>+carp/~NVSZGgd>09 # singular and plural, also has a plural in -scarpal/NJgScarpel/NgScarpenter/~NVgdGS@@ -16630,7 +16630,7 @@ catercorner/Jcaterer/Ngcaterpillar/~NVgScaterwaul/VNSgdG-catfish/~N9VgS+catfish/~N9VgS09 # singular and plural, also has a plural in -scatgut/Ngcatharses/Ncatharsis/Ng@@ -16657,7 +16657,7 @@ cattery/NScattily/Rcattiness/Ngcatting/V-cattle/~NVg+cattle/~NmVgcattleman/Ngcattlemen/N9catty/JNTp>@@ -17012,7 +17012,7 @@ chary/JT>pchase/~NVgZGd>Schaser/~Ngchasm/NgS-chassis/~Ng+chassis/~Ng09 # singular and pluralchaste/JpYT>chasten/VdGSchasteness/Ng@@ -17882,12 +17882,12 @@ coco/~NgScocoa/~NJSgcoconut/~NSgcocoon/~NVSgdG-cod/~NJVSg+cod/~NJVSg09 # singular and plural, also has a plural in -scoda/~NgScodded/Vcodding/VJcoddle/VNdSG-code/~NVeZGd>S+code/~NwVeZGd>Scode'scodebase/NScodec/NgS@@ -17897,7 +17897,7 @@ codependency/Ngcodependent/JNSgcoder/NegScodex/~Ng-codfish/NgS+codfish/NgS09 # singular and plural, also has a plural in -scodger/NSgcodices/9codicil/NVSg@@ -17939,7 +17939,7 @@ cogent/JYcogitate/VdSXGnvcogitation/Ngcogitator/NgS-cognac/NSg+cognac/NwSgcognate/~JNgScognisable/J!_cognisance/Nrg!_@@ -17992,7 +17992,7 @@ colander/NSgcold/~JNg>YTpScoldblooded/Jcoldness/Ng-coleslaw/Ng+coleslaw/Nmgcoleus/NgScoley/NScolic/NJg@@ -18081,7 +18081,7 @@ colonnade/~NgdScolonoscopy/NSgcolony/~NVSgcolophon/NSg-color/~NJVrEGdS<+color/~NwJVrEGdS<color's/<colorant/NSg<coloration/~NEg<@@ -18108,7 +18108,7 @@ colossi/Ncolossus/~Ngcolostomy/NSgcolostrum/Ng-colour/~NJVrEGdS!@_+colour/~NwJVrEGdS!@_colourant/NSg!@_colouration/NEg!_colourblind/Jp!@_@@ -18272,7 +18272,7 @@ communicative/JUcommunicator/~NSgcommunion/~Ngcommunique/NSg-communism/~Ng+communism/~Nmgcommunist/~JNSgcommunistic/Jcommunity/~NSg@@ -19243,7 +19243,7 @@ couchette/NScougar/~NSgcough/~VNgdGcoughs/NV-could/~mN+could/~ANcould've/Vcouldn't/~Vcoulee/NSg@@ -19506,13 +19506,13 @@ cravenness/Ngcraving/~NVgcraw/NVgScrawdad/NSg-crawfish/Ng+crawfish/NgS09 # singular and plural, also has a plural in -scrawl/~VNSgd>ZGcrawler/~Ngcrawlspace/NSgcrawly/JT>Sgcray/~NJS-crayfish/~NVgS+crayfish/~NVgS09 # singular and plural, also has a plural in -scrayola/Scrayon/~NVGSgdcraze/~NVdSgG@@ -19998,7 +19998,7 @@ cutout/NSgcutter/~NSgcutthroat/~NJSgcutting/~NJVgYS-cuttlefish/N9gS+cuttlefish/N9gS09 # singular and plural, also has a plural in -scutup/NSgcutworm/NgScw/~@@ -20151,7 +20151,7 @@ dankness/Ngdanseuse/NgSdapper/JT>dapple/NJVgGdS-dare/~mNd>SgZG+dare/~ANd>SgZGdaredevil/~NJVgSdaredevilry/Ngdarer/Ng@@ -20419,7 +20419,7 @@ deep/~JNSpXTgn>Ydeepen/~VGddeepfake/NVSgdeepness/Ng-deer/~Ng+deer/~Ng09 # singular and pluraldeerskin/Ngdeerstalker/NSdef/~NJZ@@ -20950,7 +20950,7 @@ devotional/~NJSgdevour/VSdGdevout/~JNp>YTdevoutness/Ng-dew/~NVg+dew/~NwVgdewberry/NSgdewclaw/NSgdewdrop/NSg@@ -20964,7 +20964,7 @@ dextrose/Ngdharma/~Ndhoti/NSgdhow/NgS-diabetes/~Ng+diabetes/~Nmgdiabetic/~JNSgdiabolic/Jdiabolical/JY@@ -21526,7 +21526,7 @@ diversification/~Ngdiversify/~VGndSdiversion/~Ngdiversionary/J-diversity/~NSg+diversity/~NmSgdivert/~VSdGdiverticulitis/Ngdivest/~VSLdG@@ -21559,7 +21559,7 @@ dizzily/Rdizziness/~Ngdizzy/~JVNd>SpTGdjellaba/NgS-do/~mNSzg>HZG+do/~ANSzg>HZGdoability/Ngdoable/JNUdob/VNS@@ -21610,7 +21610,7 @@ dogcatcher/NSgdoge/~NgSdogeared/JVdogfight/NVSg-dogfish/NgS+dogfish/NgS09 # singular and plural, also has a plural in -sdogfood/NgSVdGdogged/~VJpYdoggedness/Ng@@ -21685,7 +21685,7 @@ dona/~gSdonate/~VdSXGndonation/~Ngdone/~JVNWrU-dong/~NVgdGS+dong/~NVgdGS09 # singular and plural, currency plural is dong or dongsdongle/NSgdonkey/~NSgdonned/~V@@ -21702,7 +21702,7 @@ doodlebug/NSgdoodler/Ngdoohickey/NSgdoolally/J-doom/~NVgdGS+doom/~NwVgdGSdoomer/NgSdoomsayer/NgSdoomsday/~NJg@@ -21878,7 +21878,7 @@ draftsmen/9draftswoman/Ngdraftswomen/9drafty/J>Tp-drag/~NVgS+drag/~NwVgSdragged/~Vdragging/~JNVdraggy/JNT>@@ -21928,7 +21928,7 @@ drawl/VNSgdGdrawn/~VJrdrawstring/NgSdray/NgS-dread/~VNJSgdG+dread/~VNwJSgdGdreadful/~JNpYdreadfulness/Ngdreadlocks/NVg@@ -22096,7 +22096,7 @@ ducting/VNductless/Jdud/NJGSgddude/~NVgS-dudgeon/Ng+dudgeon/Nmgdue/~JNSgduel/~NVgd>zZGSdueler/Ng@@ -22210,7 +22210,7 @@ dwindle/VdSGdyadic/~JNdybbuk/NSgdybbukim/N-dye/~NVd>SgZG+dye/~NwVd>SgZGdyeing/~VNrdyer/~Ngdyestuff/Ng@@ -22379,7 +22379,7 @@ ecu/NSecumenical/~JYecumenicism/Ngecumenism/Ng-eczema/Ng+eczema/Nwged/~NreSgedamame/Neddy/~NVdSgG@@ -22472,7 +22472,7 @@ effusiveness/Ngegad/egalitarian/~JNSgegalitarianism/Ng-egg/~NVGSgd+egg/~NwVGSgdeggbeater/NgSeggcorn/NgSeggcup/NSg@@ -22633,7 +22633,7 @@ elite/~JNSgelitism/Ngelitist/~JNgSelixir/NSg-elk/~NSg+elk/~NSg09 # singular and plural, also has a plural in -sell/~NSgellipse/~NVgSellipsis/Ng@@ -22758,7 +22758,7 @@ emitted/~Vemitter/~NgSemitting/~Vemo/~NJSg-emoji/~NSg+emoji/~NSg09 # singular and plural, also has a plural in -semollient/NJgSemolument/NgSemote/VNXdSGnv@@ -22929,7 +22929,7 @@ energise/VZGd>S!_energiser/Ng!_energize/VZGd>Senergizer/Ng-energy/~NSg+energy/~NwSgenervate/VJGndSenervation/Ngenfeeble/VGdSL@@ -23212,7 +23212,7 @@ equinoctial/JNequinox/~NgSequip/~VNrSequipage/NVgS-equipment/~Ng+equipment/~Nmgequipoise/NVgequipped/~JVUrequipping/~VNr@@ -23482,7 +23482,7 @@ everything/~IVgeverywhere/~evict/VSdGeviction/~NgS-evidence/~NVgGdS+evidence/~NmgVGdSevident/~JYevil/~JNg>YTSpevildoer/NSg@@ -24623,7 +24623,7 @@ firsthand/~JRfirth/~Ngfirths/Nfiscal/~JNgYS-fish/~N9Vgd>SZG+fish/~N09Vgd>SZG # singular and plural, also has a plural in -sfishbowl/~NSgfishcake/NSgfisher/~Ng@@ -24757,7 +24757,7 @@ flatboat/NSgflatbread/Nflatcar/NSgflatfeet/9-flatfish/N9gS+flatfish/N09gS # singular and plural, also has a plural in -sflatfoot/NVSgdflathead/~NSgflatiron/NJSg@@ -25667,7 +25667,7 @@ fumigate/VGndSfumigation/Ngfumigator/NSgfumy/J>T-fun/~NJVgU+fun/~NmJVgUfunction/~NVgdGSfunctional/~JNYfunctionalism/N@@ -25724,7 +25724,7 @@ furnace/~NVSgfurnish/NVrdSGfurnished/~VJUfurnishings/~Ng-furniture/~Ng+furniture/~Nmgfuror/NSgfurore/NgS!_furosemide/N@@ -25919,7 +25919,7 @@ garden/~NVJSZGgd>gardener/~Nggardenia/NgSgardening/~NVg-garfish/N9gS+garfish/N09gS # singular and plural, also has a plural in -sgargantuan/Jgargle/VNdSgGgargoyle/NSg@@ -26033,7 +26033,7 @@ geek/~NVgSdGgeeky/J>Tgeese/~Ngeezer/NgS-geisha/~Ng+geisha/~Ng09S # singular and plural, also has a plural in -sgel/~NVSggelatin/~Nggelatinous/~J@@ -26531,7 +26531,7 @@ golden/~JNVT>goldenrod/~NJggoldfield/NSgoldfinch/NgS-goldfish/~NgS+goldfish/~NgS09 # singular and plural, also has a plural in -sgoldmine/NSggoldsmith/~Nggoldsmiths/~N@@ -27163,7 +27163,7 @@ gyrofrequency/NgSgyroscope/NgSgyroscopic/Jgyve/NVgGdS-h/~NVJnXZGvz # removed `>` 'her' is not comparative of 'h'+h/~NVJnXZGvz # removed `>` 'her' is not comparative of 'h'h'm/ha/~haberdasher/NSg@@ -27225,7 +27225,7 @@ haiku/~NgShail/~NVJgdGShailstone/NgShailstorm/NgS-hair/~NVgdS+hair/~NwVgdShairball/NgShairband/NShairbreadth/Ng@@ -27403,7 +27403,7 @@ happen/~VSdGzhappening/~VJNghappenstance/NSghappily/~UR-happiness/~NUg+happiness/~NmUghappy/~JNVU>Tphaptic/Jharangue/NVgGdS@@ -27546,7 +27546,7 @@ haunt/~VNSgd>ZGhaunter/Nghaunting/~VJNYhauteur/Ng-have/~mNgGS+have/~ANgGShaven/~NVSghaven't/Vhaversack/NSg@@ -28247,7 +28247,7 @@ honer/NVghonest/~JVEYThonester/Jhonesty/~NEg-honey/~NJVSGgd+honey/~NwJVSGgdhoneybee/NSghoneycomb/~NVgdSGhoneydew/NJSg@@ -28259,7 +28259,7 @@ honeysuckle/NSghonk/VNgd>SZGhonker/Nghonky/~NSg-honor/~NVESGgdB<+honor/~NwVESGgdB<honorableness/Ng<honorably/ER<honorarily/R@@ -28268,14 +28268,14 @@ honorary/~JNhonoree/NSg<honorer/NSg<honorific/~NJgS-honour/NVEgdSBG!@_+honour/NwVEgdSBG!@_honourableness/Ng!@_honourably/RE!@_honouree/NSg!@_honourer/NSg!@_honouree/NgS!@_honourer/NgS!@_-hooch/Ng+hooch/Nwghood/~NVJgdSGhoodie/NgShoodlum/NSg@@ -28400,7 +28400,7 @@ hostelry/NSghostess/~NVgdSGhostile/~JNgYShostilities/~Ng-hostility/~NSg+hostility/~NwSghostler/NgShot/~JVNSYphotbed/NgS@@ -28476,7 +28476,7 @@ hove/~Vhovel/NVSghover/~VNSGdhoverboard/NVgS-hovercraft/NgS+hovercraft/NgS09 # singular and plural, also has a plural in -show/~CNSghow'd/how're/@@ -28589,7 +28589,7 @@ hump/~NVgdSGhumpback/NVgdShumph/VdGhumphs/V-humus/Ng+humus/Nwghunch/NVgdSGhunchback/NSgdhundred/~NSgH@@ -28761,7 +28761,7 @@ hypnotist/NgShypnotize/VGdShypo/NVgShypoallergenic/J-hypochondria/Ng+hypochondria/Nmghypochondriac/JNSghypocrisy/~NSghypocrite/NgS@@ -29577,14 +29577,14 @@ influenced/~VJUinfluencer/NSginfluential/~JNYinfluenza/~Ng-info/~Ng+info/~Nmginfographic/NJSginfomercial/NSginform/~VJZinformal/~JYinformant/~NSginformatics/~N-information/~NEg+information/~NmgEinformational/~Jinformative/~JpYinformativeness/Ng@@ -30458,7 +30458,7 @@ jell/NVdSGjello/NSjelly/~NVJGdSgjellybean/NJgS-jellyfish/N9gS+jellyfish/N09gS # singular and plural, also has a plural in -sjellylike/Jjellyroll/NSgjemmy/NVJGdS@@ -30669,7 +30669,7 @@ juggle/VNgZGd>Sjuggler/Ngjugglery/Ngjugular/JNSg-juice/~NVJd>SgZG+juice/~NwVJd>SgZGjuicer/Ngjuicily/Rjuiciness/Ng@@ -30752,7 +30752,7 @@ kaleidoscopic/JQkamikaze/~NVJgSkana/~NVkangaroo/~NVJgS-kanji/~N+kanji/~N09S # singular and plural, also has a plural in -skaolin/Ngkapok/Ngkappa/~NSg@@ -30935,7 +30935,7 @@ kinsmen/9kinswoman/Ngkinswomen/9kiosk/~NSg-kip/~NVSg+kip/~NVSg09 # in the currency sense, singular and plural, also has a plural in -skipped/Vkipper/NVJgdGSkipping/V@@ -31023,7 +31023,7 @@ knotting/VNknotty/JT>know/~VNSBknowing/~JPVNUYS-knowledge/~NVg+knowledge/~Nmgknowledgeable/~JNknowledgeably/Rknown/~JNV@@ -32265,7 +32265,7 @@ ludo/Nluff/NVdSGlug/~NVSgluge/~NVS-luggage/~Ng+luggage/~Nmglugged/VJlugger/NgSlugging/VN@@ -32312,7 +32312,7 @@ lunchroom/NgSlunchtime/~NgSlung/~NgdSGlunge/NVSg-lungfish/N9gS+lungfish/N09gS # singular and plural, also has a plural in -slungful/NSlunkhead/NgSlupin/NSg!_@@ -33014,7 +33014,7 @@ maximise/VGdS!_maximization/Ngmaximize/~VGdSmaximum/~NJSg-may/~mNg+may/~ANgmaybe/~JRNSgmayday/NgSmayflower/~NgS@@ -33070,7 +33070,7 @@ measure'smeasured/~JVUmeasureless/Jmeasurement/~NgS-meat/~NgS+meat/~NwgSmeatball/NgSmeathead/NgSmeatiness/Ng@@ -33550,11 +33550,11 @@ midwives/NVmidyear/NgSmien/Ngmiff/NVdSG-might/~NJmg+might/~NmJAgmight've/Vmightily/Rmightiness/Ng-mightn't/m+mightn't/Amighty/~NJT>pmignonette/NJSgmigraine/NgS@@ -33592,7 +33592,7 @@ militate/VGdSmilitia/~NSgmilitiaman/Ngmilitiamen/~9-milk/~NVgd>SZG+milk/~NwVgd>SZGmilker/Ngmilkiness/Ngmilkmaid/NgS@@ -34235,7 +34235,7 @@ moor/~NVgdzSGmoorhen/~NSmooring/VNgmoorland/~NgS-moose/~Ng+moose/~Ng09 # singular and pluralmoot/~JNVdSGmop/~NVSZGgd>mope/VNgS@@ -34630,7 +34630,7 @@ mush/NVgd>SZGmushiness/Ngmushroom/~NJVGSgdmushy/JpT>-music/~NVJSg+music/~NwVJSgmusical/~JNgYSmusicale/NgSmusicality/Ng@@ -34942,7 +34942,7 @@ necrotic/Jnectar/~NVgnectarine/NJgSnee/~J-need/~NmgdSG+need/~NwAgdSGneeded/~JVUneedful/JNYneediness/Ng@@ -34953,7 +34953,7 @@ needlessness/Ngneedlewoman/Ngneedlewomen/9needlework/Ng-needn't/m+needn't/Aneedy/~JpT>nefarious/JYpnefariousness/Ng@@ -35103,7 +35103,7 @@ neutralize/~Vd>SZGneutralizer/Ngneutrino/NSgneutron/~NSg-never/~R # removed `V` verb sense is dialectal+never/~R # removed `V` verb sense is dialectalnevermore/~nevertheless/~nevi/N@@ -35118,7 +35118,7 @@ newfound/~Jnewline/~NSnewlywed/NJSgnewness/Ng-news/~NVg+news/~NmVgnewsagent/NSnewsboy/NSgnewscast/~NVSg>Z@@ -35229,7 +35229,7 @@ nineteenths/Nninetieth/JNgninetieths/Nninety/~HSg-ninja/~NJVSg+ninja/~NJVSg09 # singular and plural, also has a plural in -sninny/NSgninth/~JNVgninths/N@@ -36479,8 +36479,8 @@ otter/~NgSottoman/~NgSoubliette/NgSouch/NV-ought/~mIN-oughtn't/m+ought/~AIN+oughtn't/Aounce/~NgSour/~D5ours/~I@@ -37490,7 +37490,7 @@ pastor/~NVgSpastoral/~JNgSpastorate/NgSpastrami/Ng-pastry/~NSg+pastry/~NwSgpasturage/Ngpasture/~NVdSgGpastureland/Ng@@ -38535,7 +38535,7 @@ pittance/NgSpitted/~JVpitting/~NVpituitary/~JNSg-pity/~NVGdSg+pity/~NwVGdSgpitying/VNYpivot/~NVgdGSpivotal/~JY@@ -38543,7 +38543,7 @@ pix/~NVgpixel/~NVgSpixelate/VdSGnpixie/~NgS-pizza/~NgS+pizza/~NwgSpizzazz/Ngpizzeria/NSgpizzicati/N@@ -41898,7 +41898,7 @@ ribber/NSgribbing/VNribbon/~NVSgriboflavin/~Ng-rice/~NVgZGd>S+rice/~NwVgZGd>Sricer/Ngrich/~JNVTg>SYprichness/~Ng@@ -41974,7 +41974,7 @@ rimstone/NgSrind/NVgSring/~NVZGgd>zringer/~Ng-ringgit/NgS+ringgit/NgS09 # singular and plural, also has a plural in -sringleader/NgSringlet/NVgSringlike/J@@ -42360,7 +42360,7 @@ runtime/~JNrunty/J>Trunway/~NSgrupee/~NSg-rupiah/Ng+rupiah/Ng09 # singular and plural, also has a plural in -s belowrupiahs/Nrupture/~NVgGdSrural/~JN@@ -42451,9 +42451,9 @@ safe/~JNVgYTp>Ssafeguard/~NVSgdGsafekeeping/Ngsafeness/Ng-safety/~NVSgU+safety/~NwVSgUsafflower/NgS-saffron/~NJVgS+saffron/~NwJVgSsag/~NVSgsaga/~NgSsagacious/JY@@ -42473,7 +42473,7 @@ sailboarder/Ngsailboarding/Ngsailboat/~NgSsailcloth/Ng-sailfish/N9gS+sailfish/N09gS # singular and plural, also has a plural in -s belowsailing/~VJNgsailor/~NSgsailplane/NVgS@@ -42519,7 +42519,7 @@ salivation/Ngsallow/JVN>Tpsallowness/Ngsally/~NVdSgG-salmon/~NJVSg+salmon/~NJVSg09 # singular and plural, also has a plural in -s belowsalmonella/Ngsalmonellae/9salon/~NgS@@ -42550,10 +42550,8 @@ salvation/~NVgsalve/NVgZGd>Ssalver/Ngsalvo/~NVgS-sam/~NVJm-samantha/~m-samar/~m-samara/~Nm+samara/~NS+samarae/9samarium/Ngsamba/~NVgdSGsame/~JISp@@ -42700,7 +42698,7 @@ saturnine/Jsatyr/NgSsatyriasis/Ngsatyric/J-sauce/~NVgZGd>S+sauce/~NwVgZGd>Ssaucepan/NVSgsaucer/~NVgsaucily/R@@ -42887,7 +42885,7 @@ schlemiel/NSgschlep/VNSgschlepped/Vschlepping/V-schlock/Ng+schlock/Nmgschlocky/J>Tschlong/NgSxschmaltz/Ng@@ -43213,7 +43211,7 @@ secede/~VdSGsecession/~Ngsecessionist/~NJgSseclude/VGdS-seclusion/~Ng+seclusion/~Nwgseclusive/JNsecond/~JNVSLZGgd>Ysecondarily/R@@ -43529,7 +43527,7 @@ serialisation/NSg!_serialise/VGdSB!_serialization/NSgserialize/VGdSB>-series/~Ng+series/~Ng09 # singular and pluralserif/~NJgSserigraph/Ngserigraphs/N@@ -43638,7 +43636,7 @@ shack/~NVJgdSGshackle/NVUGdSshackle'sshad/~NGgdSz-shade/~NVgS+shade/~NwVgSshader/NgSshadily/Rshadiness/Ng@@ -43668,7 +43666,7 @@ shakily/Rshakiness/Ngshaky/~J>pTshale/~NVg-shall/~m+shall/~Ashallot/NgSshallow/~JNVTpg>YSshallowness/Ng@@ -43759,7 +43757,7 @@ shed/~VNgSshedding/~VNsheen/~JNVgsheeny/NJT>-sheep/~N9g+sheep/~N09g # singular and pluralsheepdog/NVgSsheepfold/NSgsheepherder/NgS@@ -43784,7 +43782,7 @@ shellac/NVgSshellacked/Jshellacking/VNgSshellfire/Ng-shellfish/~N9gS+shellfish/~N09gS # singular and plural, also has a plural in -sshelter/~NVGgdSshelve/VNGdSshelving/JVNg@@ -43954,7 +43952,7 @@ shot/~JNVgSshotgun/~NVSgshotgunned/Vshotgunning/V-should/~m+should/~Ashould've/Vshoulder/~NVgdGSshouldn't/V@@ -44010,7 +44008,7 @@ shrike/~NgSshrill/JVNd>SpTGshrillness/Ngshrilly/JR-shrimp/~NVgd>SZG+shrimp/~NVgd>SZG09 # singular and plural, also has a plural in -sshrine/~NVgSshrink/~VNgSBGshrinkage/Ng@@ -44184,7 +44182,7 @@ siloviki/9silt/~NVGgdSsilty/JT>silver/~NJVGgdS-silverfish/N9gS+silverfish/N09gS # singular and plural, also has a plural in -ssilverish/Jsilversmith/Ngsilversmiths/N@@ -45184,7 +45182,7 @@ soybean/~NgSsozzled/JVspa/~NSgspace/~NVd>SgZG-spacecraft/~NgS+spacecraft/~NgS09 # singular and plural, also has a plural in -sspaceflight/~NgSspaceman/Ngspacemen/9@@ -45261,7 +45259,7 @@ speakeasy/~NSgspeaker/~Ngspeakerphone/NSspear/~NVJSgdG-spearfish/NV9GgdS+spearfish/NV09GgdS # singular and plural, also has a plural in -sspeargun/Nspearhead/~NVGgdSspearmint/Ng@@ -45276,7 +45274,7 @@ specialization/~NgSspecialize/~VGdSspecialty/~NSgspecie/NSg-species/~Ng+species/~Ng09 # singular and pluralspecif/specifiable/Jspecific/~JNgSQ@@ -45653,7 +45651,7 @@ squeezy/Jsquelch/VNGgdSsquelchy/Jsquib/NVSg-squid/~NVSg+squid/~NVSg09 # singular and plural, also has a plural in -ssquidgy/JNsquiffy/Jsquiggle/NVdSgG@@ -45690,7 +45688,7 @@ stably/NURstaccato/NJgSstack/~NVSgdGBstadium/~NgS-staff/~NVrSdG+staff/~NwVrSdGstaff'sstaffer/~NgSstaffing/~VNg@@ -45783,7 +45781,7 @@ stardom/~Ngstardust/~Ngstare/~VNSgstarer/Ng-starfish/~NV9gS+starfish/~NV09gS # singular and plural, also has a plural in -sstarfruit/Nstargate/~NgSstargaze/Vd>SZG@@ -45966,7 +45964,7 @@ stetson/NgSstetted/Vstetting/Vstevedore/NVSg-stew/~NVgdGS+stew/~NwVgdGSsteward/~NVGgdSstewardess/NgSstewardship/~Ng@@ -46078,7 +46076,7 @@ stomachache/NSgstomacher/Ngstomachs/NVstomp/~VNGSgd-stone/~NVJd>SgZG+stone/~NVJd>SgZG09 # weight sense in UK is singular and pluralstonemason/~NgSstoner/~Ngstonewall/~NVJGSd@@ -46330,7 +46328,7 @@ studiousness/Ngstudly/J>Tstudy/~VNrGdSstudy's-stuff/~NVGSgdz+stuff/~NmVGSgdzstuffily/Rstuffiness/Ngstuffing/VNg@@ -46619,7 +46617,7 @@ suffragette/~NSgsuffragist/~NgSsuffuse/VJdSGnsuffusion/Ng-sugar/~NVGSgd+sugar/~NwVGSgdsugarcane/~Ngsugarcoat/VGdSsugarless/J@@ -46717,7 +46715,7 @@ sundown/~NVSgsundress/NSsundries/Ngsundry/JNIS-sunfish/NV9gS+sunfish/NV09gS # singular and plural, also has a plural in -ssunflower/~NgSsung/~VUsunglasses/~Ng@@ -47095,7 +47093,7 @@ swoon/NVSGgdswoop/VNSGgdswoosh/VNgdSGsword/~NVSg-swordfish/~NV9gS+swordfish/~NV09gS # singular and plural, also has a plural in -sswordplay/Ngswordsman/~Ngswordsmanship/Ng@@ -48461,7 +48459,7 @@ tooter/Ngtooth/~NVgdtoothache/NgStoothbrush/NVgS-toothfish/NgS+toothfish/NgS09 # singular and plural, also has a plural in -stoothily/Rtoothless/Jtoothpaste/NSg@@ -48680,7 +48678,7 @@ traditionalism/Ngtraditionalist/~NJSgtraduce/Vd>SZGtraducer/Ng-traffic/~NVJSg+traffic/~NmVJSgtrafficked/JVtrafficker/NSgtrafficking/~VNg@@ -48984,7 +48982,7 @@ tribute'strice/VNgtricentennial/NJgStriceps/NgS-triceratops/Ng+triceratops/Ng09S # singular and plural, also has a plural in -strichina/Ngtrichinae/9trichinosis/Ng@@ -49130,7 +49128,7 @@ trouser/~NVSgtrousers/~Ngtrousseau/Ngtrousseaux/N-trout/~NVSg+trout/~NVSg09 # singular and plural, also has a plural in -strove/NSgtrow/VNdSGtrowel/NVgdSG@@ -49450,7 +49448,6 @@ tyrant/~NJVSgtyre/NVgS!_tyro/NgStzatziki/N-# u/~185S # probably left over from hunspell, causes havoc with linter heuristicsubiquitous/~JYubiquity/Ngudder/NSg@@ -51119,7 +51116,7 @@ watchmen/~9watchstrap/NSwatchtower/~NSgwatchword/NgS-water/~NVGSgd>+water/~NwVGSgd>waterbed/NgSwaterbird/NSgwaterboard/NVgdzSG@@ -51128,7 +51125,7 @@ waterborne/Jwatercolor/NJgSwatercolour/NJVgS!@_watercourse/~NSg-watercraft/~Ng+watercraft/~Ng09S # singular and plural, also has a plural in -swatercress/Ngwaterfall/~NVSgwaterfowl/~NSg@@ -51195,7 +51192,7 @@ we've/weak/~Jpn>YXTweaken/~Vd>ZGweakener/Ng-weakfish/N9gS+weakfish/N09gS # singular and plural, also has a plural in -sweakish/Jweakling/NJSgweakness/~NgS@@ -51470,7 +51467,7 @@ white/~JNVSpgwhitebait/NVwhiteboard/NVSwhitecap/NSg-whitefish/~NV9gS+whitefish/~NV09gS # singular and plural, also has a plural in -swhitehead/~NgSwhitelist/NVGdSwhiten/VZGd>z@@ -51603,7 +51600,7 @@ wile/~NVgGdSwilful/JpY!@_wilfulness/Ng!@_wiliness/Ng-will/~mNgdS+will/~ANgdSwillful/JpYwillfulness/Ngwillies/Ng@@ -51802,7 +51799,7 @@ womble/NVSwomen/~9gwomenfolk/9Sgwomenfolks/9g-won/~VNg+won/~VNg09 # singular and pluralwon't/Vwonder/~NVgdGLSwonderful/~JYp@@ -51960,9 +51957,9 @@ worthy/~JNVUp>Tworthy'swot/VIwotcha/-would/~mNS+would/~ANSwould've/-wouldn't/m+wouldn't/Awouldst/Vwound/~NVSGgd>wove/VJr@@ -52104,7 +52101,7 @@ yahoo/~NVSgyak/~NVSgyakked/Vyakking/V-yakuza/NgS+yakuza/NgS09 # singular and plural, also has a plural in -syam/~NVSgyammer/VNSZGgd>yammerer/Ng@@ -52152,7 +52149,7 @@ yellowish/~Jyellowness/Ngyellowy/Jyelp/NVgdSG-yen/~NVSg+yen/~NVSg09 # singular and plural, currency plural is yen, desire plural is yensyeoman/~Ngyeomanry/~Ngyeomen/~9@@ -52218,7 +52215,7 @@ yowl/NVgdSGyr/~NSytterbium/Ngyttrium/Ng-yuan/~Ng+yuan/~Ng09S # singular and plural, also has a plural in -syucca/~NSgyuck/NVyucky/JT>@@ -53084,6 +53081,7 @@ so-called/Jsocio-political/Jsolid-state/Jsound wave/NgS+source code/Nmgspace bar/NgSspell checker/NgSspot on/J@@ -53254,4 +53252,4 @@ z-axis/Ng# And they will be reviewed# Word added using the `just addnoun` command will be added here-handedly+handedly\ No newline at end of filediff --git a/harper-core/src/token_kind.rs b/harper-core/src/token_kind.rsindex 1b44f1306..d1b07274f 100644--- a/harper-core/src/token_kind.rs+++ b/harper-core/src/token_kind.rs@@ -2,10 +2,20 @@ use harper_brill::UPOS;use is_macro::Is;use serde::{Deserialize, Serialize};-use crate::{- ConjunctionData, NounData, Number, PronounData, Punctuation, Quote, VerbData, VerbForm,- WordMetadata,-};+use crate::{Number, Punctuation, Quote, TokenKind::Word, WordMetadata};++macro_rules! delegate_to_metadata {+ ($($method:ident),* $(,)?) => {+ $(+ pub fn $method(&self) -> bool {+ let Word(Some(metadata)) = self else {+ return false;+ };+ metadata.$method()+ }+ )*+ };+}#[derive(Debug, Is, Clone, Serialize, Deserialize, Default, PartialOrd, Hash, Eq, PartialEq)]#[serde(tag = "kind", content = "value")]@@ -31,6 +41,91 @@ pub enum TokenKind {}impl TokenKind {+ // Word metadata delegation methods grouped by part of speech+ delegate_to_metadata! {+ // Nominal methods (nouns and pronouns)+ is_nominal,+ is_noun,+ is_pronoun,+ is_proper_noun,+ is_singular_nominal,+ is_plural_nominal,+ is_possessive_nominal,+ is_non_plural_nominal,+ is_singular_noun,+ is_plural_noun,+ is_non_plural_noun,+ is_countable_noun,+ is_mass_noun,+ is_singular_pronoun,+ is_plural_pronoun,+ is_non_plural_pronoun,+ is_reflexive_pronoun,+ is_first_person_singular_pronoun,+ is_first_person_plural_pronoun,+ is_second_person_pronoun,+ is_third_person_pronoun,+ is_third_person_singular_pronoun,+ is_third_person_plural_pronoun,+ is_object_pronoun,+ is_possessive_noun,+ is_possessive_pronoun,++ // Verb methods+ is_verb,+ is_auxiliary_verb,+ is_linking_verb,+ is_verb_lemma,+ is_verb_past_form,+ is_verb_progressive_form,+ is_verb_third_person_singular_present_form,++ // Adjective methods+ is_adjective,++ // Adverb methods+ is_adverb,++ // Determiner methods+ is_determiner,+ is_demonstrative_determiner,+ is_possessive_determiner,++ // Conjunction methods+ is_conjunction+ }++ // Word metadata delegation methods not generated by macro+ pub fn is_preposition(&self) -> bool {+ let Word(Some(metadata)) = self else {+ return false;+ };+ metadata.preposition+ }++ pub fn is_swear(&self) -> bool {+ let Word(Some(metadata)) = self else {+ return false;+ };+ metadata.is_swear()+ }++ pub fn is_common_word(&self) -> bool {+ let Word(Some(metadata)) = self else {+ return true;+ };+ metadata.common+ }++ pub fn is_likely_homograph(&self) -> bool {+ let Word(Some(metadata)) = self else {+ return false;+ };+ metadata.is_likely_homograph()+ }++ // Punctuation and symbol is-methods+pub fn is_open_square(&self) -> bool {matches!(self, TokenKind::Punctuation(Punctuation::OpenSquare))}@@ -43,84 +138,50 @@ impl TokenKind {matches!(self, TokenKind::Punctuation(Punctuation::Pipe))}- /// Checks whether a token is word-like--meaning it is more complex than punctuation and can- /// hold semantic meaning in the way a word does.- pub fn is_word_like(&self) -> bool {- matches!(- self,- TokenKind::Word(..)- | TokenKind::EmailAddress- | TokenKind::Hostname- | TokenKind::Decade- | TokenKind::Number(..)- )+ pub fn is_currency(&self) -> bool {+ matches!(self, TokenKind::Punctuation(Punctuation::Currency(..)))}- pub fn is_possessive_nominal(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- noun: Some(NounData {- is_possessive: Some(true),- ..- }),- ..- })) | TokenKind::Word(Some(WordMetadata {- pronoun: Some(PronounData {- is_possessive: Some(true),- ..- }),- ..- }))- )+ pub fn is_ellipsis(&self) -> bool {+ matches!(self, TokenKind::Punctuation(Punctuation::Ellipsis))}- pub fn is_possessive_noun(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- noun: Some(NounData {- is_possessive: Some(true),- ..- }),- ..- }))- )+ pub fn is_hyphen(&self) -> bool {+ matches!(self, TokenKind::Punctuation(Punctuation::Hyphen))}- pub fn is_possessive_pronoun(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- pronoun: Some(PronounData {- is_possessive: Some(true),- ..- }),- ..- }))- )+ pub fn is_quote(&self) -> bool {+ matches!(self, TokenKind::Punctuation(Punctuation::Quote(_)))}- pub fn is_proper_noun(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- noun: Some(NounData {- is_proper: Some(true),- ..- }),- ..- }))- )+ pub fn is_apostrophe(&self) -> bool {+ matches!(self, TokenKind::Punctuation(Punctuation::Apostrophe))}- pub fn is_conjunction(&self) -> bool {+ pub fn is_period(&self) -> bool {+ matches!(self, TokenKind::Punctuation(Punctuation::Period))+ }++ pub fn is_at(&self) -> bool {+ matches!(self, TokenKind::Punctuation(Punctuation::At))+ }++ pub fn is_comma(&self) -> bool {+ matches!(self, TokenKind::Punctuation(Punctuation::Comma))+ }++ // Miscellaneous is-methods++ /// Checks whether a token is word-like--meaning it is more complex than punctuation and can+ /// hold semantic meaning in the way a word does.+ pub fn is_word_like(&self) -> bool {matches!(self,- TokenKind::Word(Some(WordMetadata {- conjunction: Some(ConjunctionData {}),- ..- }))+ TokenKind::Word(..)+ | TokenKind::EmailAddress+ | TokenKind::Hostname+ | TokenKind::Decade+ | TokenKind::Number(..))}@@ -153,109 +214,28 @@ impl TokenKind {}}- pub fn is_currency(&self) -> bool {- matches!(self, TokenKind::Punctuation(Punctuation::Currency(..)))- }-- pub fn is_preposition(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- preposition: true,- ..- }))- )- }-- pub fn is_ellipsis(&self) -> bool {- matches!(self, TokenKind::Punctuation(Punctuation::Ellipsis))- }-- pub fn is_hyphen(&self) -> bool {- matches!(self, TokenKind::Punctuation(Punctuation::Hyphen))- }-- pub fn is_adjective(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- adjective: Some(_),- ..- }))- )- }-- pub fn is_verb_lemma(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- verb: Some(VerbData {- verb_form: Some(VerbForm::LemmaForm),- ..- }),- ..- }))- )- }-- pub fn is_verb_past_form(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- verb: Some(VerbData {- verb_form: Some(VerbForm::PastForm),- ..- }),- ..- }))- )+ /// Used by `crate::parsers::CollapseIdentifiers`+ /// TODO: Separate this into two functions and add OR functionality to+ /// pattern matching+ pub fn is_case_separator(&self) -> bool {+ matches!(self, TokenKind::Punctuation(Punctuation::Underscore))+ || matches!(self, TokenKind::Punctuation(Punctuation::Hyphen))}- pub fn is_verb_progressive_form(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- verb: Some(VerbData {- verb_form: Some(VerbForm::ProgressiveForm),- ..- }),- ..- }))- )+ /// Checks whether the token is whitespace.+ pub fn is_whitespace(&self) -> bool {+ matches!(self, TokenKind::Space(_) | TokenKind::Newline(_))}- pub fn is_verb_third_person_singular_present_form(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- verb: Some(VerbData {- verb_form: Some(VerbForm::ThirdPersonSingularPresentForm),- ..- }),- ..- }))- )- }+ pub fn is_upos(&self, upos: UPOS) -> bool {+ let Some(Some(meta)) = self.as_word() else {+ return false;+ };- pub fn is_adverb(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- adverb: Some(_),- ..- }))- )+ meta.pos_tag == Some(upos)}- pub fn is_swear(&self) -> bool {- matches!(- self,- TokenKind::Word(Some(WordMetadata {- swear: Some(true),- ..- }))- )- }+ // Miscellaneous non-is methods/// Checks that `self` is the same enum variant as `other`, regardless of/// whether the inner metadata is also equal.@@ -276,16 +256,14 @@ impl TokenKind {_ => self.clone(),}}-}-impl TokenKind {/// Construct a [`TokenKind::Word`] with no metadata.pub fn blank_word() -> Self {Self::Word(None)}-}-impl TokenKind {+ // Punctuation and symbol non-is methods+pub fn as_mut_quote(&mut self) -> Option<&mut Quote> {self.as_mut_punctuation()?.as_mut_quote()}@@ -293,245 +271,23 @@ impl TokenKind {pub fn as_quote(&self) -> Option<&Quote> {self.as_punctuation()?.as_quote()}+}- pub fn is_quote(&self) -> bool {- matches!(self, TokenKind::Punctuation(Punctuation::Quote(_)))- }-- pub fn is_apostrophe(&self) -> bool {- matches!(self, TokenKind::Punctuation(Punctuation::Apostrophe))- }-- pub fn is_period(&self) -> bool {- matches!(self, TokenKind::Punctuation(Punctuation::Period))- }-- pub fn is_at(&self) -> bool {- matches!(self, TokenKind::Punctuation(Punctuation::At))- }-- /// Used by `crate::parsers::CollapseIdentifiers`- /// TODO: Separate this into two functions and add OR functionality to- /// pattern matching- pub fn is_case_separator(&self) -> bool {- matches!(self, TokenKind::Punctuation(Punctuation::Underscore))- || matches!(self, TokenKind::Punctuation(Punctuation::Hyphen))- }-- pub fn is_verb(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_verb()- }-- pub fn is_auxiliary_verb(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_auxiliary_verb()- }-- pub fn is_linking_verb(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_linking_verb()- }-- pub fn is_non_plural_nominal(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.is_non_plural_noun() || metadata.is_non_plural_pronoun()- }-- pub fn is_non_plural_noun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.is_non_plural_noun()- }-- pub fn is_non_plural_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.is_non_plural_pronoun()- }-- pub fn is_second_person_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.is_second_person_pronoun()- }-- pub fn is_third_person_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.is_third_person_pronoun()- }-- pub fn is_first_person_singular_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.is_first_person_singular_pronoun()- }-- pub fn is_first_person_plural_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.is_first_person_plural_pronoun()- }-- pub fn is_third_person_singular_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.is_third_person_singular_pronoun()- }-- pub fn is_third_person_plural_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.is_third_person_plural_pronoun()- }-- pub fn is_object_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.is_object_pronoun()- }-- pub fn is_common_word(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return true;- };-- metadata.common- }-- pub fn is_plural_nominal(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_plural_noun() || metadata.is_plural_pronoun()- }-- pub fn is_plural_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_plural_pronoun()- }-- pub fn is_plural_noun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_plural_noun()- }-- pub fn is_nominal(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_noun() || metadata.is_pronoun()- }-- pub fn is_noun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_noun()- }-- pub fn is_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_pronoun()- }-- pub fn is_reflexive_pronoun(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_reflexive_pronoun()- }-- pub fn is_determiner(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_determiner()- }-- pub fn is_demonstrative_determiner(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_demonstrative_determiner()- }-- pub fn is_possessive_determiner(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_possessive_determiner()- }-- pub fn is_likely_homograph(&self) -> bool {- let TokenKind::Word(Some(metadata)) = self else {- return false;- };-- metadata.is_likely_homograph()- }+#[cfg(test)]+mod tests {+ use crate::Document;- pub fn is_comma(&self) -> bool {- matches!(self, TokenKind::Punctuation(Punctuation::Comma))+ #[test]+ fn car_is_singular_noun() {+ let doc = Document::new_plain_english_curated("car");+ let tk = &doc.tokens().next().unwrap().kind;+ assert!(tk.is_singular_noun());}- /// Checks whether the token is whitespace.- pub fn is_whitespace(&self) -> bool {- matches!(self, TokenKind::Space(_) | TokenKind::Newline(_))- }-- pub fn is_upos(&self, upos: UPOS) -> bool {- let Some(Some(meta)) = self.as_word() else {- return false;- };-- meta.pos_tag == Some(upos)+ #[test]+ fn traffic_is_mass_noun() {+ let doc = Document::new_plain_english_curated("traffic");+ let tk = &doc.tokens().next().unwrap().kind;+ assert!(tk.is_mass_noun());}}diff --git a/harper-core/src/word_metadata.rs b/harper-core/src/word_metadata.rsindex 014c75812..24011d7ca 100644--- a/harper-core/src/word_metadata.rs+++ b/harper-core/src/word_metadata.rs@@ -150,6 +150,8 @@ impl WordMetadata {is_proper: Some(false),is_singular: None,is_plural: None,+ is_countable: None,+ is_mass: None,is_possessive: None,})}@@ -173,6 +175,8 @@ impl WordMetadata {is_proper: Some(true),is_singular: None,is_plural: None,+ is_countable: None,+ is_mass: None,is_possessive: None,})}@@ -304,8 +308,9 @@ impl WordMetadata {}generate_metadata_queries!(- noun has proper, plural, possessive.- pronoun has personal, singular, plural, possessive, reflexive, object.+ // Singular and countable default to true, so their metadata queries are not generated.+ noun has proper, plural, mass, possessive.+ pronoun has personal, singular, plural, possessive, reflexive, subject, object.determiner has demonstrative, possessive.verb has linking, auxiliary.conjunction has.@@ -313,6 +318,10 @@ impl WordMetadata {adverb has);+ // Manual metadata queries++ // Pronoun metadata queries+pub fn is_first_person_plural_pronoun(&self) -> bool {matches!(self.pronoun,@@ -417,111 +426,87 @@ impl WordMetadata {)}+ // Noun metadata queries++ // Singular is default if number is not marked in the dictionary.+ pub fn is_singular_noun(&self) -> bool {+ if let Some(noun) = self.noun {+ matches!(+ (noun.is_singular, noun.is_plural),+ (Some(true), _) | (None | Some(false), None | Some(false))+ )+ } else {+ false+ }+ }+ pub fn is_non_singular_noun(&self) -> bool {+ if let Some(noun) = self.noun {+ !matches!(+ (noun.is_singular, noun.is_plural),+ (Some(true), _) | (None | Some(false), None | Some(false))+ )+ } else {+ false+ }+ }++ // Countable is default if countability is not marked in the dictionary.+ pub fn is_countable_noun(&self) -> bool {+ if let Some(noun) = self.noun {+ matches!(+ (noun.is_singular, noun.is_plural),+ (Some(true), _) | (None | Some(false), None | Some(false))+ )+ } else {+ false+ }+ }+ pub fn is_non_countable_noun(&self) -> bool {+ if let Some(noun) = self.noun {+ !matches!(+ (noun.is_countable, noun.is_mass),+ (Some(true), _) | (None | Some(false), None | Some(false))+ )+ } else {+ false+ }+ }++ // Nominal metadata queries (noun + pronoun)+/// Checks if the word is definitely nominal.pub fn is_nominal(&self) -> bool {- self.noun.is_some() || self.pronoun.is_some()+ self.is_noun() || self.is_pronoun()}/// Checks if the word is definitely a nominal and more specifically is labeled as (a) singular.pub fn is_singular_nominal(&self) -> bool {- matches!(- self.noun,- Some(NounData {- is_singular: None | Some(true),- ..- })- ) || matches!(- self.pronoun,- Some(PronounData {- is_singular: None | Some(true),- ..- })- )+ self.is_singular_noun() || self.is_singular_pronoun()}/// Checks if the word is definitely a nominal and more specifically is labeled as (a) plural.pub fn is_plural_nominal(&self) -> bool {- matches!(- self.noun,- Some(NounData {- is_plural: Some(true),- ..- })- ) || matches!(- self.pronoun,- Some(PronounData {- is_plural: Some(true),- ..- })- )+ self.is_plural_noun() || self.is_plural_pronoun()}/// Checks if the word is definitely a nominal and more specifically is labeled as (a) possessive.pub fn is_possessive_nominal(&self) -> bool {- matches!(- self.noun,- Some(NounData {- is_possessive: Some(true),- ..- })- ) || matches!(- self.pronoun,- Some(PronounData {- is_possessive: Some(true),- ..- })- )+ self.is_possessive_noun() || self.is_possessive_pronoun()}/// Checks if the word is definitely a nominal and more specifically is labeled as __not__ (a) singular.pub fn is_non_singular_nominal(&self) -> bool {- matches!(- self.noun,- Some(NounData {- is_singular: Some(false),- ..- })- ) || matches!(- self.pronoun,- Some(PronounData {- is_singular: Some(false),- ..- })- )+ self.is_non_singular_noun() || self.is_non_singular_pronoun()}/// Checks if the word is definitely a nominal and more specifically is labeled as __not__ (a) plural.pub fn is_non_plural_nominal(&self) -> bool {- matches!(- self.noun,- Some(NounData {- is_plural: None | Some(false),- ..- })- ) || matches!(- self.pronoun,- Some(PronounData {- is_plural: None | Some(false),- ..- })- )+ self.is_non_plural_noun() || self.is_non_plural_pronoun()}/// Checks if the word is definitely a nominal and more specifically is labeled as __not__ (a) possessive.pub fn is_non_possessive_nominal(&self) -> bool {- matches!(- self.noun,- Some(NounData {- is_possessive: Some(false),- ..- })- ) && matches!(- self.pronoun,- Some(PronounData {- is_possessive: Some(false),- ..- })- )+ self.is_non_possessive_noun() || self.is_non_possessive_pronoun()}/// Checks whether a word is _definitely_ a swear.@@ -585,6 +570,8 @@ pub struct NounData {pub is_proper: Option<bool>,pub is_singular: Option<bool>,pub is_plural: Option<bool>,+ pub is_countable: Option<bool>,+ pub is_mass: Option<bool>,pub is_possessive: Option<bool>,}@@ -595,6 +582,8 @@ impl NounData {is_proper: self.is_proper.or(other.is_proper),is_singular: self.is_singular.or(other.is_singular),is_plural: self.is_plural.or(other.is_plural),+ is_countable: self.is_countable.or(other.is_countable),+ is_mass: self.is_mass.or(other.is_mass),is_possessive: self.is_possessive.or(other.is_possessive),}}@@ -932,79 +921,75 @@ mod tests {#[test]fn puppy_is_noun() {- assert!(md("puppy").noun.is_some());+ assert!(md("puppy").is_noun());}#[test]fn prepare_is_not_noun() {- assert!(md("prepare").noun.is_none());+ assert!(!md("prepare").is_noun());}#[test]fn paris_is_proper_noun() {- assert!(md("Paris").noun.unwrap().is_proper.unwrap());+ assert!(md("Paris").is_proper_noun());}#[test]- fn permit_is_not_proper_noun() {- assert!(matches!(- md("lapdog").noun.and_then(|n| n.is_proper),- None | Some(false)- ));+ fn permit_is_non_proper_noun() {+ assert!(md("lapdog").is_non_proper_noun());}#[test]- #[ignore = "noun singular property not implemented yet"]fn hound_is_singular_noun() {- assert!(md("hound").noun.unwrap().is_singular.unwrap());+ assert!(md("hound").is_singular_noun());+ }++ #[test]+ fn pooches_is_non_singular_noun() {+ assert!(md("pooches").is_non_singular_noun());}+ // Make sure is_non_xxx_noun methods don't behave like is_not_xxx_noun.+ // In other words, make sure they don't return true for words that are not nouns.+ // They must only pass for words that are nouns but not singular etc.#[test]- fn pooches_is_not_singular_noun() {- assert!(matches!(- md("pooches").noun.and_then(|n| n.is_singular),- None | Some(false)- ));+ fn loyal_doesnt_pass_is_non_singular_noun() {+ assert!(!md("loyal").is_non_singular_noun());}#[test]fn hounds_is_plural_noun() {- assert!(md("hounds").noun.unwrap().is_plural.unwrap());+ assert!(md("hounds").is_plural_noun());}#[test]- fn pooch_is_not_plural_noun() {- assert!(matches!(- md("pooch").noun.and_then(|n| n.is_plural),- None | Some(false)- ));+ fn pooch_is_non_plural_noun() {+ assert!(md("pooch").is_non_plural_noun());}#[test]- #[ignore = "noun singular property not implemented yet"]fn fish_is_singular_noun() {- assert!(md("fish").noun.unwrap().is_singular.unwrap());+ assert!(md("fish").is_singular_noun());}#[test]fn fish_is_plural_noun() {- assert!(md("fish").noun.unwrap().is_plural.unwrap());+ assert!(md("fish").is_plural_noun());}#[test]fn fishes_is_plural_noun() {- assert!(md("fishes").noun.unwrap().is_plural.unwrap());+ assert!(md("fishes").is_plural_noun());}#[test]- #[ignore = "noun singular property not implemented yet"]fn sheep_is_singular_noun() {- assert!(md("sheep").noun.unwrap().is_singular.unwrap());+ assert!(md("sheep").is_singular_noun());}#[test]fn sheep_is_plural_noun() {- assert!(md("sheep").noun.unwrap().is_plural.unwrap());+ assert!(md("sheep").is_plural_noun());}#[test]@@ -1014,32 +999,28 @@ mod tests {}#[test]- #[ignore = "noun singular property not implemented yet"]fn bicep_is_singular_noun() {- assert!(md("bicep").noun.unwrap().is_singular.unwrap());+ assert!(md("bicep").is_singular_noun());}#[test]- #[ignore = "noun singular property not implemented yet"]fn biceps_is_singular_noun() {- assert!(md("biceps").noun.unwrap().is_singular.unwrap());+ assert!(md("biceps").is_singular_noun());}#[test]fn biceps_is_plural_noun() {- assert!(md("biceps").noun.unwrap().is_plural.unwrap());+ assert!(md("biceps").is_plural_noun());}#[test]- #[ignore = "noun singular property not implemented yet"]fn aircraft_is_singular_noun() {- assert!(md("aircraft").noun.unwrap().is_singular.unwrap());+ assert!(md("aircraft").is_singular_noun());}#[test]- #[ignore = "noun plural property not implemented yet"]fn aircraft_is_plural_noun() {- assert!(md("aircraft").noun.unwrap().is_plural.unwrap());+ assert!(md("aircraft").is_plural_noun());}#[test]@@ -1050,12 +1031,41 @@ mod tests {#[test]fn dog_apostrophe_s_is_possessive_noun() {- assert!(md("dog's").noun.unwrap().is_possessive.unwrap());+ assert!(md("dog's").is_possessive_noun());}#[test]- fn dogs_is_not_possessive_noun() {- assert!(md("dogs").noun.unwrap().is_possessive.is_none());+ fn dogs_is_non_possessive_noun() {+ assert!(md("dogs").is_non_possessive_noun());+ }++ // noun countability++ #[test]+ fn dog_is_countable() {+ assert!(md("dog").is_countable_noun());+ }+ #[test]+ fn dog_is_non_mass_noun() {+ assert!(md("dog").is_non_mass_noun());+ }++ #[test]+ fn furniture_is_mass_noun() {+ assert!(md("furniture").is_mass_noun());+ }+ #[test]+ fn furniture_is_not_countable_noun() {+ assert!(md("furniture").is_non_countable_noun());+ }++ #[test]+ fn beer_is_countable_noun() {+ assert!(md("beer").is_countable_noun());+ }+ #[test]+ fn beer_is_mass_noun() {+ assert!(md("beer").is_mass_noun());}}@@ -1067,53 +1077,53 @@ mod tests {#[test]fn i_is_pronoun() {- assert!(md("I").pronoun.is_some());+ assert!(md("I").is_pronoun());}#[test]fn i_is_personal_pronoun() {- assert!(md("I").pronoun.unwrap().is_personal.unwrap());+ assert!(md("I").is_personal_pronoun());}#[test]fn i_is_singular_pronoun() {- assert!(md("I").pronoun.unwrap().is_singular.unwrap());+ assert!(md("I").is_singular_pronoun());}#[test]fn i_is_subject_pronoun() {- assert!(md("I").pronoun.unwrap().is_subject.unwrap());+ assert!(md("I").is_subject_pronoun());}#[test]fn me_is_pronoun() {- assert!(md("me").pronoun.is_some());+ assert!(md("me").is_pronoun());}#[test]fn me_is_personal_pronoun() {- assert!(md("me").pronoun.unwrap().is_personal.unwrap());+ assert!(md("me").is_personal_pronoun());}#[test]fn me_is_singular_pronoun() {- assert!(md("me").pronoun.unwrap().is_singular.unwrap());+ assert!(md("me").is_singular_pronoun());}#[test]fn me_is_object_pronoun() {- assert!(md("me").pronoun.unwrap().is_object.unwrap());+ assert!(md("me").is_object_pronoun());}#[test]fn myself_is_pronoun() {- assert!(md("myself").pronoun.is_some());+ assert!(md("myself").is_pronoun());}#[test]fn myself_is_personal_pronoun() {- assert!(md("myself").pronoun.unwrap().is_personal.unwrap());+ assert!(md("myself").is_personal_pronoun());}#[test]fn myself_is_singular_pronoun() {- assert!(md("myself").pronoun.unwrap().is_singular.unwrap());+ assert!(md("myself").is_singular_pronoun());}#[test]fn myself_is_reflexive_pronoun() {- assert!(md("myself").pronoun.unwrap().is_reflexive.unwrap());+ assert!(md("myself").is_reflexive_pronoun());}}@@ -1122,53 +1132,53 @@ mod tests {#[test]fn we_is_pronoun() {- assert!(md("we").pronoun.is_some());+ assert!(md("we").is_pronoun());}#[test]fn we_is_personal_pronoun() {- assert!(md("we").pronoun.unwrap().is_personal.unwrap());+ assert!(md("we").is_personal_pronoun());}#[test]fn we_is_plural_pronoun() {- assert!(md("we").pronoun.unwrap().is_plural.unwrap());+ assert!(md("we").is_plural_pronoun());}#[test]fn we_is_subject_pronoun() {- assert!(md("we").pronoun.unwrap().is_subject.unwrap());+ assert!(md("we").is_subject_pronoun());}#[test]fn us_is_pronoun() {- assert!(md("us").pronoun.is_some());+ assert!(md("us").is_pronoun());}#[test]fn us_is_personal_pronoun() {- assert!(md("us").pronoun.unwrap().is_personal.unwrap());+ assert!(md("us").is_personal_pronoun());}#[test]fn us_is_plural_pronoun() {- assert!(md("us").pronoun.unwrap().is_plural.unwrap());+ assert!(md("us").is_plural_pronoun());}#[test]fn us_is_object_pronoun() {- assert!(md("us").pronoun.unwrap().is_object.unwrap());+ assert!(md("us").is_object_pronoun());}#[test]fn ourselves_is_pronoun() {- assert!(md("ourselves").pronoun.is_some());+ assert!(md("ourselves").is_pronoun());}#[test]fn ourselves_is_personal_pronoun() {- assert!(md("ourselves").pronoun.unwrap().is_personal.unwrap());+ assert!(md("ourselves").is_personal_pronoun());}#[test]fn ourselves_is_plural_pronoun() {- assert!(md("ourselves").pronoun.unwrap().is_plural.unwrap());+ assert!(md("ourselves").is_plural_pronoun());}#[test]fn ourselves_is_reflexive_pronoun() {- assert!(md("ourselves").pronoun.unwrap().is_reflexive.unwrap());+ assert!(md("ourselves").is_reflexive_pronoun());}}@@ -1177,43 +1187,43 @@ mod tests {#[test]fn you_is_pronoun() {- assert!(md("you").pronoun.is_some());+ assert!(md("you").is_pronoun());}#[test]fn you_is_personal_pronoun() {- assert!(md("you").pronoun.unwrap().is_personal.unwrap());+ assert!(md("you").is_personal_pronoun());}#[test]fn you_is_singular_pronoun() {- assert!(md("you").pronoun.unwrap().is_singular.unwrap());+ assert!(md("you").is_singular_pronoun());}#[test]fn you_is_plural_pronoun() {- assert!(md("you").pronoun.unwrap().is_plural.unwrap());+ assert!(md("you").is_plural_pronoun());}#[test]fn you_is_subject_pronoun() {- assert!(md("you").pronoun.unwrap().is_subject.unwrap());+ assert!(md("you").is_subject_pronoun());}#[test]fn you_is_object_pronoun() {- assert!(md("you").pronoun.unwrap().is_object.unwrap());+ assert!(md("you").is_object_pronoun());}#[test]fn yourself_is_pronoun() {- assert!(md("yourself").pronoun.is_some());+ assert!(md("yourself").is_pronoun());}#[test]fn yourself_is_personal_pronoun() {- assert!(md("yourself").pronoun.unwrap().is_personal.unwrap());+ assert!(md("yourself").is_personal_pronoun());}#[test]fn yourself_is_singular_pronoun() {- assert!(md("yourself").pronoun.unwrap().is_singular.unwrap());+ assert!(md("yourself").is_singular_pronoun());}#[test]fn yourself_is_reflexive_pronoun() {- assert!(md("yourself").pronoun.unwrap().is_reflexive.unwrap());+ assert!(md("yourself").is_reflexive_pronoun());}}@@ -1222,53 +1232,53 @@ mod tests {#[test]fn he_is_pronoun() {- assert!(md("he").pronoun.is_some());+ assert!(md("he").is_pronoun());}#[test]fn he_is_personal_pronoun() {- assert!(md("he").pronoun.unwrap().is_personal.unwrap());+ assert!(md("he").is_personal_pronoun());}#[test]fn he_is_singular_pronoun() {- assert!(md("he").pronoun.unwrap().is_singular.unwrap());+ assert!(md("he").is_singular_pronoun());}#[test]fn he_is_subject_pronoun() {- assert!(md("he").pronoun.unwrap().is_subject.unwrap());+ assert!(md("he").is_subject_pronoun());}#[test]fn him_is_pronoun() {- assert!(md("him").pronoun.is_some());+ assert!(md("him").is_pronoun());}#[test]fn him_is_personal_pronoun() {- assert!(md("him").pronoun.unwrap().is_personal.unwrap());+ assert!(md("him").is_personal_pronoun());}#[test]fn him_is_singular_pronoun() {- assert!(md("him").pronoun.unwrap().is_singular.unwrap());+ assert!(md("him").is_singular_pronoun());}#[test]fn him_is_object_pronoun() {- assert!(md("him").pronoun.unwrap().is_object.unwrap());+ assert!(md("him").is_object_pronoun());}#[test]fn himself_is_pronoun() {- assert!(md("himself").pronoun.is_some());+ assert!(md("himself").is_pronoun());}#[test]fn himself_is_personal_pronoun() {- assert!(md("himself").pronoun.unwrap().is_personal.unwrap());+ assert!(md("himself").is_personal_pronoun());}#[test]fn himself_is_singular_pronoun() {- assert!(md("himself").pronoun.unwrap().is_singular.unwrap());+ assert!(md("himself").is_singular_pronoun());}#[test]fn himself_is_reflexive_pronoun() {- assert!(md("himself").pronoun.unwrap().is_reflexive.unwrap());+ assert!(md("himself").is_reflexive_pronoun());}}@@ -1277,53 +1287,53 @@ mod tests {#[test]fn she_is_pronoun() {- assert!(md("she").pronoun.is_some());+ assert!(md("she").is_pronoun());}#[test]fn she_is_personal_pronoun() {- assert!(md("she").pronoun.unwrap().is_personal.unwrap());+ assert!(md("she").is_personal_pronoun());}#[test]fn she_is_singular_pronoun() {- assert!(md("she").pronoun.unwrap().is_singular.unwrap());+ assert!(md("she").is_singular_pronoun());}#[test]fn she_is_subject_pronoun() {- assert!(md("she").pronoun.unwrap().is_subject.unwrap());+ assert!(md("she").is_subject_pronoun());}#[test]fn her_is_pronoun() {- assert!(md("her").pronoun.is_some());+ assert!(md("her").is_pronoun());}#[test]fn her_is_personal_pronoun() {- assert!(md("her").pronoun.unwrap().is_personal.unwrap());+ assert!(md("her").is_personal_pronoun());}#[test]fn her_is_singular_pronoun() {- assert!(md("her").pronoun.unwrap().is_singular.unwrap());+ assert!(md("her").is_singular_pronoun());}#[test]fn her_is_object_pronoun() {- assert!(md("her").pronoun.unwrap().is_object.unwrap());+ assert!(md("her").is_object_pronoun());}#[test]fn herself_is_pronoun() {- assert!(md("herself").pronoun.is_some());+ assert!(md("herself").is_pronoun());}#[test]fn herself_is_personal_pronoun() {- assert!(md("herself").pronoun.unwrap().is_personal.unwrap());+ assert!(md("herself").is_personal_pronoun());}#[test]fn herself_is_singular_pronoun() {- assert!(md("herself").pronoun.unwrap().is_singular.unwrap());+ assert!(md("herself").is_singular_pronoun());}#[test]fn herself_is_reflexive_pronoun() {- assert!(md("herself").pronoun.unwrap().is_reflexive.unwrap());+ assert!(md("herself").is_reflexive_pronoun());}}@@ -1332,40 +1342,40 @@ mod tests {#[test]fn it_is_pronoun() {- assert!(md("it").pronoun.is_some());+ assert!(md("it").is_pronoun());}#[test]fn it_is_personal_pronoun() {- assert!(md("it").pronoun.unwrap().is_personal.unwrap());+ assert!(md("it").is_personal_pronoun());}#[test]fn it_is_singular_pronoun() {- assert!(md("it").pronoun.unwrap().is_singular.unwrap());+ assert!(md("it").is_singular_pronoun());}#[test]fn it_is_subject_pronoun() {- assert!(md("it").pronoun.unwrap().is_subject.unwrap());+ assert!(md("it").is_subject_pronoun());}#[test]fn it_is_object_pronoun() {- assert!(md("it").pronoun.unwrap().is_object.unwrap());+ assert!(md("it").is_object_pronoun());}#[test]fn itself_is_pronoun() {- assert!(md("itself").pronoun.is_some());+ assert!(md("itself").is_pronoun());}#[test]fn itself_is_personal_pronoun() {- assert!(md("itself").pronoun.unwrap().is_personal.unwrap());+ assert!(md("itself").is_personal_pronoun());}#[test]fn itself_is_singular_pronoun() {- assert!(md("itself").pronoun.unwrap().is_singular.unwrap());+ assert!(md("itself").is_singular_pronoun());}#[test]fn itself_is_reflexive_pronoun() {- assert!(md("itself").pronoun.unwrap().is_reflexive.unwrap());+ assert!(md("itself").is_reflexive_pronoun());}}@@ -1374,110 +1384,110 @@ mod tests {#[test]fn they_is_pronoun() {- assert!(md("they").pronoun.is_some());+ assert!(md("they").is_pronoun());}#[test]fn they_is_personal_pronoun() {- assert!(md("they").pronoun.unwrap().is_personal.unwrap());+ assert!(md("they").is_personal_pronoun());}#[test]fn they_is_plural_pronoun() {- assert!(md("they").pronoun.unwrap().is_plural.unwrap());+ assert!(md("they").is_plural_pronoun());}#[test]fn they_is_subject_pronoun() {- assert!(md("they").pronoun.unwrap().is_subject.unwrap());+ assert!(md("they").is_subject_pronoun());}#[test]fn them_is_pronoun() {- assert!(md("them").pronoun.is_some());+ assert!(md("them").is_pronoun());}#[test]fn them_is_personal_pronoun() {- assert!(md("them").pronoun.unwrap().is_personal.unwrap());+ assert!(md("them").is_personal_pronoun());}#[test]fn them_is_plural_pronoun() {- assert!(md("them").pronoun.unwrap().is_plural.unwrap());+ assert!(md("them").is_plural_pronoun());}#[test]fn them_is_object_pronoun() {- assert!(md("them").pronoun.unwrap().is_object.unwrap());+ assert!(md("them").is_object_pronoun());}#[test]fn themselves_is_pronoun() {- assert!(md("themselves").pronoun.is_some());+ assert!(md("themselves").is_pronoun());}#[test]fn themselves_is_personal_pronoun() {- assert!(md("themselves").pronoun.unwrap().is_personal.unwrap());+ assert!(md("themselves").is_personal_pronoun());}#[test]fn themselves_is_plural_pronoun() {- assert!(md("themselves").pronoun.unwrap().is_plural.unwrap());+ assert!(md("themselves").is_plural_pronoun());}#[test]fn themselves_is_reflexive_pronoun() {- assert!(md("themselves").pronoun.unwrap().is_reflexive.unwrap());+ assert!(md("themselves").is_reflexive_pronoun());}}// Possessive pronouns (not to be confused with possessive adjectives/determiners)#[test]fn mine_is_pronoun() {- assert!(md("mine").pronoun.is_some());+ assert!(md("mine").is_pronoun());}#[test]fn ours_is_pronoun() {- assert!(md("ours").pronoun.is_some());+ assert!(md("ours").is_pronoun());}#[test]fn yours_is_pronoun() {- assert!(md("yours").pronoun.is_some());+ assert!(md("yours").is_pronoun());}#[test]fn his_is_pronoun() {- assert!(md("his").pronoun.is_some());+ assert!(md("his").is_pronoun());}#[test]fn hers_is_pronoun() {- assert!(md("hers").pronoun.is_some());+ assert!(md("hers").is_pronoun());}#[test]fn its_is_pronoun() {- assert!(md("its").pronoun.is_some());+ assert!(md("its").is_pronoun());}#[test]fn theirs_is_pronoun() {- assert!(md("theirs").pronoun.is_some());+ assert!(md("theirs").is_pronoun());}// archaic pronouns#[test]fn archaic_pronouns() {- assert!(md("thou").pronoun.is_some());- assert!(md("thee").pronoun.is_some());- assert!(md("thyself").pronoun.is_some());- assert!(md("thine").pronoun.is_some());+ assert!(md("thou").is_pronoun());+ assert!(md("thee").is_pronoun());+ assert!(md("thyself").is_pronoun());+ assert!(md("thine").is_pronoun());}// generic pronouns#[test]fn generic_pronouns() {- assert!(md("one").pronoun.is_some());- assert!(md("oneself").pronoun.is_some());+ assert!(md("one").is_pronoun());+ assert!(md("oneself").is_pronoun());}// relative and interrogative pronouns#[test]fn relative_and_interrogative_pronouns() {- assert!(md("who").pronoun.is_some());- assert!(md("whom").pronoun.is_some());- assert!(md("whose").pronoun.is_some());- assert!(md("which").pronoun.is_some());- assert!(md("what").pronoun.is_some());+ assert!(md("who").is_pronoun());+ assert!(md("whom").is_pronoun());+ assert!(md("whose").is_pronoun());+ assert!(md("which").is_pronoun());+ assert!(md("what").is_pronoun());}// nonstandard pronouns@@ -1491,14 +1501,14 @@ mod tests {#[test]fn the_is_determiner() {- assert!(md("the").determiner.is_some());+ assert!(md("the").is_determiner());}#[test]fn this_is_demonstrative_determiner() {- assert!(md("this").determiner.unwrap().is_demonstrative.unwrap());+ assert!(md("this").is_demonstrative_determiner());}#[test]fn your_is_possessive_determiner() {- assert!(md("your").determiner.unwrap().is_possessive.unwrap());+ assert!(md("your").is_possessive_determiner());}}diff --git a/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml b/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.ymlindex c86533ef9..13ebbaa74 100644--- a/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml+++ b/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml@@ -2815,9 +2815,9 @@ Message: |2485 | > evening, beautiful Soup! Beau—ootiful Soo—oop! Beau—ootiful Soo—oop! Soo—oop| ^~~ Did you mean to spell `Soo` this way?Suggest:- - Replace with: “Sop”- - Replace with: “Soho”- - Replace with: “Soto”+ - Replace with: “Soon”+ - Replace with: “Sou”+ - Replace with: “Soy”@@ -2848,9 +2848,9 @@ Message: |2485 | > evening, beautiful Soup! Beau—ootiful Soo—oop! Beau—ootiful Soo—oop! Soo—oop| ^~~ Did you mean to spell `Soo` this way?Suggest:- - Replace with: “Sop”- - Replace with: “Soho”- - Replace with: “Soto”+ - Replace with: “Soon”+ - Replace with: “Sou”+ - Replace with: “Soy”@@ -2871,9 +2871,9 @@ Message: || ^~~ Did you mean to spell `Soo` this way?2486 | > of the e—e—evening, Beautiful, beautiful Soup!Suggest:- - Replace with: “Sop”- - Replace with: “Soho”- - Replace with: “Soto”+ - Replace with: “Soon”+ - Replace with: “Sou”+ - Replace with: “Soy”@@ -2925,9 +2925,9 @@ Message: |2490 | > beautiful Soup? Beau—ootiful Soo—oop! Beau—ootiful Soo—oop! Soo—oop of the| ^~~ Did you mean to spell `Soo` this way?Suggest:- - Replace with: “Sop”- - Replace with: “Soho”- - Replace with: “Soto”+ - Replace with: “Soon”+ - Replace with: “Sou”+ - Replace with: “Soy”@@ -2958,9 +2958,9 @@ Message: |2490 | > beautiful Soup? Beau—ootiful Soo—oop! Beau—ootiful Soo—oop! Soo—oop of the| ^~~ Did you mean to spell `Soo` this way?Suggest:- - Replace with: “Sop”- - Replace with: “Soho”- - Replace with: “Soto”+ - Replace with: “Soon”+ - Replace with: “Sou”+ - Replace with: “Soy”@@ -2981,9 +2981,9 @@ Message: || ^~~ Did you mean to spell `Soo` this way?2491 | > e—e—evening, Beautiful, beauti—FUL SOUP!”Suggest:- - Replace with: “Sop”- - Replace with: “Soho”- - Replace with: “Soto”+ - Replace with: “Soon”+ - Replace with: “Sou”+ - Replace with: “Soy”@@ -3056,9 +3056,9 @@ Message: |2503 | > “Soo—oop of the e—e—evening, Beautiful, beautiful Soup!”| ^~~ Did you mean to spell `Soo` this way?Suggest:- - Replace with: “Sop”- - Replace with: “Soho”- - Replace with: “Soto”+ - Replace with: “Soon”+ - Replace with: “Sou”+ - Replace with: “Soy”diff --git a/harper-core/tests/text/linters/Computer science.snap.yml b/harper-core/tests/text/linters/Computer science.snap.ymlindex ea21c1ec7..a39a5ee50 100644--- a/harper-core/tests/text/linters/Computer science.snap.yml+++ b/harper-core/tests/text/linters/Computer science.snap.yml@@ -642,9 +642,9 @@ Message: |182 | Newell and Herbert A. Simon argued in 1975,| ^~ Did you mean to spell `A.` this way?Suggest:- - Replace with: “Aw”+ - Replace with: “Av”+ - Replace with: “A”- Replace with: “Ab”- - Replace with: “Ac”diff --git a/harper-core/tests/text/linters/Part-of-speech tagging.snap.yml b/harper-core/tests/text/linters/Part-of-speech tagging.snap.ymlindex 4e714628b..faefb8a23 100644--- a/harper-core/tests/text/linters/Part-of-speech tagging.snap.yml+++ b/harper-core/tests/text/linters/Part-of-speech tagging.snap.yml@@ -520,7 +520,7 @@ Message: || ^~~ Did you mean to spell `SVM` this way?Suggest:- Replace with: “Sim”- - Replace with: “Sam”+ - Replace with: “SAM”- Replace with: “SCM”diff --git a/harper-core/tests/text/linters/The Great Gatsby.snap.yml b/harper-core/tests/text/linters/The Great Gatsby.snap.ymlindex 987cdfae0..c4401de9d 100644--- a/harper-core/tests/text/linters/The Great Gatsby.snap.yml+++ b/harper-core/tests/text/linters/The Great Gatsby.snap.yml@@ -2475,9 +2475,9 @@ Message: |1862 | The Dancies came, too, and S. B. Whitebait, who was well over sixty, and Maurice| ^~ Did you mean to spell `S.` this way?Suggest:+ - Replace with: “Sf”+ - Replace with: “Sh”- Replace with: “So”- - Replace with: “Sq”- - Replace with: “St”@@ -2498,9 +2498,9 @@ Message: |1863 | A. Flink, and the Hammerheads, and Beluga the tobacco importer, and Beluga’s| ^~ Did you mean to spell `A.` this way?Suggest:- - Replace with: “Aw”+ - Replace with: “Av”+ - Replace with: “A”- Replace with: “Ab”- - Replace with: “Ac”@@ -2578,9 +2578,9 @@ Message: |1868 | Excellence, and Eckhaust and Clyde Cohen and Don S. Schwartze (the son) and| ^~ Did you mean to spell `S.` this way?Suggest:+ - Replace with: “Sf”+ - Replace with: “Sh”- Replace with: “So”- - Replace with: “Sq”- - Replace with: “St”@@ -2867,9 +2867,9 @@ Message: |1881 | Scullys and S. W. Belcher and the Smirkes and the young Quinns, divorced now,| ^~ Did you mean to spell `S.` this way?Suggest:+ - Replace with: “Sf”+ - Replace with: “Sh”- Replace with: “So”- - Replace with: “Sq”- - Replace with: “St”diff --git a/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md b/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.mdindex e42607a9b..1aebd08ec 100644--- a/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md+++ b/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md@@ -113,7 +113,7 @@> lessons in the schoolroom , and though this was not a very good opportunity for# NPl/V+ NPr/J/P D NSg . V/C V/C I/Ddem+ V NSg/C D/P J/R NPr/V/J NSg C/P> showing off her knowledge , as there was no one to listen to her , still it was-# NSg/V NSg/V/J/P ISg/D$+ NSg/V+ . NSg/R + V NPr/P NSg/I/V/J+ P NSg/V P ISg/D$+ . NSg/V/J NPr/ISg+ V+# NSg/V NSg/V/J/P ISg/D$+ NSg+ . NSg/R + V NPr/P NSg/I/V/J+ P NSg/V P ISg/D$+ . NSg/V/J NPr/ISg+ V> good practice to say it over ) “ — yes , that’s about the right distance — but then I# NPr/V/J NSg/V P NSg/V NPr/ISg+ NSg/V/J/P . . . NPl/V . NSg$ J/P D+ NPr/V/J+ NSg/V+ . NSg/C/P NSg/J/C ISg+> wonder what Latitude or Longitude I’ve got to ? ” ( Alice had no idea what Latitude@@ -323,7 +323,7 @@> sharply ; “ I advise you to leave off this minute ! ” She generally gave herself# R . . ISg+ NSg/V ISgPl+ P NSg/V NSg/V/J/P I/Ddem+ NSg/V/J+ . . ISg+ R V ISg+> very good advice , ( though she very seldom followed it ) , and sometimes she-# J/R NPr/V/J+ NSg/V+ . . V/C ISg+ J/R R V/J NPr/ISg+ . . V/C R ISg++# J/R NPr/V/J+ NSg+ . . V/C ISg+ J/R R V/J NPr/ISg+ . . V/C R ISg+> scolded herself so severely as to bring tears into her eyes ; and once she# V/J ISg+ NSg/I/J/C R NSg/R P V NPl/V+ P ISg/D$+ NPl/V+ . V/C NSg/C ISg+> remembered trying to box her own ears for having cheated herself in a game of@@ -633,7 +633,7 @@> “ Perhaps it doesn’t understand English , ” thought Alice ; “ I daresay it’s a French# . NSg NPr/ISg+ V V NPr/V/J+ . . NSg/V NPr+ . . ISg+ V W? D/P+ NPr/V/J+> mouse , come over with William the Conqueror . ” ( For , with all her knowledge of-# NSg/V . NSg/V/P NSg/V/J/P P NPr+ D+ NSg . . . C/P . P NSg/I/J/C ISg/D$+ NSg/V P+# NSg/V . NSg/V/P NSg/V/J/P P NPr+ D+ NSg . . . C/P . P NSg/I/J/C ISg/D$+ NSg P> history , Alice had no very clear notion how long ago anything had happened . ) So# NSg+ . NPr+ V NPr/P+ J/R NSg/V/J NSg+ NSg/C NPr/V/J J/P NSg/I/V+ V+ V/J . . NSg/I/J/C> she began again : “ Où est ma chatte ? ” which was the first sentence in her French@@ -882,8 +882,8 @@# NSg/I/C D+ NSg/V+ V NSg/V/J/P . C . NSg/I/C IPl+ V NSg/V NSg/V/J/P NSg/V/J/P+ D/P NSg NPr/C NSg/I/J/C .> and were quite dry again , the Dodo suddenly called out “ The race is over ! ” and# V/C NSg/V NSg NSg/V/J+ P . D NSg R V/J NSg/V/J/R/P . D+ NSg/V+ VL NSg/V/J/P . . V/C-> they all crowded round it , panting , and asking , “ But who has won ? ”-# IPl+ NSg/I/J/C V/J NSg/V/J/P NPr/ISg . V . V/C V . . NSg/C/P NPr/I+ V NSg/V . .+> they all crowded round it , panting , and asking , “ But who has won ? ”+# IPl+ NSg/I/J/C V/J NSg/V/J/P NPr/ISg . V . V/C V . . NSg/C/P NPr/I+ V NSgPl/V . .>#> This question the Dodo could not answer without a great deal of thought , and it@@ -892,8 +892,8 @@# NSg/V/J C/P D/P NPr/V/J NSg/V/J P NSg/I/V/J NSg/V+ V/J P ISg/D$+ NSg . D+ NSg/V+ NPr/J/P> which you usually see Shakespeare , in the pictures of him ) , while the rest# I/C+ ISgPl+ R NSg/V NPr/V+ . NPr/J/P D NPl/V P ISg+ . . NSg/V/C/P D+ NSg/V+-> waited in silence . At last the Dodo said , “ Everybody has won , and all must have-# V/J NPr/J/P NSg/V+ . NSg/P NSg/V/J D NSg V/J . . NSg/I+ V NSg/V . V/C NSg/I/J/C NSg/V NSg/VX+> waited in silence . At last the Dodo said , “ Everybody has won , and all must have+# V/J NPr/J/P NSg/V+ . NSg/P NSg/V/J D NSg V/J . . NSg/I+ V NSgPl/V . V/C NSg/I/J/C NSg/V NSg/VX> prizes . ”# NPl/V . .>@@ -1535,7 +1535,7 @@> expecting every moment to be trampled under its feet , ran round the thistle# V D+ NSg+ P NSg/VX V/J NSg/J/P ISg/D$+ NPl+ . NSg/V NSg/V/J/P D NSg> again ; then the puppy began a series of short charges at the stick , running a-# P . NSg/J/C D+ NSg/V+ V D/P NSg P NPr/V/J/P NPl/V NSg/P D+ NSg/V/J+ . NSg/V/J/P D/P+# P . NSg/J/C D+ NSg/V+ V D/P NSgPl P NPr/V/J/P NPl/V NSg/P D+ NSg/V/J+ . NSg/V/J/P D/P> very little way forwards each time and a long way back , and barking hoarsely all# J/R NPr/I/J NSg/J NPl/V D+ NSg/V/J V/C D/P NPr/V/J+ NSg/J+ NSg/V/J . V/C V+ R NSg/I/J/C> the while , till at last it sat down a good way off , panting , with its tongue@@ -1591,7 +1591,7 @@>#> CHAPTER V : Advice from a Caterpillar-# NSg/V NSg/P . NSg/V P D/P NSg/V++# NSg/V NSg/P . NSg P D/P NSg/V+>#> The Caterpillar and Alice looked at each other for some time in silence : at last@@ -2126,8 +2126,8 @@# NSg/J/P . NSg/I/C R D/P NSg NPr/J/P NSg/V/J NSg/V/P NSg/V/J/P NSg/V/J/R/P P D+ NPr/V/J+ . . ISg+> considered him to be a footman because he was in livery : otherwise , judging by# V/J ISg+ P NSg/VX D/P NSg C/P NPr/ISg+ V NPr/J/P NSg/V/J . J . V NSg/J/P-> his face only , she would have called him a fish ) — and rapped loudly at the door-# ISg/D$+ NSg/V+ J/R/C . ISg+ NSg/VX NSg/VX V/J ISg+ D/P+ NPl/V+ . . V/C V R NSg/P D+ NSg/V++> his face only , she would have called him a fish ) — and rapped loudly at the door+# ISg/D$+ NSg/V+ J/R/C . ISg+ NSg/VX NSg/VX V/J ISg+ D/P+ NSgPl/V+ . . V/C V R NSg/P D+ NSg/V+> with his knuckles . It was opened by another footman in livery , with a round# P ISg/D$+ NPl/V+ . NPr/ISg+ V V/J NSg/J/P I/D NSg NPr/J/P NSg/V/J . P D/P NSg/V/J/P> face , and large eyes like a frog ; and both footmen , Alice noticed , had powdered@@ -2138,8 +2138,8 @@# NSg/I/J/C J/P . V/C V D/P NPr/I/J NSg/J NSg/V/J/R/P P D+ NPr/V/J+ P+ NSg/V+ .>#-> The Fish - Footman began by producing from under his arm a great letter , nearly as-# D+ NPl/V . NSg V NSg/J/P V P NSg/J/P ISg/D$+ NSg/V/J D/P+ NSg/J+ NSg/V+ . R NSg/R+> The Fish - Footman began by producing from under his arm a great letter , nearly as+# D+ NSgPl/V . NSg V NSg/J/P V P NSg/J/P ISg/D$+ NSg/V/J D/P+ NSg/J+ NSg/V+ . R NSg/R> large as himself , and this he handed over to the other , saying , in a solemn# NSg/J NSg/R ISg+ . V/C I/Ddem+ NPr/ISg+ V/J NSg/V/J/P P D NSg/V/J . NSg/V . NPr/J/P D/P+ J+> tone , “ For the Duchess . An invitation from the Queen to play croquet . ” The@@ -2156,8 +2156,8 @@#> Alice laughed so much at this , that she had to run back into the wood for fear# NPr+ V/J NSg/I/J/C NSg/I/J NSg/P I/Ddem+ . NSg/I/C/Ddem ISg+ V P NSg/V NSg/V/J P D NPr/V/J C/P NSg/V-> of their hearing her ; and when she next peeped out the Fish - Footman was gone ,-# P D$+ NSg/V/J+ ISg/D$+ . V/C NSg/I/C ISg+ NSg/J/P V/J NSg/V/J/R/P D NPl/V+ . NSg V V/J/P .+> of their hearing her ; and when she next peeped out the Fish - Footman was gone ,+# P D$+ NSg/V/J+ ISg/D$+ . V/C NSg/I/C ISg+ NSg/J/P V/J NSg/V/J/R/P D NSgPl/V+ . NSg V V/J/P .> and the other was sitting on the ground near the door , staring stupidly up into# V/C D NSg/V/J V NSg/V/J J/P D NSg/V/J NSg/V/J/P D+ NSg/V+ . V R NSg/V/J/P P> the sky .@@ -2361,7 +2361,7 @@> “ Which would not be an advantage , ” said Alice , who felt very glad to get an# . I/C+ NSg/VX NSg/C NSg/VX D/P NSg/V . . V/J NPr+ . NPr/I+ NSg/V/J J/R NSg/V/J P NSg/V D/P> opportunity of showing off a little of her knowledge . “ Just think of what work-# NSg P NSg/V NSg/V/J/P D/P NPr/I/J P ISg/D$+ NSg/V+ . . V/J NSg/V P NSg/I+ NSg/V++# NSg P NSg/V NSg/V/J/P D/P NPr/I/J P ISg/D$+ NSg+ . . V/J NSg/V P NSg/I+ NSg/V+> it would make with the day and night ! You see the earth takes twenty - four hours# NPr/ISg+ NSg/VX NSg/V P D NPr V/C NSg/V+ . ISgPl+ NSg/V D+ NPr/V+ NPl/V NSg . NSg NPl> to turn round on its axis — ”@@ -2438,8 +2438,8 @@# NPr+ V/J D+ NSg/V/J+ P I/J/R+ NSg+ . NSg/R NPr/ISg+ V D/P NSg/V/J . V/J NPr/I/J+> creature , and held out its arms and legs in all directions , “ just like a# NSg . V/C V NSg/V/J/R/P ISg/D$+ NPl/V V/C NPl/V+ NPr/J/P NSg/I/J/C+ NSg+ . . V/J NSg/V/J/C/P D/P-> star - fish , ” thought Alice . The poor little thing was snorting like a-# NSg/V+ . NPl/V . . NSg/V NPr+ . D NSg/V/J NPr/I/J NSg/V+ V V NSg/V/J/C/P D/P+> star - fish , ” thought Alice . The poor little thing was snorting like a+# NSg/V+ . NSgPl/V . . NSg/V NPr+ . D NSg/V/J NPr/I/J NSg/V+ V V NSg/V/J/C/P D/P> steam - engine when she caught it , and kept doubling itself up and straightening# NSg/V/J+ . NSg/V NSg/I/C ISg+ V/J NPr/ISg+ . V/C V V ISg+ NSg/V/J/P V/C V> itself out again , so that altogether , for the first minute or two , it was as@@ -4520,10 +4520,10 @@# . NSg/V . . V/J D ? . . ISgPl+ NSg/V/J+ NSg/V P D/P NSg/V P D NSg+ . NSg/V . .>#-> “ Two lines ! ” cried the Mock Turtle . “ Seals , turtles , salmon , and so on ; then ,-# . NSg+ NPl/V+ . . V/J D+ NSg/V/J+ NSg/V+ . . NPl/V+ . NPl/V . NSg/V/J+ . V/C NSg/I/J/C J/P . NSg/J/C .-> when you’ve cleared all the jelly - fish out of the way — ”-# NSg/I/C W? V/J NSg/I/J/C D NSg/V/J+ . NPl/V NSg/V/J/R/P P D+ NSg/J+ . .+> “ Two lines ! ” cried the Mock Turtle . “ Seals , turtles , salmon , and so on ; then ,+# . NSg+ NPl/V+ . . V/J D+ NSg/V/J+ NSg/V+ . . NPl/V+ . NPl/V . NSgPl/V/J+ . V/C NSg/I/J/C J/P . NSg/J/C .+> when you’ve cleared all the jelly - fish out of the way — ”+# NSg/I/C W? V/J NSg/I/J/C D NSg/V/J+ . NSgPl/V NSg/V/J/R/P P D+ NSg/J+ . .>#> “ That generally takes some time , ” interrupted the Gryphon .@@ -4749,7 +4749,7 @@>#> “ Soles and eels , of course , ” the Gryphon replied rather impatiently : “ any shrimp-# . NPl/V V/C NPl/V . P NSg/V+ . . D ? V/J NPr/V/J R . . I/R/D+ NSg/V++# . NPl/V V/C NPl/V . P NSg/V+ . . D ? V/J NPr/V/J R . . I/R/D+ NSgPl/V+> could have told you that . ”# NSg/VX NSg/VX V ISgPl+ NSg/I/C/Ddem+ . .>@@ -4763,7 +4763,7 @@>#> “ They were obliged to have him with them , ” the Mock Turtle said : “ no wise fish-# . IPl+ NSg/V V/J P NSg/VX ISg+ P NSg/IPl+ . . D+ NSg/V/J+ NSg/V+ V/J . . NPr/P+ NPr/V/J NPl/V++# . IPl+ NSg/V V/J P NSg/VX ISg+ P NSg/IPl+ . . D+ NSg/V/J+ NSg/V+ V/J . . NPr/P+ NPr/V/J NSgPl/V+> would go anywhere without a porpoise . ”# NSg/VX NSg/V/J NSg/I C/P D/P+ NSg/V+ . .>@@ -4772,8 +4772,8 @@# . VX NPr/ISg+ R . . V/J NPr+ NPr/J/P D/P NSg/I/V P NSg/J+ NSg/V+ .>#-> “ Of course not , ” said the Mock Turtle : “ why , if a fish came to me , and told me-# . P NSg/V+ NSg/C . . V/J D+ NSg/V/J+ NSg/V+ . . NSg/V . NSg/C D/P NPl/V+ NSg/V/P P NPr/ISg+ . V/C V NPr/ISg++> “ Of course not , ” said the Mock Turtle : “ why , if a fish came to me , and told me+# . P NSg/V+ NSg/C . . V/J D+ NSg/V/J+ NSg/V+ . . NSg/V . NSg/C D/P NSgPl/V+ NSg/V/P P NPr/ISg+ . V/C V NPr/ISg+> he was going a journey , I should say ‘ With what porpoise ? ’ ”# NPr/ISg+ V NSg/V/J D/P+ NSg/V+ . ISg+ VX NSg/V Unlintable P NSg/I+ NSg/V+ . . .>@@ -4974,8 +4974,8 @@# P D+ NPr/I+ . NPr/I+ . NSg/V+ . NSg/J . NSg/J+ NSg/V+ .>#-> “ Beautiful Soup ! Who cares for fish , Game , or any other dish ? Who would not-# . NSg/J NSg/V . NPr/I+ NPl/V C/P NPl/V . NSg/V/J+ . NPr/C I/R/D+ NSg/V/J+ NSg/V+ . NPr/I+ NSg/VX NSg/C+> “ Beautiful Soup ! Who cares for fish , Game , or any other dish ? Who would not+# . NSg/J NSg/V . NPr/I+ NPl/V C/P NSgPl/V . NSg/V/J+ . NPr/C I/R/D+ NSg/V/J+ NSg/V+ . NPr/I+ NSg/VX NSg/C> give all else for two p ennyworth only of beautiful Soup ? Pennyworth only of# NSg/V NSg/I/J/C NSg/J/C C/P NSg+ NPr/V/J/P+ ? J/R/C P NSg/J NSg/V+ . NSg J/R/C P> beautiful Soup ? Beau — ootiful Soo — oop ! Beau — ootiful Soo — oop ! Soo — oop of the@@ -5501,7 +5501,7 @@> on to the heads of the crowd below , and there they lay sprawling about ,# J/P P D NPl/V P D+ NSg/V+ P . V/C + IPl+ NSg/V/J V J/P .> reminding her very much of a globe of goldfish she had accidentally upset the-# V ISg/D$+ J/R NSg/I/J P D/P NSg/V P NSg ISg+ V R NSg/V/J D++# V ISg/D$+ J/R NSg/I/J P D/P NSg/V P NSgPl ISg+ V R NSg/V/J D+> week before .# NSg/J+ C/P+ .>@@ -5509,7 +5509,7 @@> “ Oh , I beg your pardon ! ” she exclaimed in a tone of great dismay , and began# . NPr/V . ISg+ NSg/V D$+ NSg/V . . ISg+ V/J NPr/J/P D/P NSg/I/V P NSg/J+ NSg/V+ . V/C V> picking them up again as quickly as she could , for the accident of the goldfish-# V NSg/IPl+ NSg/V/J/P P NSg/R R NSg/R ISg+ NSg/VX . C/P D NSg/J P D NSg+# V NSg/IPl+ NSg/V/J/P P NSg/R R NSg/R ISg+ NSg/VX . C/P D NSg/J P D NSgPl> kept running in her head , and she had a vague sort of idea that they must be# V NSg/V/J/P NPr/J/P ISg/D$+ NPr/V/J+ . V/C ISg+ V D/P NSg/V/J NSg/V P NSg+ NSg/I/C/Ddem+ IPl+ NSg/V NSg/VX> collected at once and put back into the jury - box , or they would die .@@ -5966,8 +5966,8 @@# NSg+ . D+ NPr/V+ NSg/VX NSg/VX J/R/C V NPr/J/P D+ NSg/V+ . V/C D+ NSg/V+ V P> the waving of the reeds — the rattling teacups would change to tinkling# D V P D+ NPl+ . D V NPl NSg/VX NSg/V+ P V-> sheep - bells , and the Queen’s shrill cries to the voice of the shepherd boy — and-# NPl+ . NPl/V . V/C D NSg$ NSg/V/J NPl/V P D NSg/V P D+ NPr/V+ NSg/V+ . V/C+> sheep - bells , and the Queen’s shrill cries to the voice of the shepherd boy — and+# NSgPl+ . NPl/V . V/C D NSg$ NSg/V/J NPl/V P D NSg/V P D+ NPr/V+ NSg/V+ . V/C> the sneeze of the baby , the shriek of the Gryphon , and all the other queer# D NSg/V P D+ NSg/V/J+ . D NSg/V P D ? . V/C NSg/I/J/C D+ NSg/V/J+ NSg/V/J+> noises , would change ( she knew ) to the confused clamour of the busydiff --git a/harper-core/tests/text/tagged/Computer science.md b/harper-core/tests/text/tagged/Computer science.mdindex 12a718c9b..081ecfcda 100644--- a/harper-core/tests/text/tagged/Computer science.md+++ b/harper-core/tests/text/tagged/Computer science.md@@ -673,7 +673,7 @@> habitats , among many others . Modern computers enable optimization of such# NPl . P NSg/I/J/D+ NPl/V+ . NSg/J NPl/V+ V NSg P NSg/I> designs as complete aircraft . Notable in electrical and electronic circuit-# NPl/V NSg/R NSg/V/J+ NPl+ . NSg/J NPr/J/P NSg/J V/C J NSg/V++# NPl/V NSg/R NSg/V/J+ NSgPl+ . NSg/J NPr/J/P NSg/J V/C J NSg/V+> design are SPICE , as well as software for physical realization of new ( or# NSg/V+ V NSg/V . NSg/R NSg/V/J NSg/R NSg C/P NSg/J NSg/Am/Ca P NSg/V/J . NPr/C> modified ) designs . The latter includes essential design software for integrated@@ -843,7 +843,7 @@> include symmetric and asymmetric encryption , digital signatures , cryptographic# NSg/V J V/C J+ NSg . NSg/J+ NPl+ . J> hash functions , key - agreement protocols , blockchain , zero - knowledge proofs , and-# NSg/V+ NPl/V+ . NPr/V/J . NSg NPl/V . NSg . NSg/V/J . NSg/V NPl/V . V/C+# NSg/V+ NPl/V+ . NPr/V/J . NSg NPl/V . NSg . NSg/V/J . NSg NPl/V . V/C> garbled circuits .# V/J+ NPl/V+ .>diff --git a/harper-core/tests/text/tagged/Difficult sentences.md b/harper-core/tests/text/tagged/Difficult sentences.mdindex 04be4c64b..9ca561bc5 100644--- a/harper-core/tests/text/tagged/Difficult sentences.md+++ b/harper-core/tests/text/tagged/Difficult sentences.md@@ -140,8 +140,8 @@# NSg/V+ # NPl/V NPl/V P D$+ NPl+ V/J NSg/V/J/P NSg/J/P NSg/V V/C NSg/V+ .> Our stock is up by ten percent .# D$+ NSg/V/J+ VL NSg/V/J/P NSg/J/P NSg+ NSg+ .-> We won by six goals to three .-# IPl+ NSg/V NSg/J/P NSg NPl/V+ P+ NSg .+> We won by six goals to three .+# IPl+ NSgPl/V NSg/J/P NSg NPl/V+ P+ NSg .> His date of birth was wrong by ten years .# ISg/D$+ NSg/V P NSg/V/J+ V NSg/V/J NSg/J/P NSg+ NPl+ .> We went through the book page by page .diff --git a/harper-core/tests/text/tagged/Part-of-speech tagging.md b/harper-core/tests/text/tagged/Part-of-speech tagging.mdindex 35f080494..af2a33519 100644--- a/harper-core/tests/text/tagged/Part-of-speech tagging.md+++ b/harper-core/tests/text/tagged/Part-of-speech tagging.md@@ -249,7 +249,7 @@> a verb or a modal . The same method can , of course , be used to benefit from# D/P NSg/V NPr/C D/P+ NSg/J+ . D+ I/J+ NSg/V+ NPr/VX . P NSg/V+ . NSg/VX V/J P NSg/V P> knowledge about the following words .-# NSg/V+ J/P D+ NSg/V/J/P+ NPl/V .+# NSg+ J/P D+ NSg/V/J/P+ NPl/V .>#> More advanced ( " higher - order " ) HMMs learn the probabilities not only of pairsdiff --git a/harper-core/tests/text/tagged/The Constitution of the United States.md b/harper-core/tests/text/tagged/The Constitution of the United States.mdindex d46468d5d..e459ff51b 100644--- a/harper-core/tests/text/tagged/The Constitution of the United States.md+++ b/harper-core/tests/text/tagged/The Constitution of the United States.md@@ -1019,11 +1019,11 @@>#> He shall have Power , by and with the Advice and Consent of the Senate , to make-# NPr/ISg+ VX NSg/VX NSg/V/J . NSg/J/P V/C P D+ NSg/V V/C NSg/V P D+ NPr+ . P NSg/V+# NPr/ISg+ VX NSg/VX NSg/V/J . NSg/J/P V/C P D+ NSg V/C NSg/V P D+ NPr+ . P NSg/V> Treaties , provided two thirds of the Senators present concur ; and he shall# NPl/V+ . V/J/C NSg NPl/V P D+ NPl+ NSg/V/J V+ . V/C NPr/ISg+ VX> nominate , and by and with the Advice and Consent of the Senate , shall appoint-# V/J . V/C NSg/J/P V/C P D+ NSg/V V/C NSg/V P D+ NPr+ . VX V+# V/J . V/C NSg/J/P V/C P D+ NSg V/C NSg/V P D+ NPr+ . VX V> Ambassadors , other public Ministers and Consuls , Judges of the supreme Court ,# NPl . NSg/V/J NSg/V/J NPl/V+ V/C NPl . NPrPl/V P D+ NSg/V/J+ NSg/V/J+ .> and all other Officers of the United States , whose Appointments are not hereindiff --git a/harper-core/tests/text/tagged/The Great Gatsby.md b/harper-core/tests/text/tagged/The Great Gatsby.mdindex c18796c39..5064e3ee1 100644--- a/harper-core/tests/text/tagged/The Great Gatsby.md+++ b/harper-core/tests/text/tagged/The Great Gatsby.md@@ -11,7 +11,7 @@>#> In my younger and more vulnerable years my father gave me some advice that I’ve-# NPr/J/P D$+ J+ V/C NPr/I/V/J J NPl+ D$+ NPr/V+ V NPr/ISg+ I/J/R+ NSg/V+ NSg/I/C/Ddem+ W?+# NPr/J/P D$+ J+ V/C NPr/I/V/J J NPl+ D$+ NPr/V+ V NPr/ISg+ I/J/R+ NSg+ NSg/I/C/Ddem+ W?> been turning over in my mind ever since .# NSg/V NSg/V NSg/V/J/P NPr/J/P D$+ NSg/V+ J+ C/P+ .>@@ -73,7 +73,7 @@> everything for which I have an unaffected scorn . If personality is an unbroken# NSg/I/V+ C/P I/C+ ISg+ NSg/VX D/P+ NSg/V/J+ NSg/V+ . NSg/C NSg+ VL D/P V/J> series of successful gestures , then there was something gorgeous about him , some-# NSg P J+ NPl/V+ . NSg/J/C + V NSg/I/V/J J J/P ISg+ . I/J/R+# NSgPl P J+ NPl/V+ . NSg/J/C + V NSg/I/V/J J J/P ISg+ . I/J/R> heightened sensitivity to the promises of life , as if he were related to one of# V/J NSg+ P D NPl/V P NSg/V+ . NSg/R NSg/C NPr/ISg+ NSg/V J P NSg/I/V/J P> those intricate machines that register earthquakes ten thousand miles away . This@@ -191,7 +191,7 @@> Midas and Morgan and Mæcenas knew . And I had the high intention of reading many# NPr V/C NPr+ V/C ? V . V/C ISg+ V D NSg/V/J NSg/V P NPr/V NSg/I/J/D+> other books besides . I was rather literary in college — one year I wrote a series-# NSg/V/J+ NPl/V+ W? . ISg+ V NPr/V/J J NPr/J/P NSg+ . NSg/I/V/J NSg+ ISg+ V D/P NSg+# NSg/V/J+ NPl/V+ W? . ISg+ V NPr/V/J J NPr/J/P NSg+ . NSg/I/V/J NSg+ ISg+ V D/P NSgPl> of very solemn and obvious editorials for the Yale News — and now I was going to# P J/R J V/C J NPl C/P D+ NPr+ NPl/V+ . V/C NPr/V/J/C ISg+ V NSg/V/J P> bring back all such things into my life and become again that most limited of@@ -571,7 +571,7 @@> Evidently it surprised her as much as it did me , for she yawned and with a# R NPr/ISg+ V/J ISg/D$+ NSg/R NSg/I/J NSg/R NPr/ISg+ V NPr/ISg . C/P ISg+ V/J V/C P D/P> series of rapid , deft movements stood up into the room .-# NSg P NSg/J . J NPl+ V NSg/V/J/P P D+ NSg/V/J+ .+# NSgPl P NSg/J . J NPl+ V NSg/V/J/P P D+ NSg/V/J+ .>#> “ I’m stiff , ” she complained , “ I’ve been lying on that sofa for as long as I can@@ -1638,8 +1638,8 @@# IPl+ NSg/V NSg/V/J/P P NSg/V/J+ NSg . NSg/V/J V/C NSg/J . NSg NSg/J . J/P D+ NPr/V+> Sunday afternoon . I wouldn’t have been surprised to see a great flock of white# NSg/V+ NSg+ . ISg+ VX NSg/VX NSg/V V/J P NSg/V D/P NSg/J NSg/V P NPr/V/J-> sheep turn the corner .-# NPl+ NSg/V D NSg/V/J+ .+> sheep turn the corner .+# NSgPl+ NSg/V D NSg/V/J+ .>#> “ Hold on , ” I said , “ I have to leave you here . ”@@ -2481,7 +2481,7 @@> people of whom I asked his whereabouts stared at me in such an amazed way , and# NSg/V P I+ ISg+ V/J ISg/D$+ NSg+ V/J NSg/P NPr/ISg+ NPr/J/P NSg/I D/P V/J NSg/J+ . V/C> denied so vehemently any knowledge of his movements , that I slunk off in the-# V/J NSg/I/J/C R I/R/D NSg/V P ISg/D$+ NPl+ . NSg/I/C/Ddem ISg+ NSg/V NSg/V/J/P NPr/J/P D+# V/J NSg/I/J/C R I/R/D NSg P ISg/D$+ NPl+ . NSg/I/C/Ddem ISg+ NSg/V NSg/V/J/P NPr/J/P D> direction of the cocktail table — the only place in the garden where a single man# NSg P D+ NSg/V/J+ NSg/V+ . D J/R/C NSg/V NPr/J/P D+ NSg/V/J+ NSg/C D/P+ NSg/V/J+ NPr/V/J+> could linger without looking purposeless and alone .@@ -4485,15 +4485,15 @@> “ Meyer Wolfshiem ? No , he’s a gambler . ” Gatsby hesitated , then added coolly :# . NPr ? . NPr/P+ . NSg$ D/P+ NSg/J+ . . NPr V/J . NSg/J/C V/J R .> “ He’s the man who fixed the World’s Series back in 1919 . ”-# . NSg$ D+ NPr/V/J+ NPr/I+ V/J D+ NSg$+ NSg+ NSg/V/J NPr/J/P # . .+# . NSg$ D+ NPr/V/J+ NPr/I+ V/J D+ NSg$+ NSgPl+ NSg/V/J NPr/J/P # . .>#> “ Fixed the World’s Series ? ” I repeated .-# . V/J D+ NSg$+ NSg+ . . ISg+ V/J+ .+# . V/J D+ NSg$+ NSgPl+ . . ISg+ V/J+ .>#> The idea staggered me . I remembered , of course , that the World’s Series had been-# D+ NSg V/J NPr/ISg+ . ISg+ V/J . P NSg/V+ . NSg/I/C/Ddem D+ NSg$+ NSg+ V NSg/V+# D+ NSg V/J NPr/ISg+ . ISg+ V/J . P NSg/V+ . NSg/I/C/Ddem D+ NSg$+ NSgPl+ V NSg/V> fixed in 1919 , but if I had thought of it at all I would have thought of it as a# V/J NPr/J/P # . NSg/C/P NSg/C ISg+ V NSg/V P NPr/ISg+ NSg/P NSg/I/J/C ISg+ NSg/VX NSg/VX NSg/V P NPr/ISg+ NSg/R D/P+> thing that merely happened , the end of some inevitable chain . It never occurred@@ -5057,7 +5057,7 @@>#> “ Oh , it isn’t about that . At least — ’ ’ He fumbled with a series of beginnings .-# . NPr/V . NPr/ISg+ NSg/V J/P NSg/I/C/Ddem . NSg/P NSg/J . . . NPr/ISg+ V/J P D/P NSg P NPl/V+ .+# . NPr/V . NPr/ISg+ NSg/V J/P NSg/I/C/Ddem . NSg/P NSg/J . . . NPr/ISg+ V/J P D/P NSgPl P NPl/V+ .> “ Why , I thought — why , look here , old sport , you don’t make much money , do you ? ”# . NSg/V . ISg+ NSg/V . NSg/V . NSg/V NSg/J/R . NSg/J+ NSg/V+ . ISgPl+ V NSg/V NSg/I/J NSg/J+ . NSg/VX ISgPl+ . .>@@ -5213,7 +5213,7 @@> Clay’s “ Economics , ” starting at the Finnish tread that shook the kitchen floor ,# NSg$ . NSg+ . . V NSg/P D+ NSg/J+ NSg/V NSg/I/C/Ddem+ NSg/V/J D+ NSg/V+ NSg/V+ .> and peering toward the bleared windows from time to time as if a series of-# V/C V J/P D+ ? NPrPl/V+ P NSg/V/J+ P NSg/V/J NSg/R NSg/C D/P NSg P+# V/C V J/P D+ ? NPrPl/V+ P NSg/V/J+ P NSg/V/J NSg/R NSg/C D/P NSgPl P> invisible but alarming happenings were taking place outside . Finally he got up# J NSg/C/P V/J W? NSg/V NSg/V/J NSg/V NSg/V/J/P . R NPr/ISg+ V NSg/V/J/P> and informed me , in an uncertain voice , that he was going home .@@ -6084,8 +6084,8 @@#> For over a year he had been beating his way along the south shore of Lake# C/P NSg/V/J/P D/P+ NSg+ NPr/ISg+ V NSg/V NSg/V ISg/D$+ NSg/J+ P D NPr/V/J+ NSg/V P NSg/V+-> Superior as a clam - digger and a salmon - fisher or in any other capacity that-# NPr/J NSg/R D/P NSg/V/J . NSg V/C D/P NSg/V/J+ . NPr/J NPr/C NPr/J/P I/R/D+ NSg/V/J+ NSg/J+ NSg/I/C/Ddem++> Superior as a clam - digger and a salmon - fisher or in any other capacity that+# NPr/J NSg/R D/P NSg/V/J . NSg V/C D/P NSgPl/V/J+ . NPr/J NPr/C NPr/J/P I/R/D+ NSg/V/J+ NSg/J+ NSg/I/C/Ddem+> brought him food and bed . His brown , hardening body lived naturally through the# V ISg+ NSg V/C NSg/V/J+ . ISg/D$+ NPr/V/J . V NSg/V+ V/J R NSg/J/P D> half - fierce , half - lazy work of the bracing days . He knew women early , and since@@ -6438,8 +6438,8 @@# NSg/V NSg/C NPr/J/P D+ NPr/V+ NPr/ISg+ V+ NPr+ . NSg/J/P NPr/V+ . ISg+ NPr/VX NSg/VX NSg/J . V/J NPr/J/P D$+> ideas , but women run around too much these days to suit me . They meet all kinds# NPl+ . NSg/C/P NPl+ NSg/V J/P W? NSg/I/J I/Ddem+ NPl+ P NSg/V NPr/ISg+ . IPl+ NSg/V/J NSg/I/J/C NSg-> of crazy fish . ”-# P NSg/J+ NPl/V+ . .+> of crazy fish . ”+# P NSg/J+ NSgPl/V+ . .>#> Suddenly Mr . Sloane and the lady walked down the steps and mounted their horses .@@ -10929,7 +10929,7 @@> couldn’t seem to reach him any other way . The door that I pushed open , on the# V V P NSg/V ISg+ I/R/D+ NSg/V/J+ NSg/J+ . D+ NSg/V+ NSg/I/C/Ddem+ ISg+ V/J NSg/V/J . J/P D> advice of an elevator boy , was marked “ The Swastika Holding Company , ” and at-# NSg/V P D/P+ NSg/V+ NSg/V+ . V V/J . D NSg NSg/V NSg/V . . V/C NSg/P+# NSg P D/P+ NSg/V+ NSg/V+ . V V/J . D NSg NSg/V NSg/V . . V/C NSg/P> first there didn’t seem to be any one inside . But when I’d shouted “ hello ”# NSg/V/J + V V P NSg/VX I/R/D NSg/I/V/J+ NSg/J/P+ . NSg/C/P NSg/I/C W? V/J . NSg/V .> several times in vain , an argument broke out behind a partition , and presently a@@ -11047,7 +11047,7 @@>#> I wondered if this partnership had included the World’s Series transaction-# ISg+ V/J NSg/C I/Ddem+ NSg+ V V/J D NSg$+ NSg+ NSg+# ISg+ V/J NSg/C I/Ddem+ NSg+ V V/J D NSg$+ NSgPl+ NSg> in 1919 .# NPr/J/P # .>@@ -11610,8 +11610,8 @@# NPr/V/J+ NPl/V+ D/P V/J NSg/V+ . V/J NSg/J/P I/J/R NSg/V+ P D/P NSg/V P NSg/V/J+ . V> out clearly in the moonlight , and I erased it , drawing my shoe raspingly along# NSg/V/J/R/P R NPr/J/P D+ NSg/V+ . V/C ISg+ V/J NPr/ISg+ . NSg/V D$+ NSg/V+ ? P-> the stone . Then I wandered down to the beach and sprawled out on the sand .-# D NPr/V/J+ . NSg/J/C ISg+ V/J NSg/V/J/P P D+ NPr/V+ V/C V/J NSg/V/J/R/P J/P D+ NSg/V/J+ .+> the stone . Then I wandered down to the beach and sprawled out on the sand .+# D NPrSgPl/V/J+ . NSg/J/C ISg+ V/J NSg/V/J/P P D+ NPr/V+ V/C V/J NSg/V/J/R/P J/P D+ NSg/V/J+ .>#> Most of the big shore places were closed now and there were hardly any lightsdiff --git a/packages/chrome-plugin/src/lintKindColor.ts b/packages/chrome-plugin/src/lintKindColor.tsindex c406a4ead..40ebfab04 100644--- a/packages/chrome-plugin/src/lintKindColor.ts+++ b/packages/chrome-plugin/src/lintKindColor.ts@@ -10,8 +10,8 @@ const LINT_KIND_COLORS = {Repetition: '#00A67C', // Green-cyanSpelling: '#EE4266', // Pink-redStyle: '#FFD23F', // Yellow- WordChoice: '#228B22', // Forest greenTypo: '#FF6B35', // Vibrant orange-red+ WordChoice: '#228B22', // Forest green} as const;// Export the type for the lint kind keysdiff --git a/packages/web/src/lib/lintKindColor.ts b/packages/web/src/lib/lintKindColor.tsindex c406a4ead..40ebfab04 100644--- a/packages/web/src/lib/lintKindColor.ts+++ b/packages/web/src/lib/lintKindColor.ts@@ -10,8 +10,8 @@ const LINT_KIND_COLORS = {Repetition: '#00A67C', // Green-cyanSpelling: '#EE4266', // Pink-redStyle: '#FFD23F', // Yellow- WordChoice: '#228B22', // Forest greenTypo: '#FF6B35', // Vibrant orange-red+ WordChoice: '#228B22', // Forest green} as const;// Export the type for the lint kind keys