Merge branch 'master' into Issue-#532

scripts/ewe.py

@@ -2,6 +2,7 @@
 from change_manager import ChangeList
 from autocorrect import Speller
 import wordnet
+import re
 
 #####################################
 # English WordNet Editor (EWE)
@@ -160,6 +161,9 @@ def change_synset(wn, change_list):
     if mode == "d":
         synset = enter_synset(wn)
         reason = input("Reason for deletion with (#IssueNo): ")
+        while not re.match("\w+.*\(#\d+\)$", reason):
+            print("Bad reason please state at least one word with the issue number in parentheses, e.g., duplicate (#123)")
+            reason = input("Reason for deletion with (#IssueNo): ")
         supersede_synset = enter_synset(wn, "superseding ")
 
     if mode == "a":

scripts/wordnet.py

@@ -151,7 +151,8 @@ def add_form(self, form):
         self.forms.append(form)
 
     def add_sense(self, sense):
-        self.senses.append(sense)
+        if not any(s.id == sense.id for s in self.senses):
+            self.senses.append(sense)
 
     def add_syntactic_behaviour(self, synbeh):
         self.syntactic_behaviours.append(synbeh)

src/deprecations.csv

@@ -46,3 +46,16 @@
 "ewn-12786162-n","i103913","ewn-12785738-n","i103911","merging with other synset"
 "ewn-01409010-v","i28755","ewn-01409166-v","i28756","merging with other synset"
 "ewn-00551895-s","i3070","ewn-00551001-a","i3067","merging with other synset"
+"ewn-04928485-n","i62844","ewn-04928753-n","i62846","Duplicate (#192)"
+"ewn-01770259-v","i30569","ewn-01021817-v","i26676","Duplicate (#193)"
+"ewn-02235408-s","i12313","ewn-02351216-s","i12976","Duplicate (#197)"
+"ewn-00427109-v","i23856","ewn-02161949-v","i32538","Duplicate (#40)"
+"ewn-01926192-s","i10529","ewn-01927976-v","i31335","Duplicate (#27)"
+"ewn-11487100-n","i97847","ewn-11545095-n","i98170","compositional (#103)"
+"ewn-04264001-n","i59186","ewn-86432478-n,ewn-88571022-n","in,in","Split of senses(#508)"
+"ewn-03739038-n","i56097","ewn-03580409-n","i55130","merging with other synset (#220)"
+"ewn-01151793-v","i27371","ewn-01382265-v","i28606","merging with another synset (#580)"
+"ewn-00021452-r","i18263","ewn-00021214-r","i18262","merge with another synset (#213)"
+"ewn-12786162-n","i103913","ewn-12785738-n","i103911","merging with other synset (#583)"
+"ewn-01409010-v","i28755","ewn-01409166-v","i28756","merging with other synset (#12)"
+"ewn-02257563-v","i32998","ewn-02257350-v","i32997","Duplicate (#201)"

src/xml/wn-adj.all.xml

@@ -65515,7 +65515,7 @@
         <SenseRelation relType="derivation" target="ewn-meanness-n-04852915-02"/> <!-- meanness, beastliness -->
         </Sense>
       <Sense id="ewn-mean-s-02033096-02" n="4" synset="ewn-02033096-s" dc:identifier="mean%5:00:00:poor:03"/>
-      <Sense id="ewn-mean-s-02235408-01" n="3" synset="ewn-02235408-s" dc:identifier="mean%5:00:00:skilled:00"/>
+      <Sense id="ewn-mean-s-02351216-06" n="8" synset="ewn-02351216-s" dc:identifier="mean%5:00:03:superior:02"/>
     </LexicalEntry>
     <LexicalEntry id="ewn-lemon-scented-s">
       <Lemma writtenForm="lemon-scented" partOfSpeech="s"/>
@@ -91696,10 +91696,6 @@
         <SenseRelation relType="antonym" target="ewn-hairless-a-00212038-01"/> <!-- hairless -->
         </Sense>
     </LexicalEntry>
