merge

@@ -7,0 +7,3 @@
+</r_ele>
+<r_ele>
+<reb>シュミーズ</reb>

delete--merge

@@ -32 +32 @@
-<s_inf>usu. used passively</s_inf>
+<s_inf>usu. in the passive</s_inf>

Google N-gram Corpus Counts
うかがう	178514
窺う	57515
覗う	3956

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

collision with 伺う though

prog, eij kana
n-grams
動向をうかがう	36
動向を窺う	17
顔色をうかがう	485
顔色を窺う	173
機会をうかがう	205
機会を窺う	85

@@ -15,0 +16 @@
+<misc>&uk;</misc>
@@ -22,0 +24 @@
+<misc>&uk;</misc>
@@ -27,0 +30 @@
+<misc>&uk;</misc>

@@ -20,2 +20 @@
-<gloss>memorial service for Nichiren (13th day of the 10th month</gloss>
-<gloss>in Nichiren Buddhism)</gloss>
+<gloss>memorial service for Nichiren (13th day of the 10th month; in Nichiren Buddhism)</gloss>

Aligning.
Daijs redirects to 御会式.

@@ -18 +18,4 @@
-<gloss>(Nichiren Buddhism) memorial service for Nichiren (13th day of 10th month)</gloss>
+<xref type="see" seq="2645610">お会式</xref>
+<s_inf>usu. as お会式</s_inf>
+<gloss>memorial service for Nichiren (13th day of the 10th month</gloss>
+<gloss>in Nichiren Buddhism)</gloss>

@@ -18,0 +18,1 @@
+<xref type="see" seq="2645610">御会式</xref>

far too many restrictions.  if  かぶた needs an entry it has to be alone

oops, meant to do this. 

kabuta shows for me though.
http://dic.search.yahoo.co.jp/search?ei=UTF-
8&p=%E3%81%8B%E3%81%B6%E3%81%9F&fr=dic&stype=prefix

かぶた【株】-日本国語大辞典
〔名〕木の切り株。転じて、利用価値のないもの。＊松翁道話〔１８１４〜４６〕
一・中「下手（へた）くそや、かぶたの何にもならぬ所を残してやるゆゑ、後が行か
ぬ」＊和英語林集成（初版）〔１８６７〕「Kabut ...

@@ -21,0 +21,1 @@
+<stagr>かぶ</stagr>
@@ -27,1 +28,0 @@
-<stagr>かぶた</stagr>
@@ -39,0 +39,1 @@
+<stagr>かぶ</stagr>
@@ -44,0 +45,1 @@
+<stagr>かぶ</stagr>
@@ -50,0 +52,1 @@
+<stagr>かぶ</stagr>

Er, no. The first sense of 株/かぶ in GG5 is "stump; stubble".
I can't see かぶた in the Yahoo online 日本国語大辞典.

nikk

@@ -16,0 +16,4 @@
+<r_ele>
+<reb>かぶた</reb>
+<re_inf>&ok;</re_inf>
+</r_ele>
@@ -23,0 +27,1 @@
+<stagr>かぶた</stagr>

this is not a duplicate.  both are entry ID 1208920; however, it appears that because an anonymous editor revived a rejected fork and Jim approved on that branch instead of rejecting, this one entry now has two approved branches.  (if you search for 株, two entries will show.)  this should not be able to happen, so it appears to be a database error.  i will raise this on the mailing list so it can be fixed

i will try deleting the other forked branch; however, i suspect that it will delete the entire entry and it will need to be restored.

if it was you who revived the rejected branch, please do not do so again.  edit off of the approved branches that represent the current entries only.

duplicate entry: see https://www.edrdg.org/jmdictdb/cgi-bin/entr.py?svc=jmdict&sid=&q=1208920.1

In the absence of a reference or examples I'm dropping this edit.

@@ -49,7 +48,0 @@
-<sense>
-<pos>&n;</pos>
-<pos>&n-suf;</pos>
-<xref type="see" seq="1208980">株式会社</xref>
-<misc>&abbr;</misc>
-<gloss>stock company</gloss>
-</sense>

(a) please provide a case for this edit - references, examples, etc.
(b) why was the cross-reference to お株 removed?

@@ -45,0 +46 @@
+<xref type="see" seq="1694520">御株・おかぶ</xref>
@@ -51 +52,3 @@
-<gloss>abbreviation for stock company (株式会社)</gloss>
+<xref type="see" seq="1208980">株式会社</xref>
+<misc>&abbr;</misc>
+<gloss>stock company</gloss>

@@ -46 +45,0 @@
-<xref type="see" seq="1694520">お株</xref>
@@ -48,0 +48,5 @@
+<sense>
+<pos>&n;</pos>
+<pos>&n-suf;</pos>
+<gloss>abbreviation for stock company (株式会社)</gloss>
+</sense>

Jim approved an edit made to a rejected fork, which appears to have caused this entry to show up twice in the database.  (株[Seq=1208920] has two approved Seq numbers: this one, ID=2051055, and another one, ID=1070337).

i will raise it on the mailing list, but i'm seeing what happens if i delete this entry.  will it delete both of the ID numbers or only one?

In the absence of a reference or examples I'm dropping this edit.

