@@ -7 +7 @@
-<ke_pri>spec1</ke_pri>
+<ke_inf>&rK;</ke_inf>

Actually, not irregular, just old.

@@ -18 +18 @@
-<re_inf>&ik;</re_inf>
+<re_inf>&ok;</re_inf>

G n-grams:
ギリシャ	1688827
ギリシア	572146
ギリシヤ	7117

@@ -15,0 +16,4 @@
+<r_ele>
+<reb>ギリシヤ</reb>
+<re_inf>&ik;</re_inf>
+</r_ele>

daijs

moved out of the NAFTA entry

@@ -7,0 +8,3 @@
+<r_ele>
+<reb>ナフタ</reb>
+</r_ele>

naphtha = ナフサ and should be split out in any case

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>ＮＡＦＴＡ</keb>
+</k_ele>
@@ -7,4 +9,0 @@
-<sense>
-<pos>&n;</pos>
-<gloss>naphtha</gloss>
-</sense>

koj, daij, meikyo, shinmeikai, gg5, OED
https://ja.wikipedia.org/wiki/ブルーフィルム

overly specific explanation, i think

@@ -11,0 +12 @@
+<gloss>blue movie</gloss>
@@ -13 +14 @@
-<gloss g_type="expl">early (1950s-) type of hardcore pornographic film usually filmed on 8 or 16mm film and often in black market circulation</gloss>
+<gloss g_type="expl">pornographic movie (esp. one screened secretly)</gloss>

@@ -13 +13 @@
-<gloss g_type="expl">early (1950's-) type of hardcore pornographic film usually filmed on 8 or 16 mm film and often in black market circulation</gloss>
+<gloss g_type="expl">early (1950s-) type of hardcore pornographic film usually filmed on 8 or 16mm film and often in black market circulation</gloss>

https://books.google.com/books?id=s7-_Gon5-
a0C&pg=PA300&dq=Japanese+%22blue+film%22&hl=en&sa=X&ved=
0ahUKEwjFkqry9IHZAhXL6oMKHZhpARUQ6AEIJzAA#v=onepage&q=Ja
panese%20%22blue%20film%22&f=false
"blue film - earlier American term for hard-core 
pornographic film"
https://books.google.com/books?id=8sc-
AQAAIAAJ&q=Japanese+%22blue+film%22&dq=Japanese+%22blue+
film%22&hl=en&sa=X&ved=0ahUKEwjFkqry9IHZAhXL6oMKHZhpARUQ
6AEIXzAL
"Blue films" (buru eiga) are erotic films roughly 
distinguished from "pink films" (pinky eiga) in official 
circles by the absence of a story element."
https://books.google.com/books?
id=v5LZ30HI6dsC&pg=PA173&dq=%22blue+film%22+porn&hl=en&s
a=X&ved=0ahUKEwierOG29YHZAhUL24MKHUaVDIoQ6AEIPjAE#v=onep
age&q=%22blue%20film%22%20porn&f=false
"In the recent book Nihon eigha ha, ima (Japanese film 
today), Sano Shinichi dedicates an engaging chapter to 
the fifty-year history of Japanese pornographic film and 
video. The industry emerged in the late 1940s and boomed 
in the early 1950s. First there was blue film, a rag-tag 
operation of amateurs and misfits that produced twenty-
minute shorts. Blue film was followed by pink film, 
which produced soft-porn sponsored by the major film 
companies to offset the loss of revenue from declining 
ticket sales brought about by the popularity of 
television. ... Sano's blue-pink-adult trajectory offers 
a good start at historicizing the links among the three 
dominant moments of pornography."