-    <LexicalEntry id="ewn-tiptoe-s">
-      <Lemma writtenForm="tiptoe" partOfSpeech="s"/>
-      <Sense id="ewn-tiptoe-s-01926192-01" n="0" synset="ewn-01926192-s" dc:identifier="tiptoe%5:00:00:quiet:01"/>
-    </LexicalEntry>
     <LexicalEntry id="ewn-prismatic-s">
       <Lemma writtenForm="prismatic" partOfSpeech="s"/>
       <Sense id="ewn-prismatic-s-00404731-01" n="1" synset="ewn-00404731-s" dc:identifier="prismatic%5:00:00:colorful:00">
@@ -183642,7 +183638,6 @@
       <SynsetRelation relType="similar" target="ewn-01925681-s"/> <!-- noiseless -->
       <SynsetRelation relType="similar" target="ewn-01925827-s"/> <!-- still, soundless, silent -->
       <SynsetRelation relType="similar" target="ewn-01926075-s"/> <!-- stilly -->
-      <SynsetRelation relType="similar" target="ewn-01926192-s"/> <!-- tiptoe -->
       <Example>&quot;a quiet audience at the concert&quot;</Example>
       <Example>&quot;the room was dark and quiet&quot;</Example>
     </Synset>
@@ -183667,12 +183662,6 @@
       <SynsetRelation relType="domain_topic" target="ewn-07107220-n"/> <!-- poetry, verse, poesy -->
       <Example>&quot;in the stilly night&quot;</Example>
     </Synset>
-    <!-- tiptoe -->
-    <Synset id="ewn-01926192-s" ili="i10529" partOfSpeech="s" dc:subject="adj.all">
-      <Definition>walking on the tips of ones&apos;s toes so as to make no noise</Definition>
-      <SynsetRelation relType="similar" target="ewn-01925383-a"/> <!-- quiet -->
-      <Example>&quot;moving with tiptoe steps&quot;</Example>
-    </Synset>
     <!-- noisy -->
     <Synset id="ewn-01926330-a" ili="i10530" partOfSpeech="a" dc:subject="adj.all">
       <Definition>full of or characterized by loud and nonmusical sounds</Definition>
@@ -195864,7 +195853,6 @@
       <SynsetRelation relType="similar" target="ewn-02234724-s"/> <!-- masterly, consummate, masterful, virtuoso -->
       <SynsetRelation relType="similar" target="ewn-02235089-s"/> <!-- delicate -->
       <SynsetRelation relType="similar" target="ewn-02235230-s"/> <!-- hot -->
-      <SynsetRelation relType="similar" target="ewn-02235408-s"/> <!-- mean -->
       <SynsetRelation relType="similar" target="ewn-02235517-s"/> <!-- sure-handed -->
       <SynsetRelation relType="similar" target="ewn-02235691-s"/> <!-- expert, technical -->
       <SynsetRelation relType="similar" target="ewn-02235908-s"/> <!-- versatile -->
@@ -195927,13 +195915,6 @@
       <Example>&quot;a hot drummer&quot;</Example>
       <Example>&quot;he&apos;s hot tonight&quot;</Example>
     </Synset>
-    <!-- mean -->
-    <Synset id="ewn-02235408-s" ili="i12313" partOfSpeech="s" dc:subject="adj.all">
-      <Definition>excellent</Definition>
-      <SynsetRelation relType="similar" target="ewn-02233368-a"/> <!-- skilled -->
-      <SynsetRelation relType="exemplifies" target="ewn-07171981-n"/> <!-- vernacular, slang, jargon, argot, cant, patois, lingo -->
-      <Example>&quot;famous for a mean backhand&quot;</Example>
-    </Synset>
     <!-- sure-handed -->
     <Synset id="ewn-02235517-s" ili="i12314" partOfSpeech="s" dc:subject="adj.all">
       <Definition>proficient and confident in performance</Definition>
@@ -200637,6 +200618,7 @@
       <Example>&quot;made an excellent speech&quot;</Example>
       <Example>&quot;he was a splendid teacher&quot;</Example>
       <Example>&quot;a first-class mind&quot;</Example>
+      <Example>&quot;famous for a mean backhand&quot;</Example>
     </Synset>
     <!-- gilt-edged -->
     <Synset id="ewn-02351544-s" ili="i12977" partOfSpeech="s" dc:subject="adj.all">

src/xml/wn-noun.act.xml

@@ -28977,7 +28977,6 @@
     <LexicalEntry id="ewn-reassurance-n">
       <Lemma writtenForm="reassurance" partOfSpeech="n"/>
       <Sense id="ewn-reassurance-n-01218209-01" n="0" synset="ewn-01218209-n" dc:identifier="reassurance%1:04:00::">
-        <SenseRelation relType="derivation" target="ewn-reassure-v-01770259-01"/> <!-- reassure, assure -->
         <SenseRelation relType="derivation" target="ewn-reassure-v-01021817-01"/> <!-- reassure -->
         </Sense>
     </LexicalEntry>

src/xml/wn-noun.attribute.xml

@@ -3904,7 +3904,6 @@
     </LexicalEntry>
     <LexicalEntry id="ewn-birthright-n">
       <Lemma writtenForm="birthright" partOfSpeech="n"/>
-      <Sense id="ewn-birthright-n-04928485-01" n="2" synset="ewn-04928485-n" dc:identifier="birthright%1:07:01::"/>
       <Sense id="ewn-birthright-n-04928753-01" n="0" synset="ewn-04928753-n" dc:identifier="birthright%1:07:00::"/>
     </LexicalEntry>
     <LexicalEntry id="ewn-intelligibility-n">
@@ -41204,18 +41203,12 @@
     <Synset id="ewn-04928188-n" ili="i62843" partOfSpeech="n" dc:subject="noun.attribute">
       <Definition>any attribute or immaterial possession that is inherited from ancestors</Definition>
       <SynsetRelation relType="hypernym" target="ewn-00024444-n"/> <!-- attribute -->
-      <SynsetRelation relType="hyponym" target="ewn-04928485-n"/> <!-- birthright -->
       <SynsetRelation relType="hyponym" target="ewn-04928594-n"/> <!-- background -->
       <SynsetRelation relType="hyponym" target="ewn-04928753-n"/> <!-- birthright -->
       <SynsetRelation relType="hyponym" target="ewn-04928931-n"/> <!-- upbringing -->
       <Example>&quot;my only inheritance was my mother&apos;s blessing&quot;</Example>
       <Example>&quot;the world&apos;s heritage of knowledge&quot;</Example>
     </Synset>
-    <!-- birthright -->
-    <Synset id="ewn-04928485-n" ili="i62844" partOfSpeech="n" dc:subject="noun.attribute">
-      <Definition>personal characteristics that are inherited at birth</Definition>
-      <SynsetRelation relType="hypernym" target="ewn-04928188-n"/> <!-- heritage, inheritance -->
-    </Synset>
     <!-- background -->
     <Synset id="ewn-04928594-n" ili="i62845" partOfSpeech="n" dc:subject="noun.attribute">
       <Definition>a person&apos;s social heritage: previous experience or training</Definition>

src/xml/wn-noun.communication.xml

@@ -78312,7 +78312,6 @@
       <SynsetRelation relType="is_exemplified_by" target="ewn-01205211-s"/> <!-- butch -->
       <SynsetRelation relType="is_exemplified_by" target="ewn-01592051-s"/> <!-- grotty -->
       <SynsetRelation relType="is_exemplified_by" target="ewn-01683245-s"/> <!-- some -->
-      <SynsetRelation relType="is_exemplified_by" target="ewn-02235408-s"/> <!-- mean -->
       <SynsetRelation relType="is_exemplified_by" target="ewn-02335307-s"/> <!-- stroppy, bolshy -->
       <SynsetRelation relType="is_exemplified_by" target="ewn-02396358-s"/> <!-- pint-size, sawn-off, sawed-off, runty, pint-sized -->
       <SynsetRelation relType="is_exemplified_by" target="ewn-02522852-s"/> <!-- slam-bang -->