@@ -49,7 +48,0 @@
-<sense>
-<pos>&n;</pos>
-<pos>&n-suf;</pos>
-<xref type="see" seq="1208980">株式会社</xref>
-<misc>&abbr;</misc>
-<gloss>stock company</gloss>
-</sense>

(a) please provide a case for this edit - references, examples, etc.
(b) why was the cross-reference to お株 removed?

@@ -45,0 +46 @@
+<xref type="see" seq="1694520">御株・おかぶ</xref>
@@ -51 +52,3 @@
-<gloss>abbreviation for stock company (株式会社)</gloss>
+<xref type="see" seq="1208980">株式会社</xref>
+<misc>&abbr;</misc>
+<gloss>stock company</gloss>

@@ -46 +45,0 @@
-<xref type="see" seq="1694520">お株</xref>
@@ -48,0 +48,5 @@
+<sense>
+<pos>&n;</pos>
+<pos>&n-suf;</pos>
+<gloss>abbreviation for stock company (株式会社)</gloss>
+</sense>

Noted [8-)}].
The "edict2" format used by WWWJDIC uses EUC-JP coding which supports the JIS X 0208 and 0212 character sets. The standard conversion from UTF-8 to EUC simply drops unsupported characters, but our routine does a few fiddles of the ㈱ -> (株) variety. sometimes with amusing results.

Just noting that ㈱ is rendered as "(株)" on WWWJDIC, so the note reads "written as (株) or (株)".

I've reindexed sentences.

I'll move it to #5. I quite like that odd glyph.

@@ -41,0 +42,10 @@
+<xref type="see" seq="1208980">株式会社</xref>
+<misc>&abbr;</misc>
+<s_inf>in company names; written as (株) or ㈱</s_inf>
+<gloss>stock company</gloss>
+<gloss>corporation</gloss>
+<gloss>kabushiki kaisha</gloss>
+<gloss>KK</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -58,10 +67,0 @@
-</sense>
-<sense>
-<pos>&n;</pos>
-<xref type="see" seq="1208980">株式会社</xref>
-<misc>&abbr;</misc>
-<s_inf>in company names; written as (株)</s_inf>
-<gloss>stock company</gloss>
-<gloss>corporation</gloss>
-<gloss>kabushiki kaisha</gloss>
-<gloss>KK</gloss>

Missed that it doesn't always come after the company name, my bad. I think this use is very common, not sure if sense 2 might have been one position 
too high up but it's definitely not 8/8 in terms of percentage of usage.

I think it was worthwhile to include the glyph ㈱ in the note because searching for it right now (on jisho for example) doesn't turn up anything.

koj, daij, gg5

@@ -30,0 +30,19 @@
+<gloss>spirits</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>safety</gloss>
+<gloss>health</gloss>
+<gloss>well-being</gloss>
+<gloss>one's situation</gloss>
+</sense>
+<sense>
+<pos>&adj-na;</pos>
+<xref type="see" seq="1270280">ご機嫌・ごきげん・3</xref>
+<s_inf>usu. as ご機嫌</s_inf>
+<gloss>in a good mood</gloss>
+<gloss>in high spirits</gloss>
+<gloss>happy</gloss>
+<gloss>cheery</gloss>
+<gloss>merry</gloss>
+<gloss>chipper</gloss>

meikyo

@@ -13,0 +13,4 @@
+</k_ele>
+<k_ele>
+<keb>気嫌</keb>
+<ke_inf>&iK;</ke_inf>

daij

@@ -12,0 +12,9 @@
+</k_ele>
+<k_ele>
+<keb>起き上る</keb>
+</k_ele>
+<k_ele>
+<keb>起上がる</keb>
+</k_ele>
+<k_ele>
+<keb>起上る</keb>

koj, daij, gg5

@@ -14,0 +14,20 @@
+<pos>&n;</pos>
+<xref type="see" seq="1220930">機嫌</xref>
+<misc>&hon;</misc>
+<misc>&pol;</misc>
+<gloss>humour</gloss>
+<gloss>humor</gloss>
+<gloss>temper</gloss>
+<gloss>mood</gloss>
+<gloss>spirits</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<misc>&hon;</misc>
+<misc>&pol;</misc>
+<gloss>safety</gloss>
+<gloss>health</gloss>
+<gloss>well-being</gloss>
+<gloss>one's situation</gloss>
+</sense>
+<sense>
@@ -15,4 +35,0 @@
-<pos>&n;</pos>
-<pos>&adj-no;</pos>
-<xref type="see" seq="1220930">機嫌</xref>
-<gloss>pleasant</gloss>
@@ -21,0 +37,4 @@
+<gloss>happy</gloss>
+<gloss>cheery</gloss>
+<gloss>merry</gloss>
+<gloss>chipper</gloss>

G n-grams 杭 582857

@@ -7,0 +8 @@
+<ke_pri>spec1</ke_pri>
@@ -18,0 +20 @@
+<re_pri>spec1</re_pri>

Agree

@@ -31,3 +31,3 @@
-<xref type="see" seq="2645440">杭・くいぜ</xref>
-<xref type="see" seq="2645440">杭・くいぜ</xref>
-<xref type="see" seq="2645440">杭・くいぜ</xref>
+<xref type="see" seq="2645440">株・くいぜ</xref>
+<xref type="see" seq="2645440">株・くいぜ</xref>
+<xref type="see" seq="2645440">株・くいぜ</xref>

