@@ -10,0 +11 @@
+<re_inf>&sk;</re_inf>
@@ -14 +15 @@
-<re_inf>&ik;</re_inf>
+<re_inf>&sk;</re_inf>
@@ -18 +19 @@
-<re_inf>&ik;</re_inf>
+<re_inf>&sk;</re_inf>
@@ -22 +23 @@
-<re_inf>&ik;</re_inf>
+<re_inf>&sk;</re_inf>

コミュニーケーション	1929

@@ -17,0 +18,4 @@
+<re_inf>&ik;</re_inf>
+</r_ele>
+<r_ele>
+<reb>コミュニーケーション</reb>

コミュニケーション	8573589
コミュニケイション	10009
コミニュケーション	110924
コミニケーション	47068

@@ -13,0 +14,4 @@
+<re_inf>&ik;</re_inf>
+</r_ele>
+<r_ele>
+<reb>コミニケーション</reb>

Yes, 葵 probably generated false positives.

@@ -6,2 +5,0 @@
-<ke_pri>news1</ke_pri>
-<ke_pri>nf19</ke_pri>
@@ -11,2 +8,0 @@
-<re_pri>news1</re_pri>
-<re_pri>nf19</re_pri>

葵	1089803	87.6%
フタバアオイ	2987	0.2%
アオイ	151779	12.2% （also "blue", and a name", so....)

Suggest removing [news1] statistics, unless we think "mallow" or "a species of wild ginger" are likely big in the news.

Appears in endless Japanese names. Image search for "アオイ" does not return plants.

Several JEs mention hollyhock in the glosses.

daij, koj, meiyko

None of the refs has a separate "hollyhock" sense. It's one of the mallows so it's included in sense 1.

@@ -20,2 +19,0 @@
-<xref type="see" seq="1855300">銭葵</xref>
-<xref type="see" seq="2517870">冬葵</xref>
@@ -27 +25,2 @@
-<xref type="see" seq="2517850">二葉葵</xref>
+<xref type="see" seq="2517850">フタバアオイ</xref>
+<misc>&uk;</misc>
@@ -30,6 +28,0 @@
-<sense>
-<pos>&n;</pos>
-<xref type="see" seq="1551580">立葵</xref>
-<s_inf>hollyhocks (genus Alcea) are part of the mallow family</s_inf>
-<gloss>hollyhock</gloss>
-</sense>

〈一／ひと〉〈寝／ね〉〈入／い〉り

Google N-gram Corpus Counts
╭─ーーーーー─┬───────┬───────╮
│ 一寝入り　 │ 8,979 │ 58.2% │
│ ひと寝入り │ 6,093 │ 39.5% │ - add
│ ひと寝いり │    39 │  0.3% │
│ 一寝いり　 │    23 │  0.1% │
│ ひとねいり │   284 │  1.8% │
╰─ーーーーー─┴───────┴───────╯

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>ひと寝入り</keb>

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

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

gg5, prog, luminous

Only chujiten splits but I think it works well.

@@ -16,0 +17 @@
+<gloss>elegant</gloss>
@@ -17,0 +19,4 @@
+<gloss>cultivated</gloss>
+</sense>
+<sense>
+<pos>&adj-i;</pos>
@@ -19,2 +23,0 @@
-<gloss>cultivated</gloss>
-<gloss>elegant</gloss>
@@ -22,0 +26 @@
+<gloss>self-effacing</gloss>

smk: 「床」は、借字。
iwakoku: 「床」と書くのは当て字。

@@ -8,0 +9 @@
+<ke_inf>&ateji;</ke_inf>

G n-grams:
  奥床しい	2507
  奥ゆかしい	48852
  おくゆかしい	3457

reordering

@@ -5 +5 @@
-<keb>奥床しい</keb>
+<keb>奥ゆかしい</keb>
@@ -8 +8 @@
-<keb>奥ゆかしい</keb>
+<keb>奥床しい</keb>

I'd seen the 会社・町内会など so I thought the schools mention was plausible. I certainly don't mind dropping it if it's contested.

2 native informers: 学校でつかわんな
daij only mention 町内会
gakkoku has 会社・町内会などで

Is ChatGPT the only surce for the school thing? I wnt to reiterate I don't think we should ever refer to ChatGPT even when what it outputs seems OK because there's just no way of knowing what's based on facts and what's AI hallucinations.

@@ -12 +12 @@
-<gloss>circular notice (esp. in binder form; passed around households within a neighbourhood association, school community, etc.)</gloss>
+<gloss>circular notice (esp. in binder form; passed around households within a neighbourhood association, etc.)</gloss>

@@ -12 +12 @@
-<gloss>circular notice (esp. in binder form; passed around households within a neighbourhood association, school communities, etc.)</gloss>
+<gloss>circular notice (esp. in binder form; passed around households within a neighbourhood association, school community, etc.)</gloss>

WWW images. 
ChatGPT dug out the following, which seems pretty accurate:
"In Japan, "kairanban" is a type of bulletin board used in neighborhood associations, schools, or other local organizations to distribute information, notices, or announcements among the members. The documents are usually posted on the board, and each member is expected to read and pass them on to the next person in a circular fashion, hence the name "kairan" (circulation). It is a traditional and widely used means of communication in Japanese communities."

I think my 2012 edit was a bit off.

@@ -12 +12 @@
-<gloss>circular notice (esp. in binder form distributed to households within a neighbourhood association)</gloss>
+<gloss>circular notice (esp. in binder form; passed around households within a neighbourhood association, school communities, etc.)</gloss>

gg5
割栗石	        2,781	86.6%	
割り栗石	        210	6.5%	
割ぐり石	        154	4.8%	
割りぐり石	65	2.0%

I don't think the 砕石 x-ref is needed.

@@ -11,0 +12 @@
+<ke_inf>&sK;</ke_inf>
@@ -14,0 +16 @@
+<ke_inf>&sK;</ke_inf>
@@ -21 +22,0 @@
-<xref type="see" seq="1295210">砕石・1</xref>
@@ -22,0 +24 @@
+<gloss>hardcore</gloss>

GG5, etc.

See my comments on 砕石.

@@ -21 +21 @@
-<xref type="see" seq="1295210">砕石・さいせき・1</xref>
+<xref type="see" seq="1295210">砕石・1</xref>
@@ -22,0 +23 @@
+<gloss>macadam</gloss>

See comments on 砕石. not macadam.  Harmonizing "crushed rock" as the somewhat more common "crushed stone".  Alternatively, could say "crushed rock;crushed stone" on all of these entries. 

xref is vastly more common for "crushed stone".  Technically 割栗石 may identify a particular grade/size, but that's more than I want to get into.

@@ -21,2 +21,3 @@
-<gloss>crushed rock</gloss>
-<gloss>macadam</gloss>
+<xref type="see" seq="1295210">砕石・さいせき・1</xref>
+<xref type="see" seq="1295210">砕石・さいせき・1</xref>
+<gloss>crushed stone</gloss>

@@ -8,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>割ぐり石</keb>

https://ja.wikipedia.org/wiki/カリ首
https://en.wikipedia.org/wiki/Corona_of_glans_penis
https://www.merriam-webster.com/dictionary/gooseneck
カリ首	1,826