src/xml/wn-noun.person.xml

@@ -85056,7 +85056,6 @@
     <LexicalEntry id="ewn-tither-n">
       <Lemma writtenForm="tither" partOfSpeech="n"/>
       <Sense id="ewn-tither-n-10732661-01" n="0" synset="ewn-10732661-n" dc:identifier="tither%1:18:00::">
-        <SenseRelation relType="derivation" target="ewn-tithe-v-02257563-01"/> <!-- tithe -->
         <SenseRelation relType="derivation" target="ewn-tithe-v-02257350-01"/> <!-- tithe -->
         </Sense>
     </LexicalEntry>

src/xml/wn-verb.change.xml

@@ -22349,10 +22349,8 @@
     <LexicalEntry id="ewn-burst_out-v">
       <Lemma writtenForm="burst out" partOfSpeech="v"/>
       <Sense id="ewn-burst_out-v-00308567-06" n="2" synset="ewn-00308567-v" dc:identifier="burst_out%2:30:00::"/>
-      <Sense id="ewn-burst_out-v-00427109-02" n="1" synset="ewn-00427109-v" dc:identifier="burst_out%2:30:01::"/>
-      <SyntacticBehaviour subcategorizationFrame="Something ----s" senses="ewn-burst_out-v-00308567-06 ewn-burst_out-v-00427109-02"/>
+      <SyntacticBehaviour subcategorizationFrame="Something ----s" senses="ewn-burst_out-v-00308567-06"/>
       <SyntacticBehaviour subcategorizationFrame="Somebody ----s" senses="ewn-burst_out-v-00308567-06"/>
-      <SyntacticBehaviour subcategorizationFrame="Something is ----ing PP" senses="ewn-burst_out-v-00427109-02"/>
     </LexicalEntry>
     <LexicalEntry id="ewn-melt_down-v">
       <Lemma writtenForm="melt down" partOfSpeech="v"/>
@@ -24004,10 +24002,9 @@
     </LexicalEntry>
     <LexicalEntry id="ewn-pop_out-v">
       <Lemma writtenForm="pop out" partOfSpeech="v"/>
-      <Sense id="ewn-pop_out-v-00427109-01" n="0" synset="ewn-00427109-v" dc:identifier="pop_out%2:30:01::"/>
       <Sense id="ewn-pop_out-v-00530491-01" n="3" synset="ewn-00530491-v" dc:identifier="pop_out%2:30:00::"/>
-      <SyntacticBehaviour subcategorizationFrame="Something ----s" senses="ewn-pop_out-v-00427109-01 ewn-pop_out-v-00530491-01"/>
-      <SyntacticBehaviour subcategorizationFrame="Something is ----ing PP" senses="ewn-pop_out-v-00427109-01 ewn-pop_out-v-00530491-01"/>
+      <SyntacticBehaviour subcategorizationFrame="Something ----s" senses="ewn-pop_out-v-00530491-01"/>
+      <SyntacticBehaviour subcategorizationFrame="Something is ----ing PP" senses="ewn-pop_out-v-00530491-01"/>
     </LexicalEntry>
     <LexicalEntry id="ewn-invigorate-v">
       <Lemma writtenForm="invigorate" partOfSpeech="v"/>
@@ -36449,7 +36446,6 @@
       <SynsetRelation relType="hyponym" target="ewn-00425822-v"/> <!-- flash -->
       <SynsetRelation relType="hyponym" target="ewn-00426475-v"/> <!-- turn out -->
       <SynsetRelation relType="hyponym" target="ewn-00426798-v"/> <!-- crop out, basset -->
-      <SynsetRelation relType="hyponym" target="ewn-00427109-v"/> <!-- burst out, pop out -->
       <SynsetRelation relType="hyponym" target="ewn-00427254-v"/> <!-- re-emerge, reappear -->
       <SynsetRelation relType="hyponym" target="ewn-00427534-v"/> <!-- emerge -->
       <SynsetRelation relType="hyponym" target="ewn-00427702-v"/> <!-- break through, come through -->
