Merge branch 'main' into issue-1133

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
+```

src/deprecations.csv

@@ -128,3 +128,26 @@
 "ewn-09938325-n","i88968","ewn-10146463-n","i90187","Compositional (#1068)"
 "ewn-14956360-n","i115584","ewn-14749543-n","i114384","Duplicate with wrong lemma (#1128)"
 "ewn-92449518-n","","ewn-04220331-n","i58900","Duplicate (#1133)"
+"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)"
+"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)"
+"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)"
+"ewn-10410299-n","i91815","ewn-"10300973-n,"i91146","Duplicate (#1150)"

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:
@@ -10288,7 +10288,7 @@ Anglia:
   n:
     sense:
     - id: 'anglia%1:15:00::'
-      synset: 08893294-n
+      synset: 08891234-n
 Anglian:
   n:
     sense:
@@ -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:
@@ -13269,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:
@@ -14054,14 +14059,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:

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:
@@ -2989,8 +2987,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::'
-      synset: 01297864-n
 Battle of the Spanish Armada:
   n:
     sense:
@@ -23339,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:

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:
@@ -8359,11 +8361,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:
@@ -8500,6 +8497,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:
@@ -8809,11 +8816,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:
@@ -17542,6 +17544,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:
@@ -28866,11 +28870,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:
@@ -116693,7 +116692,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:

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:
@@ -6612,7 +6612,7 @@ Duke of Edinburgh:
   n:
     sense:
     - id: 'duke_of_edinburgh%1:18:00::'
-      synset: 11252465-n
+      synset: 87460721-n
 Duke of Lancaster:
   n:
     sense:
@@ -6632,7 +6632,7 @@ Duke of Windsor:
   n:
     sense:
     - id: 'duke_of_windsor%1:18:00::'
-      synset: 10971689-n
+      synset: 85994344-n
 Dulles:
   n:
     sense:

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:

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:

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:

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:
@@ -3465,7 +3470,7 @@ Helvetia:
   n:
     sense:
     - id: 'helvetia%1:15:00::'
-      synset: 09054580-n
+      synset: 09054023-n
 Helvetian:
   n:
     sense:

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:
@@ -5119,11 +5115,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 +5284,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:

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:
@@ -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: