Skip to content

Commit

Permalink
Merge branch 'main' into 2024-release-candidate
Browse files Browse the repository at this point in the history
  • Loading branch information
jmccrae committed Oct 16, 2024
2 parents 0307e84 + f76ba40 commit 3b9a76d
Show file tree
Hide file tree
Showing 34 changed files with 1,335 additions and 234 deletions.
2 changes: 0 additions & 2 deletions src/deprecations.csv
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,4 @@
"ewn-00596900-v","i24739","ewn-01311849-s","i7131","Not attested (#1060)"
"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)"
"ewn-00596900-v","i24739","ewn-01311849-s","i7131","Not attested (#1060)"
18 changes: 9 additions & 9 deletions src/yaml/adj.all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23589,7 +23589,7 @@
example:
- an arrogant and cocksure materialist
- so overconfident and impudent as to speak to the queen
- the less he knows the more positive he gets
- the less he knows, the more positive he gets
ili: i1884
members:
- cocksure
Expand Down Expand Up @@ -34098,7 +34098,7 @@
definition:
- per person
example:
- among the states Connecticut has a high per capita income
- among the states, Connecticut has a high per capita income
ili: i2720
members:
- per capita
Expand Down Expand Up @@ -36686,7 +36686,7 @@
definition:
- successfully completed or brought to an end
example:
- his mission accomplished he took a vacation
- his mission accomplished, he took a vacation
- the completed project
- the joy of a realized ambition overcame him
ili: i2923
Expand Down Expand Up @@ -54456,7 +54456,7 @@
definition:
- (of an image) not being in or brought into focus
example:
- at their edges things were pretty much unfocused
- at their edges, things were pretty much unfocused
ili: i4314
members:
- unfocused
Expand Down Expand Up @@ -105893,7 +105893,7 @@
definition:
- not involved
example:
- being uninvolved he remained objective
- being uninvolved, he remained objective
ili: i8323
members:
- uninvolved
Expand Down Expand Up @@ -106110,7 +106110,7 @@
definition:
- allayed
example:
- his thirst quenched he was able to continue
- his thirst quenched, he was able to continue
ili: i8342
members:
- quenched
Expand Down Expand Up @@ -112481,7 +112481,7 @@
definition:
- resistant to guidance or discipline
example:
- Mary Mary quite contrary
- Mary, Mary, quite contrary
- an obstinate child with a violent temper
- a perverse mood
- wayward behavior
Expand Down Expand Up @@ -130968,7 +130968,7 @@
definition:
- appearing as such but not necessarily so
example:
- for all his apparent wealth he had no money to pay the rent
- for all his apparent wealth, he had no money to pay the rent
- the committee investigated some apparent discrepancies
- the ostensible truth of their theories
- his seeming honesty
Expand Down Expand Up @@ -134422,7 +134422,7 @@
- characterized by unrest or disorder
example:
- unquiet days of riots
- following the assassination of Martin Luther King ours was an unquiet nation
- following the assassination of Martin Luther King, ours was an unquiet nation
- spent an unquiet night tossing and turning
ili: i10549
members:
Expand Down
2 changes: 1 addition & 1 deletion src/yaml/adj.pert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29342,7 +29342,7 @@
- 08891234-n
example:
- Saxon princes
- for greater clarity choose a plain Saxon term instead of a latinate one
- for greater clarity, choose a plain Saxon term instead of a latinate one
ili: i17872
members:
- Saxon
Expand Down
18 changes: 9 additions & 9 deletions src/yaml/adv.all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
- they scarcely ever used the emergency generator
- I can hardly hear what she is saying
- she barely seemed to notice him
- we were so far back in the theater, we could barely read the subtitles
- we were so far back in the theater we could barely read the subtitles
ili: i18165
members:
- hardly
Expand Down Expand Up @@ -571,7 +571,7 @@
definition:
- in an improper or mistaken or unfortunate manner
example:
- if you think him guilty you judge amiss
- if you think him guilty, you judge amiss
- he spoke amiss
- no one took it amiss when she spoke frankly
ili: i18206
Expand Down Expand Up @@ -721,7 +721,7 @@
- The problem is well understood
- she was well informed
- shake well before using
- in order to avoid food poisoning be sure the meat is well cooked
- in order to avoid food poisoning, be sure the meat is well cooked
- well-done beef
- well-satisfied customers
- well-educated
Expand Down Expand Up @@ -1586,7 +1586,7 @@
definition:
- in the actual state of affairs and often contrary to expectations
example:
- he might have been killed; as it is he was severely injured
- he might have been killed; as it is, he was severely injured
ili: i18296
members:
- as it is
Expand Down Expand Up @@ -4156,7 +4156,7 @@
definition:
- in addition to all the foregoing
example:
- last not least he plays the saxophone
- last not least, he plays the saxophone
ili: i18538
members:
- last but not least
Expand Down Expand Up @@ -16501,7 +16501,7 @@
definition:
- by virtue of analysis
example:
- assuming that the distinction is maintained one may ask which is to be analytically
- assuming that the distinction is maintained, one may ask which is to be analytically
prior?
ili: i19797
members:
Expand Down Expand Up @@ -26275,7 +26275,7 @@
definition:
- in a manful manner; with qualities thought to befit a man
example:
- having said her say Peggy manfully shouldered her burden and prepared to break
- having said her say, Peggy manfully shouldered her burden and prepared to break
up yet another home
ili: i20818
members:
Expand Down Expand Up @@ -32554,8 +32554,8 @@
definition:
- in an unarguable and undisputed manner
example:
- you write as if this fact whilst inarguably forever condemning me to the ranks
of Bohemianism nevertheless earned for me the right of entry into any company
- you write as if this fact, whilst inarguably forever condemning me to the ranks
of Bohemianism, nevertheless earned for me the right of entry into any company
ili: i21495
members:
- unarguably
Expand Down
4 changes: 2 additions & 2 deletions src/yaml/entries-h.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10629,10 +10629,10 @@ hair trigger:
sense:
- id: 'hair_trigger%1:06:00::'
synset: 03482426-n
hair's-breadth:
hair's breadth:
n:
sense:
- id: 'hair''s-breadth%1:23:00::'
- id: 'hair''s_breadth%1:23:00::'
synset: 13783743-n
hair-raiser:
n:
Expand Down
10 changes: 5 additions & 5 deletions src/yaml/noun.act.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@
- any recognized accomplishment
example:
- they admired his performance under stress
- when Roger Maris powered four home runs in one game his performance merits awe
- when Roger Maris powered four home runs in one game, his performance merits awe
hypernym:
- 00035910-n
ili: i35651
Expand Down Expand Up @@ -3042,7 +3042,7 @@
domain_topic:
- 06546650-n
example:
- under Roman law addiction was the justification for slavery
- under Roman law, addiction was the justification for slavery
hypernym:
- 00088483-n
ili: i35866
Expand Down Expand Up @@ -15182,7 +15182,7 @@
- travel via aircraft
example:
- air travel involves too much waiting in airports
- if you've time to spare go by air
- if you've time to spare, go by air
hypernym:
- 00296527-n
ili: i36981
Expand Down Expand Up @@ -40119,7 +40119,7 @@
- useless or profitless activity; using or expending or consuming thoughtlessly
or carelessly
example:
- if the effort brings no compensating gain it is a waste
- if the effort brings no compensating gain, it is a waste
- mindless dissipation of natural resources
hypernym:
- 00408356-n
Expand Down Expand Up @@ -52052,7 +52052,7 @@
- an open clash between two opposing groups (or individuals)
example:
- source: Thomas Paine
text: the harder the conflict the more glorious the triumph
text: the harder the conflict, the more glorious the triumph
- police tried to control the battle between the pro- and anti-abortion mobs
hypernym:
- 01082290-n
Expand Down
14 changes: 7 additions & 7 deletions src/yaml/noun.artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26463,7 +26463,7 @@
definition:
- an accessory for a computer
example:
- when you add in all the computer accessories you are going to need the computer
- when you add in all the computer accessories you are going to need, the computer
gets pretty expensive
hypernym:
- 02674051-n
Expand Down Expand Up @@ -59106,7 +59106,7 @@
- the leaves of the shrub Catha edulis which are chewed like tobacco or used to
make tea; has the effect of a euphoric stimulant
example:
- in Yemen kat is used daily by 85% of adults
- in Yemen, kat is used daily by 85% of adults
hypernym:
- 04327264-n
ili: i55335
Expand Down Expand Up @@ -79549,7 +79549,7 @@
definition:
- the yarn (as in a rug or velvet or corduroy) that stands up from the weave
example:
- for uniform color and texture tailors cut velvet with the pile running the same
- for uniform color and texture, tailors cut velvet with the pile running the same
direction
hypernym:
- 04433923-n
Expand Down Expand Up @@ -80620,7 +80620,7 @@
domain_topic:
- 06138021-n
example:
- the greater the number of pixels per inch the greater the resolution
- the greater the number of pixels per inch, the greater the resolution
hypernym:
- 03085025-n
ili: i57375
Expand Down Expand Up @@ -123704,7 +123704,7 @@
definition:
- A spanish hat with wide, flat brim and flat top, usually made of black felt.
example:
- Your look like Zorro in this bolero hat.
- You look like Zorro in this bolero hat.
hypernym:
- 03502782-n
members:
Expand Down Expand Up @@ -125848,7 +125848,7 @@
radioisotopes.
example:
- source: https://en.wikipedia.org
text: Because the cobalt machines were expensive and required specialist support
text: Because the cobalt machines were expensive and required specialist support,
they were often housed in cobalt units.
hypernym:
- 03745184-n
Expand Down Expand Up @@ -126618,7 +126618,7 @@
screws in furniture.
example:
- source: https://en.wikipedia.org
text: After fastening the boards with a screw use a plug button to cover it.
text: After fastening the boards with a screw, use a plug button to cover it.
hypernym:
- 03974274-n
members:
Expand Down
5 changes: 3 additions & 2 deletions src/yaml/noun.attribute.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3224,7 +3224,7 @@
- the general impression that something (a person or organization or product) presents
to the public
example:
- although her popular image was contrived it served to inspire music and pageantry
- although her popular image was contrived, it served to inspire music and pageantry
- the company tried to project an altruistic image
hypernym:
- 04682671-n
Expand Down Expand Up @@ -7583,7 +7583,8 @@
- the quality of being probable; a probable event or the most probable event
example:
- for a while mutiny seemed a probability
- going by past experience there was a high probability that the visitors were lost
- going by past experience, there was a high probability that the visitors were
lost
hypernym:
- 04731092-n
ili: i62018
Expand Down
14 changes: 7 additions & 7 deletions src/yaml/noun.cognition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6649,7 +6649,7 @@
definition:
- a somatic sensation of acute discomfort
example:
- as the intensity increased the sensation changed from tickle to pain
- as the intensity increased, the sensation changed from tickle to pain
hypernym:
- 05729127-n
ili: i66993
Expand Down Expand Up @@ -11418,7 +11418,7 @@
definition:
- something that strongly attracts attention and admiration
example:
- if he was the cynosure of all eyes he didn't notice
- if he was the cynosure of all eyes, he didn't notice
hypernym:
- 05820064-n
ili: i67426
Expand Down Expand Up @@ -17527,7 +17527,7 @@
definition:
- the general meaning or substance of an utterance
example:
- although I disagreed with him I could follow the tenor of his argument
- although I disagreed with him, I could follow the tenor of his argument
hypernym:
- 05928460-n
ili: i67956
Expand Down Expand Up @@ -20930,7 +20930,7 @@
definition:
- a fixed and persistent intent or purpose
example:
- where there's a will there's a way
- where there's a will, there's a way
hypernym:
- 05991037-n
ili: i68267
Expand Down Expand Up @@ -25923,7 +25923,7 @@
domain_topic:
- 06100457-n
example:
- according to supersymmetry each force emerged separately during the big bang
- according to supersymmetry, each force emerged separately during the big bang
hypernym:
- 06002729-n
ili: i68718
Expand Down Expand Up @@ -30687,7 +30687,7 @@
definition:
- a range of mental vision
example:
- in his sight she could do no wrong
- in his sight, she could do no wrong
hypernym:
- 06218486-n
ili: i69170
Expand Down Expand Up @@ -34384,7 +34384,7 @@
definition:
- Opposition to traditionalism.
example:
- Following the collapse of the Qing dynasty in 1911 the anti-traditionalism of
- Following the collapse of the Qing dynasty in 1911, the anti-traditionalism of
the Chinese intellectual elite was embraced by the iconoclastic Chinese Nationalists
and led to the widespread destruction of religious and ancestral temples in the
1920s.
Expand Down
Loading

0 comments on commit 3b9a76d

Please sign in to comment.