Skip to content

Commit

Permalink
Merge pull request #984 from spencermountain/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
spencermountain authored Nov 25, 2022
2 parents 4b0a75a + 10a94a7 commit ba5a23c
Show file tree
Hide file tree
Showing 117 changed files with 1,774 additions and 863 deletions.
2 changes: 1 addition & 1 deletion builds/compromise.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/one/compromise-one.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/one/compromise-one.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/three/compromise-three.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/three/compromise-three.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/two/compromise-two.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/two/compromise-two.mjs

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,23 @@ While all _Major_ releases should be reviewed, our only _large_ releases are **v
- deprecate #Participle for #PastParticiple
- run chunker only when necessary
- cleanup verb+noun metadata in json()
- remove confidence numbers
-->

<!-- #### 14.7.2 [Unreleased]
<!-- #### 14.7.3 [Unreleased]
-->

#### 14.8.0
- **[fix]** - tagging fixes
- **[new]** - add Person .presumedMale(), .presumedFemale() methods
- **[new]** - add Pronoun class, .refersTo()
- **[new]** - add Noun.references()
- **[new]** - .nouns('spencer') shorthand as an if-match
- **[change]** - "[do] you .." etc now #QuestionWord
- **[new]** - add #Hyphenated tag
- **[fix]** - improved Auxiliary verb tagging
- **[update]** - dependencies

#### 14.7.1
- **[fix]** - concat fix
- **[change]** - tagging fixes
Expand Down
16 changes: 5 additions & 11 deletions data/lexicon/adjectives/adjectives.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ export default [
'unappealing',
'unbecoming',
'unassuming',
'cunning',
'foregoing',
'ongoing',
'easygoing',
Expand All @@ -265,15 +264,14 @@ export default [
'stylish',
'squeamish',
'loutish',
'lush',


'mammoth',
'north',
'south',
'punjabi',
'mini',
'a priori',
'back',
'ok',
'brisk',

Expand Down Expand Up @@ -305,8 +303,6 @@ export default [
'royal',

// -el
'rebel',
'parallel',
'civil',
'all',
'overall',
Expand Down Expand Up @@ -338,8 +334,6 @@ export default [

'dim',
'longterm',
'premium',
'humdrum',
'ad infinitum',
'urban',
'suburban',
Expand All @@ -357,7 +351,6 @@ export default [
'proven',
'frozen',

'sovereign',
'foreign',
'benign',
'main',
Expand All @@ -372,7 +365,6 @@ export default [
'unknown',
'gung ho',
'macho',
'pro',
'in vitro',
'de facto',
'ipso facto',
Expand Down Expand Up @@ -412,7 +404,6 @@ export default [
'sui generis',
'gratis',
'for keeps',
'excess',
'bogus',
'dangerous',
'offbeat',
Expand Down Expand Up @@ -531,7 +522,6 @@ export default [
'past',
'best',
'honest',
'racist',
'populist',
'against',
'most',
Expand Down Expand Up @@ -665,5 +655,9 @@ export default [
'golden',
'bare',
'subpar',
'ingrown',
'agreeable',
'vile',
'win win',
]

16 changes: 7 additions & 9 deletions data/lexicon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import lex from './misc.js'
import demonyms from './nouns/demonyms.js'
import organizations from './nouns/organizations.js'
import possessives from './nouns/possessives.js'
import professions from './nouns/professions.js'
import actors from './nouns/actors.js'
import pronouns from './nouns/pronouns.js'
import singulars from './nouns/singulars.js'
import sportsTeams from './nouns/sportsTeams.js'
Expand Down Expand Up @@ -60,7 +60,6 @@ import personDate from './switches/person-date.js'
import personVerb from './switches/person-verb.js'
import personPlace from './switches/person-place.js'
import unitNoun from './switches/unit-noun.js'
import honorificNoun from './switches/honorific-noun.js'


//add-in the generic, flat word-lists
Expand All @@ -69,7 +68,7 @@ const data = [
[demonyms, 'Demonym'],
[organizations, 'Organization'],
[possessives, 'Possessive'],
[professions, 'Actor'],
[actors, 'Actor'],
[pronouns, 'Pronoun'],
[singulars, 'Singular'],
[sportsTeams, 'SportsTeam'],
Expand All @@ -92,10 +91,10 @@ const data = [
[dates, 'Date'],
[durations, 'Duration'],

[femaleNames, 'FemaleName'],
[femaleNames, 'FemaleName'], //5kb
[firstnames, 'FirstName'],
[lastnames, 'LastName'],
[maleNames, 'MaleName'],
[lastnames, 'LastName'], //3k
[maleNames, 'MaleName'], //5kb
[people, 'Person'],

[adjectives, 'Adjective'],
Expand All @@ -111,9 +110,9 @@ const data = [
[modals, 'Modal'],
[verbs, 'Verb'],
[participles, 'Participle'],
[phrasals, 'PhrasalVerb'], //5kb
[phrasals, 'PhrasalVerb'], //3kb

// switches
// switches - 10kb
[adjGerund, 'Adj|Gerund'],
[adjNoun, 'Adj|Noun'],
[adjPast, 'Adj|Past'],
Expand All @@ -125,7 +124,6 @@ const data = [
[personDate, 'Person|Date'],
[personVerb, 'Person|Verb'],
[unitNoun, 'Unit|Noun'],
[honorificNoun, 'Honorific|Noun'],
]
for (let i = 0; i < data.length; i++) {
const list = data[i][0]
Expand Down
1 change: 1 addition & 0 deletions data/lexicon/misc/adverbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,6 @@ export default [
'very',
'well',
'backward',
'hella',

]
3 changes: 1 addition & 2 deletions data/lexicon/misc/conjunctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ export default [
'or not',
'otherwise',
'plus',
'provided',
// 'provided',
'provided that',
'provide that',
'since',
'so that',
'supposing',
Expand Down
6 changes: 4 additions & 2 deletions data/lexicon/misc/expressions.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export default [
'wtf',
'ya',
'yaa',
'yahoo',
// 'yahoo',
'yay',
'yeah',
'yep',
Expand All @@ -121,5 +121,7 @@ export default [
`d'oh`,
'shoo',
'there now',
'aye'
'aye',
'cmon',//come on
'excuse me',
]
166 changes: 166 additions & 0 deletions data/lexicon/nouns/actors.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
//professions 'lawyer' that aren't covered by verb.to_actor()

export default [
'accountant',
'administrator',
'advisor',
'agent',
'aid',
'analyst',
'animator',
'announcer',
'architect',
'artist',
'assistant',
'attendant',
'bricklayer',
'broker',
'butcher',
'captain',
'caretaker',
'carpenter',
'ceo',
'cfo',
'cleaner',
'clerk',
'composer',
'cook',
'coordinator',
'cowboy',
'dancer',
'dealer',
'deputee',
'deputy',
'designer',
'detective',
'developer',
'dietician',
'director',
'doctor',
'driver',
'examiner',
'farmer',
'fighter',
'firefighter',
'fireman',
'fitter',
'gardener',
'guard',
'hairdresser',
'housekeeper',
'illustrator',
'inspector',
'installer',
'instructor',
'investigator',
'journalist',
'laborer',
'lawyer',
'leader',
'maker',
'mechanic',
'merchant',
'minister',
'musician',
'nurse',
'officer',
'operator',
'optometrist',
'organizer',
'photographer',
'physician',
'pilot',
'planner',
'player',
'plumber',
'policeman',
'politician',
'practitioner',
'president',
'producer',
'programmer',
'prospector',
'psychologist',
'receptionist',
'recruiter',
'reporter',
'representative',
'researcher',
'roofer',
'sailor',
'scientist',
'secretary',
'singer',
'soldier',
'specialist',
'spokesperson',
'supervisor',
'surgeon',
'technician',
'therapist',
'transcriptionist',
'underwriter',
'veterinarian',
'worker',
'writer',
'manager',
// 'engineer',


'admiral',
'ayatullah',
'baron',
'baroness',
'brigadier',
'chancellor',
'colonel',
'commander',
'congressman',
'congresswoman',
'constable',
'corporal',
'councillor',
'doctor',
'dutchess',
'excellency',
'field marshal',
'lieutenant',
// 'count',
'captain',
'judge',
'king',
'lady',
'lord',
'magistrate',
'marshal',
'mayor',
// 'miss',
'missus',
'mister',
'officer',
'pastor',
'president',
'prime minister',
'prince',
'princess',
'professor',
'queen',
'rabbi',
'rear admiral',
'first lady',
'reverend',
'sergeant',
'secretary',
'cheerleader',
'quarterback',
'running back',
'defenceman',
'goalie',
'goaltender',
'goalkeeper',
'sultan',
'taoiseach',
'vice admiral',
'sergeant major',
'lieutenant general',
]
11 changes: 4 additions & 7 deletions data/lexicon/nouns/possessives.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
export default [
'anyone',
'anything',
// 'her', //this one is check ambiguous
// 'hers',
// 'his',
Expand All @@ -10,11 +8,10 @@ export default [
'none',
'our',
'ours',
'something',
'their',
'theirs',
'your',
'yours',
// 'their',
// 'theirs',
// 'your',
// 'yours',


]
Loading

0 comments on commit ba5a23c

Please sign in to comment.