should not be merged, but the くい from 株 can probably come here

@@ -20,7 +20,0 @@
-<r_ele>
-<reb>くいぜ</reb>
-</r_ele>
-<r_ele>
-<reb>くいせ</reb>
-<re_inf>&ok;</re_inf>
-</r_ele>
@@ -29,0 +22,1 @@
+<s_inf>esp. 杭, 杙</s_inf>
@@ -36,0 +30,7 @@
+<xref type="see" seq="2645440">株・くいぜ</xref>
+<xref type="see" seq="2645440">杭・くいぜ</xref>
+<xref type="see" seq="2645440">杭・くいぜ</xref>
+<xref type="see" seq="2645440">杭・くいぜ</xref>
+<misc>&abbr;</misc>
+<misc>&arch;</misc>
+<s_inf>esp. 株</s_inf>
@@ -37,1 +38,0 @@
-<gloss>stubble</gloss>

I don't really agree. See comments on 2645440. The more modern dictionaries keep these senses fairly well separated.

daijs, nikk

@@ -12,0 +12,3 @@
+<k_ele>
+<keb>株</keb>
+</k_ele>
@@ -16,0 +19,7 @@
+</r_ele>
+<r_ele>
+<reb>くいぜ</reb>
+</r_ele>
+<r_ele>
+<reb>くいせ</reb>
+<re_inf>&ok;</re_inf>
@@ -24,0 +34,5 @@
+<sense>
+<pos>&n;</pos>
+<gloss>stump</gloss>
+<gloss>stubble</gloss>
+</sense>

looks to be ~240 hits inc edict.  only nikkoku has it

@@ -12,0 +12,1 @@
+<misc>&obsc;</misc>

please submit new entries as new, not as amendments.  i have submitted this one and contacted Winnie.

An additional word for the dictionary is 作り機 -- "maker" or "machine" or "making machine".  As in 自動ポップコーン作り機 -- "automatic popcorn popper/maker"

Another example is 丸氷作り機 -- "ice ball maker", as at http://www.youtube.com/watch?v=r0tW36rakKM

looks to be ~240 hits inc edict.  only nikkoku has it

@@ -12,0 +12,1 @@
+<misc>&obsc;</misc>

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

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

G n-grams 780596

@@ -5,0 +6 @@
+<ke_pri>spec1</ke_pri>
@@ -8,0 +10 @@
+<re_pri>spec1</re_pri>

Original was rather lame.

@@ -14,1 +14,0 @@
-<gloss>wearing clothes to try on</gloss>

新和英中辞典, ルミナス和英辞典

@@ -13,0 +13,1 @@
+<gloss>trying on clothes</gloss>

新和英中辞典, ルミナス和英辞典

@@ -13,0 +13,1 @@
+<gloss>fitting room</gloss>

@@ -20,0 +21,2 @@
+<pos>&n;</pos>
+<pos>&n-pref;</pos>
@@ -22,2 +23,0 @@
-<pos>&n-pref;</pos>
-<pos>&n;</pos>

GG5
日本人初の宇宙飛行士 the first Japanese astronaut
世界初の the world's first 《commercial space flight》

So it seems.

@@ -20,0 +21 @@
+<pos>&n-suf;</pos>

isn't this also a suffix? like アフリカ初のワールドカップ

koj, daij, gg5

suf->pref

@@ -16,0 +16,3 @@
+<r_ele>
+<reb>うい</reb>
+</r_ele>
@@ -17,0 +20,2 @@
+<pos>&adj-no;</pos>
+<pos>&n-pref;</pos>
@@ -18,2 +23,1 @@
-<pos>&adj-no;</pos>
-<pos>&n-suf;</pos>
+<xref type="see" seq="2640340">御初・1</xref>

daij, meikyo

@@ -17,0 +17,1 @@
+<xref type="see" seq="1491820">不機嫌</xref>

@@ -31,0 +31,1 @@
+<field>&sumo;</field>
@@ -32,1 +33,1 @@
-<gloss>stable master (sumo)</gloss>
+<gloss>stable master</gloss>

koj, daij, meikyo, gg5, prog

tidying.  'foster parent' sense is archaic

@@ -20,0 +20,1 @@
+<xref type="see" seq="1825250">子方・こかた・2</xref>
@@ -22,0 +23,4 @@
+<gloss>boss</gloss>
+<gloss>chief</gloss>
+<gloss>foreman</gloss>
+<gloss>supervisor</gloss>
@@ -27,5 +32,1 @@
-<gloss>coach in professional sumo</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>foster parent</gloss>
+<gloss>stable master (sumo)</gloss>
@@ -40,0 +41,5 @@
+<sense>
+<pos>&n;</pos>
+<misc>&arch;</misc>
+<gloss>foster parent</gloss>
+</sense>

Google

@@ -8,0 +8,3 @@
+</k_ele>
+<k_ele>
+<keb>河沿い</keb>

koj, daij, meikyo