There's also this non-archaic sense.

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>カリ首</keb>
@@ -11,0 +15,6 @@
+<field>&anat;</field>
+<gloss>corona of glans penis</gloss>
+<gloss>corona glandis penis</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -13 +22 @@
-<gloss>thing shaped like a goose's neck</gloss>
+<gloss>gooseneck (i.e. something shaped like a goose's neck)</gloss>

daijr/s, koj

Presumably archaic. Not in the smaller kokugos.

@@ -7,3 +6,0 @@
-<k_ele>
-<keb>カリ首</keb>
-</k_ele>
@@ -12,5 +8,0 @@
-<re_restr>雁首</re_restr>
-</r_ele>
-<r_ele>
-<reb>カリくび</reb>
-<re_restr>カリ首</re_restr>
@@ -19,0 +12,7 @@
+<misc>&arch;</misc>
+<gloss>thing shaped like a goose's neck</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<misc>&arch;</misc>
+<gloss>head of the penis</gloss>
@@ -21,2 +19,0 @@
-<gloss>head of a penis</gloss>
-<gloss g_type="lit">goose's neck</gloss>

日マワリ	    0
日まわり	1,492

@@ -12,0 +13,4 @@
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>日まわり</keb>

日回り is in several kokugos, so we'd tag it [rK}.

@@ -9 +9 @@
-<ke_inf>&sK;</ke_inf>
+<ke_inf>&rK;</ke_inf>

向日葵	408179	9.6%
ひまわり	3408667	80.6%
ヒマワリ	412362	9.7%
日回り	777	0.0%
日廻り	653	0.0%

https://zatugaku-gimonn.com/entry1050.html
向日葵を「ひまわり」と読むのは”熟字訓（じゅくじくん）”と言われる読み方で、
熟字訓とは漢字１字に読み方をあてるのではなく、熟字（２字以上の漢字の組み合わせ）に訓読みをあてた読み方のことです。

pretty apparently 熟字訓 I think, dug up a random reference to support it.

Added another rare form off of wikipedia, [sK]'d both of them (super-rare).

@@ -8,0 +9,5 @@
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>日廻り</keb>
+<ke_inf>&sK;</ke_inf>
@@ -11,0 +17 @@
+<re_inf>&gikun;</re_inf>

daij

@@ -20 +19,0 @@
-<s_inf>向日葵 is irregular</s_inf>

ひまわり	3408667
ヒマワリ	412362
向日葵	408179
日回り	777

Is the note correct?
If it were, why not use [iK]?

Disambiguating.

@@ -12 +12 @@
-<gloss>aggregate</gloss>
+<gloss>aggregate (material)</gloss>

@@ -23,0 +24 @@
+<pos>&vt;</pos>

https://en.m.wikipedia.org/wiki/Macadam
GG5 and other JEs have macadam as a gloss.

Strictly speaking, macadam roads, etc. do not necessarily have tar. I don't mind it staying.

@@ -18,0 +19 @@
+<gloss>macadam</gloss>

ターマック
https://ja.wikipedia.org/wiki/ターマック
ターマック (Tarmac) は、骨材にタールをしみ込ませて固めた舗装、あるいはその舗装路面である。タルマック、タールマクともいう。
Tarmac は商標で、一般名称はタールマカダム (tarmacadam) である。マカダムとは、砕石をロードローラーで踏み固めただけの舗装である。



https://www.ei-navi.jp/dictionary/content/macadam/
砕石
broken stone used in macadamized roadways.
マカダム舗装の道路で用いられる割栗石。

macadam
noun
broken stone of even size, bound with tar or bitumen and used in successively compacted layers for surfacing roads and paths.


砕石	81603
を砕石して	39	  
砕石する	138
砕石します	21
砕石した	128
砕石して	110

macadam seems to be just plainly incorrect.  砕石 is an ingredient, and that is all.  砕石 has innumerable other applications, and without tar/bitumen, it is not macadam. I can't imagine anyone would ever use 砕石 as a shorthand for asphalt.

sankoku lists as suru intransitive.  Even so, marked the [vs] form as rare, as it certainly seems uncommon (and looking at actual use cases, I'm still not entirely sure what is being communicated.  In some cases, it might even be "the application of crushed stone" (to a lawn)".  But anyway, don't hold me to that, I didn't look that hard.

@@ -19 +18,0 @@
-<gloss>macadam</gloss>
@@ -23,0 +23 @@
+<misc>&rare;</misc>

gg5, prog, daij

@@ -17,0 +18,5 @@
+<gloss>crushed stone</gloss>
+<gloss>macadam</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -19,2 +24 @@
-<gloss>broken stone</gloss>
-<gloss>rubble</gloss>
+<gloss>crushing (rock)</gloss>

This seemed to become a fork.

ワサビ	265338	66.7%
山葵	132404	33.3%
山萮菜	0	0.0% <-- wikipedia added this, for some reason or another. Seems possibly Chinese
和佐比	106	0.0%

Google shopping search for 和佐比 yields no results.  If it's not even used for marketing...
Twitter search doesn't yield anything but people throwing out "和佐比" as trivia(and usernames).
Wikipedia mentions 和佐比 specifically as an orthography recorded from ~800~1200a.d.

*only* appearance in all of wikipedia for  和佐比 or 山萮菜 is the historical note on the wasabi page itself.

IME won't produce 和佐比 (MacOS)
amazon.co.jp can't even match 和佐比 with wasabi

yourei returns two results, and they are both copies of the same text, which is a historical reference to the heian period orthography:
1. ワサビの語源については、平安時代中期の『本草和名』には、「山葵」の和名を和佐比と記している。同じく平安時代の『和名類聚抄』にも和佐比と記されている。

If you search on google, you get some hits.  They are:
1. Extremely historical texts
2. Mentions of the etymology of the modern term
3. People who have incorporated it on a lark into usernames on websites ("和佐比さんの手書きブログ")

I think on balance that it is counterproductive to display the form, especially for such a common term. (people should not learn or use it, and are unlikely to encounter it).

@@ -10 +10 @@
-<ke_inf>&ateji;</ke_inf>
+<ke_inf>&sK;</ke_inf>

wiki

gg5

@@ -23,0 +24 @@
+<gloss>Japanese horseradish</gloss>

Pretty rare.

@@ -9,0 +10 @@
+<ke_inf>&ateji;</ke_inf>

Fork

We could have a 2nd sense:
[col] horseradish
(I don't think it's usually a blend?)

Non-rhetorically, do you have any sources in mind where 和佐比 is actually used, where this surface form would be useful?   I couldn't find any that were not Chinese or Korean(and those are also few in number). Since everything I find mentions it only in passing as a form from the 平安 period, this feels a little like an English-Japanese dictionary providing glosses for Chaucer's English. 

On the other point,  if the gloss were "wasabi", I wouldn't have any objection.  "Everybody" knows that if you ask for wasabi in a restaurant, you're not going to get wasabi.  It's just that peculiarity of this dictionary in listing scientific names next to things the feels wrong in this specific instance. 

If you see　わさび on anything anywhere in Japan, 95% chance it's mostly western horse radish(which is much cheaper).  Anything that is *actually* wasabi is going to have to go out of its way to advertise "no, really, it is actually wasabi wasabi". 

So, it's nitpicky, but the note on the gloss just seems factually incorrect. And I would prefer for a dictionary to be correct, if there is a way to do that we can be happy with.

Reverting to our standard style for these sorts of entries. I don't see a case for the "colloquially any wasabi/horseradish blend", but if that's needed it could be another sense.
I'd like to keep 和佐比 visible with its ateji tag.

@@ -10 +10,2 @@
-<ke_inf>&sK;</ke_inf>
+<ke_inf>&ateji;</ke_inf>
+<ke_inf>&rK;</ke_inf>
@@ -23,2 +24 @@
-<gloss>wasabi (defined as Wasabia japonica, colloquially any wasabi/horseradish blend)</gloss>
-<gloss>Japanese horseradish</gloss>
+<gloss>wasabi (Wasabia japonica)</gloss>

I invite another way to approach this.  Seems silly to pretend that "wasabi" means "Wasabia japonica", as it almost never is.  (I know all the kokugos, and wikipedia, define it this way, but lets be honest...)

@@ -23 +23 @@
-<gloss>wasabi (Wasabia japonica)</gloss>
+<gloss>wasabi (defined as Wasabia japonica, colloquially any wasabi/horseradish blend)</gloss>

Incredible. The *English* wiktionary page notes the historic phonetic spelling, but not the Japanese page (this just how unimportant this is...)
https://en.wiktionary.org/wiki/山葵
Japanese
山葵 わさび Grade: 1	Jinmeiyō  jukujikun
Etymology */wasapi/ → /wasabi/
First attested in the Honzō Wamyō (918 CE) with this kanji compound and phonetic spelling of 和佐比.  

(The kanji form is not otherwise searchable on wiktionary)

No reference on the Japanese わさび page:
https://ja.wiktionary.org/wiki/わさび

Thank you, I appreciate the consideration and effort, this looks good.

Wikipedia doesn't really "have" this form.  It's not listed in the opening section as an accepted orthography. It is only noted as a historical artifact later in the article.
Headword: ワサビ（山葵[6]・山萮菜[7]、学名: Eutrema japonicum）は、...
History(名称): （918年）には、「山葵」の和名を和佐比と記している。同じく平安時代の『和名類聚抄』にも和佐比と記されている。

(山萮菜 was added randomly in 2021, I think that doesn't belong where it is either...)

和佐比 is not in nikk, it's not in daijs, it's obviously not in sankoku. I imagine it is omitted for a reason.

Sorry to repeat some numbers that are already in the notes, but:
わさび	1232009	75.6%
ワサビ	265338	16.3%
山葵	132404	8.1%
和佐比	106	0.0%

That's 106 of 1629857 occurrences, or ~1 in 15,000, or 0.0065%.  

And of those 106 occurrences, almost all are from reference materials(such as the 植物名辞典) that will have 山葵 or わさび right next to it.

The odds of encountering 和佐比 *by itself* as an attempt by an author to communicate the concept of "wasabi" seems infinitesimally small, unless one is literally studying classical Japanese texts.

Just on the numbers, this would ordinarily be an obvious [sK]. I certainly agree that [sK] shouldn't be purely a numbers game - sometimes terminology of historical/at-least-marginally useful significance is helpful to display.  This just doesn't appear to be one of those cases.

The reason that I put effort into this is that there is a cost to listing these forms in jmdict.  "Wasabi" is obviously an extremely common term. Students of Japanese will study it.  Every single person building a hand-made flashcard for わさび (paper or digital) off of this dictionary (or any of the many tools that use jmdict) has to decide for themselves if "和佐比" is worth learning(and if they lazily decide "yes", then they will waste additional time trying to learn a form that has gone mostly unused for hundreds of years).  

[rK], unfortunately, is insufficient to make this kind of choice. 磯巾着　いそぎんちゃく　"sea anemone" is [rK] at a little under 2%. It's still maybe worth learning, but rare enough that you probably should avoid it if you want a random Japanese person to understand your writing.  (This is an example I happened to be studying yesterday. 樹懶　なまけもの "tree sloth" is another fun one)

Put differently, if you write 磯巾着, a Japanese person might think you are overly educated, and/or have an unhealthy fascination with kanji (or sea anemones).

If you write 和佐比 for わさび, they will probably wonder what's the matter with you. (Since it's phonetic, they can probably guess the reading though わ　さ　ひ・び).

The amount of time wasted by thousands of individual learners adds up to something.  In exchange, what benefit does listing 和佐比 provide?  This is what is unclear to me.

Here's a big, colorful, example flashcard/study resource generated straight out of this entry(second page of a "和佐比" search)
https://www.tanoshiijapanese.com/dictionary/entry_details.cfm?entry_id=28918&element_id=201696

I'm not pressing the point beyond leaving these thoughts.  It can stay [rK] if that still feels appropriate to everyone.  But that is my motivation for "disappearing" some of these very, very rare forms.

https://ja.wikipedia.org/wiki/ワサビ#名称
ワサビの名が付く近縁な植物としてセイヨウワサビ（ホースラディッシュ）があるが、加工品の粉ワサビやチューブ入り練りワサビなどでは、原材料にセイヨウワサビのみを使用したり、両方を使っていたりするため、日本原産のワサビを本わさびと呼び、これを使ったものを高級品として区別していることが多い。

I think this is better.

@@ -28,0 +29,2 @@
+<xref type="see" seq="1121660">ホースラディッシュ</xref>
+<xref type="see" seq="2160220">西洋わさび</xref>
@@ -31 +33 @@
-<gloss>(any) blend of wasabi and horseradish</gloss>
+<gloss>horseradish (or any blend of wasabi and horseradish)</gloss>

植物名辞典 (has 和佐比), as does Wikipedia.
GG5, 中辞典, etc. all add Japanese horseradish.

Suggesting a second sense to cover Brian's issue. If this sort of information is appropriate, it shouldn't be in the literal sense.

@@ -24,0 +25,7 @@
+<gloss>Japanese horseradish</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<misc>&uk;</misc>
+<misc>&col;</misc>
+<gloss>(any) blend of wasabi and horseradish</gloss>

Don't really need it here. I thought about an arch entry but reindexing the 300+ 時計 sentences would be a pain.

@@ -19,5 +18,0 @@
-</r_ele>
-<r_ele>
-<reb>ときはかり</reb>
-<re_restr>時計</re_restr>
-<re_inf>&ok;</re_inf>

Only koj and nikk have ときはかり. I think it's a distraction on this entry. If we really want it, it could be a separate [arch] entry but I think it's fine to drop it entirely. Even daijr and daijs don't think it's important enough to record.

OK

iwakoku: 古く「土圭」「斗鶏」と書いたことがある。

斗鶏	78

Probably not worth adding. Google/twitter searches don't show anything related. Just wanted to leave a note.

OK. I've amended the indices.

gg5, luminous, wisdom, daij

Looks OK.
GG5 and daijr have a separate "wedding" sense.

@@ -14,0 +15 @@
+<gloss>way</gloss>
@@ -15,0 +17 @@
+<gloss>fashion</gloss>
@@ -17,0 +20,2 @@
+<gloss>form</gloss>
+<gloss>type</gloss>
@@ -21 +24,0 @@
-<pos>&n-suf;</pos>
@@ -29 +32,4 @@
-<pos>&n-suf;</pos>
+<gloss>wedding (ceremony)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -36 +41,0 @@
-<pos>&n-suf;</pos>
@@ -38,2 +43,2 @@
-<misc>&arch;</misc>
-<gloss>enforcement regulations (of the ritsuryō)</gloss>
+<misc>&hist;</misc>
+<gloss>enforcement regulations (of the ritsuryō legal codes)</gloss>

GG5 and other JEs lead with the "ceremony" sense.

I'm comfortable with the order Chris has suggested. Any other views before I adjust the sentence indices?

@@ -15,0 +16,2 @@
+<gloss>method</gloss>
+<gloss>system</gloss>
@@ -20,0 +23,3 @@
+<gloss>rite</gloss>
+<gloss>ritual</gloss>
+<gloss>celebration</gloss>

大辞泉 (https://www.weblio.jp/content/式)

The order of these senses seems wrong to me. It feels like the "style" and "ceremony senses" are more common, and one of them should be the first sense. In 大辞泉 the "style" meaning comes first, "ceremony" second, and "equation" third, so that's what I've emulated here.

@@ -15,3 +15 @@
-<gloss>equation</gloss>
-<gloss>formula</gloss>
-<gloss>expression</gloss>
+<gloss>style</gloss>
@@ -27 +25,3 @@
-<gloss>style</gloss>
+<gloss>equation</gloss>
+<gloss>formula</gloss>
+<gloss>expression</gloss>

ritsuryo conversion
-*- via bulkupd.py -*-

@@ -34 +34 @@
-<gloss>enforcement regulations (of the ritsuryo)</gloss>
+<gloss>enforcement regulations (of the ritsuryō)</gloss>

Splitting into two senses

@@ -16 +16 @@
-<pos>&adj-no;</pos>
+<field>&math;</field>
@@ -18,0 +19,5 @@
+<sense>
+<pos>&n;</pos>
+<gloss>actual number (as opposed to a speculative number)</gloss>
+<gloss>true number</gloss>
+</sense>

meikyo: 「猿」と書くのは誤り。「×猿年→○申年」

Google N-gram Corpus Counts
╭─ーーーー─┬────────┬───────╮
│ 申年　　 │ 34,846 │ 81.4% │
│ さる年　 │  3,214 │  7.5% │
│ サル年　 │  2,714 │  6.3% │
│ 猿年　　 │  1,083 │  2.5% │ - add, [iK]
│ さるどし │    926 │  2.2% │
│ サルどし │      0 │  0.0% │ - drop restrictions
╰─ーーーー─┴────────┴───────╯

@@ -12,0 +13,4 @@
+<k_ele>
+<keb>猿年</keb>
+<ke_inf>&iK;</ke_inf>
+</k_ele>
@@ -15,6 +18,0 @@
-<re_restr>申年</re_restr>
-<re_restr>さる年</re_restr>
-</r_ele>
-<r_ele>
-<reb>サルどし</reb>
-<re_restr>サル年</re_restr>

@@ -24 +24 @@
-<gloss>year of the monkey</gloss>
+<gloss>year of the Monkey</gloss>

申年	34846
さる年	3214
サル年	2714
猿年	1083

@@ -9,0 +10,3 @@
+<k_ele>
+<keb>サル年</keb>
+</k_ele>
@@ -11,0 +15,6 @@
+<re_restr>申年</re_restr>
+<re_restr>さる年</re_restr>
+</r_ele>
+<r_ele>
+<reb>サルどし</reb>
+<re_restr>サル年</re_restr>

I don't think "constancy" is a good leading gloss. Maybe it's old-fashioned or just not common in AmE. It makes me think "consistency," "invariance," etc, which are much broader in meaning than 節操.

@@ -18 +17,0 @@
-<gloss>constancy</gloss>
@@ -20,0 +20 @@
+<gloss>constancy</gloss>

daij, koj, gg5, prog

None of the refs have more than one sense.

@@ -19,0 +20,3 @@
+<gloss>fidelity</gloss>
+<gloss>principle</gloss>
+<gloss>faithfulness</gloss>
@@ -23,5 +25,0 @@
-<sense>
-<pos>&n;</pos>
-<gloss>chastity</gloss>
-<gloss>fidelity</gloss>
-</sense>

meikyo, shinmeikai, sankoku

@@ -8,0 +9 @@
+<re_inf>&gikun;</re_inf>

prog, wisdom

I don't think "garments" is a great fit.
I think "clothes" should be higher up.

@@ -19,3 +18,0 @@
-<gloss>outfit</gloss>
-<gloss>garments</gloss>
-<gloss>costume</gloss>
@@ -23,0 +21,3 @@
+<gloss>clothing</gloss>
+<gloss>costume</gloss>
+<gloss>garb</gloss>

中辞典: 	(a style of) dress; clothes
GG5: 	(the style of) dress; costume; attire; (職服･式服) ceremonial 「dress [attire]; (職業･時代･国柄に特有の) garb; costume.
Daijs: 衣服とその装身具。また、それをつけたときのようす。

I don't see the problem with "style" but it seems it's being taken the wrong way. Maybe this works.

@@ -18 +18,2 @@
-<gloss>(style of) clothes</gloss>
+<gloss>attire</gloss>
+<gloss>outfit</gloss>
@@ -20 +21 @@
-<gloss>attire</gloss>
+<gloss>costume</gloss>
@@ -21,0 +23 @@
+<gloss>clothes</gloss>

I agree (style of) is a little unfortunate

wouldn't something like "the clothes one is currently wearing" be more accurate? I don't think it has anything to do with style, it's much closer to "attire" and "outfit"

The JEs mention style and the examples agree.

@@ -18 +18 @@
-<gloss>clothes</gloss>
+<gloss>(style of) clothes</gloss>

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

Google N-gram Corpus Counts
╭─ーーー─┬─────────╮
│ 便座　 │ 560,921 │
│ 便坐　 │      62 │ - add, rK (daijs, koj, iwakoku)
│ べんざ │     710 │
╰─ーーー─┴─────────╯

@@ -5,0 +6,4 @@
+</k_ele>
+<k_ele>
+<keb>便坐</keb>
+<ke_inf>&rK;</ke_inf>

gg5, prog

Done.

@@ -17,11 +16,0 @@
-<r_ele>
-<reb>がんさつ</reb>
-<re_restr>贋札</re_restr>
-</r_ele>
-<r_ele>
-<reb>ぎさつ</reb>
-<re_restr>偽札</re_restr>
-</r_ele>
-<r_ele>
-<reb>にせふだ</reb>
-</r_ele>
@@ -31,5 +20,2 @@
-</sense>
-<sense>
-<stagr>ぎさつ</stagr>
-<pos>&n;</pos>
-<gloss>forged document</gloss>
+<gloss>counterfeit bill</gloss>
+<gloss>counterfeit note</gloss>

Yes please.

This merge is a bit uncomfortable. I think にせさつ, がんさつ and ぎさつ should be separate entries, and I suggest dropping にせふだ as it's only koj. I'll set it up myself if there are no objections.

gg5
謎解き	455,150	98.0%	
なぞ解き	5,877	1.3%	
謎解	3,392	0.7%

@@ -5,0 +6,8 @@
+</k_ele>
+<k_ele>
+<keb>なぞ解き</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>謎解</keb>
+<ke_inf>&sK;</ke_inf>
@@ -12,0 +21 @@
+<gloss>solving a mystery</gloss>

Daijisen

@@ -12 +12 @@
-<gloss>solution of a riddle</gloss>
+<gloss>solving a riddle</gloss>

Shinto-tagged

@@ -18 +18 @@
-<gloss>Fūjin (Japanese god of the wind)</gloss>
+<gloss>Fūjin (god of the wind)</gloss>

https://en.wikipedia.org/wiki/Fūjin

We could have a second sense.

@@ -13,0 +14,5 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<field>&Shinto;</field>
+<gloss>Fūjin (Japanese god of the wind)</gloss>

Oft. refers to Fūjin specifically and that name is used sometimes in English too (see Fūjin and Raijin)

gg5, prog, luminous

@@ -11,0 +12 @@
+<gloss>god of the wind</gloss>

meikyo:「鉄壁の守備 に／を━」

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

Aligning.

@@ -16,2 +16,3 @@
-<xref type="see" seq="2069190">攻めあぐねる・せめあぐねる</xref>
-<gloss>to be at a loss for how to continue an attack (against someone or something)</gloss>
+<xref type="see" seq="2069190">攻めあぐねる</xref>
+<gloss>to be at a loss how to continue an offensive</gloss>
+<gloss>to be frustrated by impregnable defences</gloss>

攻めあぐねる	3592	26.5%
攻めあぐねて	7536	55.6%

攻めあぐむ	1117	8.2%
攻めあぐんで	1261	9.3%

https://ejje.weblio.jp/content/攻め倦む
be at one's wits' end because of [be completely frustrated by] the impregnable defenses (of the enemy)、be at a loss how to renew one's attack.

sankoku, transitive: 攻め切れないで、もてあます。

good twitter example:
https://twitter.com/ryutidoh/status/1558579073190080512
マスコミや野党が岸田さんを攻めあぐんで参院選に負け、やっと攻撃材料を見つけただけ。統一教会のモリカケ化を狙っているから。そこにアベガーまで加わったからね。その証拠に宗教と政治という問題までにはどこも触れない。

simple sports example:
https://twitter.com/yoshi2ahmnrsty/status/1525745060054462464
相手エース則本を攻めあぐんでの敗戦…残念…

twitter "を攻めあぐねて"
https://twitter.com/search?q="を攻めあぐねて"&src=typed_query&f=live
twitter "を攻めあぐんで"　(far less common)
https://twitter.com/search?q="を攻めあぐんで"&src=typed_query&f=live

"the attacking initiative", to me, means "taking the chance to strike first".  To lose the initiative means to give your enemy a chance to prepare, or to allow them to strike first. Even with some of the other potential senses of "initiative", I don't think this was a clear gloss.

I just dropped a placeholder gloss here, so as not to leave the old gloss. But, see comments on xref. These should probably be handled as synonyms. sankoku has no entry for the xref, but the xref is a far more common formulation.

Definitely transitive, though an explicit object-of-attack is by no means required.　(one of about 4 uses of this verb on wikipedia, comparatively rare there)
https://ja.wikipedia.org/wiki/二俣城の戦い
武田軍は二俣城を攻めあぐんだ

If in agreement, glosses should be aligned when something is decided on.

@@ -15,2 +15,4 @@
-<pos>&vi;</pos>
-<gloss>to lose the attacking initiative</gloss>
+<pos>&vt;</pos>
+<xref type="see" seq="2069190">攻めあぐねる・せめあぐねる</xref>
+<xref type="see" seq="2069190">攻めあぐねる・せめあぐねる</xref>
+<gloss>to be at a loss for how to continue an attack (against someone or something)</gloss>

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>攻めあぐむ</keb>
+</k_ele>

JE examples.

I think so.

@@ -21 +21 @@
-<gloss>bad eyes</gloss>
+<gloss g_type="fig">bad eyes</gloss>

meikyo: 見ることのできない目。物事の本質を見抜く力のないことをあざけっていう語。

I suspect the second sense is mostly used figuratively

Google N-gram Corpus Counts
╭─ーーーー─┬────────┬───────╮
│ 節穴　　 │ 44,399 │ 74.9% │
│ ふし穴　 │  1,409 │  2.4% │ - sK
│ ふしあな │ 13,434 │ 22.7% │
╰─ーーーー─┴────────┴───────╯

@@ -8,0 +9 @@
+<ke_inf>&sK;</ke_inf>
@@ -20,0 +22 @@
+<gloss>tunnel vision</gloss>

Google estimate of 17,600 hits for "ふし穴"

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>ふし穴</keb>
@@ -13,0 +16,1 @@
+<gloss>peep-hole</gloss>

@@ -13,0 +14 @@
+<field>&finc;</field>

Meikyo, smk, etc.: ⇔可変資本

@@ -11,0 +12,2 @@
+<xref type="see" seq="1777810">可変資本</xref>
+<field>&econ;</field>

@@ -14,0 +15 @@
+<field>&finc;</field>

Meikyo, smk, etc: ⇔不変資本

@@ -11,0 +12,3 @@
+<xref type="see" seq="1740210">不変資本</xref>
+<xref type="see" seq="1740210">不変資本</xref>
+<field>&econ;</field>

https://kotobank.jp/word/巾着切-2030673
nikk
きんちゃく‐きり【巾着切】

巾着切り	1659	0.1%
巾着切	672	0.0%


some (by no means all) twitter uses giving スリ explicitly:
元巾着切り(スリ)の"完治"、町医者
脇役ですが巾着切り(スリ)の宇之
巾着切り(スリ)の完治らを配
「巾着切（スリ）の遊戯」

sankoku: 古風　すり

daijs:
https://kotobank.jp/word/巾着切り-481526
「掏摸すり」に同じ。


スリ	937752	98.8% couldn't say what % is pickpockets, but...
掏摸	5273	0.6%
掏り	3461	0.4%
掏模	117	0.0%
巾着切り	1659	0.2%
巾着切	672	0.1%

sankoku says [dated], usage certainly appears that way to me (often used in conjunction with historical imagery, edo-era pickpockets, etc.  but still understood, so some people on twitter seem to use it for what it is, perhaps for effect).

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>巾着切</keb>
@@ -11,0 +15,2 @@
+<xref type="see" seq="1567450">スリ</xref>
+<misc>&dated;</misc>

Thanks! Bad cut-and-paste when I was reversing the order.

The "テ" seems to have been mistakenly removed.

@@ -11 +11 @@
-<reb>ンジクアオイ</reb>
+<reb>テンジクアオイ</reb>

天竺葵	924	41.7%
テンジクアオイ	943	42.6%
てんじくあおい	349	15.7%
GG5 (also has "stork's bill")

Best not to mix up other forms such as ゼラニウム in the percentages.
Please follow our style for the katakana forms of plant, etc. names.

@@ -8 +8 @@
-<reb>テンジクアオイ</reb>
+<reb>てんじくあおい</reb>
@@ -11 +11,2 @@
-<reb>てんじくあおい</reb>
+<reb>ンジクアオイ</reb>
+<re_nokanji/>
@@ -17 +18 @@
-<gloss>geranium</gloss>
+<gloss>geranium (Pelargonium inquinans)</gloss>

ゼラニウム	147141	98.5%
天竺葵	924	0.6%
テンジクアオイ	943	0.6%
てんじくあおい	349	0.2%

https://www.weblio.jp/content/天竺葵
daijs:
ゼラニウムの別名。

https://ja.wikipedia.org/wiki/テンジクアオイ属

Daijs says "same as geranium". 

wikipedia seems to indicate that this is *technically* a subset of what would be colloquially called geraniums. 
Latin name: Pelargonium
科	:	フウロソウ科 Geraniaceae
属	:	テンジクアオイ属 Pelargonium
学名
Pelargonium L'Hér. ex Aiton

I see the xref is already "usually a cultivated Pelargonium". 

Maybe someone would be interested in entering this name in the appropriate style (I'm not quite sure how to say this is always a Pelargonium, which would be considered a geranium  ).  If no one thinks it's worth it, I am not pushing for the change.  Happy myself with the katakana form + xref.

Thought about [rare], but 3000 ngrams and perfectly common on twitter.  Just uncommon vs. xref.


The English wikipedia page explains that one genus was split into two...
https://en.wikipedia.org/wiki/Geranium

Confusion with Pelargonium:

Confusingly, "geranium" is also the common name of members of the genus Pelargonium, which are also in the family Geraniaceae and are widely grown as horticultural bedding plants. Linnaeus originally included all the species in one genus, Geranium, but they were later separated into two genera by Charles L’Héritier in 1789. Other former members of the genus are now classified in Erodium, including the plants known as filarees in North America.

@@ -7,0 +8,3 @@
+<reb>テンジクアオイ</reb>
+</r_ele>
+<r_ele>
@@ -11,0 +15,2 @@
+<xref type="see" seq="2071570">ゼラニウム</xref>
+<misc>&uk;</misc>

In  2857766 Robin wrote: "The previous gloss is a second sense of 振替休日. It should be added there."

@@ -20,0 +21,4 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>compensatory day off work (for having worked on a holiday, etc.)</gloss>

Daijr, GG5, ルミナス

Not a yoji. I think this gloss is clearer.

@@ -9,0 +10,3 @@
+<k_ele>
+<keb>振替え休日</keb>
+</k_ele>
@@ -15 +18,2 @@
-<misc>&yoji;</misc>
+<gloss>substitute national holiday</gloss>
+<gloss>day off in lieu of a national holiday that falls on a Sunday</gloss>
@@ -17,2 +20,0 @@
-<gloss>observed holiday (weekday holiday when the actual day is on a weekend)</gloss>
-<gloss>substitute holiday</gloss>

Kanji Haitani list

Adding yoji tagAdding yoji tag
-*- via bulkupd.py -*-

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

甘夏柑	6,274		
甘夏	114,873

@@ -12 +12 @@
-<xref type="see" seq="1950640">甘夏・あまなつ</xref>
+<xref type="see" seq="1950640">甘夏</xref>

Aligning.

@@ -13,3 +13,3 @@
-<field>&food;</field>
-<gloss>Amanatsu orange</gloss>
-<gloss>Amanatsu mikan</gloss>
+<gloss>amanatsu (Citrus natsudaidai)</gloss>
+<gloss>Japanese summer orange</gloss>
+<gloss g_type="expl">less sour variety of the natsumikan</gloss>

Everything a person could ever want to know about amanatsu oranges, a short google away. (pomelo appears in passing, "watson" does not)
https://specialtyproduce.com/produce/Amanatsu_Oranges_14989.php

Names used as-is:
https://artsandculture.google.com/story/how-purity-affects-the-flavor-of-natsu-mikan-ministry-of-agriculture-forestry-and-fisheries/8AUxKUc_N4MfLw?hl=en
Are you feeling thirsty?” Tsuboya inquires before clambering up an old Amanatsu tree to grab one of the large fruit.
Planted among the Natsumikan are Amanatsu, a closely related citrus but with fruit that is sweeter and of a somewhat milder acidity. Harvesting commences from January;

Check out the "amanatsu" marketing
https://japanshopping.org/search/items/detail/bath-time-with-amanatsu-orange

All (roughly) the same thing, and we have entries for all of them, some of which don't match each other:
カワノナツダイダイ（川野夏橙） 甘夏橙、甘夏蜜柑、甘夏柑、略して甘夏

甘夏	114873
甘夏柑	6274
甘夏蜜柑	429
カワノナツダイダイ　too long for ngram db
川野夏橙	270

https://en.wikipedia.org/wiki/Amanatsu
Amanatsu (甘夏) or natsumikan (ナツミカン(夏蜜柑)) is a yellowish orange citrus hybrid fruit, a group of cultivars of Citrus natsudaidai, which were discovered in 1740 in the Yamaguchi prefecture of Japan.

Names
Amanatsu (甘夏) means "sweet summer" in Japanese. In Japan, the fruit is known as kawano natsu daidai (カワノナツダイダイ（川野夏橙）), but also colloquially the amanatsu, amanatsu daidai (甘夏橙), amanatsukan (甘夏柑), and amanatsu mikan (甘夏蜜柑（甘夏みかん）)

https://ja.wikipedia.org/wiki/カワノナツダイダイ
カワノナツダイダイ（川野夏橙）は、ミカン科ミカン属の柑橘類の一つ。...ナツダイダイの枝変わり種である[1][2][3][2]。
甘夏橙、甘夏蜜柑、甘夏柑、略して甘夏などとも呼ばれる。

If a consensus is reached, the entry on 甘夏蜜柑 should look exactly like this one. There is a very strong tie with the non-甘 variety as well. (夏蜜柑)

See ngrams: "甘夏" is everywhere in grocery stores here, a later-season alternative to a 八朔 はっさく orange.  This is the popular term that should probably be xref'd. I didn't find it especially sweet, in spite of the name... (it's apparently not so much "sweet" as "less sour than a natsumikan", which is known for being particularly sour)

We gloss 八朔 as
Hassaku orange (Citrus hassaku)

I see no reason to do anything differently here.  This is principally a Japanese cultivar sold principally in Japan.  Fruit & vegetable flavor profiles are not generally under our purview. If you google "amanatsu orange", you'll quite quickly get all the details you could ever want.

Glossed often as "watson pomelo" by old 和英辞典, this seems like a cruel conspiracy foisted on the Japanese, constantly writing amantsu(watson pomelo) as if anyone in the West had any idea what a "watson pomelo" was. 

Good luck finding this name anywhere today. English wikipedia contains no explicit reference to such a thing, but an article on the "Arab Agricultural Revolution" has a footnote on historian Andrew Watson, saying: 

"In support of his thesis, Watson charted the advance of seventeen food crops and one fiber crop that became important over a large area of the Mediterranean world during the first four centuries of Islamic rule (roughly the seventh through eleventh centuries C.E.)"[30] The food crops named by Watson were rice, sorghum, durum wheat, sugar cane, watermelon, aubergine (eggplant), spinach, artichoke, taro, sour orange (pomelo), lemon, lime, banana, plantain, mango, and coconut; the fibre was cotton."

so, there's a pomelo-named-after-Watson there.  

Looks like the Japanese orange may have been marketed in India under the name "Watson Pomelo" in the 1940s and 50s:

Book search: 1948: Journal of Scientific and Industrial Research - Volume 7 - Page 82
Often under cultivation in the Punjab , the United Provinces , Central Provinces , and Madras under the name Watson pomelo . This is a cheap summer orange and may be valuable as a substitute for grapefruit . 24. C. nobilis Lour .

India again(10 years later, not going well):
Bombay (State) Department of Agriculture · 1958 · ‎Snippet view
As regards the effect of various root - stocks it is seen that Gajanimma , Sohyndong and Kodur Jamburi have been the most outstanding while Satkara and Watson Pomelo are not satisfactory . Atlantia has produced dwarf plants .

@@ -12 +12 @@
-<xref type="see" seq="2569090">甘夏蜜柑</xref>
+<xref type="see" seq="1950640">甘夏・あまなつ</xref>
@@ -14 +14,2 @@
-<gloss>sweet (variety of) Watson pomelo</gloss>
+<gloss>Amanatsu orange</gloss>
+<gloss>Amanatsu mikan</gloss>

http://ja.wikipedia.org/wiki/カワノナツダイダイ

@@ -12,0 +12,1 @@
+<xref type="see" seq="2569090">甘夏蜜柑</xref>

OK. I'll align 甘夏柑 too.

https://citruscentre.co.uk/products/natsudaidai-or-natsumikan-orange
https://www.oscartintori.it/en/prodotto/natsudaidai-or-daidai-mikan-or-natsumikan-or-japanese-summer-orange/
https://hosho.ees.hokudai.ac.jp/tsuyu/top/plt/citrus/citrus/nat.html

I can't find any real support for "Watson pomelo" outside of GG5. "Chinese citron" is an odd name for a Japanese fruit. Not common either. "Japanese summer orange" gets some use.
For 夏みかん (and 夏柑), I suggest "natsumikan (Citrus natsudaidai); Japanese summer orange".

@@ -19,3 +19,2 @@
-<gloss>summer orange</gloss>
-<gloss>Watson pomelo</gloss>
-<gloss>Chinese citron</gloss>
+<gloss>Japanese summer orange</gloss>
+<gloss g_type="expl">less sour variety of the natsumikan</gloss>

-- 甘夏	114873 (あまなつ	465506)
GG5: a Watson Pomelo; Citrus natsudaidai.
中辞典: a sweet (variety of) Watson pomelo.
ルミナス: sweet Chinese citron
-- 夏みかん/夏蜜柑  178674/15855
GG5: a Chinese citron; a Watson pomelo; a summer orange; Citrus natsudaidai.
中辞典: a Watson pomelo; a thick-skinned grapefruit-like fruit
ルミナス: Chinese citron
-- 甘夏柑  6274 (GG5 and 中辞典 merge with 甘夏
-- 川野夏橙  270 (not in the JEs)

Thanks to Brian for opening this one up. We have four entries for the various forms used for the Citrus natsudaidai. and they are obviously all over the place. The JEs also vary wildly. We should get one good set of glosses and use them for all the entries.
I'm proposing this as the gloss, and if it's approved I'll apply it to the other 3.
Note that we only use capital letters in plant, etc. names if they derive from a proper name. Hence "amanatsu".

@@ -17,3 +17,5 @@
-<gloss>Amanatsu (Citrus natsudaidai)</gloss>
-<gloss>Amanatsu orange</gloss>
-<gloss g_type="expl">less-sour variety of Citrus natsudaidai (Natsumikan), available from February to June</gloss>
+<misc>&uk;</misc>
+<gloss>amanatsu (Citrus natsudaidai)</gloss>
+<gloss>summer orange</gloss>
+<gloss>Watson pomelo</gloss>
+<gloss>Chinese citron</gloss>

夏みかん	178674	60.9%
甘夏	114873	39.1%

夏みかんと甘夏は何が違うの？見た目の見分け方や味の違いを解説
https://yuukiyasai.jp/blogs/blog/4
Called 甘 because it is *less sour* 
夏みかんよりも酸味が少ないことから「甘夏」と呼ばれていますが、正式名称は「川野夏橙（カワノナツダイダイ）」です。
Sweetness
味については、夏みかんの方が酸味が強く、甘夏の方が甘酸っぱい味わいので、実際に食べてみるとわかりやすいでしょう。
Availability
甘夏は夏みかんよりも酸味が抜けるのが早いため、2月〜6月ごろと少し時期が早めです。
夏みかんは、4月〜7月の初夏に出回ります。

(not "sweet", I've eaten several)

To lead with a complication, "when Japanese people say 夏みかん, they are often referring to 甘夏"
https://ja.wikipedia.org/wiki/ナツミカン
現在「夏蜜柑」と言えば、カワノナツダイダイ(amanatsu)を指す事が多い

So really, we've got 6~8 terms that are almost all the same thing...

===

See comments on 甘夏柑.  "Amanatsu" seems generally capitalized on google results. in our 八朔 entry "Hassaku" is capitalized.  I am not certain of the rationale.(was lowercase when I got here.  If that was correct, maybe Hassaku should be changed)

This is a common orange in grocery stores right now (and for the last two months or so, as the hassaku are disappearing), with these specific kanji (vs. other forms).  It seems odd to have a [food] tag, and be unable to use it on fruits and vegetables.  I'm not sure what the motivation is there.

I don't think the [expl] is so necessary regardless. But "Chinese citron" is only slightly more meaningful than "watson pomelo".  This isn't really adding information.  Possibly of interest is that we will have 6 terms all identified as "Citrus natsudaidai", so it might be worth noting that the　甘い half of the terms are less-sour than the non-甘い half., and that they are available in different seasons. But as I noted in the opening, that's probably not entirely true colloquially. (I say less-sour, and not "sweet", because I've eaten them. I definitely found the name to be misleading, but now I see it is the 甘い version of something that is *truly* sour).

@@ -17,2 +17,3 @@
-<gloss>amanatsu (Citrus natsudaidai)</gloss>
-<gloss g_type="expl">sweet form of Chinese citron</gloss>
+<gloss>Amanatsu (Citrus natsudaidai)</gloss>
+<gloss>Amanatsu orange</gloss>
+<gloss g_type="expl">less-sour variety of Citrus natsudaidai (Natsumikan), available from February to June</gloss>

を攻めあぐね	2,117		
に攻めあぐね	1,360

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

攻めあぐむ	1117
攻め倦む	266
攻めあぐねる	3592
攻め倦ねる	38
GG5 (攻めあぐねる) be at a loss how to continue [get tired of, weary of] an offensive; become disheartened in conducting 「a siege [an attack].
中辞典 (攻め倦む) ┏be at one's wits' end because of [be completely frustrated by] the impregnable defenses (of the enemy); be at a loss how to attack.

GG5 only has せめあぐねる and points せめあぐむ to it. 中辞典 only has 攻め倦む. Clearly they should be aligned.
Trimming a bit.

@@ -8,0 +9 @@
+<ke_inf>&rK;</ke_inf>
@@ -16,3 +17,2 @@
-<gloss>to struggle to find an effective means of attack (against someone or something)</gloss>
-<gloss>to have one's attack frustrated</gloss>
-<gloss>to be at a loss for how to continue an assault (e.g. against an enemy fortification)</gloss>
+<gloss>to be at a loss how to continue an offensive</gloss>
+<gloss>to be frustrated by impregnable defences</gloss>

nikk:
https://www.weblio.jp/content/攻めあぐねる
攻める手段に困る、攻撃するのが難しい、などの意味の表現。

https://hinative.com/questions/11366813
攻めたけれど、上手くいかないこと。
(城などを)攻撃したが、陥落させることができていない状態。(退却もしていない)
例
敵は城を一月(ひとつき)包囲したが、堅(かた)い守りに攻めあぐね、撤退(てったい)した。
===
Reverso matches

高経は、守りの堅い金ヶ崎城を攻めあぐね、兵糧攻めを行う。
Takatsune struggled to conquer the Kanegasaki-jo Castle which had a strong defense, and he started to starve them out.
(ie. assault was failing, so he decided to blockade them instead)

さらに、死傷者が続出して攻めあぐねた。
As the battle progressed, many more troops were killed, and Noriyori's army could not sustain the fight.

逆にいえば、このように民主主義の価値観を体現した医療保険改革法であったからこそ、共和党は攻めあぐねたのである。
In other words, because this health insurance reform is a product of the democratic process, the Republican Party has been unable to attack.
This has a complete source with full context:
https://www.marubeni.com/jp/research/potomac/backnumber/03.html

元亀元年（1570年）に始まった石山合戦は本願寺の歴史優勢のうちに進み、織田信長は石山本願寺を攻めあぐねていた。
In the Ishiyama War which began in 1570, the Ishiyama Hongan-ji Temple held onto the advantage and Nobunaga ODA had a tough time against it.
=====

I'm quite proud of aligning this two:
gave up the attack [of Rominger] near the summit = ロミンゲルを攻めあぐねて...敗北してしまった
https://en.wikipedia.org/wiki/1995_Giro_d'Italia
https://ja.wikipedia.org/wiki/ジロ・デ・イタリア_1995

Berzin and Ugrumov refused to work with one another and did not extend their advantage over Rominger... On the second ascension of the Cuvignone, Berzin attacked and was able to distance himself; however, he gave up the attack near the summit.

中盤でタイムが接近したベルズィンはチーム内で自分の立場を脅かすウグルモフとの協調が崩壊。先頭交代を拒否するなどまるで敵同士のように潰しあった挙句にロミンゲルを攻めあぐねて敗北してしまった。

I welcome other (more succinct) gloss attempts. The previous ones seem to have missed the part about "attacking", which seems pretty crucial.

This is really 攻める + あぐねる, and 攻める is vt, so so is this. (examples in the wild are regularly を攻めあぐね...)

Initially it was not this, but the gloss for 攻めあぐむ which caught my eye for its incongruity with this entry.  Since あぐむ and あぐねる are basically synonymous, I wondered if there is actually a practical difference between 攻めあぐむ and 攻めあぐねる. (I am starting to think not). While 攻め倦ねる has an entry in sankoku, this entry is clearly more common (and far more heavily used in wikipedia).

For 攻め倦む:
https://ejje.weblio.jp/content/攻め倦む
be at one's wits' end because of [be completely frustrated by] the impregnable defenses (of the enemy)、be at a loss how to renew one's attack.

@@ -15,2 +15,4 @@
-<gloss>to be at a loss how to continue</gloss>
-<gloss>to become disheartened</gloss>
+<pos>&vt;</pos>
+<gloss>to struggle to find an effective means of attack (against someone or something)</gloss>
+<gloss>to have one's attack frustrated</gloss>
+<gloss>to be at a loss for how to continue an assault (e.g. against an enemy fortification)</gloss>

Entry created

daijr: ⇒かんじのうりょくけんてい【漢字能力検定】
daijs:「漢字検定」の略。商標名。
gg5: 〔日本漢字能力検定協会による漢字能力テスト〕 the Kanji Aptitude Test.

https://ja.wikipedia.org/wiki/日本漢字能力検定
英名	The Japan Kanji Aptitude Test 

https://www.kanken.or.jp/kanken/faq/outline/
Q17 級と協会名の英語表記はどう書きますか？
・『日本漢字能力検定2級』　　→　"The Japan Kanji Aptitude Test Grade 2"

I think this is only used as a proper noun

@@ -12,0 +13 @@
+<field>&tradem;</field>
@@ -14,2 +15 @@
-<gloss>kanji test</gloss>
-<gloss>test of kanji skills</gloss>
+<gloss>The Japan Kanji Aptitude Test</gloss>

Entry created

@@ -18 +17,0 @@
-<xref type="see" seq="1302710">わさび</xref>
@@ -21,2 +20 @@
-<xref type="see" seq="2160220">西洋わさび</xref>
-<gloss>real wasabi (in contrast to Western horseradish)</gloss>
+<gloss>real wasabi (as opposed to Western horseradish)</gloss>

KOD

Trimming a lot. Don't need all the xrefs.

@@ -18,6 +18,3 @@
-<xref type="see" seq="1302710">山葵・わさび</xref>
-<xref type="see" seq="1302710">山葵・わさび</xref>
-<xref type="see" seq="2160220">西洋わさび・せいようわさび</xref>
-<xref type="see" seq="2857837">山わさび・やまわさび</xref>
-<s_inf>esp. used in marketing to distinguish from western horseradish</s_inf>
-<gloss>(true) wasabi (Wasabia japonica)</gloss>
+<xref type="see" seq="1302710">わさび</xref>
+<xref type="see" seq="2160220">西洋わさび</xref>
+<gloss>real wasabi (in contrast to Western horseradish)</gloss>

本わさび	33278	79.4%
本ワサビ	4953	11.8%
本山葵	3683	8.8%

https://www.chunichi.co.jp/article/68052
本わさびの使用量が５０％以上なら「本わさび使用」、５０％未満なら「本わさび入り」と表示する決まりです。

https://en.wiktionary.org/wiki/山葵
Called 本山葵 (hon wasabi) when needed to distinguish it from the derived terms.

The term "本山葵" does not appear in the Japanese wikipedia page for "山葵". This is not in and of itself, as I understand it, a scientific identifier for a particular species of plant.  Instead, it is more like "true wasabi" (vs. western wasabi).

If your product contains at least 50% 山葵, then it can be marketed as 本わさび使用、if less, than 50%, then 本わさび入り.  (The wasabi in my fridge says 使用, must be the good stuff... 1st ingredient is 本わさび, 3rd ingredient is 西洋わさび related)

According to the article, does *not* have to actually be produced in Japan, technically, as long as it is the correct species of wasabi.

I know we're not fans of lots of xrefs.
For marketing purposes, 本わさび　and 山わさび align directly (google/product search will return similar products)
On an ingredient list,  本わさび and 西洋わさび align
and, of course, 本わさび *is* just 山葵 (to the extent that わさび is used with its originally meaning, and not colloquially as "whatever I'm served to put on my sushi")

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>本ワサビ</keb>
@@ -15,2 +18,7 @@
-<xref type="see" seq="2160220">西洋わさび</xref>
-<gloss>wasabi (Wasabia japonica)</gloss>
+<xref type="see" seq="1302710">山葵・わさび</xref>
+<xref type="see" seq="1302710">山葵・わさび</xref>
+<xref type="see" seq="1302710">山葵・わさび</xref>
+<xref type="see" seq="2160220">西洋わさび・せいようわさび</xref>
+<xref type="see" seq="2857837">山わさび・やまわさび</xref>
+<s_inf>esp. used in marketing to distinguish from western horseradish</s_inf>
+<gloss>(true) wasabi (Wasabia japonica)</gloss>

Entry created

Thanks.

It appears so. The smaller kokugos don't have it and the example in daijr/s is from the 13th century. I think it can be dropped.
Daijr agrees with obunsha that 転く only applies to to the "spin" sense. As 転めく is only in daijs and doesn't register in the n-grams, I think it can be hidden.

@@ -11,0 +12 @@
+<ke_inf>&sK;</ke_inf>
@@ -14,0 +16 @@
+<ke_inf>&sK;</ke_inf>
@@ -22 +24 @@
-<gloss>to be dizzy</gloss>
+<gloss>to feel dizzy</gloss>
@@ -28,6 +30 @@
-<gloss>to bustle about</gloss>
-</sense>
-<sense>
-<pos>&v5k;</pos>
-<pos>&vi;</pos>
-<s_inf>original meaning</s_inf>
+<s_inf>orig. meaning; also written as 転く</s_inf>

isn't it sense 2 that's archaic?

眩く is in a majority of refs and gets the most n-gram counts.

Several of the kokugos mention the くるくる回る sense. Maybe it would be better to have an "original meaning" note rather than an [arch] tag.

Google N-gram Corpus Counts
╭─ーーーーー─┬────────┬───────╮
│ 眩く　　　 │ 15,112 │ 91.0% │ - remove [io] tag (daijr, koj, meikyo, smk, etc.)
│ 眩めく　　 │    449 │  2.7% │ - (daijs, sankoku)
│ 転く　　　 │     22 │  0.1% │ - (obunsha: ①は、「転く」と書くことが多い。)
│ 転めく　　 │      0 │  0.0% │ - (daijs)
│ くるめく　 │  1,021 │  6.1% │
├─ーーーーー─┼────────┼───────┤
│ 眩いて　　 │    129 │ 71.3% │
│ 眩めいて　 │      0 │  0.0% │
│ 転いて　　 │      0 │  0.0% │
│ 転めいて　 │      0 │  0.0% │
│ くるめいて │     52 │ 28.7% │
├─ーーーーー─┼────────┼───────┤
│ 眩いた　　 │    224 │100.0% │
│ 眩めいた　 │      0 │  0.0% │
│ 転いた　　 │      0 │  0.0% │
│ 転めいた　 │      0 │  0.0% │
│ くるめいた │      0 │  0.0% │
╰─ーーーーー─┴────────┴───────╯

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>眩く</keb>
+</k_ele>
@@ -8 +11 @@
-<keb>転めく</keb>
+<keb>転く</keb>
@@ -11,2 +14 @@
-<keb>眩く</keb>
-<ke_inf>&io;</ke_inf>
+<keb>転めく</keb>
@@ -17,8 +18,0 @@
-<sense>
-<pos>&v5k;</pos>
-<pos>&vi;</pos>
-<misc>&arch;</misc>
-<gloss>to spin</gloss>
-<gloss>to revolve</gloss>
-<gloss>to twirl</gloss>
-</sense>
@@ -35,0 +30,8 @@
+<sense>
+<pos>&v5k;</pos>
+<pos>&vi;</pos>
+<s_inf>original meaning</s_inf>
+<gloss>to spin</gloss>
+<gloss>to revolve</gloss>
+<gloss>to twirl</gloss>
+</sense>

Let's go with both.

I think we should either have びと only or both びと and じん. I don't mind which. A search-only じん form wouldn't be much help here.

I note that almost always in compounds of nation/race + 人 the reading is じん. The main class of exceptions seems to be biblical references, e.g. ヘブル人/ヘブルびと (GG5) and ナザレ人/ナザレびと. Even then, GG5 has " ペリシテ人 （ペリシテじん［びと］）".
For this entry and the others Dine has edited we could:
- just have びと
- have both the びと and じん forms visible
- have both but make the じん form only searchable.
Which should it be?

See Jim's comment.

@@ -8,0 +9,3 @@
+</r_ele>
+<r_ele>
+<reb>コリントじんへのてがみ</reb>

@@ -10,0 +11 @@
+<pos>&exp;</pos>
@@ -11,0 +13 @@
+<field>&Christn;</field>

@@ -13,0 +14 @@
+<pos>&exp;</pos>

@@ -9,0 +10,3 @@
+<r_ele>
+<reb>ガラテヤじんへのてがみ</reb>
+</r_ele>
@@ -11,0 +15 @@
+<field>&Christn;</field>

daijs, etc.: 
https://kotobank.jp/word/ガラテヤ人への手紙-467547

@@ -8 +8 @@
-<reb>ガラテヤじんへのてがみ</reb>
+<reb>ガラテヤびとへのてがみ</reb>

Entry created

@@ -13,0 +14 @@
+<pos>&exp;</pos>

@@ -9,0 +10,3 @@
+<r_ele>
+<reb>ローマじんへのてがみ</reb>
+</r_ele>
@@ -11,0 +15 @@
+<field>&Christn;</field>

daijs, nikk, etc.:
https://www.weblio.jp/content/ローマ人への手紙
https://kotobank.jp/word/ローマ人への手紙-153395

@@ -8 +8 @@
-<reb>ローマじんへのてがみ</reb>
+<reb>ローマびとへのてがみ</reb>

Entry created

Daijr/s and meikyo have 其れっ切り. Maybe we can just display that.

〈それ／其（れ）〉っ〈限／切／き〉り

Google N-gram Corpus Counts
╭─ーーーーー─┬─────────┬───────╮
│ それっ切り │     233 │  0.2% │ - sK
│ 其れっきり │     146 │  0.1% │ - add, sK
│ 其っ切り　 │       0 │  0.0% │
│ 其れっ切り │       0 │  0.0% │ - rK
│ それっ限り │       0 │  0.0% │
│ 其っ限り　 │       0 │  0.0% │
│ 其れっ限り │       0 │  0.0% │ - (daijs)
│ 其っきり　 │       0 │  0.0% │
│ それっきり │ 142,909 │ 99.7% │
╰─ーーーーー─┴─────────┴───────╯

@@ -5 +5,2 @@
-<keb>それっ切り</keb>
+<keb>其れっ切り</keb>
+<ke_inf>&rK;</ke_inf>
@@ -8 +9,6 @@
-<keb>其れっ切り</keb>
+<keb>それっ切り</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>其れっきり</keb>
+<ke_inf>&sK;</ke_inf>

Entry created

OK

I don't think it's needed. 規模 can be used with so many different words.

Reverso
全社規模	6492

Yes, not computing, but it gets reasonable usage, as well as a lot of Reverso matches.

@@ -13,2 +13,2 @@
-<field>&comp;</field>
-<gloss>corporate-wide</gloss>
+<gloss>company-wide scale</gloss>
+<gloss>enterprise scale</gloss>

Not a computing term. A+B.

Entry created

I don't think the katakana versions need to be visible.
Aligning with きもい.

@@ -11,0 +12 @@
+<re_inf>&sk;</re_inf>
@@ -14,0 +16 @@
+<re_inf>&sk;</re_inf>
@@ -19,0 +22 @@
+<gloss>gross</gloss>
@@ -21,3 +23,0 @@
-<gloss>gross</gloss>
-<gloss>bad feeling</gloss>
-<gloss>weird</gloss>

https://dic.nicovideo.jp/a/きめぇ
きめぇとは、「気持ち悪い」という意味の、日本語の口語表現である。

Google N-gram Corpus Counts
╭─ーーー─┬────────┬───────╮
│ きめぇ │ 19,592 │ 49.7% │ - add
│ きめえ │ 13,527 │ 34.3% │
│ キメェ │  5,193 │ 13.2% │ - add
│ キメエ │  1,082 │  2.7% │ - add
╰─ーーー─┴────────┴───────╯

@@ -4,0 +5,3 @@
+<reb>きめぇ</reb>
+</r_ele>
+<r_ele>
@@ -5,0 +9,6 @@
+</r_ele>
+<r_ele>
+<reb>キメェ</reb>
+</r_ele>
+<r_ele>
+<reb>キメエ</reb>

Entry created

https://en.wikipedia.org/wiki/Die-in
"A die-in, sometimes known as a lie-in, is a form of protest in which participants simulate being dead."

Kokugos mention nuclear weapons, but wikipedia describes it more broadly.

Okay to add a little bit of clarification?

@@ -12 +12 @@
-<gloss>die-in</gloss>
+<gloss>die-in (protest)</gloss>

GG5

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ダイ・イン</reb>

Invariably hyphenated.

@@ -9 +9 @@
-<gloss>diein</gloss>
+<gloss>die-in</gloss>

Entry created

I agree with the [rare[ and [uk]. I'd hide most of them.

@@ -8,0 +9 @@
+<ke_inf>&sK;</ke_inf>
@@ -11,0 +13 @@
+<ke_inf>&sK;</ke_inf>
@@ -18 +20 @@
-<re_nokanji/>
+<re_inf>&sk;</re_inf>

all ngrams starting 山葵が利:
山葵が利い	90	  
山葵が利いて	57	  
山葵が利いた	28	
ワサビが利い	231	  
ワサビが利いて	180	 
ワサビが利いた	34	  
わさびが利いて	312	  
わさびが利いた	37

わさびがきいて	701	75.7%
わさびがきいた	225	24.3%

ワサビがきいて	175	80.6%
ワサビがきいた	42	19.4%

https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1029724775
example sentence:
「警句を織り交ぜて、話に山葵を利かせる」
Which is just a copy/paste of this:
https://tomomi965.com/ko-jien08/wa01.html
which is the only place it appears on the internet.

Sense[2] -> [rare]
Add some kanji and kana forms.

Sense[2] is even in sankoku, but I've yet to find an example in the wild.

If you search sankoku's example 話にわさびをきかせる, you get one hit: "to pepper/spice up one's speech", from 和英日本文化表現辞典
sankoku: たいせつなところで強くするどくせまるひょうげんがある。「わさびの利いた評論」　「わさびを効かせる」「話にー」

(one exception to my remarks below, sankoku's exact example appears in a comment on an article/blog post here:)
https://agora-web.jp/archives/1026129.html
...しかし、わさびの利いた評論はなかなか得がたいものですから、いつかは自分もやってみたいと思っています。
Makes me suspicious that sankoku used this very example for lack of anything else... Changing 利いた to きいた yields one additional internet forum comment.

Otherwise, I've tried every variant of this I can come up with, all I get is sense[1].  

This is the simplest variant that *should* produce something (it doesn't)
わさびを利かせた話

Twitter search for a simple ”わさびをきかせた": all food
https://twitter.com/search?q="わさびを効かせた"&src=typed_query&f=top

Given how obvious the meaning would be, I'm sure if someone used this in sense[2] they would probably be understood.  But this doesn't appear to be any sort of "common" formulation.  Too bad, looked like fun.

@@ -3,0 +4,6 @@
+<k_ele>
+<keb>わさびが利く</keb>
+</k_ele>
+<k_ele>
+<keb>ワサビが利く</keb>
+</k_ele>
@@ -8,0 +15,4 @@
+</r_ele>
+<r_ele>
+<reb>ワサビがきく</reb>
+<re_nokanji/>
@@ -21,0 +32 @@
+<misc>&rare;</misc>

GG5: わさびがきいている be 「highly seasoned ［pungent］ with wasabi.
中辞典: 山葵が利(き)く ¶あの住職の法話はぴりっとわさびがきいている. The priest's sermons are sharp [pungent] and witty.

Maybe this.

@@ -11,0 +12,9 @@
+<pos>&v5k;</pos>
+<misc>&uk;</misc>
+<gloss>to be highly seasoned with wasabi</gloss>
+<gloss>to be pungent</gloss>
+</sense>
+<sense>
+<pos>&exp;</pos>
+<pos>&v5k;</pos>
+<misc>&uk;</misc>
@@ -14,2 +23 @@
-<gloss>to be sharp</gloss>
-<gloss>to be stinging</gloss>
+<gloss>to be witty</gloss>

https://kotobank.jp/word/山葵が利く-665025
https://ejje.weblio.jp/content/山葵が利く

@@ -24,0 +25 @@
+<misc>&id;</misc>

@@ -16,2 +16 @@
-<pos>&vi;</pos>
-<xref type="see" seq="2841276">足並みを揃える・あしなみをそろえる・1</xref>
+<xref type="see" seq="2841276">足並みを揃える・1</xref>
@@ -25,2 +24 @@
-<pos>&vi;</pos>
-<xref type="see" seq="2841276">足並みを揃える・あしなみをそろえる・2</xref>
+<xref type="see" seq="2841276">足並みを揃える・2</xref>

足並みを揃える was approved.

https://imidas.jp/idiom/detail/X-05-X-01-3-0031.html
足並みが揃う〔足並みを揃える〕
あしなみがそろう／あしなみをそろえる
...

足並みを揃える	5540	45.2%
足並みをそろえる	4939	40.3%
足並みが揃う	1060	8.6%
足並みがそろう	722	5.9%

I liked the "same page" example here:
https://himaginary.hatenablog.com/entry/20180922/Bernanke_Paulson_Geithner_view_vs_Summers
Four days were required to get government departments on the same page; another two weeks to persuade Congress it had no choice but to act.
政府当局の足並みが揃うのに4日掛かった。行動以外の選択肢は無いと議会を説得するのにさらに2週間掛かった。


https://context.reverso.net/translation/japanese-english/足並みがそろわない
ASEANは南シナ海問題への対応で足並みがそろわない状態が続く。
Meanwhile, ASEAN member states are not on the same page when it comes to the South China Sea issue.

Clone of xref, + "to be on the same page". 

I think these are roughly synonymous. Other form is more common.

Not clear to me yet if the difference between を and が implies different formulations:
"to be in step with" "to be keeping pace with" "to be moving in lockstep" "to be in alignment with" (and in the other direction, "to get on the same page")

I won't try to solve this one.

足並みが揃う has an entry has an entry in jmdict as negation(which is where I started), and which I am going to go vote to delete.

@@ -18 +18 @@
-<gloss>to be dear</gloss>
+<gloss>to be too dear</gloss>

Quiet. I'll approve it and reindex those sentences.

たかすぎる	1470	0.3%
高すぎる	403024	91.4%
高過ぎる	36217	8.2%
31 Tanaka sentences
RP, 研究社ビジネス英和辞典

Like many 複合動詞 this may seem obvious, but I think it would be useful to have. Its main meaning (29/31 sentences) derives from the less common senses of the components.
I'll hold off reindexing the sentence until it's approved.

https://it-engineer-info.com/employment-management/6397/
振替出勤とは、勤務日と休日を入れ替え、本来休日である日に通常の勤務日と同じように勤務することです。
https://jp.indeed.com/career-advice/career-development/what-is-transfer-commuting-or-holiday-commuting
振替出勤は、あらかじめ休日に出勤するとわかっている場合に、休日を労働日として働き、別の日を休日に振り替える制度です。つまり、労働日と休日が入れ替わります。
振り替え出勤	1,230

The previous gloss is a second sense of 振替休日. It should be added there.

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>振り替え出勤</keb>
@@ -12 +15 @@
-<gloss>compensatory day off work (for having worked on a holiday, etc.)</gloss>
+<gloss>working on a day originally scheduled as a day off after rescheduling it to another day</gloss>

I guess the meaning is not clear from the parts.

@@ -12 +12 @@
-<gloss>compensatory day off (for having worked on a day off)</gloss>
+<gloss>compensatory day off work (for having worked on a holiday, etc.)</gloss>

https://ejje.weblio.jp/content/振替出勤

振替出勤	1517

jwiki: 粛慎（みしはせ、あしはせ）は、日本の正史である『日本書紀』や『続日本紀』などの中に記述が見られる民族である。同じ漢字表記を用いるが、中国文献に記される「しゅくしん」とは存在した時期にかなりの開きがあり、同一であるかどうかなど両者の関係性は不明である。
世界大百科事典 (粛慎/みしはせ): 日本古代に，最北地方およびそこに居住した人々に対する呼称。《日本書紀》欽明紀に佐渡島に粛慎人が船できたとの記事があり，また斉明紀には阿倍比羅夫が粛慎と戦ったとの記事がある。中国では東北境外の異民族を粛慎（しゆくしん）と呼んだので，同系とみる説もあるが，日本の最北部に居住する蝦夷（えみし）の一部，またはアイヌをさすとの説などがある。　
https://en.wikipedia.org/wiki/Mishihase
https://en.wikipedia.org/wiki/Sushen

粛慎 referred to different groups in China and Japan. I'll draft a separate entry for しゅくしん.

@@ -13,3 +12,0 @@
-<r_ele>
-<reb>しゅくしん</reb>
-</r_ele>
@@ -19 +16 @@
-<gloss>Mishihase (ancient name for northeastern China)</gloss>
+<gloss>Mishihase (ancient ethnic group of people who lived in northern Japan)</gloss>

Daijr, Koj
粛慎	3344

@@ -12,0 +13,3 @@
+<r_ele>
+<reb>しゅくしん</reb>
+</r_ele>
@@ -15 +18,2 @@
-<gloss>Mishihase</gloss>
+<misc>&hist;</misc>
+<gloss>Mishihase (ancient name for northeastern China)</gloss>

https://ja.wikipedia.org/wiki/粛慎_(日本)

KOD, https://en.wikipedia.org/wiki/Japanese_labour_law
委任契約	17592

https://ja.wikipedia.org/wiki/モブキャラクター
https://dic.pixiv.net/a/雑魚キャラ
https://en.wikipedia.org/wiki/Mob_(video_games)

I think this should be two senses.

@@ -16,5 +16,9 @@
-<xref type="see" seq="2528960">雑魚キャラクター</xref>
-<misc>&col;</misc>
-<gloss>inconsequential (fictional) character</gloss>
-<gloss>worthless character</gloss>
-<gloss>mook</gloss>
+<gloss>background character (in a manga, anime, etc.)</gloss>
+<gloss>unimportant (usu. nameless) character</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<field>&vidg;</field>
+<gloss>mob (non-player character)</gloss>
+<gloss>easily defeated enemy character</gloss>
+<gloss>minor enemy character</gloss>

雑魚キャラ	16696	54.9%
ざこキャラ	103	0.3%
ザコキャラ	13343	43.9%
雑魚キャラクター	130	0.4%
ざこキャラクター	0	0.0%
ザコキャラクター	138	0.5%

@@ -14 +14 @@
-<gloss>wind god</gloss>
+<gloss>god of the wind</gloss>

smk:〔古〕

@@ -13 +13 @@
-<misc>&rare;</misc>
+<misc>&arch;</misc>

風伯	1057
風神	204702

@@ -12 +12,3 @@
-<gloss>god of wind</gloss>
+<xref type="see" seq="1664100">風神</xref>
+<misc>&rare;</misc>
+<gloss>wind god</gloss>

研究社　新和英大辞典　第５版

研究社　新和英大辞典　第５版

医学英和辞典

@@ -11,0 +12 @@
+<field>&med;</field>

研究社　新和英大辞典　第５版

冬まき	506

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>冬まき</keb>

冬蒔き	264
冬蒔きの	68
GG5; 冬蒔きの winter-sown; sown during winter.

[rare]?

@@ -11,0 +12 @@
+<pos>&adj-no;</pos>

研究社　新和英大辞典　第５版

@@ -21 +21 @@
-<xref type="see" seq="2160230">本わさび・ほんわさび</xref>
+<xref type="see" seq="2160230">本わさび</xref>

With this entry we have the following forms for "Western" horseradish; in n-gram order:
山わさび
ホースラディッシュ
西洋わさび
わさび大根
That's 4, not 15. I don't think that note is needed.

@@ -19,3 +19,2 @@
-<xref type="see" seq="2160220">西洋わさび・せいようわさび</xref>
-<xref type="see" seq="2160220">西洋わさび・せいようわさび</xref>
-<xref type="see" seq="2160220">西洋わさび・せいようわさび</xref>
+<xref type="see" seq="2160220">西洋わさび</xref>
+<xref type="see" seq="2160220">西洋わさび</xref>
@@ -23 +21,0 @@
-<s_inf>esp. used to market western horseradish made in Hokkaido, distinguished from 本わさび</s_inf>

山山葵	165	1.0%
山ワサビ	2149	12.4%
山わさび	15001	86.6%

https://ja.wikipedia.org/wiki/ホースラディッシュ
別名にワサビダイコン（山葵大根）、フランス名由来のレフォール（レホール、raifort）、ウマワサビ、英名の直訳でウマダイコン。商品名で（水場で作られることが多い本わさびに対して）「山わさび」と呼ばれることもある。

https://www.kinjirushi.co.jp/wasabi/type2/
北海道では山わさびと呼ばれます

https://mountain-c.com/media/16400/
山わさびという名前は聞き慣れないですが、これは別名西洋わさび、ホースラディッシュのことなのです。


西洋山葵	276
西洋わさび	5822
西洋ワサビ	1828
ホースラディッシュ	7294

レフォール is another western horseradish we don't have (from French)
レフォール	1472	7.8%

Pretty sure it's a clone of this entry, perhaps with an appropriate tag "from french". 

If you add up the ngrams for 西洋わさび variants, they barely beat out ホースラディッシュ. Given that this is a regional kanji/native-japanese form, I think it makes sense to xref to the common kanji form.

I originally said "Hokkaido dialect" because that's roughly what the refs say.  It is a product *of* hokkaido, so it makes sense they would talk about it there. But seemed off that the ngrams for 山わさび beat every other form of "western horseraddish" combined...

Looking back at wikipedia, it specifically said: 
商品名で（水場で作られることが多い本わさびに対して）「山わさび」と呼ばれることもある。

As far as I see, *this* is actually the most common term for any kind of western horseradish... 西洋わさび shows up on the ingredient list of my Japanese wasabi tube(in my fridge right now), but 山わさび seems more likely to show up on the consumer-facing label... Because my 300 yen wasabi isn't pure Japanese wasabi, it *isn't* 本わさび, instead it says, on the front but in fine print:

本わさび使用、西洋わさびをブレンド　

If you google (or search amazon) from 山わさび, a lot of wasabi or wasabi-flavored products turn up, and the word 北海道 is almost always nearby.  I get the feeling that 山わさび is a clever marketing variant of 本わさび, for western horseraddish grown in the mountains of hokkaido.


https://macaro-ni.jp/90889#heading-1287721
山わさびの旬と主な産地
山わさびの主な産地は北海道。　＜ー The main production area for yamawasabi is hokkaido

If we leave off the [note], we've just got 15 different entries that all mean "horseradish".  Since there is a use-case here, I hope we can give at least leave some clue.


====
Huh, found a big English-language article on the subject...
https://www.asahi.com/special/tsukiji/en/wasabi/kako/
When we see the names of raw materials described on tubes of wasabi, we find western horseradish as well as hon-wasabi (Japanese horseradish) in many cases. 

Western horseradish originated in Europe and is called “horseradish” or “raifort” there. Western horseradish was imported to Japan in the Meiji Era (1868-1912) and is called “yama-wasabi” (mountain wasabi) in Hokkaido where it grows in the wild in wide areas. Much of western horseradish is imported from overseas, but Nagoya-based Kinjirushi Co., which has the largest share of the market of processed wasabi for commercial purposes, sticks to domestically grown western horseradish. The Abashiri region of Hokkaido, whose climate is similar to the land of origin, Europe, has become a big production area. Kinjirushi is also operating a major factory in the region....

RP, eij, jwiki
https://en.wikipedia.org/wiki/Corona_of_glans_penis
https://en.wiktionary.org/wiki/corona_glandis#English
亀頭冠	360

daij, koj
https://en.wikipedia.org/wiki/Sushen

See comments on 2857778.

@@ -12,0 +13 @@
+<field>&music;</field>

daij, koj

In JMdict.

GG5, etc.

@@ -8 +8 @@
-<misc>&unclass;</misc>
+<misc>&surname;</misc>

@@ -8 +8 @@
-<misc>&unclass;</misc>
+<misc>&company;</misc>

Adding spec1
-*- via bulkupd.py -*-

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

https://ja.wikipedia.org/wiki/孫悟空_(ドラゴンボール)
https://en.wikipedia.org/wiki/Goku

Worth a mention

@@ -13,0 +14,4 @@
+</sense>
+<sense>
+<misc>&char;</misc>
+<gloss>Son Goku (Dragon Ball)</gloss>

@@ -11,3 +11,3 @@
-<misc>&person;</misc>
-<gloss>Sun Wukong</gloss>
-<gloss>Monkey King (character in the classic Chinese novel Journey to the West)</gloss>
+<misc>&char;</misc>
+<gloss>Sun Wukong (character in the classic Chinese novel Journey to the West)</gloss>
+<gloss>Monkey King</gloss>

Done.

@@ -9 +8,0 @@
-<re_pri>spec1</re_pri>

A bit more testing.

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

I don't think it's ever a given name.

@@ -10,0 +11 @@
+<misc>&surname;</misc>
@@ -12,2 +12,0 @@
-<misc>&surname;</misc>
-<misc>&fem;</misc>

Completed.

@@ -9 +8,0 @@
-<re_pri>spec1</re_pri>

Testing the use of spec1 here.

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

https://ja.wikipedia.org/wiki/小西業茂

https://ja.wikipedia.org/wiki/中川良長

https://ja.wikipedia.org/wiki/松平忠晃

https://ja.wikipedia.org/wiki/山口廣秀

https://ja.wikipedia.org/wiki/吉田悦章

https://ja.wikipedia.org/wiki/若槻有格

https://en.wikipedia.org/wiki/Flohwalzer

@@ -18,3 +18,3 @@
-<gloss>The Flea Waltz (piano piece)</gloss>
-<gloss>Der Flohwalzer</gloss>
-<gloss>Chopsticks (UK)</gloss>
+<gloss>Flohwalzer (piano piece)</gloss>
+<gloss>Flea Waltz</gloss>
+<gloss>Chopsticks</gloss>

〈猫／ねこ／ネコ〉〈踏／ふ〉んじゃった

Google N-gram Corpus Counts
╭─ーーーーーーーー─┬────────┬───────╮
│ 猫踏んじゃった　 │ 15,063 │ 24.1% │
│ 猫ふんじゃった　 │  8,078 │ 12.9% │
│ ネコ踏んじゃった │  2,624 │  4.2% │
│ ねこ踏んじゃった │    674 │  1.1% │
│ ねこふんじゃった │ 33,027 │ 52.7% │
│ ネコふんじゃった │  3,160 │  5.0% │
╰─ーーーーーーーー─┴────────┴───────╯

Copying from JMdict entry 2750710