From 2d968c50ab206582f9a82f7310dc1e9fe089f141 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 30 Sep 2024 11:09:30 +0100 Subject: [PATCH 1/3] Remove 'wonder X' senses as compositional Fixes #1068 --- src/deprecations.csv | 4 ++++ src/yaml/entries-c.yaml | 5 ----- src/yaml/entries-g.yaml | 5 ----- src/yaml/entries-i.yaml | 5 ----- src/yaml/entries-w.yaml | 27 ++---------------------- src/yaml/noun.person.yaml | 43 +-------------------------------------- 6 files changed, 7 insertions(+), 82 deletions(-) diff --git a/src/deprecations.csv b/src/deprecations.csv index bc4ccff1..9133435c 100644 --- a/src/deprecations.csv +++ b/src/deprecations.csv @@ -119,3 +119,7 @@ "ewn-01798679-v","i30704","ewn-00064841-v","i22102","Duplicate (#1043)" "ewn-02125976-v","i32364","ewn-00064841-v","i22102","Duplicate (#1043)" "ewn-00078154-v","i22163","ewn-00064841-v","i22102","Duplicate (#1043)" +"ewn-10809460-n","i94174","ewn-10146463-n","i90187","Compositional; use 10146463-n instead (#1068)" +"ewn-83000076-n","","ewn-10146463-n","i90187","Compositional (#1068)" +"ewn-10809055-n","i94171","ewn-10146463-n","i90187","Compositional (#1068)" +"ewn-09938325-n","i88968","ewn-10146463-n","i90187","Compositional (#1068)" diff --git a/src/yaml/entries-c.yaml b/src/yaml/entries-c.yaml index bca33aaa..46182c27 100644 --- a/src/yaml/entries-c.yaml +++ b/src/yaml/entries-c.yaml @@ -52774,11 +52774,6 @@ child pornography: sense: - id: 'child_pornography%1:04:00::' synset: 00748817-n -child prodigy: - n: - sense: - - id: 'child_prodigy%1:18:00::' - synset: 09938325-n child psychology: n: sense: diff --git a/src/yaml/entries-g.yaml b/src/yaml/entries-g.yaml index b14d4a22..d41eb77d 100644 --- a/src/yaml/entries-g.yaml +++ b/src/yaml/entries-g.yaml @@ -46011,11 +46011,6 @@ golden barrel cactus: sense: - id: 'golden_barrel_cactus%1:20:00::' synset: 11866382-n -golden boy: - n: - sense: - - id: 'golden_boy%1:18:00::' - synset: 10809055-n golden buttons: n: sense: diff --git a/src/yaml/entries-i.yaml b/src/yaml/entries-i.yaml index 1ebcec91..6630950f 100644 --- a/src/yaml/entries-i.yaml +++ b/src/yaml/entries-i.yaml @@ -23429,11 +23429,6 @@ infant mortality rate: sense: - id: 'infant_mortality_rate%1:28:00::' synset: 15310840-n -infant prodigy: - n: - sense: - - id: 'infant_prodigy%1:18:00::' - synset: 09938325-n infant school: n: sense: diff --git a/src/yaml/entries-w.yaml b/src/yaml/entries-w.yaml index a69831a6..7a27b3a6 100644 --- a/src/yaml/entries-w.yaml +++ b/src/yaml/entries-w.yaml @@ -27313,6 +27313,8 @@ wonder: - 'wonder%2:31:00::' id: 'wonder%1:09:00::' synset: 05690411-n + - id: 'wonder%1:18:13::' + synset: 10146463-n v: pronunciation: - value: ˈwʌndə @@ -27367,36 +27369,11 @@ wonder bean: sense: - id: 'wonder_bean%1:20:00::' synset: 12531744-n -wonder boy: - n: - sense: - - id: 'wonder_boy%1:18:00::' - synset: 10809055-n -wonder child: - n: - sense: - - id: 'wonder_child%1:18:00::' - synset: 09938325-n wonder flower: n: sense: - id: 'wonder_flower%1:20:00::' synset: 12480813-n -wonder man: - n: - sense: - - id: 'wonder_man%1:18:01::' - synset: 83000076-n -wonder woman: - n: - pronunciation: - - value: ˈwʌndə ˈwʊmən - variety: GB - - value: ˈwʌndɚ ˈwʊmən - variety: US - sense: - - id: 'wonder_woman%1:18:00::' - synset: 10809460-n wonder-struck: a: sense: diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index 4c8c1f06..80afde8e 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -26082,20 +26082,6 @@ members: - child partOfSpeech: n -09938325-n: - definition: - - a prodigy whose talents are recognized at an early age - example: - - Mozart was a child prodigy - hypernym: - - 10499368-n - - 09937051-n - ili: i88968 - members: - - child prodigy - - infant prodigy - - wonder child - partOfSpeech: n 09938519-n: definition: - someone who cleans soot from chimneys @@ -38837,6 +38823,7 @@ - brain - brainiac - Einstein + - wonder partOfSpeech: n 10146723-n: definition: @@ -80314,16 +80301,6 @@ - womaniser - philanderer partOfSpeech: n -10809055-n: - definition: - - a man who is unusually successful at an early age - hypernym: - - 10306910-n - ili: i94171 - members: - - wonder boy - - golden boy - partOfSpeech: n 10809174-n: definition: - someone filled with admiration and awe; someone who wonders at something @@ -80343,16 +80320,6 @@ members: - wonderer partOfSpeech: n -10809460-n: - definition: - - a woman who can be a successful wife and have a professional career at the same - time - hypernym: - - 10807146-n - ili: i94174 - members: - - wonder woman - partOfSpeech: n 10809603-n: definition: - makes decorative wooden panels @@ -119846,14 +119813,6 @@ members: - kept man partOfSpeech: n -83000076-n: - definition: - - a man who can be a successful husband and care for his children - hypernym: - - 10306910-n - members: - - wonder man - partOfSpeech: n 83017536-n: definition: - a female person who is not a serf or a slave From dab22884b16c7761e05de894f5e028c07ecf2420 Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Thu, 3 Oct 2024 15:43:05 +0100 Subject: [PATCH 2/3] Fix hypernym hierarchy of 'Scout' and related terms --- src/yaml/noun.person.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index 86f034a8..bf5496ce 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -22975,6 +22975,7 @@ - a boy who is a member of the Boy Scouts hypernym: - 10582611-n + - 10305010-n ili: i88675 members: - Boy Scout @@ -39080,6 +39081,7 @@ - a girl who is a member of the Girl Scouts hypernym: - 10582611-n + - 10104064-n ili: i90211 members: - Girl Scout @@ -64470,7 +64472,7 @@ definition: - an adult member of the Boy Scouts movement hypernym: - - 09891147-n + - 10582611-n ili: i92649 members: - rover @@ -65850,10 +65852,9 @@ partOfSpeech: n 10582611-n: definition: - - a Boy Scout or Girl Scout + - a member of the Scouting movement hypernym: - - 10305010-n - - 10104064-n + - 10326901-n ili: i92780 members: - Scout From 3d3b344e9caaa6e86942f1351864d21961c4109d Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Fri, 4 Oct 2024 10:07:25 +0100 Subject: [PATCH 3/3] Fix some more grammar errors --- src/yaml/noun.act.yaml | 6 +++--- src/yaml/noun.communication.yaml | 4 ++-- src/yaml/noun.person.yaml | 2 +- src/yaml/noun.time.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/yaml/noun.act.yaml b/src/yaml/noun.act.yaml index 24cb436e..dd75c8ae 100644 --- a/src/yaml/noun.act.yaml +++ b/src/yaml/noun.act.yaml @@ -4300,7 +4300,7 @@ 00110047-n: definition: - an illegal pitch in which a foreign substance (spit or Vaseline) is applied to - the ball by the pitcher before they throws it + the ball by the pitcher before they throw it hypernym: - 00107092-n ili: i35981 @@ -8923,7 +8923,7 @@ 00188348-n: definition: - (soccer) a goal that results when a player inadvertently knocks the ball into - the goal they is defending + the goal they are defending domain_topic: - 00479273-n example: @@ -25291,7 +25291,7 @@ partOfSpeech: n 00485921-n: definition: - - a game in which a child covers their eyes while the other players hide then tries + - a game in which a child covers their eyes while the other players hide then try to find them hypernym: - 00484946-n diff --git a/src/yaml/noun.communication.yaml b/src/yaml/noun.communication.yaml index bd5300f4..60bc27d7 100644 --- a/src/yaml/noun.communication.yaml +++ b/src/yaml/noun.communication.yaml @@ -17485,7 +17485,7 @@ partOfSpeech: n 06572930-n: definition: - - (law) an answer of ‘no contest’ by a defendant who does not admit guilt but that + - (law) an answer of ‘no contest’ by a defendant who does not admit guilt but subjects them to conviction domain_topic: - 06551169-n @@ -17573,7 +17573,7 @@ 06574427-n: definition: - the written statement of a plaintiff explaining the cause of action (the defamation) - and any relief they seeks + and any relief they seek domain_topic: - 08458195-n hypernym: diff --git a/src/yaml/noun.person.yaml b/src/yaml/noun.person.yaml index 1dffeb9d..a0e4a4ad 100644 --- a/src/yaml/noun.person.yaml +++ b/src/yaml/noun.person.yaml @@ -36322,7 +36322,7 @@ 10107637-n: definition: - a legislator who gives long speeches in an effort to delay or obstruct legislation - that they opposes + that they oppose hypernym: - 10273692-n - 10020209-n diff --git a/src/yaml/noun.time.yaml b/src/yaml/noun.time.yaml index 32144c80..d17ee76e 100644 --- a/src/yaml/noun.time.yaml +++ b/src/yaml/noun.time.yaml @@ -4452,7 +4452,7 @@ partOfSpeech: n 15211706-n: definition: - - if the ground hog emerges and sees its shadow on this day, there will be 6 more + - if the groundhog emerges and sees its shadow on this day, there will be 6 more weeks of winter domain_region: - 09067337-n