Merge pull request #978 from spencermountain/dev

Dev

README.md

@@ -819,7 +819,7 @@ nlp.extend({
 | [Whitespace](https://observablehq.com/@spencermountain/compromise-whitespace)         |                    [Verbs](https://observablehq.com/@spencermountain/verbs)                     | [Typeahead](https://observablehq.com/@spencermountain/compromise/compromise-typeahead) |
 | [World data](https://observablehq.com/@spencermountain/compromise-world)              |       [Normalization](https://observablehq.com/@spencermountain/compromise-normalization)       |   [Sweep](https://observablehq.com/@spencermountain/compromise-sweep)         |
 | [Fuzzy-matching](https://observablehq.com/@spencermountain/compromise-fuzzy-matching) |          [Typescript](https://observablehq.com/@spencermountain/compromise-typescript)          | [Mutation](https://observablehq.com/@spencermountain/compromise-mutation)  |
-| [Root-forms](https://observablehq.com/@spencermountain/compromise-root) |              |   |
+| [Root-forms](https://observablehq.com/@spencermountain/compromise-root) |  [Character Offsets](https://observablehq.com/@spencermountain/compromise-offsets)             |   |
 
 
 <div >

changelog.md

@@ -6,9 +6,26 @@ compromise uses semver, and pushes to npm and github frequently
 
 While all _Major_ releases should be reviewed, our only _large_ releases are **v6** in 2016 **v12** in 2019 and **v14** in 2022. Others have been mostly incremental.
 
-<!-- #### 14.6.0 [Unreleased]
+<!-- #### [planned breaking]
+- fix doc.json(0) inconsistency
+- fix text() options
 -->
 
+<!-- #### 14.7.1 [Unreleased]
+-->
+
+#### 14.7.0 
+- **[new]** - match term id
+- **[change]** - tag text by default on .concat('')
+- **[change]** - allow modifying term prePunctuation
+- **[new]** - .wrap() method
+- **[new]** - .isFull() method
+- **[fix]** - text params for #953
+- **[fix]** - nouns().isSingular() missing
+- **[change]** - one-character w/ dash tokenization #977
+- **[change]** - allow setting `model.one.prePunctuation` + `postPunctuation`
+- **[fix]** - compromise-paragraphs plugin
+
 #### 14.6.0 [Oct 2022]
 - **[change]** - move internal conjugation methods
 - **[update]** - github scripts

data/lexicon/adjectives/adjectives.js

@@ -642,5 +642,7 @@ export default [
   'renowned',
   'beside',
   'alright',
+  'top notch',
+  'self sufficient'
 ]
 

data/lexicon/nouns/professions.js

@@ -15,7 +15,7 @@ export default [
   'clerk',
   'deputy',
   'dietician',
-  'engineer',
+  // 'engineer',
   'farmer',
   'firefighter',
   'fireman',

data/lexicon/nouns/singulars.js

@@ -403,6 +403,7 @@ export default [
   'tributary',
   'flower',
   'sandwich',
+  'x ray',
 ]
 
 

data/lexicon/nouns/uncountables.js

@@ -9,7 +9,7 @@ export default [
   'aeronautics',
   'aircraft',
   'amnesty',
-  'art',
+  // 'art',
   'athletics',
   'baggage',
   'bass',
@@ -22,15 +22,15 @@ export default [
   'butter',
   'cad',
   'cards',
-  'cash',
+  // 'cash',
   'celcius',
   'chaos',
   'cheese',
   'chewing',
   'chicken',
   'civics',
   'classics',
-  'clothing',
+  // 'clothing',
   'coal',
   'cold war',
   'confusion',
@@ -52,7 +52,7 @@ export default [
   'everything',
   'fahrenheit',
   'fiction',
-  'flesh',
+  // 'flesh',
   'flour',
   'food',
   'forgiveness',
@@ -62,10 +62,10 @@ export default [
   'gene editing',
   'gene pool',
   'genetics',
-  'gold',
+  // 'gold',
   'golf',
   'grass',
-  'ground',
+  // 'ground',
   'gum',
   'gymnastics',
   'hair',
@@ -85,8 +85,8 @@ export default [
   'information',
   'jazz',
   'jewelry',
-  'justice',
-  'kelvin',
+  // 'justice',
+  // 'kelvin',
   'knowledge',
   'laughter',
   'leather',
@@ -100,7 +100,7 @@ export default [
   'luggage',
   'machine learning',
   'machinery',
-  'mail',
+  // 'mail',
   'mathematics',
   'measles',
   'meat',
@@ -123,9 +123,9 @@ export default [
   'politics',
   'polygamy',
   'pork',
-  'power',
+  // 'power',
   'pressure',
-  'progress',
+  // 'progress',
   'rabies',
   'rain',
   'recognition',
@@ -146,11 +146,11 @@ export default [
   'silk',
   'silver',
   'skittles',
-  'snow',
+  // 'snow',
   'soap',
   'soccer',
   'spacecraft',
-  'speed',
+  // 'speed',
   'statistics',
   'steam',
   'steel',
@@ -161,7 +161,7 @@ export default [
   'thermodynamics',
   'thunder',
   'there',
-  'time',
+  // 'time',
   'toothpaste',
   'traffic',
   'trouble',
@@ -203,7 +203,7 @@ export default [
   'debut',
   'disrepute',
   'couscous',
-  'vanilla',
+  // 'vanilla',
 
   'honesty',
   'dishonesty',
@@ -218,7 +218,7 @@ export default [
   'aspirin',
   'glycerin',
 
-  'spite',
+  // 'spite',
   'overcrowding',
   'troubleshooting',
   'gore',
@@ -240,4 +240,7 @@ export default [
   'arithmetic',
   'static',
   'logic',
+  'hunger',
+  'sushi',
+  'seating',
 ]

data/lexicon/places/places.js

@@ -66,6 +66,7 @@ export default [
   'bel air',
   'malibu',
   'gay village',
+  'orange county',
   'sunderland',
 
   // places with their own timezones

data/lexicon/switches/noun-verb.js

@@ -254,7 +254,6 @@ export default [
   'goof',
   'gossip',
   'grade',
-  'grant',
   'grasp',
   'grind',
   'grip',
@@ -685,18 +684,15 @@ export default [
   // prefixes
   'dispatch',
   'remark',
-  'resort',
   'detail',
   'order',
   'reorder',
-
   // -ide
   'divide',
   'guide',
   'pride',
   'ride',
   'side',
-
   // -ate
   'advocate',
   'affiliate',
@@ -715,8 +711,84 @@ export default [
   'duplicate',
   'gate',
   'graduate',
-
-  'relish',
   'polish',
   'stocking',
+  'practice',
+  'race',
+  // 'saw',//hmm
+  'format',
+  'position',
+  'cast',
+  'edge',
+  'hop',
+  'staple',
+  'top',
+  'swipe',
+  'vomit',
+  'matter',
+  'respect',
+  'circle',
+  'hedge',
+  'bind',
+  'crash',
+  'dab',
+  'duel',
+  'weed',
+  'loot',
+  'battle',
+  'fuss',
+  'zoom',
+  'leak',
+  'coach',
+  'drip',
+  'drop',
+  'struggle',
+  'canoe',
+  'blur',
+  'restart',
+  'leech',
+  'foil',
+  'eyeball',
+  'flock',
+  'worship',
+  'anger',
+  'interface',
+  'reference',
+  'trek',
+  'shuffle',
+  'whisk',
+  'print',
+  'route',
+  'transition',
+  'breed',
+  'glow',
+  'lap',
+  'bill',
+  'fragment',
+  'spot',
+  'conflict',
+  'scroll',
+  'consent',
+  'bond',
+  'foot',
+  'shore',
+  'fold',
+  'tour',
+  'sip',
+  'stroke',
+  'orbit',
+  'shave',
+  'cue',
+  'mold',
+  'snap',
+  'curve',
+  'brush',
+  'peer',
+  'text',
+  'rap',
+  'wick',
+  'interest',
+  'ask',
+  'drone',
+  'tangle',
 ]

data/lexicon/verbs/infinitives.js

@@ -82,7 +82,6 @@ export default [
   'bestow',
   'betray',
   'bewilder',
-  'bind',
   'bleed',
   'blow',
   'boil',
@@ -92,7 +91,6 @@ export default [
   'bother',
   'brake',
   'breastfeed',
-  'breed',
   'bring',
   'broaden',
   'build',
@@ -224,7 +222,6 @@ export default [
   'do',
   'draw',
   'dredge',
-  'drop',
   'drown',
   'dwindle',
   'earmark',
@@ -512,7 +509,6 @@ export default [
   'resent',
   'resign',
   'resist',
-  'restart',
   'restock',
   'restrain',
   'restrict',
@@ -547,7 +543,6 @@ export default [
   'shake',
   'sharpen',
   'shatter',
-  'shave',
   'shine',
   'shoot',
   'shorten',
@@ -697,7 +692,6 @@ export default [
   'collide',
   'confide',
   'decide',
-  'divide',
   'hide',
   'provide',
   'reside',

data/lexicon/verbs/phrasals.js

@@ -169,6 +169,7 @@ export default [
   'creep out',
   'creep up',
   'cross in',
+  'crowd out',
   'cross out',
   'cut away',
   'cut back',
@@ -853,4 +854,5 @@ export default [
   'zip up',
   'zone out',
   'zonk out',
+  'grab hold'
 ]