@@ -36588,12 +36584,6 @@
       <Example>&quot;Did your latest book appear yet?&quot;</Example>
       <Example>&quot;The new Woody Allen film hasn&apos;t come out yet&quot;</Example>
     </Synset>
-    <!-- burst out, pop out -->
-    <Synset id="ewn-00427109-v" ili="i23856" partOfSpeech="v" dc:subject="verb.change">
-      <Definition>appear suddenly</Definition>
-      <SynsetRelation relType="hypernym" target="ewn-00423043-v"/> <!-- appear -->
-      <Example>&quot;Spring popped up everywhere in the valley&quot;</Example>
-    </Synset>
     <!-- re-emerge, reappear -->
     <Synset id="ewn-00427254-v" ili="i23857" partOfSpeech="v" dc:subject="verb.change">
       <Definition>appear again</Definition>

src/xml/wn-verb.communication.xml

@@ -29418,7 +29418,7 @@
     </Synset>
     <!-- reassure -->
     <Synset id="ewn-01021817-v" ili="i26676" partOfSpeech="v" dc:subject="verb.communication">
-      <Definition>give or restore confidence in; cause to feel sure or certain</Definition>
+      <Definition>give reassurance to; give or restore confidence in; cause to feel sure or certain</Definition>
       <SynsetRelation relType="hypernym" target="ewn-00778313-v"/> <!-- assure -->
       <Example>&quot;I reassured him that we were safe&quot;</Example>
     </Synset>

src/xml/wn-verb.emotion.xml

@@ -1616,12 +1616,6 @@
       <SyntacticBehaviour subcategorizationFrame="Something ----s somebody" senses="ewn-enthral-v-01821281-06"/>
       <SyntacticBehaviour subcategorizationFrame="Somebody ----s somebody" senses="ewn-enthral-v-01821281-06"/>
     </LexicalEntry>
-    <LexicalEntry id="ewn-assure-v">
-      <Lemma writtenForm="assure" partOfSpeech="v"/>
-      <Sense id="ewn-assure-v-01770259-02" n="4" synset="ewn-01770259-v" dc:identifier="assure%2:37:00::"/>
-      <SyntacticBehaviour subcategorizationFrame="Somebody ----s somebody" senses="ewn-assure-v-01770259-02"/>
-      <SyntacticBehaviour subcategorizationFrame="Something ----s somebody" senses="ewn-assure-v-01770259-02"/>
-    </LexicalEntry>
     <LexicalEntry id="ewn-put_down-v">
       <Lemma writtenForm="put down" partOfSpeech="v"/>
       <Sense id="ewn-put_down-v-01804404-05" n="3" synset="ewn-01804404-v" dc:identifier="put_down%2:37:00::">
@@ -2179,7 +2173,6 @@
       <Sense id="ewn-worry-v-01769760-01" n="2" synset="ewn-01769760-v" dc:identifier="worry%2:37:01::">
         <SenseRelation relType="derivation" target="ewn-worry-n-05840588-02"/> <!-- headache, concern, worry, vexation -->
         <SenseRelation relType="derivation" target="ewn-worrying-n-00426281-02"/> <!-- torment, bedevilment, worrying, badgering -->
-        <SenseRelation relType="antonym" target="ewn-reassure-v-01770259-01"/> <!-- reassure, assure -->
         </Sense>
       <Sense id="ewn-worry-v-01770600-01" n="1" synset="ewn-01770600-v" dc:identifier="worry%2:37:12::">
         <SenseRelation relType="derivation" target="ewn-worry-n-07539481-01"/> <!-- trouble, worry -->
@@ -4469,15 +4462,6 @@
       <Sense id="ewn-wallow-v-01827320-01" n="3" synset="ewn-01827320-v" dc:identifier="wallow%2:37:00::"/>
       <SyntacticBehaviour subcategorizationFrame="Somebody ----s something PP" senses="ewn-wallow-v-01827320-01"/>
     </LexicalEntry>