@@ -12,0 +12,1 @@
+<gloss>secret of nature</gloss>
@@ -13,0 +14,9 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>disposition</gloss>
+<gloss>character</gloss>
+<gloss>nature</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -14,1 +24,1 @@
-<gloss>the will of heaven</gloss>
+<gloss>emperor's well-being</gloss>

my ime.  gets the most hits

@@ -4,0 +4,3 @@
+<k_ele>
+<keb>踏みとどまる</keb>
+</k_ele>

daij, meikyo

splitting senses

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>踏み留まる</keb>
@@ -16,0 +19,5 @@
+<gloss>to hold one's ground</gloss>
+</sense>
+<sense>
+<pos>&v5r;</pos>
+<pos>&vi;</pos>
@@ -18,1 +26,0 @@
-<gloss>to hold one's ground</gloss>

Usually if it goes both ways we have "vi,vt". Well, perhaps not "usually" as I see there are 20 entries with this.

@@ -21,0 +22,2 @@
+<pos>&vi;</pos>
+<pos>&vt;</pos>
@@ -27,0 +30,2 @@
+<pos>&vi;</pos>
+<pos>&vt;</pos>

"一歩一歩を踏み出すたびに、泥雪が盛大にはねて"
From "フルメタル・パニック！ 第01巻"

Sorry about the double submit. Forgot that I initially happened across sense 1 used with を in a question a friend had about a novel.
Having trouble finding an online example, since they mostly seem to be for sense 2.

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

daijs: "新しい人生の第一歩を―・す"
研究社 新和英中辞典: "新しい人生を踏み出す"
prog: "新しい人生に踏み出す"
Luminous: "彼らは世界の市場へ*踏み出した"

Sense 2 seems to be used with and without を

@@ -29 +28,0 @@
-<pos>&vi;</pos>

in none of my references; no references provided

submit again with references if you have them

Usually used when listing all the yaku a hand has.

@@ -46,0 +47,5 @@
+<pos>&n;</pos>
+<field>&mahj;</field>
+<gloss>winning hand with a pung (or kong) of green dragon tiles</gloss>
+</sense>
+<sense>

@@ -40,0 +41 @@
+<field>&mahj;</field>
@@ -43 +44 @@
-<gloss>green dragon tile (mahjong)</gloss>
+<gloss>green dragon tile</gloss>

OK

The motivation for my search was basically a note from Chinese [which I do not have much knowledge of, other than its existence] which used "发". I check for the non-simplified version and found "發". Then I searched for that on your site [then followed the sequence which I explained].

I was only motivated to make the submission for the reason stated, so if there is a problem of linkage then I guess that settles that matter. Having got to where I got to, I have satisfied my own need for information.

@@ -18 +18 @@
-<xref type="see" seq="1597470">着・2</xref>
+<xref type="see" seq="1597470">着・1</xref>

I don't think that helps much. Rendaku issues are not really in the scope of this sort of dictionary.

@@ -15,4 +14,0 @@
-</r_ele>
-<r_ele>
-<reb>ぱつ</reb>
-<re_inf>&sk;</re_inf>

Just a suggestion.

@@ -14,0 +15,4 @@
+</r_ele>
+<r_ele>
+<reb>ぱつ</reb>
+<re_inf>&sk;</re_inf>

prog, prog, nikk

I don't think the "also ぱつ" note is needed. Normal rendaku rules apply.

@@ -17 +16,0 @@
-<pos>&n;</pos>
@@ -19 +18 @@
-<xref type="see" seq="1597470">着・ちゃく・2</xref>
+<xref type="see" seq="1597470">着・2</xref>
@@ -21,2 +20,2 @@
-<gloss>departing (from ...)</gloss>
-<gloss>departing (at time ...)</gloss>
+<gloss>departing from ...</gloss>
+<gloss>leaving at (e.g. 8:30)</gloss>
@@ -25 +23,0 @@
-<pos>&n;</pos>
@@ -27,10 +25,3 @@
-<gloss>sending</gloss>
-<gloss>sent (by ...)</gloss>
-<gloss>sent (at ...)</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
-<pos>&n-suf;</pos>
-<xref type="see" seq="1679480">発動機</xref>
-<misc>&abbr;</misc>
-<gloss>engine</gloss>
+<gloss>sent from ...</gloss>
+<gloss>(a letter, etc.) dated ...</gloss>
+<gloss>datelined ...</gloss>
@@ -40 +31,4 @@
-<s_inf>also ぱつ</s_inf>
+<gloss>counter for engines (on an aircraft)</gloss>
+</sense>
+<sense>
+<pos>&ctr;</pos>

Google N-gram Corpus Counts
╭─ーーーー─┬─────────┬───────╮
│ 筆跡　　 │ 112,836 │ 97.4% │
│ 筆蹟　　 │   2,587 │  2.2% │ 🡠 rK (daijr/s, koj, etc.)
│ 筆迹　　 │      36 │  0.0% │ 🡠 rK (daijs, shinmeikai)
│ ひっせき │     236 │  0.2% │
│ ふであと │     174 │  0.2% │
╰─ーーーー─┴─────────┴───────╯

@@ -10,0 +11 @@
+<ke_inf>&rK;</ke_inf>
@@ -13,0 +15 @@
+<ke_inf>&rK;</ke_inf>