@@ -13 +13 @@
-<gloss g_type="expl">early (1950's-) type of pornographic film usually filmed on 8 or 16 mm film and often in black market circulation</gloss>
+<gloss g_type="expl">early (1950's-) type of hardcore pornographic film usually filmed on 8 or 16 mm film and often in black market circulation</gloss>

https://dot.asahi.com/wa/2016120100343.html?page=1
"かつて「風俗小型映画」と呼ばれるジャンルがあった。性的、わい
せつな映像作品を指す俗称「ブルーフィルム」（16ミリや8ミリ）と
言ったほうがわかりやすいかもしれない。
昭和27（1952）年から昭和31年くらいまでが全盛だったとされる。"
https://www.npa.go.jp/hakusyo/s53/s530600.html
”山口組系暴力団の幹部（46）が、ブルーフィルムの密造販売によっ
て組の活動資金を得ようと企て、最新式の自動プリンター、自動現像
装置その他の製作資機材一式を購入し、配下組員らを使って約5年の
間に35万巻（末端価格で約49億2,800万円）に上るブルーフィルムを
密造し、4系列33団体の暴力団を通じて全国各地に販売していた事犯
で、暴力団員51人を含む被疑者96人を検挙するとともにブルーフィル
ム、製作資機材等トラック3台分を押収した（愛知）。"
http://bungaku.cocolog-
nifty.com/barazoku/2005/09/post_7d44.html
"ブルーフィルムは、ほとんどヤクザさんが製作していて、比較的に
取締りがゆるい、四国の山中などで作られることが多かったよう
だ。"
wiki: "主としてポルノグラフィを題材とした、すなわち性的・猥褻
な映像作品、または映像媒体でのポルノグラフィを指す俗称。以下の
項目等が現在の主流であるが、日本では特に、かつて温泉宿などでの
秘密上映会用に多数製作されていた短編の猥褻映画を指すことが多
い。8ミリフィルムが用いられており、多くは非合法であった。現在
は同様の形では存続していない。"
enwiki: "Blue film, term used for erotic films in 
underground distribution in India"
I also get hits for the same "phenomenon" in China

@@ -13 +13 @@
-<gloss>porno(graphic) film</gloss>
+<gloss g_type="expl">early (1950's-) type of pornographic film usually filmed on 8 or 16 mm film and often in black market circulation</gloss>

No refs given, but I see this split is in Daijirin and 中辞典. GG5 simply xrefs to 何か.

@@ -15,0 +16 @@
+<xref type="see" seq="1188270">何か・なにか・1</xref>
@@ -21,0 +23 @@
+<xref type="see" seq="1188270">何か・なにか・2</xref>

@@ -18 +17,0 @@
-<gloss>for some reason</gloss>
@@ -20,0 +20,5 @@
+<sense>
+<pos>&adv;</pos>
+<misc>&uk;</misc>
+<gloss>for some reason</gloss>
+</sense>

uk in google ngrams

@@ -15,0 +16 @@
+<misc>&uk;</misc>

n-grams
何やら	61865
なにやら	62176

borderline [uk]

gg5, daij

Not vs. That's a separate archaic sense.

@@ -18 +18,2 @@
-<pos>&vs;</pos>
+<gloss>prison guard</gloss>
+<gloss>warder</gloss>

Daijr, GG5, etc.

I can't see it as "n-suf".

@@ -18 +18 @@
-<pos>&n-suf;</pos>
+<xref type="see" seq="1248710">軍隊</xref>
@@ -20 +20 @@
-<gloss>force</gloss>
+<gloss>armed forces</gloss>
@@ -22,0 +23,12 @@
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1248950">軍部</xref>
+<gloss>military authorities</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1886270">女性軍・じょせいぐん</xref>
+<gloss>team</gloss>
+<gloss>group</gloss>
+<gloss>troupe</gloss>
+</sense>

Hmm. Probably not needed for something so rare.

i'm fine with leaving gaol on this and on all other words where it's just a single-word gloss.  but i don't think it's needed on gaol breaking or any expressions that use gaol

G n-grams: 401

This is only in nikk.

@@ -11,0 +12 @@
+<misc>&obsc;</misc>
@@ -13 +14 @@
-<gloss>gaol</gloss>
+<gloss>prison</gloss>

gg5, prog, daij

I don't think we need "judgement". It's not in my JE refs.

@@ -16,3 +16 @@
-<pos>&adj-no;</pos>
-<gloss>judgement</gloss>
-<gloss>judgment</gloss>
+<gloss>(criminal) punishment</gloss>
@@ -20 +18 @@
-<gloss>punishment</gloss>
+<gloss>sentence</gloss>

Dropping antiquated "gaol" spelling.

@@ -18 +18 @@
-<gloss>while in jail (gaol)</gloss>
+<gloss>while in jail</gloss>

GG5 has "鎖骨の　clavicular", but I agree. None of the top 100 鎖骨の terms in the n-grams are examples of adj-no usage. This is true of a great number of entries that are tagged adj-no.

鎖骨 	203286	  
鎖骨の	35334	  
鎖骨を	21654

鎖骨の下　	5213	  
鎖骨のあたり	2514	  
鎖骨の上　	2402

Doesn't really qualify as [adj-no].

@@ -16 +15,0 @@
-<pos>&adj-no;</pos>

Daijr, GG5, etc.

Yes, "al dent" is a property of 歯ごたえ, but not its meaning.

@@ -21,2 +21,8 @@
-<gloss>feel (consistency) of food while being chewed</gloss>
-<gloss>al dente</gloss>
+<gloss>chewiness</gloss>
+<gloss>firmness</gloss>
+<gloss>feel of food while being chewed</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>challenge (e.g. work, book)</gloss>
+<gloss>toughness</gloss>

they have 'al dente' as 適度な歯応えのある, not as 歯応え

alc https://eow.alc.co.jp/search?q=歯応え&ref=wl

@@ -21,0 +22 @@
+<gloss>al dente</gloss>

@@ -11,0 +12 @@
+<xref type="see" seq="1685450">客観主義</xref>

daijs, prog, chujiten
https://www.nikkansports.com/soccer/news/202112060000587.html

The kokugos only have one senses but I think it's worth adding these two.

@@ -19,0 +20,12 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<pos>&vi;</pos>
+<gloss>appearing (in a match)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<pos>&vi;</pos>
+<gloss>starting an election campaign</gloss>

Meikyo vt and vi additions to n,vs entries
-*- via bulkupd.py -*-

@@ -16,0 +17 @@
+<pos>&vi;</pos>

中辞典 is making a sense out of metaphorical usage.

GG5; daijs

Chuujiten also has a separate sense for "starting an election campaign". Reflected in a daijs example: 「選挙戦に―する」.

@@ -16,0 +17 @@
+<gloss>going into battle</gloss>

gg5, daij

I think this is clearer for sense 2.
Aligning sense 3.

@@ -12 +12,2 @@
-<gloss>heavy drinker</gloss>
+<xref type="see" seq="1184880">下戸</xref>
+<gloss>(heavy) drinker</gloss>
@@ -13,0 +15 @@
+<gloss>boozer</gloss>
@@ -15 +16,0 @@
-<gloss>boozer</gloss>
@@ -18,3 +19,4 @@
-<pos>&n;</pos>
-<gloss>drinker's eccentricity (merriness, being maudlin, etc.)</gloss>
-<gloss>drinker's habits</gloss>
+<pos>&n-suf;</pos>
+<s_inf>following a word that describes a person's drinking habits</s_inf>
+<gloss>... drinker (e.g. merry drinker, maudlin drinker)</gloss>
+<gloss>... drunk</gloss>
@@ -23,2 +25,2 @@
-<pos>&suf;</pos>
-<xref type="see" seq="2842109">上戸・じょーぐ</xref>
+<pos>&n-suf;</pos>
+<xref type="see" seq="2842109">じょーぐー</xref>
@@ -26 +28,4 @@
-<gloss>person who likes something</gloss>
+<gloss>liker of</gloss>
+<gloss>fan</gloss>
+<gloss>enthusiast</gloss>
+<gloss>-phile</gloss>

Daijr, GG5 (split senses.)
Sense 3: Hendrik (in Okinawa emaild: "According to a (printed) dictionary of the language of Naha (perhaps the most strongly surviving dialect of Ryukyuan), the expression じょうご can be used as a suffix to denote a person who likes something..."

@@ -12,0 +13,7 @@
+<gloss>tippler</gloss>
+<gloss>sot</gloss>
+<gloss>boozer</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>drinker's eccentricity (merriness, being maudlin, etc.)</gloss>
@@ -14,0 +22,6 @@
+<sense>
+<pos>&suf;</pos>
+<xref type="see" seq="2842109">上戸・じょーぐ</xref>
+<dial>&rkb;</dial>
+<gloss>person who likes something</gloss>
+</sense>

真心	696779
真心の	133860

@@ -21,0 +22 @@
+<pos>&adj-no;</pos>

oubunsha zen'yaku kogo jiten:
 ま-ごころ【真心】
（名）〔古くは「まこころ」とも〕

i think it can stay as [ok]

@@ -15,0 +16,4 @@
+<r_ele>
+<reb>まこころ</reb>
+<re_inf>&ok;</re_inf>
+</r_ele>

Should I take that as a yes?

@@ -16,3 +15,0 @@
-<r_ele>
-<reb>まこころ</reb>
-</r_ele>

Style alignment.

@@ -27 +27 @@
-<gloss>daimyō</gloss>
+<gloss>daimyo</gloss>

OK as is.

or arch?

@@ -24 +24 @@
-<xref type="see" seq="1415080">大名</xref>
+<misc>&hist;</misc>

OK. I'm happy to leave this how it is now.

@@ -26 +26 @@
-<gloss>daimyo</gloss>
+<gloss>daimyō</gloss>

daij nikk

I'm going to reopen this. There's a big difference between being a 1) nobleman - a person part of the nobility who in most cases held 
little power, and 2) being a "powerful Japanese feudal lord" who "ruled most of Japan from their vast, hereditary land holdings" (enwiki). 
The meaning is different enough to qualify splitting in both Japanese and English. If the two meanings in English look too similar, that 
can be handled by making them more different

This isn't some obscure little historical issue but the word is used with both meanings today. If somebody looked up the use of "tonosama" 
in hyakunin isshu decks (for one example of contemporary use of the word in the Heian sense meaning) and walked away with the 
understanding that the "tonosama" cards of those decks depict "powerful feudal lords", then we've done them a disservice.

@@ -15,0 +16,7 @@
+<misc>&hon;</misc>
+<gloss>nobleman</gloss>
+<gloss>dignitary</gloss>
+<gloss>lord</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -18,5 +25 @@
-<gloss>lord</gloss>
-<gloss>nobleman</gloss>
-<gloss>dignitary</gloss>
-<gloss>master</gloss>
-<gloss>feudal lord</gloss>
+<gloss>feudal lord (of the Edo period)</gloss>

Sense 2 should be marked as a suffix (行方不明、国籍不明、etc.).

@@ -26,0 +27 @@
+<pos>&suf;</pos>

daijr/s, GG5, prog

Tidied up PoS tags.
I don't think "anonymous" is a good gloss.

@@ -19 +19 @@
-<gloss>unknown</gloss>
+<gloss>unclear</gloss>
@@ -26,3 +26,2 @@
-<pos>&adj-na;</pos>
-<pos>&n;</pos>
-<gloss>anonymous</gloss>
+<pos>&adj-no;</pos>
+<gloss>unknown</gloss>
@@ -32 +30,0 @@
-<pos>&adj-na;</pos>
@@ -34 +32 @@
-<gloss>ignorant</gloss>
+<gloss>ignorance</gloss>
@@ -35,0 +34 @@
+<gloss>lack of insight</gloss>

Dropping antiquated "gaol" spelling.

@@ -16,2 +16 @@
-<gloss>jail cell</gloss>
-<gloss>gaol cell</gloss>
+<gloss>(jail) cell</gloss>

gg5, prog

"coast" is wrong.

@@ -21,2 +21 @@
-<gloss>coast</gloss>
-<gloss>offing</gloss>
+<gloss>off the coast</gloss>
@@ -23,0 +23 @@
+<gloss>out at sea</gloss>

daijs
https://en.wiktionary.org/wiki/jailbreak#Verb

Added sense.

@@ -14,0 +15 @@
+<gloss>breaking out of prison</gloss>
@@ -15,0 +17,7 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<pos>&vt;</pos>
+<field>&comp;</field>
+<gloss>jailbreaking (a smartphone, video game console, etc.)</gloss>

Meikyo vt and vi additions to n,vs entries
-*- via bulkupd.py -*-

@@ -12,0 +13 @@
+<pos>&vi;</pos>

gg5

Dropping antiquated "gaol" spelling.

@@ -13 +13 @@
-<gloss>prison breaking</gloss>
+<gloss>escaping from prison</gloss>
@@ -15 +14,0 @@
-<gloss>gaolbreak</gloss>

Meikyo vt and vi additions to n,vs entries
-*- via bulkupd.py -*-

@@ -12,0 +13 @@
+<pos>&vi;</pos>

G n-grams: 908

Dropping antiquated "gaol" spelling.
Not common.

@@ -13 +13,2 @@
-<gloss>prison breaking</gloss>
+<misc>&obsc;</misc>
+<gloss>breaking out of prison</gloss>
@@ -15 +15,0 @@
-<gloss>gaolbreak</gloss>

gg5, prog, daij

Splitting into senses.

@@ -13,4 +13,11 @@
-<gloss>to be sent up</gloss>
-<gloss>to be imprisoned</gloss>
-<gloss>to be jailed</gloss>
-<gloss>to be gaoled</gloss>
+<gloss>to be thrown in jail</gloss>
+<gloss>to be locked up</gloss>
+<gloss>to be put in the slammer</gloss>
+<gloss>to be put away</gloss>
+</sense>
+<sense>
+<pos>&v5m;</pos>
+<pos>&vt;</pos>
+<gloss>to be burdened with (e.g. someone else's debt)</gloss>
+<gloss>to be saddled with</gloss>
+<gloss>to be stuck with</gloss>

@@ -11,0 +12 @@
+<xref type="see" seq="1325190">主観主義</xref>

daij, gg5

Splitting into senses.

@@ -12 +12,5 @@
-<gloss>iron or steel-grilled (prison) window</gloss>
+<gloss>iron-barred window</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>prison</gloss>
@@ -14 +17,0 @@
-<gloss>gaol</gloss>

Daijr

I don't know how it got there.

@@ -23,0 +24 @@
+<gloss>sincere</gloss>

daijs

I don't think the first gloss works here.

@@ -9,0 +10,6 @@
+<k_ele>
+<keb>悃々</keb>
+</k_ele>
+<k_ele>
+<keb>悃悃</keb>
+</k_ele>
@@ -16 +21,0 @@
-<gloss>repeated</gloss>

懇々	12747
懇懇	61

@@ -5 +5 @@
-<keb>懇懇</keb>
+<keb>懇々</keb>
@@ -8 +8 @@
-<keb>懇々</keb>
+<keb>懇懇</keb>

prog

@@ -17,0 +18 @@
+<gloss>jail</gloss>

@@ -12 +12,2 @@
-<gloss>(Edo-period) jail warden (gaol)</gloss>
+<gloss>(Edo-period) jail warden</gloss>
+<gloss>jailer</gloss>

ルミナス

I don't mind "jailbreaker" - not a term I'd use though.

@@ -18,0 +19 @@
+<gloss>prison escapee</gloss>

despite gg5, i'm not sure jailbreaker is used with this meaning.  if it is, it certainly is not what comes to mind

@@ -18 +17,0 @@
-<gloss>jailbreaker</gloss>

gg5, daij

Also refers to the person.
Dropping antiquated "gaol" spelling.

@@ -14 +14,6 @@
-<gloss>gaolbreak</gloss>
+<gloss>breaking out of prison</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>jailbreaker</gloss>
+<gloss>person who escapes from jail</gloss>

with the exception of kanjigen, none of my refs have きふく at all

@@ -11,0 +12 @@
+<re_inf>&ok;</re_inf>

https://kotobank.jp/word/忌服-51457
GG5

most dictionaries list きぶく as the only reading

@@ -6,0 +7,3 @@
+<r_ele>
+<reb>きぶく</reb>
+</r_ele>

I agree that オフショー was very marginal.

i suppose we could have both xrefs but i don't like to have too many when their relevance isn't clear and this is the one in daij and gakken katakana

@@ -9,2 +9,2 @@
-<xref type="see" seq="1588990">沖合</xref>
-<xref type="see" seq="1588990">沖合</xref>
+<xref type="see" seq="2842355">オンショア</xref>
+<xref type="see" seq="2842355">オンショア</xref>

daijr: "他の語に付いて，海外での，域外の，の意を表す。"
オフショア開発	70845
オフショー開発	No matches

The "オフショー" reading in eij is tagged "〔カタカナ発音〕", which means it's for EJ lookups. It's not a spelling used in Japanese.

@@ -7,4 +6,0 @@
-<r_ele>
-<reb>オフショー</reb>
-<re_inf>&ik;</re_inf>
-</r_ele>
@@ -12 +8,3 @@
-<pos>&n;</pos>
+<pos>&adj-f;</pos>
+<xref type="see" seq="1588990">沖合</xref>
+<xref type="see" seq="1588990">沖合</xref>

Eijiro

@@ -5,0 +6,4 @@
+</r_ele>
+<r_ele>
+<reb>オフショー</reb>
+<re_inf>&ik;</re_inf>

gg5, prog, daij

Added vi/vt tags.

@@ -15,0 +16 @@
+<pos>&vi;</pos>
@@ -17,4 +18,4 @@
-<gloss>to submit</gloss>
-<gloss>to defer</gloss>
-<gloss>to yield</gloss>
-<gloss>to abide</gloss>
+<gloss>to submit to</gloss>
+<gloss>to yield to</gloss>
+<gloss>to accept</gloss>
+<gloss>to abide by</gloss>
@@ -24 +25,2 @@
-<gloss>to serve (e.g. in the army, or a sentence in jail (gaol))</gloss>
+<pos>&vi;</pos>
+<gloss>to serve (in the army, a prison sentence, etc.)</gloss>
@@ -27,0 +30,2 @@
+<pos>&vi;</pos>
+<xref type="see" seq="2830829">喪に服する</xref>
@@ -29 +33,2 @@
-<gloss>to observe (e.g. mourning)</gloss>
+<gloss>to go into (mourning)</gloss>
+<gloss>to observe</gloss>
@@ -32,0 +38 @@
+<pos>&vt;</pos>
@@ -34 +40,2 @@
-<gloss>to drink (tea, medicine, etc.)</gloss>
+<gloss>to take (medicine, poison, etc.)</gloss>
+<gloss>to drink (tea)</gloss>

Agreed.

from the junk range of expressions.  it's in eijiro but it's obvious a+b and gets 51 ngrams

@@ -15 +14,0 @@
-<misc>&hon;</misc>

Thanks

meikyo
転じて、わがままで自己中心的な男性の意の名詞としても使う。「━男」

possibly the 'honorific' tag should be nuked.  様 makes it honorific-style language, but i'm not sure it's really used "honorifically" here, is it?  it's just arrogant

all the sources just say 尊大, not 敬称 (etc.) which is usually the indicator we use when applying an [hon] tag

@@ -19,0 +20,6 @@
+<sense>
+<pos>&n;</pos>
+<gloss>self-centered man</gloss>
+<gloss>egotistical man</gloss>
+<gloss>pompous man</gloss>
+</sense>

I think there might be some merit to 
having some kind of second sense here, but 
I don't really have time to figure out 
exactly what it should be/properly attest 
for the usage right now.

I do believe us editors have a 
responsiblity (in one sense - this is of 
course volunteer work) to look up even 
poorly sourced amendments/suggestions, but 
Nicolas, if you're going to "insist" on 
something being included, you'd make it a 
lot easier for everyone if you could 
include actual sourced examples (and 
several of them) instead of vaguely hand-
waving with "there's plenty on Google". 
I'm not saying this as an admonishment, 
more as advice.

I think it was an attempt to avoid having just an explanation as a gloss.

I don't think we should try to force glosses for sense 1. Makes it look like か is only used for asking for confirmation.

@@ -10,5 +10,2 @@
-<s_inf>used at sentence-end; indicates a question (sometimes rhetorical)</s_inf>
-<gloss>yes?</gloss>
-<gloss>no?</gloss>
-<gloss>isn't it?</gloss>
-<gloss>is it?</gloss>
+<s_inf>at sentence end</s_inf>
+<gloss>indicates a question</gloss>

@@ -30 +29,0 @@
-<xref type="see" seq="1008530">とか・1</xref>

Moving to Marcus' alternative.

@@ -11 +11,4 @@
-<gloss>?</gloss>
+<gloss>yes?</gloss>
+<gloss>no?</gloss>
+<gloss>isn't it?</gloss>
+<gloss>is it?</gloss>

i don't really care for translating a word as a question mark.

gg5

@@ -9,0 +10 @@
+<xref type="see" seq="2842372">ネオコンサーバティブ</xref>
@@ -11 +12 @@
-<gloss>neo-conservative</gloss>
+<gloss>neocon</gloss>

Entry created

G n-grams: 1178
http://yourei.jp/石牢

This isn't in any of my refs. The reference given when this was added back in 2005 was: "From a Japanese comic-strip taking place in mediaeval Japan. 天守に棲む鬼 by 田亀源五郎. Published in the magazine "Kinniku Otoko" vol. 8, p. 5."
There are quite a few examples in literature.

@@ -12,2 +12,3 @@
-<gloss>jail (gaol) made by placing bars across a cave entrance</gloss>
-<gloss>cave-prison</gloss>
+<misc>&obsc;</misc>
+<gloss>jail made by placing bars across a cave entrance</gloss>
+<gloss>cave prison</gloss>

Entry created

@@ -12 +12,2 @@
-<gloss>ineffective or wasted move (in go or shogi)</gloss>
+<gloss>ineffective move (in go or shogi)</gloss>
+<gloss>wasted move</gloss>

tidying up

@@ -12 +12 @@
-<gloss>ineffective or wasted move (in Go or Shoji)</gloss>
+<gloss>ineffective or wasted move (in go or shogi)</gloss>

Entry created

Makes me feel tired.

@@ -41,0 +42 @@
+<misc>&id;</misc>

〈鴨／かも／カモ〉が〈葱／ねぎ／ネギ〉を〈背負／しょ〉って〈来／く〉る
Maybe displaying one form which has all the kanji is enough (鴨が葱を背負って来る).
I'm hiding the other 7 kanji forms and dropping all the other readings.

@@ -4,15 +3,0 @@
-<k_ele>
-<keb>カモがネギを背負ってくる</keb>
-</k_ele>
-<k_ele>
-<keb>カモがネギを背負って来る</keb>
-</k_ele>
-<k_ele>
-<keb>鴨がねぎを背負ってくる</keb>
-</k_ele>
-<k_ele>
-<keb>鴨がねぎを背負って来る</keb>
-</k_ele>
-<k_ele>
-<keb>鴨が葱を背負ってくる</keb>
-</k_ele>
@@ -22,0 +8,20 @@
+<keb>カモがネギを背負ってくる</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>カモがネギを背負って来る</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>鴨がねぎを背負ってくる</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>鴨がねぎを背負って来る</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>鴨が葱を背負ってくる</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
@@ -23,0 +29 @@
+<ke_inf>&sK;</ke_inf>
@@ -26,0 +33 @@
+<ke_inf>&sK;</ke_inf>
@@ -29,5 +35,0 @@
-<reb>カモがねぎをしょってくる</reb>
-<re_restr>カモがネギを背負ってくる</re_restr>
-<re_restr>カモがネギを背負って来る</re_restr>
-</r_ele>
-<r_ele>
@@ -35,6 +36,0 @@
-<re_restr>鴨がねぎを背負ってくる</re_restr>
-<re_restr>鴨がねぎを背負って来る</re_restr>
-<re_restr>鴨が葱を背負ってくる</re_restr>
-<re_restr>鴨が葱を背負って来る</re_restr>
-<re_restr>鴨が葱をしょって来る</re_restr>
-<re_restr>鴨が葱をしょってくる</re_restr>

カモが葱を背負って	25
鴨鴨がネギを背負って	441

Could add these forme too, but it makes me feel tired.

https://www.instagram.com/p/CPDjZ37p_OJ/

@@ -24,0 +25,3 @@
+<k_ele>
+<keb>鴨が葱をしょってくる</keb>
+</k_ele>
@@ -36,0 +40 @@
+<re_restr>鴨が葱をしょってくる</re_restr>

アンチセミティズム	96
アンティセミティズム	65
アンチ・セミティズム	260
アンティ・セミティズム	No matches

@@ -3,0 +4,3 @@
+<r_ele>
+<reb>アンティ・セミティズム</reb>
+</r_ele>

アンチセミティズム	96
アンティセミティズム	65

merge

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>アンティセミティズム</reb>

Entry created

留置所	32782
留置場	48532

Aligning.

@@ -11,0 +12,3 @@
+<xref type="see" seq="1840270">留置場</xref>
+<gloss>police cell</gloss>
+<gloss>place of detention</gloss>
@@ -13 +15,0 @@
-<gloss>detention cell</gloss>

www-images

@@ -13 +13 @@
-<gloss>gaol</gloss>
+<gloss>detention cell</gloss>

Entry created

https://en.wikipedia.org/wiki/Financial_crisis_of_2007–08

it's been over for some time now... more than time to close the parentheses

@@ -12 +12 @@
-<gloss>world financial crisis (2007-)</gloss>
+<gloss>world financial crisis (2007-2008)</gloss>

Lots of collocations of 世界金融危機 and "global financial crisis".

@@ -13,0 +13,2 @@
+<gloss>global financial crisis</gloss>
+<gloss>GFC</gloss>

wiki

In the トランプ時代 it's a bit irrelevant.

https://en.wikipedia.org/wiki/Tea_Party_movement
By 2019, it was reported that the conservative wing of the Republican Party "has basically shed the tea party moniker"

i haven't heard the term be used to refer to anyone in the present tense for a while. i think the movement is still ongoing but the name has been dropped.  perhaps easiest just to remove the year altogether

@@ -12 +12 @@
-<gloss>Tea Party movement (USA, 2010-)</gloss>
+<gloss>Tea Party movement (USA)</gloss>

@@ -12,1 +12,1 @@
-<gloss>Tea Party movement</gloss>
+<gloss>Tea Party movement (USA, 2010-)</gloss>

wiki

https://www.wsj.com/articles/SB122152314746339697  "AIG, Lehman Shock Hits World Markets"
OTOH Daijirin says it wasei

We've been back and forth a bit on this. I'm inclined to accept the view that it's essntially wasei.

@@ -11,0 +12 @@
+<xref type="see" seq="2615670">世界金融危機・せかいきんゆうきき</xref>
@@ -13,0 +15,2 @@
+<gloss>global financial crisis</gloss>
+<gloss>GFC</gloss>

https://linguisticanthropology.org/blog/2014/11/25/shock-lehman-shock/

@@ -12,2 +12,2 @@
-<gloss>Lehman Shock</gloss>
-<gloss g_type="expl">economic downturn precipitated by the Lehman Brothers bankruptcy in 2008</gloss>
+<lsource ls_wasei="y">Lehman shock</lsource>
+<gloss>2008 financial crisis</gloss>

not given as wasei in daijs or 百科事典マイペディア

not wasei
used in this article
https://en.wikipedia.org/wiki/Bankruptcy_of_Lehman_Brothers

@@ -12,2 +12,2 @@
-<lsource ls_wasei="y">Lehman Shock</lsource>
-<gloss>economic downturn precipitated by the Lehman Brothers bankruptcy in 2008</gloss>
+<gloss>Lehman Shock</gloss>
+<gloss g_type="expl">economic downturn precipitated by the Lehman Brothers bankruptcy in 2008</gloss>

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>リーマン・ショック</reb>

merge

https://ja.wikipedia.org/wiki/反ユダヤ主義

そばジョーグー	1412
そばじょーぐ	702
そばじょーぐー	683
そばジョーグ	No matches
そばじょうぐう	No matches
酒ジョーグー	168
酒じょーぐ	45
酒じょーぐー	41
酒ジョーグ	No matches
酒じょうぐう	No matches

Reordering.

@@ -7,0 +8,3 @@
+<reb>ジョーグー</reb>
+</r_ele>
+<r_ele>
@@ -8,0 +12,3 @@
+</r_ele>
+<r_ele>
+<reb>じょーぐー</reb>
@@ -15,6 +20,0 @@
-</r_ele>
-<r_ele>
-<reb>ジョーグー</reb>
-</r_ele>
-<r_ele>
-<reb>じょーぐー</reb>

@@ -29,0 +30 @@
+<gloss>-phile</gloss>

OK

I think this is clearer. It's very similar to the 好き/ずき suffix.

@@ -23,2 +23 @@
-<pos>&n;</pos>
-<pos>&suf;</pos>
+<pos>&n-suf;</pos>
@@ -28 +27,3 @@
-<gloss>person who likes something</gloss>
+<gloss>liker of</gloss>
+<gloss>fan</gloss>
+<gloss>enthusiast</gloss>

Hmm. I think you're right. Makes it all a lot clearer.

Add POS to proverbs
-*- via bulkupd.py -*-

@@ -14,0 +15 @@
+<pos>&v5m;</pos>

i agree.  i think proverb matches better

@@ -15 +15 @@
-<misc>&id;</misc>
+<misc>&proverb;</misc>

http://kotopawa.com/proverbs/detail/1292
"欲望には限度がないこと"

I can't see how this isn't a proverb. It's saying that greed has no limit.

It doesn't make sense to me to say "so what if the English translation is a proverb though the Japanese term is really an idiomatic 
expression?" (paraphrasing Rene). It matters a lot. Users seeing a proverb gloss will assume the Japanese word is a proverb.

Regarding starting glosses with "to" even if they don't conjugate... this should probably be discussed on the mailing list, but I'm 
vacationing right now and don't really have the time unfortunately.

GG5, 中辞典 (freestanding entry)
早ければ	345470
早ければ早いほどいい	5197

We have this already in 早ければ早いほど良い, etc., but it obviously has wider use. Worth including.

@@ -9 +9 @@
-<xref type="see" seq="1269130">くれる・2</xref>
+<xref type="see" seq="1269130">くれる・3</xref>

@@ -9 +9 @@
-<xref type="see" seq="1269130">呉れる・2</xref>
+<xref type="see" seq="1269130">くれる・2</xref>

@@ -8,0 +9 @@
+<xref type="see" seq="1269130">呉れる・2</xref>

"誰もやってくんないから自分でまとめちゃった"
"だけどだれも来てくんない"

Not limited to requests. Not sure how we should gloss this.

@@ -10,3 +10,2 @@
-<s_inf>irreg. variety of くれ ない;after -te form of verb</s_inf>
-<gloss>won't you (please)</gloss>
-<gloss>wouldn't you</gloss>
+<s_inf>irreg. variant of くれない; after -te form of verb</s_inf>
+<gloss>won't do (for me)</gloss>

OK

I'd go with something like this.

@@ -15,2 +15 @@
-<gloss>being anxious</gloss>
-<gloss>worrying</gloss>
+<gloss>tendency to worry a lot</gloss>

心配症	29238
心配症な	4585
心配症の	4109
心配性	217164

"worrywart" is a person and XX症 terms mean a condition.
Struggling a bit for a good gloss. Worryitis? Anxiophobia?

@@ -12 +12,5 @@
-<gloss>worry-wart</gloss>
+<pos>&adj-na;</pos>
+<pos>&adj-no;</pos>
+<xref type="see" seq="1793550">心配性</xref>
+<gloss>being anxious</gloss>
+<gloss>worrying</gloss>

https://ejje.weblio.jp/content/心配症

GG5

@@ -15,0 +16,2 @@
+<gloss>questioning</gloss>
+<gloss>quizzical</gloss>

eij
物問いたげ	564
もの問いたげ	566
物問いたい	No matches
もの問いたい	No matches

Worth adding? The forms without -げ aren't used much.

オンショア	25490

gakken katakana, daijs

approve for xref

ジェイル	10629
Daijr

@@ -12,2 +12 @@
-<s_inf>during the Edo shogunate</s_inf>
-<gloss>court physician (of the Shogun and his household)</gloss>
+<gloss>court physician (of the Shōgun and his household, Edo period)</gloss>

daijr/s

GG5, etc.

alc https://eow.alc.co.jp/search?q=親善使節
britannica https://kotobank.jp/word/親善使節-82097
kenkyuusha https://ejje.weblio.jp/content/親善使節

GG5, リーダーズ+プラス

日英・英日専門用語辞書, crosslanguage etc https://ejje.weblio.jp/content/休耕地
alc https://eow.alc.co.jp/search?q=休耕地

ＫＯＤ追加語彙
プライベートジェット	13920

Bing's counts are about as useless as Google's.

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>プライベート・ジェット</reb>

bing 1,760,000 results

失敗は成功のもと	30929
失敗は成功の元	16318
失敗は成功の基	1538
失敗は成功の母	8539

@@ -11,0 +12 @@
+<xref type="see" seq="1320150">失敗は成功のもと・しっぱいはせいこうのもと</xref>

https://sentencesearch.neocities.org/#失敗は成
weblio https://ejje.weblio.jp/content/失敗は成功の母
日本国語大辞典 https://kotobank.jp/word/失敗は成功の母-2046733

Reformat initialsms
-*- via bulkupd.py -*-

@@ -7,0 +8,3 @@
+<reb>ユー・エス・エム・シー・エー</reb>
+</r_ele>
+<r_ele>
@@ -8,0 +12 @@
+<re_inf>&sk;</re_inf>

ASCII hyphens

@@ -12 +12 @@
-<gloss>United States–Mexico–Canada Agreement</gloss>
+<gloss>United States-Mexico-Canada Agreement</gloss>

https://ja.wikipedia.org/wiki/米国・メキシコ・カナダ協定
https://kotobank.jp/word/USMCA-2119364

NAFTA is in the main dictionary, so i suppose this should be too

トランスフォビア	84
ＫＯＤ追加語彙

https://ja.wikipedia.org/wiki/トランスフォビア

eij
https://ja.wikipedia.org/wiki/イスラム恐怖症

@@ -11,0 +12 @@
+<xref type="see" seq="2842367">オルタナ右翼</xref>

https://kotobank.jp/word/オルトライト-1812272
https://ja.wikipedia.org/wiki/オルタナ右翼

@@ -12 +12 @@
-<gloss>alt-right</gloss>
+<gloss>alt-right (ideology)</gloss>

https://kotobank.jp/word/オルトライト-1812272
https://ja.wikipedia.org/wiki/オルタナ右翼

古典的自由主義	1666

eij
https://ja.wikipedia.org/wiki/古典的自由主義

https://ja.wikipedia.org/wiki/インセル

GG5

@@ -12,0 +13 @@
+<gloss>antifascism</gloss>

https://kotobank.jp/word/反ファシズム-1197818
https://ja.wikipedia.org/wiki/反ファシズム

ネオコンサーバティズム	69

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ネオコンサーバティズム</reb>

ネオコンサバティズム	78
新保守主義	        18067

@@ -8,0 +9 @@
+<xref type="see" seq="2116190">新保守主義</xref>

daijs

ネオコンサーバティブ	280
ネオコン	                88283

@@ -8,0 +9 @@
+<xref type="see" seq="2058830">ネオコン</xref>

gg5

@@ -8,0 +9 @@
+<xref type="see" seq="2116190">新保守主義</xref>
@@ -9,0 +11 @@
+<gloss>neoconservatism</gloss>

gg5, 知恵蔵 (dotted version, but since it's one english word that doesn't make sense)

I like to have both.

@@ -3,0 +4,3 @@
+<r_ele>
+<reb>アイデンティティポリティクス</reb>
+</r_ele>

eij
https://ja.wikipedia.org/wiki/アイデンティティ政治

always seems to be dotted online, probably because it's long enough to be confusing w/o the dot

Not common.

eij
https://ja.wikipedia.org/wiki/白人ナショナリズム

gg5, eij

gg5, eij

Daijr, ＫＯＤ追加語彙

daijs

oops

@@ -1,3 +1,2 @@
-<ent_seq>2842362</ent_seq>
-<ent_corp>jmdict</ent_corp>
+<ent_corp>jmnedict</ent_corp>

https://ja.wikipedia.org/wiki/ホワイト島

there's a bunch of them
https://ja.wikipedia.org/wiki/ホワイト島_(曖昧さ回避)

so perhaps best/easiest to leave it generic and not specify new zealand

https://ja.wikipedia.org/wiki/カエルのペペ

https://ja.wikipedia.org/wiki/トランプ・オーガナイゼーション