-    <LexicalEntry id="ewn-reassure-v">
-      <Lemma writtenForm="reassure" partOfSpeech="v"/>
-      <Sense id="ewn-reassure-v-01770259-01" n="0" synset="ewn-01770259-v" dc:identifier="reassure%2:37:00::">
-        <SenseRelation relType="derivation" target="ewn-reassurance-n-01218209-01"/> <!-- reassurance -->
-        <SenseRelation relType="antonym" target="ewn-worry-v-01769760-01"/> <!-- worry, vex -->
-        </Sense>
-      <SyntacticBehaviour subcategorizationFrame="Something ----s somebody" senses="ewn-reassure-v-01770259-01"/>
-      <SyntacticBehaviour subcategorizationFrame="Somebody ----s somebody" senses="ewn-reassure-v-01770259-01"/>
-    </LexicalEntry>
     <LexicalEntry id="ewn-preoccupy-v">
       <Lemma writtenForm="preoccupy" partOfSpeech="v"/>
       <Form writtenForm="preoccupied"/>
@@ -5330,7 +5314,6 @@
       <SynsetRelation relType="hyponym" target="ewn-01767495-v"/> <!-- lull -->
       <SynsetRelation relType="hyponym" target="ewn-01769030-v"/> <!-- compose -->
       <SynsetRelation relType="hyponym" target="ewn-01769244-v"/> <!-- assuage, gentle, conciliate, lenify, pacify, appease, gruntle, placate, mollify -->
-      <SynsetRelation relType="hyponym" target="ewn-01770259-v"/> <!-- reassure, assure -->
       <Example>&quot;quiet the dragons of worry and fear&quot;</Example>
     </Synset>
     <!-- compose -->
@@ -5362,12 +5345,6 @@
       <SynsetRelation relType="hypernym" target="ewn-01769760-v"/> <!-- worry, vex -->
       <Example>&quot;What&apos;s eating you?&quot;</Example>
     </Synset>
-    <!-- reassure, assure -->
-    <Synset id="ewn-01770259-v" ili="i30569" partOfSpeech="v" dc:subject="verb.emotion">
-      <Definition>cause to feel sure; give reassurance to</Definition>
-      <SynsetRelation relType="hypernym" target="ewn-01768652-v"/> <!-- quiet, calm, lull, tranquillize, still, calm down, tranquilize, quieten, tranquillise -->
-      <Example>&quot;The airline tried to reassure the customers that the planes were safe&quot;</Example>
-    </Synset>
     <!-- nag -->
     <Synset id="ewn-01770490-v" ili="i30570" partOfSpeech="v" dc:subject="verb.emotion">
       <Definition>worry persistently</Definition>

src/xml/wn-verb.perception.xml

@@ -5624,6 +5624,14 @@
       <Sense id="ewn-stunt-v-90006181-01" n="2" synset="ewn-90006181-v" dc:identifier="stunt%2:39:01::"/>
       <SyntacticBehaviour subcategorizationFrame="Somebody ----s" senses="ewn-stunt-v-90006181-01"/>
     </LexicalEntry>
+    <LexicalEntry id="ewn-burst_out-v">
+      <Lemma writtenForm="burst out" partOfSpeech="v"/>
+      <Sense id="ewn-burst_out-v-02161949-05" n="3" synset="ewn-02161949-v" dc:identifier="burst_out%2:39:01::"/>
+    </LexicalEntry>
+    <LexicalEntry id="ewn-pop_out-v">
+      <Lemma writtenForm="pop out" partOfSpeech="v"/>
+      <Sense id="ewn-pop_out-v-02161949-04" n="4" synset="ewn-02161949-v" dc:identifier="pop_out%2:39:02::"/>
+    </LexicalEntry>
     <!-- register, record -->
     <Synset id="ewn-02110264-v" ili="i32294" partOfSpeech="v" dc:subject="verb.perception">
       <Definition>be aware of</Definition>