koj, daij, etc.

@@ -20,0 +20,4 @@
+<r_ele>
+<reb>ふであと</reb>
+<re_restr>筆跡</re_restr>
+</r_ele>

daijs for 筆迹.

i'm not convinced this needs to be two senses.  only gg5 splits among my refs

@@ -11,0 +11,3 @@
+</k_ele>
+<k_ele>
+<keb>筆迹</keb>

〈不／ふ／フ〉〈機／き／キ〉〈嫌／げん／ゲン〉

Google N-gram Corpus Counts
╭─ーーーー─┬─────────┬───────╮
│ 不機嫌　 │ 595,999 │ 98.1% │
│ 不きげん │     254 │  0.0% │ - add, sK (seen in meikyo entry for お冠)
│ ふ機嫌　 │      96 │  0.0% │
│ 不キゲン │      76 │  0.0% │
│ ふきげん │   6,073 │  1.0% │
│ フキゲン │   4,979 │  0.8% │
╰─ーーーー─┴─────────┴───────╯

@@ -8,0 +9,4 @@
+</k_ele>
+<k_ele>
+<keb>不きげん</keb>
+<ke_inf>&sK;</ke_inf>

daij, meikyo

@@ -19,0 +19,1 @@
+<xref type="see" seq="1352860">上機嫌</xref>

Daijr, GG5, 中辞典, etc.

Seems to work.

weblio (j-e)
https://www.chicagotribune.com/news/ct-
xpm-2005-11-14-0511140147-story.html
"loser dog" is the most literal 
translation and used here and there. 
"losing dog" could work as well.

@@ -18,2 +18,6 @@
-<gloss>dejected loser</gloss>
-<gloss g_type="lit">dog that has lost a fight</gloss>
+<gloss>loser</gloss>
+<gloss>failure</gloss>
+<gloss>underdog</gloss>
+<gloss>unsuccessful person</gloss>
+<gloss>non-achiever</gloss>
+<gloss g_type="lit">loser dog</gloss>

Correct. Aligning.

@@ -26 +26 @@
-<gloss>unmarried woman (with no children) over the age of 30</gloss>
+<gloss>unmarried and childless older woman</gloss>

not lit

@@ -19 +19 @@
-<gloss g_type="lit">dog that has lost a fight (with its tail between its legs)</gloss>
+<gloss g_type="lit">dog that has lost a fight</gloss>

http://zokugo-dict.com/31ma/makeinu.htm
負け犬とは、30代以上、未婚、子なしの女性のこと。

daij

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>物干竿</keb>

daij

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>踏石</keb>

koj, daij, meikyo, prog, gg5

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>踏板</keb>
@@ -12,1 +15,12 @@
-<gloss>pedal</gloss>
+<gloss>board (across a ditch, etc.)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>step</gloss>
+<gloss>tread</gloss>
+<gloss>footboard</gloss>
+<gloss>running board</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>pedal (of an organ, etc.)</gloss>
@@ -14,1 +28,0 @@
-<gloss>footboard</gloss>

@@ -15,1 +15,1 @@
-<gloss>a step</gloss>
+<gloss>step</gloss>

daij

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>踏段</keb>

koj, daij

sense 1 could be split

@@ -8,0 +8,3 @@
+</k_ele>
+<k_ele>
+<keb>跳ね上り</keb>
@@ -17,1 +20,4 @@
-<gloss>jump</gloss>
+<gloss>jump (e.g. in prices)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -19,0 +25,1 @@
+<gloss>rash person</gloss>

@@ -13,1 +13,1 @@
-<gloss>becoming a mere shell or dead letter</gloss>
+<gloss>becoming a mere shell or dead lette</gloss>

@@ -12,2 +12,2 @@
-<gloss>child's role in Noh dance</gloss>
-<gloss>child actor (in Noh)</gloss>
+<gloss>child's role in noh dance</gloss>
+<gloss>child actor (in noh)</gloss>

koj, daij, meikyo, gg5, etc.

@@ -13,0 +13,7 @@
+<gloss>child actor (in Noh)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1365360">親方・1</xref>
+<gloss>henchman</gloss>
+<gloss>follower</gloss>

I think the x-ref is needed.

@@ -8,0 +9 @@
+<ke_inf>&oK;</ke_inf>
@@ -22 +22,0 @@
-<xref type="see" seq="1663550">若衆・わかしゅ・2</xref>
@@ -29 +29 @@
-<gloss>someone accomplished in the arts</gloss>
+<gloss>person accomplished in the arts</gloss>

Daijirin

芸奴 appears to be a typo for 芸妓 (げいぎ). And 芸妓 seems to often get the reading げいこ, probably from confusing it with 芸子. I'll amend 1843020 accordingly.

@@ -8,1 +8,1 @@
-<keb>芸奴</keb>
+<keb>藝子</keb>

web

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>芸奴</keb>

ngrams
1229
http://careergarden.jp/maiko/maiko-geigi-chigai/
"舞妓と芸姑の違い"
(芸姑 only appears in the title, in the text it's replaced 
by 芸妓)  
http://www14.ocn.ne.jp/~s-gigei/html/ryokin-ichiran.html
"1座敷（2時間）芸姑1名につき	￥20,000"

