From 8eff6eef7d883a8efdab383d0d9b22129d3e2a11 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 11:16:40 +0000 Subject: [PATCH 01/23] Merge packrat and pack rat --- src/deprecations.csv | 1 + src/yaml/entries-p.yaml | 2 -- src/yaml/noun.person.yaml | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/deprecations.csv b/src/deprecations.csv index d0b51acc..0d46d7c9 100644 --- a/src/deprecations.csv +++ b/src/deprecations.csv @@ -127,3 +127,4 @@ "ewn-83000076-n","","ewn-10146463-n","i90187","Compositional (#1068)" "ewn-09938325-n","i88968","ewn-10146463-n","i90187","Compositional (#1068)" "ewn-14956360-n","i115584","ewn-14749543-n","i114384","Duplicate with wrong lemma (#1128)" +"ewn-10410299-n","i91815","ewn-"10300973-n,"i91146","Duplicate (#1150)" diff --git a/src/yaml/entries-p.yaml b/src/yaml/entries-p.yaml index 5dbacbad..694c93e3 100644 --- a/src/yaml/entries-p.yaml +++ b/src/yaml/entries-p.yaml @@ -16106,8 +16106,6 @@ packman: packrat: n: sense: - - id: 'packrat%1:18:00::' - synset: 10410299-n - id: 'packrat%1:05:00::' synset: 02342574-n packsack: diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index e9c82583..808a1a6a 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -55710,15 +55710,6 @@ - bagger - boxer partOfSpeech: n -10410299-n: - definition: - - a collector of miscellaneous useless objects - hypernym: - - 09956078-n - ili: i91815 - members: - - packrat - partOfSpeech: n 10410397-n: definition: - an employer who exploits Italian immigrants in the U.S. From 5768f726d7fbe40161d11e386c74f81ec2dde6b1 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 12:02:12 +0000 Subject: [PATCH 02/23] Instance hypernym changes --- src/deprecations.csv | 2 ++ src/yaml/entries-a.yaml | 4 ++-- src/yaml/entries-c.yaml | 5 ----- src/yaml/entries-d.yaml | 2 +- src/yaml/entries-h.yaml | 5 +++++ src/yaml/entries-l.yaml | 2 +- src/yaml/entries-m.yaml | 5 ----- src/yaml/noun.person.yaml | 46 ++++++++++++--------------------------- 8 files changed, 25 insertions(+), 46 deletions(-) diff --git a/src/deprecations.csv b/src/deprecations.csv index d0b51acc..db8d908e 100644 --- a/src/deprecations.csv +++ b/src/deprecations.csv @@ -127,3 +127,5 @@ "ewn-83000076-n","","ewn-10146463-n","i90187","Compositional (#1068)" "ewn-09938325-n","i88968","ewn-10146463-n","i90187","Compositional (#1068)" "ewn-14956360-n","i115584","ewn-14749543-n","i114384","Duplicate with wrong lemma (#1128)" +"ewn-09555948-n","i86747","ewn-09556053-n","i86748","Duplicate (#1127)" +"ewn-09583555-n","i86901","ewn-10941631-n","i94851","Duplicate (#1127)" diff --git a/src/yaml/entries-a.yaml b/src/yaml/entries-a.yaml index 6af64d14..4c9d73ab 100644 --- a/src/yaml/entries-a.yaml +++ b/src/yaml/entries-a.yaml @@ -14054,14 +14054,14 @@ Arhant: n: sense: - id: 'arhant%1:18:00::' - synset: 09555948-n + synset: 09556053-n Arhat: n: pronunciation: - value: ˈɑːhæt sense: - id: 'arhat%1:18:00::' - synset: 09555948-n + synset: 09556053-n Arhus: n: sense: diff --git a/src/yaml/entries-c.yaml b/src/yaml/entries-c.yaml index 0e376487..4bb3504a 100644 --- a/src/yaml/entries-c.yaml +++ b/src/yaml/entries-c.yaml @@ -8359,11 +8359,6 @@ Charles Dodgson: sense: - id: 'charles_dodgson%1:18:00::' synset: 10903813-n -Charles Dudley Warner: - n: - sense: - - id: 'charles_dudley_warner%1:18:00::' - synset: 11394584-n Charles Eames: n: sense: diff --git a/src/yaml/entries-d.yaml b/src/yaml/entries-d.yaml index 13a9796a..31023029 100644 --- a/src/yaml/entries-d.yaml +++ b/src/yaml/entries-d.yaml @@ -1011,7 +1011,7 @@ Damon and Pythias: n: sense: - id: 'damon_and_pythias%1:18:00::' - synset: 09583555-n + synset: 10941631-n Dana: n: sense: diff --git a/src/yaml/entries-h.yaml b/src/yaml/entries-h.yaml index 426be912..ec52d248 100644 --- a/src/yaml/entries-h.yaml +++ b/src/yaml/entries-h.yaml @@ -2034,6 +2034,11 @@ Harry Lillis Crosby: sense: - id: 'harry_lillis_crosby%1:18:00::' synset: 10936483-n +Harry Morris Warner: + n: + sense: + - id: 'harry_morris_warner%1:18:00::' + synset: 11394584-n Harry S Truman: n: sense: diff --git a/src/yaml/entries-l.yaml b/src/yaml/entries-l.yaml index cfc17651..7f8abf80 100644 --- a/src/yaml/entries-l.yaml +++ b/src/yaml/entries-l.yaml @@ -37339,7 +37339,7 @@ lohan: n: sense: - id: 'lohan%1:18:00::' - synset: 09555948-n + synset: 09556053-n loin: n: pronunciation: diff --git a/src/yaml/entries-m.yaml b/src/yaml/entries-m.yaml index 943d263a..a7f784fd 100644 --- a/src/yaml/entries-m.yaml +++ b/src/yaml/entries-m.yaml @@ -8648,11 +8648,6 @@ Michael Philip Jagger: sense: - id: 'michael_philip_jagger%1:18:00::' synset: 11098640-n -Michael Stuart Brown: - n: - sense: - - id: 'michael_stuart_brown%1:18:01::' - synset: 10885972-n Michaelmas: n: sense: diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index e9c82583..38b3cd9d 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -243,9 +243,9 @@ 09512920-n: definition: - imaginary people who live on the planet Mars - ili: i86486 - instance_hypernym: + hypernym: - 09506868-n + ili: i86486 members: - Martian partOfSpeech: n @@ -3102,25 +3102,19 @@ - Avalokitesvara - Avalokiteshvara partOfSpeech: n -09555948-n: - definition: - - a Buddhist who has attained nirvana - ili: i86747 - instance_hypernym: - - 09528550-n - members: - - Arhat - - Arhant - - lohan - partOfSpeech: n 09556053-n: definition: - one who has achieved a state of perfect enlightenment hypernym: - 10566407-n ili: i86748 + instance_hypernym: + - 09528550-n members: - Buddha + - Arhat + - Arhant + - lohan partOfSpeech: n 09556159-n: definition: @@ -4854,20 +4848,6 @@ - Daedalus - Daedal partOfSpeech: n -09583555-n: - definition: - - '(Greek mythology) according to a Greek legend: when Pythias was sentenced to - be executed Damon took his place to allow Pythias to get his affairs in order; - when Pythias returned in time to save Damon the king was so impressed that he - let them both live' - domain_topic: - - 07995848-n - ili: i86901 - instance_hypernym: - - 10132360-n - members: - - Damon and Pythias - partOfSpeech: n 09583891-n: definition: - (Greek mythology) goddess of the earth and mother of Cronus and the Titans in @@ -6777,9 +6757,9 @@ and conducted them to Valhalla domain_topic: - 08000298-n - ili: i87065 - instance_hypernym: + hypernym: - 09507794-n + ili: i87065 members: - Valkyrie partOfSpeech: n @@ -84702,9 +84682,8 @@ instance_hypernym: - 09887676-n members: - - Michael Stuart Brown - - Brown - Robert Brown + - Brown partOfSpeech: n 10886158-n: definition: @@ -88154,11 +88133,14 @@ definition: - the friend of Phintias who pledged his life that Phintias would return (4th century BC) + domain_topic: + - 07995848-n ili: i94851 instance_hypernym: - 10132360-n members: - Damon + - Damon and Pythias partOfSpeech: n 10941771-n: definition: @@ -117155,8 +117137,8 @@ instance_hypernym: - 10108159-n members: + - Harry Morris Warner - Warner - - Charles Dudley Warner partOfSpeech: n 11394784-n: definition: From 5c6ebfbd06d93425e0bab3814a6e4cb7fdb10021 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 12:03:11 +0000 Subject: [PATCH 03/23] Instance hypernym changes Pantaloon Rothschild --- src/yaml/entries-c.yaml | 5 ----- src/yaml/entries-p.yaml | 6 ++---- src/yaml/noun.person.yaml | 8 +++----- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/yaml/entries-c.yaml b/src/yaml/entries-c.yaml index 4bb3504a..b31ea6c7 100644 --- a/src/yaml/entries-c.yaml +++ b/src/yaml/entries-c.yaml @@ -8804,11 +8804,6 @@ Charlotte Perkins Gilman: sense: - id: 'charlotte_perkins_gilman%1:18:01::' synset: 11020345-n -Charlotte de Rothschild: - n: - sense: - - id: 'charlotte_de_rothschild%1:18:01::' - synset: 11292405-n Charlottetown: n: sense: diff --git a/src/yaml/entries-p.yaml b/src/yaml/entries-p.yaml index 5dbacbad..27aac6b1 100644 --- a/src/yaml/entries-p.yaml +++ b/src/yaml/entries-p.yaml @@ -1615,15 +1615,11 @@ Pansa: Pantalone: n: sense: - - id: 'pantalone%1:18:01::' - synset: 09625784-n - id: 'pantalone%1:18:02::' synset: 09625658-n Pantaloon: n: sense: - - id: 'pantaloon%1:18:01::' - synset: 09625784-n - id: 'pantaloon%1:18:00::' synset: 09625658-n Panthera: @@ -20122,6 +20118,8 @@ pantaloon: sense: - id: 'pantaloon%1:06:00::' synset: 03890251-n + - id: 'pantaloon%1:18:01::' + synset: 09625784-n pantalooned: a: sense: diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index 38b3cd9d..ec9df8e7 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -7501,12 +7501,11 @@ 09625784-n: definition: - a buffoon in modern pantomimes; the butt of jokes - ili: i87132 - instance_hypernym: + hypernym: - 09950623-n + ili: i87132 members: - - Pantalone - - Pantaloon + - pantaloon partOfSpeech: n 09625890-n: definition: @@ -110421,7 +110420,6 @@ instance_hypernym: - 09857212-n members: - - Charlotte de Rothschild - Rothschild partOfSpeech: n 11292513-n: From 8d4231f31473f905d60d2d63a2ac5182cdc4ad61 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 12:08:34 +0000 Subject: [PATCH 04/23] Instance hypernyms Mama Ka Anne Duke of Windsor Duke of Edinburgh --- src/deprecations.csv | 4 ++++ src/yaml/entries-a.yaml | 10 ++++++++++ src/yaml/entries-d.yaml | 10 ---------- src/yaml/entries-k.yaml | 2 +- src/yaml/entries-m.yaml | 2 +- src/yaml/noun.person.yaml | 24 ++++-------------------- 6 files changed, 20 insertions(+), 32 deletions(-) diff --git a/src/deprecations.csv b/src/deprecations.csv index db8d908e..4390a465 100644 --- a/src/deprecations.csv +++ b/src/deprecations.csv @@ -129,3 +129,7 @@ "ewn-14956360-n","i115584","ewn-14749543-n","i114384","Duplicate with wrong lemma (#1128)" "ewn-09555948-n","i86747","ewn-09556053-n","i86748","Duplicate (#1127)" "ewn-09583555-n","i86901","ewn-10941631-n","i94851","Duplicate (#1127)" +"ewn-09542327-n","i86651","ewn-09544015-n","i86663","Duplicate (#1127)" +"ewn-09549740-n","i86699","ewn-09550841-n","i86709","Duplicate (#1127)" +"ewn-09542327-n","","ewn-09544015-n","i86663","Duplicate (#1127)" +"ewn-09549740-n","","ewn-09550841-n","i86709","Duplicate (#1127)" diff --git a/src/yaml/entries-a.yaml b/src/yaml/entries-a.yaml index 4c9d73ab..edaa515b 100644 --- a/src/yaml/entries-a.yaml +++ b/src/yaml/entries-a.yaml @@ -10892,11 +10892,21 @@ Anne Sexton: sense: - id: 'anne_sexton%1:18:00::' synset: 11314572-n +Anne Stuart: + n: + sense: + - id: 'anne_stuart%1:18:00::' + synset: 10838073-n Anne Sullivan: n: sense: - id: 'anne_sullivan%1:18:00::' synset: 11344423-n +Anne of Great Britain: + n: + sense: + - id: 'anne_of_great_britain%1:18:00::' + synset: 10838073-n Annelida: n: sense: diff --git a/src/yaml/entries-d.yaml b/src/yaml/entries-d.yaml index 31023029..3411376d 100644 --- a/src/yaml/entries-d.yaml +++ b/src/yaml/entries-d.yaml @@ -6608,11 +6608,6 @@ Duke of Cumberland: sense: - id: 'duke_of_cumberland%1:18:00::' synset: 10936916-n -Duke of Edinburgh: - n: - sense: - - id: 'duke_of_edinburgh%1:18:00::' - synset: 11252465-n Duke of Lancaster: n: sense: @@ -6628,11 +6623,6 @@ Duke of Wellington: sense: - id: 'duke_of_wellington%1:18:00::' synset: 11400918-n -Duke of Windsor: - n: - sense: - - id: 'duke_of_windsor%1:18:00::' - synset: 10971689-n Dulles: n: sense: diff --git a/src/yaml/entries-k.yaml b/src/yaml/entries-k.yaml index 252f498c..3c73dd9c 100644 --- a/src/yaml/entries-k.yaml +++ b/src/yaml/entries-k.yaml @@ -125,7 +125,7 @@ Ka: n: sense: - id: 'ka%1:18:00::' - synset: 09549740-n + synset: 09550841-n Kaaba: n: pronunciation: diff --git a/src/yaml/entries-m.yaml b/src/yaml/entries-m.yaml index a7f784fd..d408bf83 100644 --- a/src/yaml/entries-m.yaml +++ b/src/yaml/entries-m.yaml @@ -2478,7 +2478,7 @@ Mama: variety: GB sense: - id: 'mama%1:18:02::' - synset: 09542327-n + synset: 09544015-n Mamet: n: sense: diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index ec9df8e7..117f1833 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -2128,15 +2128,6 @@ members: - Lilith partOfSpeech: n -09542327-n: - definition: - - a name under which Ninkhursag was worshipped, meaning ‘Mother’ - ili: i86651 - instance_hypernym: - - 09537037-n - members: - - Mama - partOfSpeech: n 09542423-n: definition: - the chief Babylonian god; his consort was Sarpanitu @@ -2265,6 +2256,7 @@ - Ninkhursag - Ninhursag - Ninkharsag + - Mama partOfSpeech: n wikidata: Q836170 09544186-n: @@ -2634,15 +2626,6 @@ members: - Indra partOfSpeech: n -09549740-n: - definition: - - unknown god; an epithet of Prajapati and Brahma - ili: i86699 - instance_hypernym: - - 09546113-n - members: - - Ka - partOfSpeech: n 09549837-n: definition: - wife of Siva and malevolent form of Devi @@ -2740,6 +2723,7 @@ - 09546113-n members: - Prajapati + - Ka partOfSpeech: n 09550959-n: definition: @@ -81614,6 +81598,8 @@ instance_hypernym: - 10519216-n members: + - Anne of Great Britain + - Anne Stuart - Anne partOfSpeech: n 10838319-n: @@ -89986,7 +89972,6 @@ members: - Edward - Edward VIII - - Duke of Windsor partOfSpeech: n 10971940-n: definition: @@ -107947,7 +107932,6 @@ members: - Philip - Prince Philip - - Duke of Edinburgh partOfSpeech: n 11252605-n: definition: From 420861c4ce37a6827a0603baa14570bb80d06d77 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 12:33:00 +0000 Subject: [PATCH 05/23] Instance hypernyms Duke of Windsor Duke of Edinburgh --- src/yaml/entries-d.yaml | 10 ++++++++++ src/yaml/noun.person.yaml | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/yaml/entries-d.yaml b/src/yaml/entries-d.yaml index 3411376d..ea65ce15 100644 --- a/src/yaml/entries-d.yaml +++ b/src/yaml/entries-d.yaml @@ -6608,6 +6608,11 @@ Duke of Cumberland: sense: - id: 'duke_of_cumberland%1:18:00::' synset: 10936916-n +Duke of Edinburgh: + n: + sense: + - id: 'duke_of_edinburgh%1:18:00::' + synset: 87460721-n Duke of Lancaster: n: sense: @@ -6623,6 +6628,11 @@ Duke of Wellington: sense: - id: 'duke_of_wellington%1:18:00::' synset: 11400918-n +Duke of Windsor: + n: + sense: + - id: 'duke_of_windsor%1:18:00::' + synset: 85994344-n Dulles: n: sense: diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index 117f1833..a21d80df 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -89868,6 +89868,7 @@ ili: i94999 instance_hypernym: - 10492384-n + - 87460721-n members: - Edward - Prince Edward @@ -89969,6 +89970,7 @@ ili: i95007 instance_hypernym: - 10253142-n + - 85994344-n members: - Edward - Edward VIII @@ -107929,6 +107931,7 @@ ili: i96553 instance_hypernym: - 10492384-n + - 87460721-n members: - Philip - Prince Philip @@ -122568,6 +122571,14 @@ members: - alderman partOfSpeech: n +85994344-n: + definition: + - British royal title created for the former monarch Edward VIII after his abdication + hypernym: + - 10058345-n + members: + - Duke of Windsor + partOfSpeech: n 86032704-n: definition: - a female person who has received a degree from a school (high school or college @@ -123499,6 +123510,15 @@ members: - miracle woman partOfSpeech: n +87460721-n: + definition: + - British royal title created for Prince Frederick and subsequently held by other + members of the British royal family + hypernym: + - 10058345-n + members: + - Duke of Edinburgh + partOfSpeech: n 87464708-n: definition: - a man who works in a coal mine From 05496c07168be5f0a84d26e8fb47a41a4c0eb9ba Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 13:02:22 +0000 Subject: [PATCH 06/23] Instance hypernyms Ulysses Guiseppe Guarneri Guiseppe Verdi Kami Ananias Prince Charles Aegospotamos Battle of the Somme --- src/deprecations.csv | 2 ++ src/yaml/entries-b.yaml | 1 - src/yaml/entries-c.yaml | 10 ++++++++++ src/yaml/entries-g.yaml | 15 +++++---------- src/yaml/entries-s.yaml | 2 -- src/yaml/entries-u.yaml | 2 +- src/yaml/noun.act.yaml | 15 ++------------- src/yaml/noun.person.yaml | 23 +++++++++-------------- 8 files changed, 29 insertions(+), 41 deletions(-) diff --git a/src/deprecations.csv b/src/deprecations.csv index 4390a465..87c5c08c 100644 --- a/src/deprecations.csv +++ b/src/deprecations.csv @@ -133,3 +133,5 @@ "ewn-09549740-n","i86699","ewn-09550841-n","i86709","Duplicate (#1127)" "ewn-09542327-n","","ewn-09544015-n","i86663","Duplicate (#1127)" "ewn-09549740-n","","ewn-09550841-n","i86709","Duplicate (#1127)" +"ewn-09616218-n","i87078","ewn-09616022-n","i87077","Duplicate (#1172)" +"ewn-01297864-n","i42176","ewn-00955670-n","i40416","Does not exist (#1172)" diff --git a/src/yaml/entries-b.yaml b/src/yaml/entries-b.yaml index eb7b4f56..16c3a693 100644 --- a/src/yaml/entries-b.yaml +++ b/src/yaml/entries-b.yaml @@ -2990,7 +2990,6 @@ Battle of the Somme: - id: 'battle_of_the_somme%1:04:02::' synset: 01298019-n - id: 'battle_of_the_somme%1:04:01::' - synset: 01297864-n Battle of the Spanish Armada: n: sense: diff --git a/src/yaml/entries-c.yaml b/src/yaml/entries-c.yaml index b31ea6c7..715d8398 100644 --- a/src/yaml/entries-c.yaml +++ b/src/yaml/entries-c.yaml @@ -8495,6 +8495,16 @@ Charles II of England: sense: - id: 'charles_ii_of_england%1:18:01::' synset: 10912538-n +Charles III: + n: + sense: + - id: 'charles_iii%1:18:00::' + synset: 10912168-n +Charles III of England: + n: + sense: + - id: 'charles_iii_of_england%1:18:00::' + synset: 10912168-n Charles IX: n: sense: diff --git a/src/yaml/entries-g.yaml b/src/yaml/entries-g.yaml index ea22e065..e3677269 100644 --- a/src/yaml/entries-g.yaml +++ b/src/yaml/entries-g.yaml @@ -4511,6 +4511,11 @@ Giuseppe Balsamo: sense: - id: 'giuseppe_balsamo%1:18:00::' synset: 10898424-n +Giuseppe Fortunino Francesco Verdi: + n: + sense: + - id: 'giuseppe_fortunino_francesco_verdi%1:18:00::' + synset: 11383015-n Giuseppe Garibaldi: n: sense: @@ -7982,16 +7987,6 @@ Guinness: synset: 11039265-n - id: 'guinness%1:13:00::' synset: 07906515-n -Guiseppe Fortunino Francesco Verdi: - n: - sense: - - id: 'guiseppe_fortunino_francesco_verdi%1:18:00::' - synset: 11383015-n -Guiseppe Guarneri: - n: - sense: - - id: 'guiseppe_guarneri%1:18:00::' - synset: 11037983-n Gujarat: n: sense: diff --git a/src/yaml/entries-s.yaml b/src/yaml/entries-s.yaml index 29313d4d..50ada435 100644 --- a/src/yaml/entries-s.yaml +++ b/src/yaml/entries-s.yaml @@ -12573,14 +12573,12 @@ Somme: - id: 'somme%1:04:02::' synset: 01298019-n - id: 'somme%1:04:01::' - synset: 01297864-n Somme River: n: sense: - id: 'somme_river%1:04:02::' synset: 01298019-n - id: 'somme_river%1:04:01::' - synset: 01297864-n Somrai: n: sense: diff --git a/src/yaml/entries-u.yaml b/src/yaml/entries-u.yaml index 50355d95..9057b768 100644 --- a/src/yaml/entries-u.yaml +++ b/src/yaml/entries-u.yaml @@ -846,7 +846,7 @@ Ulysses: n: sense: - id: 'ulysses%1:18:00::' - synset: 09616218-n + synset: 09616022-n Ulysses Grant: n: sense: diff --git a/src/yaml/noun.act.yaml b/src/yaml/noun.act.yaml index bf80ac1c..78ba9938 100644 --- a/src/yaml/noun.act.yaml +++ b/src/yaml/noun.act.yaml @@ -69785,6 +69785,8 @@ definition: - a river in ancient Thrace (now Turkey); in the mouth of this river the Spartan fleet under Lysander destroyed the Athenian fleet in the final battle of the Peloponnesian + - a naval battle in the mouth of a river in Thrace where the Spartan fleet under + Lysander destroyed the Athenian fleet in the final battle of the Peloponnesian War (404 BC) ili: i42060 instance_hypernym: @@ -71353,19 +71355,6 @@ - Solferino - battle of Solferino partOfSpeech: n -01297864-n: - definition: - - battle in World War I (1916) - domain_region: - - 08949695-n - ili: i42176 - instance_hypernym: - - 00958596-n - members: - - Somme - - Somme River - - Battle of the Somme - partOfSpeech: n 01298019-n: definition: - battle of World War II (1944) diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index a21d80df..b5d1d0ba 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -3263,9 +3263,9 @@ definition: - one the Shinto deities (including mythological beings, spirits of distinguished men, forces of nature) - ili: i86764 - instance_hypernym: + hypernym: - 09557539-n + ili: i86764 members: - Kami partOfSpeech: n @@ -6879,14 +6879,6 @@ - 09507794-n members: - Odysseus - partOfSpeech: n -09616218-n: - definition: - - (Roman mythology) Roman spelling for Odysseus - ili: i87078 - instance_hypernym: - - 09507794-n - members: - Ulysses partOfSpeech: n 09616318-n: @@ -7729,7 +7721,7 @@ partOfSpeech: n 09630085-n: definition: - - a habitual liar (after a New Testament character who was struck dead for lying) + - a New Testament character who was struck dead for lying domain_topic: - 06465519-n exemplifies: @@ -86309,13 +86301,17 @@ partOfSpeech: n 10912168-n: definition: - - the eldest son of Elizabeth II and heir to the English throne (born in 1948) + - the eldest son of Elizabeth II and king of the United Kingdom since 2022 (born + in 1948) ili: i94698 instance_hypernym: - 10493502-n + - 10253142-n members: - Charles - Prince Charles + - Charles III + - Charles III of England partOfSpeech: n 10912316-n: definition: @@ -94043,7 +94039,6 @@ - Guarneri - Guarnieri - Guarnerius - - Guiseppe Guarneri partOfSpeech: n 11038149-n: definition: @@ -116351,7 +116346,7 @@ members: - Verdi - Giuseppe Verdi - - Guiseppe Fortunino Francesco Verdi + - Giuseppe Fortunino Francesco Verdi partOfSpeech: n 11383159-n: definition: From eadd99ff9f5326e8d5c158fcf3e806cd30348625 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 13:10:56 +0000 Subject: [PATCH 07/23] Instance hypernyms Corregidor Anglia Arcadia Aegyptus TT Josef Michel Montgolfier Harriet E. Wilson Joseon --- src/deprecations.csv | 1 + src/yaml/entries-a.yaml | 7 +------ src/yaml/entries-j.yaml | 10 +++++----- src/yaml/entries-s.yaml | 5 +++++ src/yaml/entries-t.yaml | 2 -- src/yaml/noun.act.yaml | 8 +++----- src/yaml/noun.location.yaml | 19 +++++-------------- src/yaml/noun.person.yaml | 4 ++-- 8 files changed, 22 insertions(+), 34 deletions(-) diff --git a/src/deprecations.csv b/src/deprecations.csv index 87c5c08c..d7abbfe2 100644 --- a/src/deprecations.csv +++ b/src/deprecations.csv @@ -135,3 +135,4 @@ "ewn-09549740-n","","ewn-09550841-n","i86709","Duplicate (#1127)" "ewn-09616218-n","i87078","ewn-09616022-n","i87077","Duplicate (#1172)" "ewn-01297864-n","i42176","ewn-00955670-n","i40416","Does not exist (#1172)" +"ewn-08893294-n","i83376","ewn-08891234-n","i83374","Epithet (#1127)" diff --git a/src/yaml/entries-a.yaml b/src/yaml/entries-a.yaml index edaa515b..7b40acfc 100644 --- a/src/yaml/entries-a.yaml +++ b/src/yaml/entries-a.yaml @@ -10288,7 +10288,7 @@ Anglia: n: sense: - id: 'anglia%1:15:00::' - synset: 08893294-n + synset: 08891234-n Anglian: n: sense: @@ -13279,11 +13279,6 @@ Arcadia: sense: - id: 'arcadia%1:15:00::' synset: 08808205-n -Arcadia Aegypti: - n: - sense: - - id: 'arcadia_aegypti%1:15:01::' - synset: 08808205-n Arcadian: n: sense: diff --git a/src/yaml/entries-j.yaml b/src/yaml/entries-j.yaml index 229853f2..05c1b667 100644 --- a/src/yaml/entries-j.yaml +++ b/src/yaml/entries-j.yaml @@ -5119,11 +5119,6 @@ Josef Hoffmann: sense: - id: 'josef_hoffmann%1:18:00::' synset: 11075149-n -Josef Michel Montgolfier: - n: - sense: - - id: 'josef_michel_montgolfier%1:18:00::' - synset: 11207920-n Josef von Sternberg: n: sense: @@ -5293,6 +5288,11 @@ Joseph McCarthy: sense: - id: 'joseph_mccarthy%1:18:00::' synset: 11187585-n +Joseph Michel Montgolfier: + n: + sense: + - id: 'joseph_michel_montgolfier%1:18:00::' + synset: 11207920-n Joseph Oliver: n: sense: diff --git a/src/yaml/entries-s.yaml b/src/yaml/entries-s.yaml index 50ada435..d697be5a 100644 --- a/src/yaml/entries-s.yaml +++ b/src/yaml/entries-s.yaml @@ -15452,6 +15452,11 @@ State of Kuwait: sense: - id: 'state_of_kuwait%1:15:00::' synset: 08949016-n +State of Libya: + n: + sense: + - id: 'state_of_libya%1:15:00::' + synset: 08979456-n State of Palestine: n: sense: diff --git a/src/yaml/entries-t.yaml b/src/yaml/entries-t.yaml index 98800c34..9c8ce059 100644 --- a/src/yaml/entries-t.yaml +++ b/src/yaml/entries-t.yaml @@ -269,8 +269,6 @@ TT: sense: - id: 'tt%1:28:00::' synset: 15181706-n - - id: 'tt%1:15:01::' - synset: 09000531-n - id: 'tt%1:15:00::' synset: 08856040-n TURP: diff --git a/src/yaml/noun.act.yaml b/src/yaml/noun.act.yaml index 78ba9938..9a3776c7 100644 --- a/src/yaml/noun.act.yaml +++ b/src/yaml/noun.act.yaml @@ -69783,8 +69783,6 @@ partOfSpeech: n 01271379-n: definition: - - a river in ancient Thrace (now Turkey); in the mouth of this river the Spartan - fleet under Lysander destroyed the Athenian fleet in the final battle of the Peloponnesian - a naval battle in the mouth of a river in Thrace where the Spartan fleet under Lysander destroyed the Athenian fleet in the final battle of the Peloponnesian War (404 BC) @@ -69867,9 +69865,9 @@ partOfSpeech: n 01272836-n: definition: - - the peninsula and island in the Philippines where Japanese forces besieged American - forces in World War II; United States forces surrendered in 1942 and recaptured - the area in 1945 + - a siege on a peninsula and island in the Philippines where Japanese forces besieged + American forces in World War II; United States forces surrendered in 1942 and + recaptured the area in 1945 domain_region: - 09002670-n ili: i42066 diff --git a/src/yaml/noun.location.yaml b/src/yaml/noun.location.yaml index 207b226a..6464cf94 100644 --- a/src/yaml/noun.location.yaml +++ b/src/yaml/noun.location.yaml @@ -15797,7 +15797,6 @@ instance_hypernym: - 08591861-n members: - - Arcadia Aegypti - Arcadia mero_member: - 09731150-n @@ -19706,6 +19705,7 @@ - 08714745-n members: - England + - Anglia mero_member: - 09720544-n - 09720999-n @@ -19789,15 +19789,6 @@ members: - Albion partOfSpeech: n -08893294-n: - definition: - - the Latin name for England - ili: i83376 - instance_hypernym: - - 08891234-n - members: - - Anglia - partOfSpeech: n 08893496-n: definition: - a city in northwestern England @@ -24379,7 +24370,7 @@ - the name for Korea as a Japanese province (1910-1945) ili: i83764 instance_hypernym: - - 08974384-n + - 08516868-n members: - Joseon - Chosen @@ -24661,14 +24652,15 @@ partOfSpeech: n 08979456-n: definition: - - a military dictatorship in northern Africa on the Mediterranean; consists almost - entirely of desert; a major exporter of petroleum + - a country in northern Africa on the Mediterranean; consists almost entirely of + desert; a major exporter of petroleum ili: i83786 instance_hypernym: - 08716193-n members: - Libya - Socialist People's Libyan Arab Jamahiriya + - State of Libya mero_member: - 09740363-n mero_part: @@ -25885,7 +25877,6 @@ members: - Palau - Republic of Palau - - TT partOfSpeech: n 09000713-n: definition: diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index b5d1d0ba..c0388592 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -104963,7 +104963,7 @@ - 09854736-n members: - Montgolfier - - Josef Michel Montgolfier + - Joseph Michel Montgolfier partOfSpeech: n 11208113-n: definition: @@ -118304,7 +118304,7 @@ 11412363-n: definition: - author of the first novel by an African American that was published in the United - States (1808-1870) + States (1825-1900) ili: i97453 instance_hypernym: - 10813654-n From 9f531d1c30abc4e68cf8d384ba3abf76a02ad717 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 13:12:52 +0000 Subject: [PATCH 08/23] Some errors introduced by EWE --- src/yaml/entries-b.yaml | 1 - src/yaml/entries-s.yaml | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/yaml/entries-b.yaml b/src/yaml/entries-b.yaml index 16c3a693..43667b13 100644 --- a/src/yaml/entries-b.yaml +++ b/src/yaml/entries-b.yaml @@ -2989,7 +2989,6 @@ Battle of the Somme: sense: - id: 'battle_of_the_somme%1:04:02::' synset: 01298019-n - - id: 'battle_of_the_somme%1:04:01::' Battle of the Spanish Armada: n: sense: diff --git a/src/yaml/entries-s.yaml b/src/yaml/entries-s.yaml index d697be5a..99f2c834 100644 --- a/src/yaml/entries-s.yaml +++ b/src/yaml/entries-s.yaml @@ -12572,13 +12572,11 @@ Somme: sense: - id: 'somme%1:04:02::' synset: 01298019-n - - id: 'somme%1:04:01::' Somme River: n: sense: - id: 'somme_river%1:04:02::' synset: 01298019-n - - id: 'somme_river%1:04:01::' Somrai: n: sense: From fcabf50dbabe5bef612a182361863fce72bc8926 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 13:19:11 +0000 Subject: [PATCH 09/23] Instance Hypernyms Helvetia Singapore --- src/deprecations.csv | 2 ++ src/yaml/entries-c.yaml | 5 ----- src/yaml/entries-h.yaml | 2 +- src/yaml/entries-s.yaml | 7 +------ src/yaml/noun.location.yaml | 28 +++++----------------------- 5 files changed, 9 insertions(+), 35 deletions(-) diff --git a/src/deprecations.csv b/src/deprecations.csv index d7abbfe2..bb812151 100644 --- a/src/deprecations.csv +++ b/src/deprecations.csv @@ -136,3 +136,5 @@ "ewn-09616218-n","i87078","ewn-09616022-n","i87077","Duplicate (#1172)" "ewn-01297864-n","i42176","ewn-00955670-n","i40416","Does not exist (#1172)" "ewn-08893294-n","i83376","ewn-08891234-n","i83374","Epithet (#1127)" +"ewn-09054580-n","","ewn-09054023-n","i84121","Epithet (#1127)" +"ewn-09020171-n","i83965","ewn-09019857-n","i83964","City is also the country (#1127)" diff --git a/src/yaml/entries-c.yaml b/src/yaml/entries-c.yaml index 715d8398..ba7b105e 100644 --- a/src/yaml/entries-c.yaml +++ b/src/yaml/entries-c.yaml @@ -28866,11 +28866,6 @@ capital of Sierra Leone: sense: - id: 'capital_of_sierra_leone%1:15:00::' synset: 09019502-n -capital of Singapore: - n: - sense: - - id: 'capital_of_singapore%1:15:00::' - synset: 09020171-n capital of Slovakia: n: sense: diff --git a/src/yaml/entries-h.yaml b/src/yaml/entries-h.yaml index ec52d248..f841a352 100644 --- a/src/yaml/entries-h.yaml +++ b/src/yaml/entries-h.yaml @@ -3470,7 +3470,7 @@ Helvetia: n: sense: - id: 'helvetia%1:15:00::' - synset: 09054580-n + synset: 09054023-n Helvetian: n: sense: diff --git a/src/yaml/entries-s.yaml b/src/yaml/entries-s.yaml index 99f2c834..89c72135 100644 --- a/src/yaml/entries-s.yaml +++ b/src/yaml/entries-s.yaml @@ -9901,10 +9901,6 @@ Singan: Singapore: n: sense: - - derivation: - - 'singaporean%3:01:01::' - id: 'singapore%1:15:02::' - synset: 09020171-n - derivation: - 'singaporean%3:01:02::' - 'singaporean%3:01:01::' @@ -9940,11 +9936,10 @@ Singaporean: synset: 03129503-a - derivation: - 'singaporean%1:18:00::' - - 'singapore%1:15:02::' - 'singapore%1:15:00::' id: 'singaporean%3:01:01::' pertainym: - - 'singapore%1:15:02::' + - 'singapore%1:15:00::' synset: 03129321-a n: pronunciation: diff --git a/src/yaml/noun.location.yaml b/src/yaml/noun.location.yaml index 6464cf94..f8972ab8 100644 --- a/src/yaml/noun.location.yaml +++ b/src/yaml/noun.location.yaml @@ -27000,28 +27000,17 @@ partOfSpeech: n 09019857-n: definition: - - a country in southeastern Asia on the island of Singapore; achieved independence + - a country and city in southeastern Asia on the island of Singapore; achieved independence from Malaysia in 1965 ili: i83964 instance_hypernym: - 08718069-n + - 08709407-n members: - Singapore - Republic of Singapore mero_member: - 09768945-n - mero_part: - - 09020171-n - partOfSpeech: n -09020171-n: - definition: - - the capital of Singapore; one of the world's biggest ports - ili: i83965 - instance_hypernym: - - 08709407-n - members: - - Singapore - - capital of Singapore partOfSpeech: n 09020346-n: definition: @@ -28987,6 +28976,7 @@ - Suisse - Schweiz - Svizzera + - Helvetia mero_part: - 08819398-n - 08965050-n @@ -29005,14 +28995,6 @@ - 09431855-n - 09500697-n partOfSpeech: n -09054580-n: - definition: - - the Latin name for Switzerland - instance_hypernym: - - 09054023-n - members: - - Helvetia - partOfSpeech: n 09054666-n: definition: - one of the cantons of Switzerland @@ -36297,11 +36279,11 @@ partOfSpeech: n 09175156-n: definition: - - a village in northeastern Virginia where battles were fought during the American + - a county in northeastern Virginia where battles were fought during the American Civil War ili: i84733 instance_hypernym: - - 08690476-n + - 08564445-n members: - Spotsylvania County - Spotsylvania From 9bcf2329aad57c6b434c4c8bb3c9a26a6632f52d Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 13:24:59 +0000 Subject: [PATCH 10/23] Instance hypernyms zeppelin Albion Mashriq Burkina Faso Vatican City Northamptonshire --- src/deprecations.csv | 3 +++ src/yaml/entries-a.yaml | 2 +- src/yaml/noun.artifact.yaml | 4 ++-- src/yaml/noun.location.yaml | 23 ++++++++--------------- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/deprecations.csv b/src/deprecations.csv index bb812151..7850f88f 100644 --- a/src/deprecations.csv +++ b/src/deprecations.csv @@ -138,3 +138,6 @@ "ewn-08893294-n","i83376","ewn-08891234-n","i83374","Epithet (#1127)" "ewn-09054580-n","","ewn-09054023-n","i84121","Epithet (#1127)" "ewn-09020171-n","i83965","ewn-09019857-n","i83964","City is also the country (#1127)" +"ewn-09054580-n","","ewn-09054023-n","i84121","Epithet (#1127)" +"ewn-09020171-n","","ewn-09019857-n","i83964","City is also the country (#1127)" +"ewn-08893163-n","i83375","ewn-08879115-n","i83373","Epithet (#1127)" diff --git a/src/yaml/entries-a.yaml b/src/yaml/entries-a.yaml index 7b40acfc..f9b794f4 100644 --- a/src/yaml/entries-a.yaml +++ b/src/yaml/entries-a.yaml @@ -5274,7 +5274,7 @@ Albion: variety: US sense: - id: 'albion%1:15:00::' - synset: 08893163-n + synset: 08879115-n Albizia julibrissin: n: sense: diff --git a/src/yaml/noun.artifact.yaml b/src/yaml/noun.artifact.yaml index a1b47cdc..c3c84f07 100644 --- a/src/yaml/noun.artifact.yaml +++ b/src/yaml/noun.artifact.yaml @@ -122094,9 +122094,9 @@ 04621729-n: definition: - a large rigid dirigible designed to carry passengers or bombs - ili: i61332 - instance_hypernym: + hypernym: - 02695736-n + ili: i61332 members: - zeppelin - Graf Zeppelin diff --git a/src/yaml/noun.location.yaml b/src/yaml/noun.location.yaml index f8972ab8..97f9e214 100644 --- a/src/yaml/noun.location.yaml +++ b/src/yaml/noun.location.yaml @@ -15868,12 +15868,12 @@ partOfSpeech: n 08809830-n: definition: - - Arabic name for the Middle East + - Arab part of the Middle East domain_topic: - 07000717-n ili: i83066 instance_hypernym: - - 08809019-n + - 08591861-n members: - Mashriq partOfSpeech: n @@ -19691,6 +19691,7 @@ - United Kingdom of Great Britain and Northern Ireland - Great Britain - Blighty + - Albion mero_part: - 08891234-n - 08908068-n @@ -19779,16 +19780,6 @@ - 09484645-n - 09487935-n partOfSpeech: n -08893163-n: - definition: - - archaic name for England or Great Britain; used poetically - ili: i83375 - instance_hypernym: - - 08891234-n - - 08877934-n - members: - - Albion - partOfSpeech: n 08893496-n: definition: - a city in northwestern England @@ -20561,7 +20552,7 @@ partOfSpeech: n 08906000-n: definition: - - a county is central England + - a county in central England ili: i83447 instance_hypernym: - 08563758-n @@ -21156,8 +21147,8 @@ partOfSpeech: n 08916686-n: definition: - - a desperately poor landlocked country in western Africa; was formerly Upper Volta - under French rule but gained independence in 1960 + - a landlocked country in western Africa; was formerly Upper Volta under French + rule but gained independence in 1960 ili: i83499 instance_hypernym: - 08562388-n @@ -36846,6 +36837,8 @@ ili: i84780 instance_hypernym: - 08542298-n + - 08562388-n + - 08714745-n members: - Vatican City - Citta del Vaticano From ded581a6c519ef8f05191c344ef8eefbbb498800 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 13:31:15 +0000 Subject: [PATCH 11/23] Add the country of Montenegro --- src/yaml/entries-c.yaml | 2 ++ src/yaml/entries-m.yaml | 2 ++ src/yaml/noun.location.yaml | 12 ++++++++++++ 3 files changed, 16 insertions(+) diff --git a/src/yaml/entries-c.yaml b/src/yaml/entries-c.yaml index ba7b105e..fe1946d4 100644 --- a/src/yaml/entries-c.yaml +++ b/src/yaml/entries-c.yaml @@ -17542,6 +17542,8 @@ Crna Gora: sense: - id: 'crna_gora%1:15:00::' synset: 08835087-n + - id: 'crna_gora%1:15:01::' + synset: 86097949-n Cro-magnon: n: sense: diff --git a/src/yaml/entries-m.yaml b/src/yaml/entries-m.yaml index d408bf83..4790c854 100644 --- a/src/yaml/entries-m.yaml +++ b/src/yaml/entries-m.yaml @@ -11422,6 +11422,8 @@ Montenegro: sense: - id: 'montenegro%1:15:00::' synset: 08835087-n + - id: 'montenegro%1:15:01::' + synset: 86097949-n Monterey: n: sense: diff --git a/src/yaml/noun.location.yaml b/src/yaml/noun.location.yaml index 97f9e214..a8326ee6 100644 --- a/src/yaml/noun.location.yaml +++ b/src/yaml/noun.location.yaml @@ -11300,6 +11300,7 @@ - 08981403-n - 09061886-n - 09235983-n + - 86097949-n partOfSpeech: n 08731965-n: definition: @@ -37963,6 +37964,17 @@ - Somaliland - Republic of Somaliland partOfSpeech: n +86097949-n: + definition: + - a country in Southeastern Europe bordering Bosnia, Albania and Serbia, formerly + part of Yugoslavia + hypernym: + - 08714745-n + members: + - Montenegro + - Crna Gora + partOfSpeech: n + wikidata: Q236 88471280-n: definition: - disputed state in the South Caucasus From 97b40deeed9a6f52714adaac0a7f2f94629b3901 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 13:37:07 +0000 Subject: [PATCH 12/23] Instance hypernyms Parkinson's law Malaysian states Battle of Lake Trasmine --- src/deprecations.csv | 8 +++ src/yaml/entries-b.yaml | 4 +- src/yaml/entries-j.yaml | 4 -- src/yaml/entries-k.yaml | 4 -- src/yaml/entries-p.yaml | 6 --- src/yaml/entries-t.yaml | 4 +- src/yaml/noun.act.yaml | 16 +----- src/yaml/noun.communication.yaml | 14 +----- src/yaml/noun.location.yaml | 86 +++++--------------------------- 9 files changed, 26 insertions(+), 120 deletions(-) diff --git a/src/deprecations.csv b/src/deprecations.csv index 7850f88f..fc01ea71 100644 --- a/src/deprecations.csv +++ b/src/deprecations.csv @@ -141,3 +141,11 @@ "ewn-09054580-n","","ewn-09054023-n","i84121","Epithet (#1127)" "ewn-09020171-n","","ewn-09019857-n","i83964","City is also the country (#1127)" "ewn-08893163-n","i83375","ewn-08879115-n","i83373","Epithet (#1127)" +"ewn-06780078-n","i72050","ewn-06780303-n","i72051","Duplicate (#1127)" +"ewn-92333128-n","","ewn-08985864-n","","Duplicate (#1127)" +"ewn-92333130-n","","ewn-08986176-n","","Duplicate (#1127)" +"ewn-92333131-n","","ewn-08986325-n","","Duplicate (#1127)" +"ewn-92333132-n","","ewn-08986475-n","","Duplicate (#1127)" +"ewn-92333133-n","","ewn-08986627-n","","Duplicate (#1127)" +"ewn-92333134-n","","ewn-08986776-n","","Duplicate (#1127)" +"ewn-01300469-n","i42189","ewn-01285678-n","i42122","Duplicate (#1127)" diff --git a/src/yaml/entries-b.yaml b/src/yaml/entries-b.yaml index 43667b13..d7229bb8 100644 --- a/src/yaml/entries-b.yaml +++ b/src/yaml/entries-b.yaml @@ -2800,8 +2800,6 @@ Battle of Kwajalein: Battle of Lake Trasimene: n: sense: - - id: 'battle_of_lake_trasimene%1:04:01::' - synset: 01300469-n - id: 'battle_of_lake_trasimene%1:04:02::' synset: 01285678-n Battle of Lake Trasimenus: @@ -23337,7 +23335,7 @@ battle of Trasimeno: n: sense: - id: 'battle_of_trasimeno%1:04:00::' - synset: 01300469-n + synset: 01285678-n battle of Valmy: n: sense: diff --git a/src/yaml/entries-j.yaml b/src/yaml/entries-j.yaml index 05c1b667..94e6aa0d 100644 --- a/src/yaml/entries-j.yaml +++ b/src/yaml/entries-j.yaml @@ -4808,15 +4808,11 @@ Johor: sense: - id: 'johor%1:15:00::' synset: 08986776-n - - id: 'johor%1:15:01::' - synset: 92333134-n Johore: n: sense: - id: 'johore%1:15:00::' synset: 08986776-n - - id: 'johore%1:15:01::' - synset: 92333134-n Joint Chiefs: n: sense: diff --git a/src/yaml/entries-k.yaml b/src/yaml/entries-k.yaml index 3c73dd9c..68ab1d93 100644 --- a/src/yaml/entries-k.yaml +++ b/src/yaml/entries-k.yaml @@ -1566,8 +1566,6 @@ Kedah: sense: - id: 'kedah%1:15:00::' synset: 08986627-n - - id: 'kedah%1:15:01::' - synset: 92333133-n Keflex: n: sense: @@ -1626,8 +1624,6 @@ Kelantan: sense: - id: 'kelantan%1:15:00::' synset: 08986475-n - - id: 'kelantan%1:15:01::' - synset: 92333132-n Keller: n: sense: diff --git a/src/yaml/entries-p.yaml b/src/yaml/entries-p.yaml index 27aac6b1..380177be 100644 --- a/src/yaml/entries-p.yaml +++ b/src/yaml/entries-p.yaml @@ -776,8 +776,6 @@ Pahang: sense: - id: 'pahang%1:15:00::' synset: 08986325-n - - id: 'pahang%1:15:01::' - synset: 92333131-n Pahlavi: n: sense: @@ -2262,8 +2260,6 @@ Parkinson's law: sense: - id: 'parkinson''s_law%1:10:02::' synset: 06780303-n - - id: 'parkinson''s_law%1:10:01::' - synset: 06780078-n Parkinson's syndrome: n: sense: @@ -4366,8 +4362,6 @@ Perak: sense: - id: 'perak%1:15:00::' synset: 08986176-n - - id: 'perak%1:15:01::' - synset: 92333130-n Peramelidae: n: sense: diff --git a/src/yaml/entries-t.yaml b/src/yaml/entries-t.yaml index 9c8ce059..e6ec477a 100644 --- a/src/yaml/entries-t.yaml +++ b/src/yaml/entries-t.yaml @@ -2725,8 +2725,6 @@ Terengganu: sense: - id: 'terengganu%1:15:00::' synset: 08985864-n - - id: 'terengganu%1:15:01::' - synset: 92333128-n Teresa: n: sense: @@ -6603,7 +6601,7 @@ Trasimeno: n: sense: - id: 'trasimeno%1:04:00::' - synset: 01300469-n + synset: 01285678-n Traubel: n: sense: diff --git a/src/yaml/noun.act.yaml b/src/yaml/noun.act.yaml index 9a3776c7..1b6c6cbf 100644 --- a/src/yaml/noun.act.yaml +++ b/src/yaml/noun.act.yaml @@ -70638,6 +70638,8 @@ - Battle of Lake Trasimene - Lake Trasimenus - Battle of Lake Trasimenus + - Trasimeno + - battle of Trasimeno partOfSpeech: n 01285882-n: definition: @@ -71510,20 +71512,6 @@ - Trafalgar - battle of Trafalgar partOfSpeech: n -01300469-n: - definition: - - a battle in central Italy where Hannibal defeated the Romans under Flaminius in - 217 BC - domain_region: - - 08819530-n - ili: i42189 - instance_hypernym: - - 00958596-n - members: - - Battle of Lake Trasimene - - Trasimeno - - battle of Trasimeno - partOfSpeech: n 01300653-n: definition: - a naval battle in the Russo-Japanese War (1905); the Japanese fleet defeated the diff --git a/src/yaml/noun.communication.yaml b/src/yaml/noun.communication.yaml index d4a43025..553a4f1e 100644 --- a/src/yaml/noun.communication.yaml +++ b/src/yaml/noun.communication.yaml @@ -29739,21 +29739,11 @@ - reflection - reflexion partOfSpeech: n -06780078-n: - definition: - - C. Northcote Parkinson's cynical observation that the number of subordinates in - an organization will increase linearly regardless of the amount of work to be - done - ili: i72050 - instance_hypernym: - - 06779826-n - members: - - Parkinson's law - partOfSpeech: n 06780303-n: definition: - C. Northcote Parkinson's cynical observation that work will expand so as to fill - the time available for its completion + the time available for its completion and that the number of subordinates in an + organization will increase linearly regardless of the amount of work to be done ili: i72051 instance_hypernym: - 06779826-n diff --git a/src/yaml/noun.location.yaml b/src/yaml/noun.location.yaml index a8326ee6..7b215b78 100644 --- a/src/yaml/noun.location.yaml +++ b/src/yaml/noun.location.yaml @@ -24925,12 +24925,6 @@ - 08986475-n - 08986627-n - 08986776-n - - 92333128-n - - 92333130-n - - 92333133-n - - 92333134-n - - 92333132-n - - 92333131-n partOfSpeech: n wikidata: Q1973345 08984548-n: @@ -24997,7 +24991,8 @@ wikidata: Q213893 08985864-n: definition: - - sultanate and one of the 13 states of the Federation of Malaysia + - sultanate and one of the 13 states of the Federation of Malaysia; situated in + eastern Peninsular Malaysia instance_hypernym: - 08984793-n - 08916554-n @@ -25014,7 +25009,8 @@ partOfSpeech: n 08986176-n: definition: - - sultanate and one of the 13 states that constitute the Federation of Malaysia + - sultanate and one of the 13 states that constitute the Federation of Malaysia; + is the fourth largest state in the country instance_hypernym: - 08984793-n members: @@ -25022,7 +25018,8 @@ partOfSpeech: n 08986325-n: definition: - - sultanate and one of the 13 states that constitute the Federation of Malaysia + - the third largest state in Malaysia, sultanate and one of the 13 states that constitute + the Federation of Malaysia instance_hypernym: - 08984793-n members: @@ -25030,7 +25027,8 @@ partOfSpeech: n 08986475-n: definition: - - sultanate and one of the 13 states that constitute the Federation of Malaysia + - sultanate and one of the 13 states that constitute the Federation of Malaysia; + positioned in the north-east of Peninsular Malaysia instance_hypernym: - 08984793-n members: @@ -25038,7 +25036,8 @@ partOfSpeech: n 08986627-n: definition: - - sultanate and one of the 13 states that constitute the Federation of Malaysia + - sultanate and one of the 13 states that constitute the Federation of Malaysia; + located in the northwestern part of Peninsular Malaysia instance_hypernym: - 08984793-n members: @@ -25046,7 +25045,8 @@ partOfSpeech: n 08986776-n: definition: - - sultanate and one of the 13 states that constitute the Federation of Malaysia + - sultanate and one of the 13 states that constitute the Federation of Malaysia; + located in the southern portion of Peninsular Malaysia instance_hypernym: - 08984793-n members: @@ -38020,68 +38020,6 @@ - Saharawi Arab Democratic Republic - Western Sahara partOfSpeech: n -92333128-n: - definition: - - sultanate and one of the 13 states of the Federation of Malaysia; situated in - eastern Peninsular Malaysia - instance_hypernym: - - 08984793-n - - 08916554-n - members: - - Terengganu - partOfSpeech: n - source: plWordNet 4.0 -92333130-n: - definition: - - sultanate and one of the 13 states that constitute the Federation of Malaysia; - is the fourth largest state in the country - instance_hypernym: - - 08984793-n - members: - - Perak - partOfSpeech: n - source: plWordNet 4.0 -92333131-n: - definition: - - the third largest state in Malaysia, sultanate and one of the 13 states that constitute - the Federation of Malaysia - instance_hypernym: - - 08984793-n - members: - - Pahang - partOfSpeech: n - source: plWordNet 4.0 -92333132-n: - definition: - - sultanate and one of the 13 states that constitute the Federation of Malaysia; - positioned in the north-east of Peninsular Malaysia - instance_hypernym: - - 08984793-n - members: - - Kelantan - partOfSpeech: n - source: plWordNet 4.0 -92333133-n: - definition: - - sultanate and one of the 13 states that constitute the Federation of Malaysia; - located in the northwestern part of Peninsular Malaysia - instance_hypernym: - - 08984793-n - members: - - Kedah - partOfSpeech: n - source: plWordNet 4.0 -92333134-n: - definition: - - sultanate and one of the 13 states that constitute the Federation of Malaysia; - located in the southern portion of Peninsular Malaysia - instance_hypernym: - - 08984793-n - members: - - Johor - - Johore - partOfSpeech: n - source: plWordNet 4.0 92406097-n: definition: - an administrative-territorial division of the Russian Empire from 1775-1917. From d433dd013b43b9cf27524bc93627fec5d4595bad Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 13:43:25 +0000 Subject: [PATCH 13/23] Remove orphaned link --- src/yaml/noun.act.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/yaml/noun.act.yaml b/src/yaml/noun.act.yaml index 10d5acf9..e6a698f5 100644 --- a/src/yaml/noun.act.yaml +++ b/src/yaml/noun.act.yaml @@ -72433,7 +72433,6 @@ - 01284959-n - 01289924-n - 01297282-n - - 01297864-n - 01298996-n - 01301064-n - 01302999-n From 821f70638ac9c7b8b6ebece3946dd13eef89d4c4 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 13:49:33 +0000 Subject: [PATCH 14/23] Pepto-bismal=>Pepto-bismol Fixes #1130 --- src/yaml/entries-p.yaml | 4 ++-- src/yaml/noun.substance.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/yaml/entries-p.yaml b/src/yaml/entries-p.yaml index 5dbacbad..f532e9c5 100644 --- a/src/yaml/entries-p.yaml +++ b/src/yaml/entries-p.yaml @@ -4355,10 +4355,10 @@ Pepsi Cola: sense: - id: 'pepsi_cola%1:13:00::' synset: 07945030-n -Pepto-bismal: +Pepto-bismol: n: sense: - - id: 'pepto-bismal%1:27:00::' + - id: 'pepto-bismol%1:27:00::' synset: 14801927-n Pepys: n: diff --git a/src/yaml/noun.substance.yaml b/src/yaml/noun.substance.yaml index 8f5c48e4..b78831d3 100644 --- a/src/yaml/noun.substance.yaml +++ b/src/yaml/noun.substance.yaml @@ -11118,7 +11118,7 @@ - 14802178-n ili: i114679 members: - - Pepto-bismal + - Pepto-bismol partOfSpeech: n 14802015-n: definition: From 2fe2cf91b404fb0bc9cf91317e88b57264ab1767 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 14:00:10 +0000 Subject: [PATCH 15/23] Add needleman Fixes #1046 --- src/yaml/entries-n.yaml | 5 +++++ src/yaml/noun.person.yaml | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/src/yaml/entries-n.yaml b/src/yaml/entries-n.yaml index 2d37adb2..0864b133 100644 --- a/src/yaml/entries-n.yaml +++ b/src/yaml/entries-n.yaml @@ -11669,6 +11669,11 @@ needlelike: sense: - id: needlelike%5:00:00:pointed:00 synset: 01815474-s +needleman: + n: + sense: + - id: 'needleman%1:18:00::' + synset: 87565945-n needlenose pliers: n: sense: diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index da20b012..13e50154 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -126262,6 +126262,15 @@ members: - gagman partOfSpeech: n +87565945-n: + definition: + - a man who makes or mends dresses + hypernym: + - 10140473-n + - 10306910-n + members: + - needleman + partOfSpeech: n 87584402-n: definition: - archer who uses an arbalest From 100791a60fc4e5d946f3750eaf0a30f1148bc225 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 14:02:40 +0000 Subject: [PATCH 16/23] Change definition of observer Fixes #1055 --- src/yaml/verb.social.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yaml/verb.social.yaml b/src/yaml/verb.social.yaml index 58a6de5c..8cc4da3e 100644 --- a/src/yaml/verb.social.yaml +++ b/src/yaml/verb.social.yaml @@ -11751,7 +11751,7 @@ partOfSpeech: v 02584595-v: definition: - - behave as expected during of holidays or rites + - behave as expected during holidays or rites example: - Keep the commandments - celebrate Christmas From bfa19dc81c6eb409b9d38a798c1fc4c7b78c6103 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 14:10:28 +0000 Subject: [PATCH 17/23] Fix hypernyms of some 'change' verbs Fixes #1056 --- src/yaml/verb.change.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/yaml/verb.change.yaml b/src/yaml/verb.change.yaml index c6b2cf89..7c21a558 100644 --- a/src/yaml/verb.change.yaml +++ b/src/yaml/verb.change.yaml @@ -633,7 +633,7 @@ - vary the frequency, amplitude, phase, or other characteristic of (electromagnetic waves) hypernym: - - 00122978-v + - 00125072-v ili: i22377 members: - modulate @@ -642,7 +642,7 @@ definition: - to modify microorganisms by repeated culture in the developing chick embryo hypernym: - - 00122978-v + - 00125072-v ili: i22378 members: - avianize @@ -10724,7 +10724,7 @@ example: - Adapt our native cuisine to the available food resources of the new country hypernym: - - 00122978-v + - 00125072-v ili: i23224 members: - adapt @@ -10982,7 +10982,7 @@ example: - Let out that dress — I gained a lot of weight hypernym: - - 00122978-v + - 00125072-v ili: i23244 members: - let out @@ -10994,7 +10994,7 @@ example: - Please take in this skirt — I've lost weight hypernym: - - 00122978-v + - 00125072-v ili: i23245 members: - take in @@ -25047,7 +25047,7 @@ definition: - make full of cavities, like a honeycomb hypernym: - - 00122978-v + - 00125072-v ili: i24394 members: - honeycomb From 64e32322950ccaee67786d2e31c1cab7cd302d72 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 14:28:07 +0000 Subject: [PATCH 18/23] Fix exemplifies links Fixes #1099 --- src/yaml/entries-c.yaml | 8 ++++++-- src/yaml/entries-e.yaml | 4 +++- src/yaml/entries-f.yaml | 4 +++- src/yaml/entries-l.yaml | 4 +++- src/yaml/entries-s.yaml | 8 ++++++-- src/yaml/noun.communication.yaml | 8 -------- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/yaml/entries-c.yaml b/src/yaml/entries-c.yaml index 0e376487..099788f4 100644 --- a/src/yaml/entries-c.yaml +++ b/src/yaml/entries-c.yaml @@ -6150,7 +6150,9 @@ Cebidae: Cebion: n: sense: - - id: 'cebion%1:06:01::' + - exemplifies: + - 'trademark%1:10:00::' + id: 'cebion%1:06:01::' synset: 92460019-n Cebu: n: @@ -116693,7 +116695,9 @@ crimping iron: crimping pliers: n: sense: - - id: 'crimping_pliers%1:06:01::' + - exemplifies: + - 'plural%1:10:00::' + id: 'crimping_pliers%1:06:01::' synset: 92460209-n crimson: a: diff --git a/src/yaml/entries-e.yaml b/src/yaml/entries-e.yaml index cdbfc234..dcc7e3ca 100644 --- a/src/yaml/entries-e.yaml +++ b/src/yaml/entries-e.yaml @@ -28046,7 +28046,9 @@ entry word: entryphone: n: sense: - - id: 'entryphone%1:06:01::' + - exemplifies: + - 'trademark%1:10:00::' + id: 'entryphone%1:06:01::' synset: 92448672-n entryway: n: diff --git a/src/yaml/entries-f.yaml b/src/yaml/entries-f.yaml index d2ccc587..336a333f 100644 --- a/src/yaml/entries-f.yaml +++ b/src/yaml/entries-f.yaml @@ -32171,7 +32171,9 @@ fishnet: fishnet stockings: n: sense: - - id: 'fishnet_stockings%1:06:01::' + - exemplifies: + - 'plural%1:10:00::' + id: 'fishnet_stockings%1:06:01::' synset: 92464059-n fishpaste: n: diff --git a/src/yaml/entries-l.yaml b/src/yaml/entries-l.yaml index cfc17651..e645965b 100644 --- a/src/yaml/entries-l.yaml +++ b/src/yaml/entries-l.yaml @@ -9515,7 +9515,9 @@ Lysippus: Lysoform: n: sense: - - id: 'lysoform%1:06:01::' + - exemplifies: + - 'trademark%1:10:00::' + id: 'lysoform%1:06:01::' synset: 92433720-n Lysol: n: diff --git a/src/yaml/entries-s.yaml b/src/yaml/entries-s.yaml index 29313d4d..649f5fca 100644 --- a/src/yaml/entries-s.yaml +++ b/src/yaml/entries-s.yaml @@ -21741,7 +21741,9 @@ saloon keeper: salopettes: n: sense: - - id: 'salopettes%1:06:01::' + - exemplifies: + - 'plural%1:10:00::' + id: 'salopettes%1:06:01::' synset: 92464512-n salp: n: @@ -69514,7 +69516,9 @@ ski mask: ski pants: n: sense: - - id: 'ski_pants%1:06:01::' + - exemplifies: + - 'plural%1:10:00::' + id: 'ski_pants%1:06:01::' synset: 92464512-n ski parka: n: diff --git a/src/yaml/noun.communication.yaml b/src/yaml/noun.communication.yaml index 118f4d66..920695cf 100644 --- a/src/yaml/noun.communication.yaml +++ b/src/yaml/noun.communication.yaml @@ -2482,10 +2482,6 @@ 06306016-n: definition: - the form of a word that is used to denote more than one - exemplifies: - - 92464059-n - - 92460209-n - - 92464512-n hypernym: - 06301417-n ili: i69585 @@ -34673,10 +34669,6 @@ definition: - a formally registered symbol (‘™’) identifying the manufacturer or distributor of a product - exemplifies: - - 92433720-n - - 92460019-n - - 92448672-n hypernym: - 07284884-n ili: i72497 From 4bee6371788f04410df607c43ef03679c3fe1576 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 14:40:26 +0000 Subject: [PATCH 19/23] Change hypernym of male homophobic slurs Fixes #1100 --- src/yaml/noun.person.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index da20b012..c5b8c0ef 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -35798,7 +35798,7 @@ - 06730109-n - 07139048-n hypernym: - - 10202544-n + - 83837368-n ili: i89870 members: - fagot From 629e009099c013419ad9d8412fa6dc24e949ea1f Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 15:18:30 +0000 Subject: [PATCH 20/23] Update erroneous value --- src/yaml/verb.change.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/yaml/verb.change.yaml b/src/yaml/verb.change.yaml index 7c21a558..ed89553b 100644 --- a/src/yaml/verb.change.yaml +++ b/src/yaml/verb.change.yaml @@ -633,7 +633,7 @@ - vary the frequency, amplitude, phase, or other characteristic of (electromagnetic waves) hypernym: - - 00125072-v + - 00126072-v ili: i22377 members: - modulate @@ -642,7 +642,7 @@ definition: - to modify microorganisms by repeated culture in the developing chick embryo hypernym: - - 00125072-v + - 00126072-v ili: i22378 members: - avianize @@ -10724,7 +10724,7 @@ example: - Adapt our native cuisine to the available food resources of the new country hypernym: - - 00125072-v + - 00126072-v ili: i23224 members: - adapt @@ -10982,7 +10982,7 @@ example: - Let out that dress — I gained a lot of weight hypernym: - - 00125072-v + - 00126072-v ili: i23244 members: - let out @@ -10994,7 +10994,7 @@ example: - Please take in this skirt — I've lost weight hypernym: - - 00125072-v + - 00126072-v ili: i23245 members: - take in @@ -25047,7 +25047,7 @@ definition: - make full of cavities, like a honeycomb hypernym: - - 00125072-v + - 00126072-v ili: i24394 members: - honeycomb From 91b3ffbbcaebae220a859c558ff47b85c904a6fb Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 15:23:31 +0000 Subject: [PATCH 21/23] Update definition of 'Montenegro' --- src/yaml/noun.location.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/yaml/noun.location.yaml b/src/yaml/noun.location.yaml index 9154ef99..0476ebe1 100644 --- a/src/yaml/noun.location.yaml +++ b/src/yaml/noun.location.yaml @@ -17892,8 +17892,8 @@ partOfSpeech: n 08835087-n: definition: - - a former country bordering on the Adriatic Sea; now part of the Union of Serbia - and Montenegro + - a former country bordering on the Adriatic Sea within the Socialist Federal + Republic of Yugoslavia (1944-1992) ili: i83178 instance_hypernym: - 08591861-n @@ -17901,7 +17901,7 @@ - Montenegro - Crna Gora partOfSpeech: n - wikidata: Q236 + wikidata: Q838291 08835270-n: definition: - capital and largest city of Serbia and Montenegro; situated on the Danube From 2384e46496fb29c5c5c98e52877ec05c3303742b Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 13 Jan 2025 15:29:36 +0000 Subject: [PATCH 22/23] Fix bug from merge --- src/yaml/noun.person.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index 5dbd7068..1e9e8b58 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -3190,8 +3190,6 @@ hypernym: - 10566407-n ili: i86748 - instance_hypernym: - - 09528550-n members: - Buddha - Arhat From 3061c6f9dc7a6c96404d47d4dc8985aa35110c6f Mon Sep 17 00:00:00 2001 From: Francis Bond Date: Sat, 18 Jan 2025 13:37:07 +0100 Subject: [PATCH 23/23] Update NEW_SYNSETS.md Added documentation on when to add irregular forms. --- NEW_SYNSETS.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/NEW_SYNSETS.md b/NEW_SYNSETS.md index 2d8562b1..e013e831 100644 --- a/NEW_SYNSETS.md +++ b/NEW_SYNSETS.md @@ -123,3 +123,23 @@ The synset should be possible to link into the graph * **Adverbs**: No clear guidelines but at least one links should be proposed. The more links that can be provided the better a synset is. + +## Irregular forms + +If a word has an irregular inflection that is not covered by the [rules in morphy](https://wordnet.princeton.edu/documentation/morphy7wn) then it shoule be added as a variant form: + +For example: +``` +child: + n: + form: + - children +``` + +``` +outwear: + v: + form: + - outwore + - outworn +```