@@ -10,0 +11,4 @@
+<ke_inf>&iK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>芸姑</keb>

i've removed the note and left just the x-ref.  we're calling it ik.  that should be enough.  if interested they can see the xref, which specifies ksb

@@ -25,1 +25,0 @@
-<s_inf>reading as げいこ is 関西弁, see 芸子</s_inf>

http://ja.wikipedia.org/wiki/芸妓

* Add note that げいこ reading is 関西弁, and related to 芸子
* …and corresponding cross-reference
In fact, 
* Should this be merged to 芸子（げいこ）?
(It satisfies 2/3: reading げいこ, meaning “geisha”.)
(Not doing myself b/c not sure if this is desired – it’s been noticed over there – and it’s a bit ugly to do, due to restrictions.)

@@ -24,0 +24,2 @@
+<xref type="see" seq="1842990">芸子・1</xref>
+<s_inf>reading as げいこ is 関西弁, see 芸子</s_inf>

my ime.  lots of hits

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>踏みつぶす</keb>

Merged.

If the merge with 基原 goes ahead.

koj

confusion with
起源(P); 起原 【きげん】 (n,adj-no) origin; beginning; rise

@@ -12,1 +12,1 @@
-<gloss>origin</gloss>
+<gloss>ingredient (of a traditional Chinese medicine)</gloss>

Kanji Haitani list

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

@@ -11,0 +12 @@
+<misc>&yoji;</misc>

just synching with 機嫌

@@ -12,0 +12,1 @@
+<gloss>humour</gloss>
@@ -15,0 +16,1 @@
+<gloss>spirits</gloss>

Entry created

61 hits, mostly edict.  no other dict has it

covered by the new sense added to 機嫌

Entry created

68 hits (inc. edict) for the first form, even fewer for the others.  not idiomatic of itself (e.g., it's a variant of 機嫌を取る), and people should be able to piece this together from that

Entry created

D'accord.

http://en.wikipedia.org/wiki/Gobelins_tapestry

No link with goblins.

@@ -15,1 +15,1 @@
-<gloss>Gobelin tapestry</gloss>
+<gloss>Gobelins tapestry</gloss>

daij

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>ゴブラン織</keb>
@@ -12,1 +15,1 @@
-<gloss>(a) Gobelin tapestry</gloss>
+<gloss>Gobelin tapestry</gloss>

Entry created

@@ -9,0 +10 @@
+<ke_inf>&sK;</ke_inf>
@@ -12,0 +14 @@
+<ke_inf>&sK;</ke_inf>

Hmmm. I'll slip in "older". I think it gets the 中高年層 message across.

@@ -28 +28 @@
-<gloss>unmarried and childless woman</gloss>
+<gloss>unmarried and childless older woman</gloss>

kenkyusha 

おひとりさま【お一人・お独り様】
独りで生活している女性。

...

未婚だったり離婚したりして独りで暮らしている、*****おもに中高年層の女性を指す*****。本人が自分自身のことを指して言う場合も多い。一応自分の給料でやりくりできているので、その生活が気楽きらくでよい、または気楽だが独りは寂さびしいという含みを持つ言い方である。

This may work, but I'm hoping it catches Rene's attention as he put this sense in. If this gets accepted the 負け犬 entry needs aligning.

@@ -28 +28 @@
-<gloss>unmarried woman (with no children) over the age of 30</gloss>
+<gloss>unmarried and childless woman</gloss>

"over the age of 30" seems oddly specific
(and at odds with how words really work in 
the real world)

daijr

@@ -23,0 +24 @@
+<pos>&aux-v;</pos>
@@ -25 +26,2 @@
-<pos>&vi;</pos>
+<misc>&uk;</misc>
+<misc>&hon;</misc>

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

to a real note

@@ -15,0 +15,1 @@
+<pos>&vi;</pos>
@@ -23,1 +24,3 @@
-<gloss>(after the -te form of a verb) -ing</gloss>
+<pos>&vi;</pos>
+<s_inf>after the -te form of a verb</s_inf>
+<gloss>-ing</gloss>

Entry created

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

@@ -17,0 +18 @@
+<misc>&pol;</misc>
@@ -26 +27,2 @@
-<gloss>welcome!</gloss>
+<misc>&pol;</misc>
+<gloss>welcome</gloss>

to a proper note

@@ -15,1 +15,1 @@
-<xref type="see" seq="2216910">御出でなさる</xref>
+<xref type="see" seq="2216910">御出でなさる・1</xref>
@@ -18,1 +18,2 @@
-<gloss>(used as a polite imperative) come</gloss>
+<s_inf>used as a polite imperative</s_inf>
+<gloss>come</gloss>
@@ -24,1 +25,1 @@
-<xref type="see" seq="1000920">いらっしゃい</xref>
+<xref type="see" seq="1000920">いらっしゃい・2</xref>

Entry created

gg5, meikyo

Only daijr has this as a noun.

@@ -17,4 +17,2 @@
-<pos>&n;</pos>
-<s_inf>of the future</s_inf>
-<gloss>very bleak</gloss>
-<gloss>dim</gloss>
+<gloss>(looking) very bleak</gloss>
+<gloss>having dim prospects</gloss>

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

to a proper note

@@ -15,1 +15,4 @@
-<gloss>(of the future) very bleak</gloss>
+<pos>&adj-no;</pos>
+<pos>&n;</pos>
+<s_inf>of the future</s_inf>
+<gloss>very bleak</gloss>

GG5 & Eijiro associate the two. I don't have a problem with it.

ref seems unnecessary

@@ -12,1 +12,0 @@
-<xref type="see" seq="2645620">ナポリを見てから死ね</xref>

@@ -13,0 +13,1 @@
+<misc>&id;</misc>

that translation is clearly inappropriate.  one is about the beauty of naples, the other is about the beauty of nikko.  link to the appropriate expression

@@ -12,1 +12,1 @@
-<gloss>see Naples and die</gloss>
+<xref type="see" seq="2645620">ナポリを見てから死ね</xref>

GG5

Idiomatic English/European is “See Naples and die” (or “vedi Napoli e poi muori” for Italian), and this is given in dictionaries.

(Dunno best way to tag these shades of translations; I’ve tagged the literal one as such though.)

I’ve also removed the [obsc] – I have heard this phrase used (in history class), and it hasn’t been flagged as particularly obscure; it seems to be the well-known phrase associated with 日光市.

@@ -12,2 +12,3 @@
-<misc>&obsc;</misc>
-<gloss>see Nikko and die (lit: don't say "wonderful" until you've seen Nikko)</gloss>
+<gloss>see Naples and die</gloss>
+<gloss>see Nikko and die</gloss>
+<gloss g_type="lit">don't say "wonderful" until you've seen Nikko</gloss>

@@ -14,1 +14,1 @@
-<misc>&id;</misc>
+<misc>&proverb;</misc>

@@ -13,0 +13,1 @@
+<misc>&id;</misc>

that translation is clearly inappropriate.  one is about the beauty of naples, the other is about the beauty of nikko.  link to the appropriate expression

@@ -12,1 +12,1 @@
-<gloss>see Naples and die</gloss>
+<xref type="see" seq="2645620">ナポリを見てから死ね</xref>

GG5

Idiomatic English/European is “See Naples and die” (or “vedi Napoli e poi muori” for Italian), and this is given in dictionaries.

(Dunno best way to tag these shades of translations; I’ve tagged the literal one as such though.)

I’ve also removed the [obsc] – I have heard this phrase used (in history class), and it hasn’t been flagged as particularly obscure; it seems to be the well-known phrase associated with 日光市.

@@ -12,2 +12,3 @@
-<misc>&obsc;</misc>
-<gloss>see Nikko and die (lit: don't say "wonderful" until you've seen Nikko)</gloss>
+<gloss>see Naples and die</gloss>
+<gloss>see Nikko and die</gloss>
+<gloss g_type="lit">don't say "wonderful" until you've seen Nikko</gloss>

Better?

@@ -19 +19 @@
-<gloss>losers (those who have 'failed' socially, economically, etc.)</gloss>
+<gloss>losers (of society)</gloss>

負組	7240

@@ -8,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>負組</keb>

Agree.

nikk

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>起坐呼吸</keb>

Entry created

@@ -14 +14 @@
-<s_inf>euph.</s_inf>
+<misc>&euph;</misc>

I think we can stay with the abbreviation.

@@ -11,0 +12 @@
+<xref type="see" seq="2076210">おめでた</xref>
@@ -13 +14 @@
-<s_inf>euphemistic</s_inf>
+<s_inf>euph.</s_inf>

@@ -13 +13,2 @@
-<gloss>shotgun wedding (euphemistic)</gloss>
+<s_inf>euphemistic</s_inf>
+<gloss>shotgun wedding</gloss>

giving the definition of "euphemism" seems redundant

@@ -12,1 +12,2 @@
-<gloss>(euph. for) shotgun wedding (seeking to avoid a negative connotation)</gloss>
+<misc>&col;</misc>
+<gloss>shotgun wedding (euphemistic)</gloss>

see discussion under  1960440

@@ -4,0 +5,3 @@
+<keb>タークスカイコス諸島</keb>
+</k_ele>
+<k_ele>
@@ -7,7 +9,0 @@
-<k_ele>
-<keb>タークスカイコス諸島</keb>
-</k_ele>
-<r_ele>
-<reb>タークス・カイコスしょとう</reb>
-<re_restr>タークス・カイコス諸島</re_restr>
-</r_ele>
@@ -16 +11,0 @@
-<re_restr>タークスカイコス諸島</re_restr>

i think this is necessary according to our formatting rules?

@@ -12,0 +12,5 @@
+<re_restr>タークス・カイコス諸島</re_restr>
+</r_ele>
+<r_ele>
+<reb>タークスカイコスしょとう</reb>
+<re_restr>タークスカイコス諸島</re_restr>

leftover (p)

@@ -15,1 +15,1 @@
-<gloss>(p) Turks and Caicos Islands</gloss>
+<gloss>Turks and Caicos Islands</gloss>

Adding undotted form too.

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>タークスカイコス諸島</keb>

@@ -12,1 +12,1 @@
-<gloss>(p) United States Virgin Islands</gloss>
+<gloss>United States Virgin Islands</gloss>

leftover (p)

Reinstated.

leftover (p)

@@ -12,1 +12,1 @@
-<gloss>(p) British Virgin Islands</gloss>
+<gloss>British Virgin Islands</gloss>

Reinstated

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

Trying to make it more of a noun.

@@ -17 +17 @@
-<gloss>for the first time</gloss>
+<gloss>(for the) first time</gloss>

gg5, daij

Added sense.

@@ -15 +14,0 @@
-<xref type="see" seq="1342530">初・はつ</xref>
@@ -17 +16,2 @@
-<gloss>doing something for the first time (ever, in a season, etc.)</gloss>
+<s_inf>as お初に</s_inf>
+<gloss>for the first time</gloss>
@@ -20,0 +21 @@
+<gloss>something used (worn, etc.) for the first time</gloss>
@@ -22 +23,4 @@
-<gloss>first crop of the season</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>first of the season (crop, fruit, etc.)</gloss>

daij, meikyo, gg5

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>御初</keb>
@@ -12,0 +15,2 @@
+<xref type="see" seq="1342530">初・はつ</xref>
+<misc>&pol;</misc>
@@ -14,0 +19,5 @@
+<sense>
+<pos>&n;</pos>
+<gloss>new item</gloss>
+<gloss>first crop of the season</gloss>
+</sense>

koj, daijr, daijs

they should not be merged, but くい can perhaps be split out

@@ -4,0 +4,3 @@
+<k_ele>
+<keb>株</keb>
+</k_ele>
@@ -9,3 +12,0 @@
-</k_ele>
-<k_ele>
-<keb>株</keb>
@@ -20,5 +20,0 @@
-<r_ele>
-<reb>くい</reb>
-<re_restr>株</re_restr>
-<re_inf>&ok;</re_inf>
-</r_ele>

daijr for kui:(2)〔「くいぜ（株）」の略〕切り株。 
(daijr also has "thorn" for くいぜ)

well, it's at least weird to have くい[株] in this entry?

I don't think I agree. Daijisen and Nikk. take some fairly extreme positions on meanings and readings, and I'm reluctant to embark on mergings based on them alone. If 広辞苑, 大辞林 and the major JEs such as GG5 don't go that far, I'd hold back too. Add cross-references, etc. as appropriate.

suggest this should be merged into  1279450/1070336
shares all 3 kanji and both meanings in daijs

Aligning.

@@ -13 +13,3 @@
-<gloss>to manipulate</gloss>
+<gloss>to manipulate (someone)</gloss>
+<gloss>to make (someone) dance to one's tune</gloss>
+<gloss>to lead astray</gloss>
@@ -18 +20,2 @@
-<gloss>to let one dance</gloss>
+<gloss>to make (someone) dance</gloss>
+<gloss>to let dance</gloss>

obvious copy-paste error

causative verbs are from ichidan group

@@ -11,1 +11,1 @@
-<pos>&v5s;</pos>
+<pos>&v1;</pos>
@@ -16,1 +16,1 @@
-<pos>&v5s;</pos>
+<pos>&v1;</pos>

gg5, japan wordnet

just a causative.  glosses copied from 踊らす

@@ -9,0 +9,1 @@
+<pos>&vs;</pos>

daijs, wiki

yahoo enc, eij

koj, daij, gg5

koj, daij, eij

koj, daij

Koj, Daij

nikk

i'm not sure, but these may be the same sense.  (just a different translation of 戸)

Koj, Daij, GG5

@@ -10,0 +10,3 @@
+<r_ele>
+<reb>おおと</reb>
+</r_ele>
@@ -12,1 +15,5 @@
-<gloss>main door in front of a house</gloss>
+<gloss>main door at the front of a house</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>front shutters</gloss>

daij

@@ -12,1 +12,2 @@
-<gloss>longrain</gloss>
+<xref type="see" seq="1797640">長雨・ながあめ</xref>
+<gloss>long period of rain</gloss>

daij

nikk

nikk

GG5, リーダーズ+プラス

@@ -13,0 +13,1 @@
+<gloss>recitation</gloss>

Eijiro

GG5

@@ -18,0 +18,1 @@
+<gloss>hair band</gloss>

Eijiro
http://ja.wikipedia.org/wiki/バレッタ_(装身具)

koj has as kana only, so perhaps [uk]

http://familyfun.go.com/playtime/nekki-707664/
Daij

@@ -12,1 +12,1 @@
-<gloss>children's game in which children try to drive a sharp wooden stick or nail into the ground (winter)</gloss>
+<gloss>children's game in which a wooden stick driven into the ground is dislodged by sticks thrown at it</gloss>

daij

or something like that

Eijiro

御会式	4,658	38.2%	
お会式	7,548	61.8%

I don't think 御会式 should be hidden.

@@ -9 +8,0 @@
-<ke_inf>&sK;</ke_inf>
@@ -16,2 +15,2 @@
-<xref type="see" seq="1198540">会式・えしき・2</xref>
-<gloss>(Nichiren Buddhism) memorial service for Nichiren (13th day of 10th month)</gloss>
+<xref type="see" seq="1198540">会式・2</xref>
+<gloss>memorial service for Nichiren (13th day of the 10th month; in Nichiren Buddhism)</gloss>