mk

@@ -12,0 +13,2 @@
+<pos>&vi;</pos>
+<pos>&adv;</pos>
@@ -23,0 +26,2 @@
+<pos>&vs;</pos>
+<pos>&vi;</pos>
@@ -26 +29,0 @@
-<pos>&vs;</pos>

daij, gg5, prog

Splitting.

@@ -4,0 +5,3 @@
+<reb>ゴタゴタ</reb>
+</r_ele>
+<r_ele>
@@ -7,3 +9,0 @@
-<r_ele>
-<reb>ゴタゴタ</reb>
-</r_ele>
@@ -11,2 +10,0 @@
-<pos>&adj-na;</pos>
-<pos>&adv;</pos>
@@ -14,0 +13 @@
+<pos>&adv-to;</pos>
@@ -17,0 +17,11 @@
+<gloss>dispute</gloss>
+<gloss>quarrel</gloss>
+<gloss>discord</gloss>
+<gloss>dissension</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&adv;</pos>
+<pos>&adv-to;</pos>
+<pos>&vs;</pos>
+<misc>&on-mim;</misc>
@@ -19 +28,0 @@
-<gloss>complication</gloss>
@@ -21,2 +29,0 @@
-<gloss>mix-up</gloss>
-<gloss>imbroglio</gloss>
@@ -23,0 +31 @@
+<gloss>muddle</gloss>

Merging 2751210.

@@ -6,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ゴタゴタ</reb>
@@ -14,0 +17,1 @@
+<gloss>difficulties</gloss>
@@ -15,0 +19,5 @@
+<gloss>complication</gloss>
+<gloss>disorder</gloss>
+<gloss>mix-up</gloss>
+<gloss>imbroglio</gloss>
+<gloss>mess</gloss>

luminous, wisdom, daij
パッと	1,210,604	60.1%	
ぱっと	767,707	        38.1%	
パっと	36,564	        1.8%

I think sense 2 should have adverbial glosses.
I'm not seeing any vs examples for sense 1.

@@ -13,0 +14 @@
+<re_inf>&sk;</re_inf>
@@ -17 +17,0 @@
-<pos>&vs;</pos>
@@ -20,0 +21 @@
+<gloss>quickly</gloss>
@@ -21,0 +23 @@
+<gloss>swiftly</gloss>
@@ -23 +24,0 @@
-<gloss>alertly</gloss>
@@ -25,0 +27 @@
+<pos>&adv;</pos>
@@ -27 +28,0 @@
-<pos>&adv;</pos>
@@ -29,4 +30,6 @@
-<gloss>attractive</gloss>
-<gloss>distinguished</gloss>
-<gloss>showy</gloss>
-<gloss>catching</gloss>
+<misc>&on-mim;</misc>
+<gloss>conspicuously</gloss>
+<gloss>prominently</gloss>
+<gloss>showily</gloss>
+<gloss>attractively</gloss>
+<gloss>impressively</gloss>

daijr ex: "ぱっと派手に繰り込もう
koj ex: "忘年会はぱっと派手にやろう"

Not always [vs].

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

ビッシリ	89188
びっしり	380930

@@ -6,0 +7,3 @@
+</r_ele>
+<r_ele>
+<reb>ビッシリ</reb>

Not sure either.

gg5, prog
daijr (sense 2): "十分に物事を行うさま。「八時間―（と）働く」"
daijs (sense 2): "気を抜くことなく十分に行うさま。「一週間びっしり（と）働く」"

There's a second sense but I'm not sure how to translate it.

@@ -12,2 +12,9 @@
-<gloss>closely packed</gloss>
-<gloss>crowded close</gloss>
+<gloss>closely (packed, lined up, etc.)</gloss>
+<gloss>tightly</gloss>
+<gloss>densely</gloss>
+</sense>
+<sense>
+<pos>&adv;</pos>
+<pos>&adv-to;</pos>
+<misc>&on-mim;</misc>
+<gloss>(work) sufficiently</gloss>

gg5 koj dajs

@@ -9,0 +10,2 @@
+<pos>&adv-to;</pos>
+<misc>&on-mim;</misc>

gg5, daij

@@ -13,0 +14 @@
+<xref type="ant" seq="1088450">ドライ・1</xref>
@@ -14,0 +16 @@
+<gloss>moist</gloss>
@@ -17,0 +20 @@
+<xref type="ant" seq="1088450">ドライ・2</xref>

googits

ウェット definitely more common.
Should the frequency tag be moved over?

@@ -4,0 +5,3 @@
+<reb>ウェット</reb>
+</r_ele>
+<r_ele>
@@ -7,3 +9,0 @@
-</r_ele>
-<r_ele>
-<reb>ウェット</reb>

gg5

daijr/s

@@ -15,0 +16,6 @@
+<sense>
+<pos>&adj-na;</pos>
+<gloss>soft-hearted</gloss>
+<gloss>tender-hearted</gloss>
+<gloss>sentimental</gloss>
+</sense>

gakkoku

@@ -18,0 +19 @@
+<pos>&vi;</pos>

育児	8372989	100.0%
育兒	137	0.0%

Probably not.

@@ -9,4 +8,0 @@
-</k_ele>
-<k_ele>
-<keb>育兒</keb>
-<ke_inf>&oK;</ke_inf>

@@ -8,0 +9,4 @@
+</k_ele>
+<k_ele>
+<keb>育兒</keb>
+<ke_inf>&oK;</ke_inf>

gg5

@@ -19,0 +20 @@
+<gloss>child-rearing</gloss>

daijr

@@ -26 +26,2 @@
-<gloss>good long distance vision</gloss>
+<gloss>being able to see a long distance</gloss>
+<gloss>good long-distance vision</gloss>
@@ -30,2 +31 @@
-<pos>&adj-no;</pos>
-<xref type="see" seq="1178120">遠視・えんし</xref>
+<xref type="see" seq="1178120">遠視</xref>

Google N-gram Corpus Counts
╭─ーーー─┬─────────╮
│ 遠目　 │ 263,203 │
│ 遠眼　 │     462 │ - adding (daijs, meikyo)
│ とおめ │  11,912 │
╰─ーーー─┴─────────╯

@@ -7,0 +8,4 @@
+</k_ele>
+<k_ele>
+<keb>遠眼</keb>
+<ke_inf>&rK;</ke_inf>

daij, koj, gg5

Added sense.
Sense 1 is not an adjective.

@@ -15 +14,0 @@
-<pos>&adj-na;</pos>
@@ -17 +15,0 @@
-<pos>&adj-no;</pos>
@@ -18,0 +17 @@
+<gloss>looking from a distance</gloss>
@@ -21,0 +21,6 @@
+<xref type="see" seq="2832946">遠目がきく</xref>
+<gloss>good long distance vision</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&adj-no;</pos>

OK.

The addition of 伏せる to this entry has set up an overlap with 1500220. It's upset the examples for 伏せる because they get linked here as well. 臥せる/ふせる is not that common, and using 伏せる for this meaning is quite rare (which is why the JEs ignore it.)
What I'm proposing to do is:
- remove 伏せる from here;
- add an extra sense in 1500220 - "to lie down; to retire; to go to bed (with an illness)" with xrefs to/from here.
It's not the way kokugos do it, but it will be unambiguous and stop messing up the examples.

@@ -6,3 +5,0 @@
-</k_ele>
-<k_ele>
-<keb>伏せる</keb>
@@ -15,0 +13,2 @@
+<xref type="see" seq="1500220">伏せる・ふせる・5</xref>
+<xref type="see" seq="1500220">伏せる・ふせる・5</xref>

daijr: "多くは病気で床につく場合に"
daijs: "特に、病気で床につく"

Daijr and Koj give 伏せる as well.
Not transitive.

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>伏せる</keb>
@@ -12 +15 @@
-<pos>&vt;</pos>
+<pos>&vi;</pos>
@@ -15 +18 @@
-<gloss>to go to bed</gloss>
+<gloss>to go to bed (with an illness)</gloss>

Bulk update n-adv to n,adv
-*- via bulkupd.py -*-

@@ -36 +36 @@
-<pos>&n-adv;</pos>
+<pos>&adv;</pos>

Bulk update n-adv to n,adv
-*- via bulkupd.py -*-

@@ -28 +28 @@
-<pos>&n-adv;</pos>
+<pos>&adv;</pos>

gg5, daijr

@@ -26 +25,0 @@
-<pos>&adv;</pos>
@@ -27,0 +27,2 @@
+<pos>&pn;</pos>
+<pos>&n-adv;</pos>
@@ -29 +29,0 @@
-<gloss>all</gloss>
@@ -31,0 +32 @@
+<gloss>all</gloss>
@@ -34 +34,0 @@
-<pos>&adv;</pos>
@@ -35,0 +36 @@
+<pos>&n-adv;</pos>
@@ -37,0 +39 @@
+<gloss>all</gloss>

@@ -11 +11,2 @@
-<keb>皆んな(io)</keb>
+<keb>皆んな</keb>
+<ke_inf>&io;</ke_inf>

@@ -9,0 +10,3 @@
+<k_ele>
+<keb>寒け</keb>
+</k_ele>
@@ -16,0 +20 @@
+<re_restr>寒気</re_restr>

gg5, prog

@@ -17 +17,3 @@
-<gloss>relation(ship)</gloss>
+<gloss>relationship</gloss>
+<gloss>relation</gloss>
+<gloss>terms (good, friendly, etc.)</gloss>

gg5, prog

More natural sounding glosses, IMO.
GG5 splits but I'm not sure it's necessary.

@@ -17 +17,2 @@
-<gloss>extreme penalty</gloss>
+<gloss>death penalty</gloss>
+<gloss>maximum penalty</gloss>

shinsen: 「遇然」と書くのはあやまり。

Google N-gram Corpus Counts
╭─ーーーー─┬───────────╮
│ 偶然　　 │ 4,911,655 │
│ 遇然　　 │       683 │ - add, sK
│ ぐうぜん │    19,553 │
╰─ーーーー─┴───────────╯

@@ -8,0 +9,4 @@
+</k_ele>
+<k_ele>
+<keb>遇然</keb>
+<ke_inf>&sK;</ke_inf>

@@ -34 +34,2 @@
-<gloss>contingency (philosophy)</gloss>
+<field>&phil;</field>
+<gloss>contingency</gloss>

gg5

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

daij, gg5, prog

Added senses.

@@ -18,3 +18,19 @@
-<gloss>condition</gloss>
-<gloss>state</gloss>
-<gloss>business (condition)</gloss>
+<gloss>business conditions</gloss>
+<gloss>the market</gloss>
+<gloss>economic activity</gloss>
+<gloss>economic climate</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1631220">好景気</xref>
+<gloss>good (economic) times</gloss>
+<gloss>prosperity</gloss>
+<gloss>boom</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>liveliness</gloss>
+<gloss>energy</gloss>
+<gloss>vigour</gloss>
+<gloss>vigor</gloss>
+<gloss>spirit</gloss>

@@ -13,0 +14 @@
+<gloss>police officer</gloss>
@@ -16 +16,0 @@
-<gloss>police officer</gloss>

OK

Pretty much any Japanese word can be written in katakana.
I think we should only include the katakana if it is reasonably common.
I don't think ケイサツカン qualifies.

Some non-JMdict sites using ケイサツカン:
http://aaaaaa.co.jp/job/?p=152
https://www.no-ichigo.jp/read/book/book_id/620525
http://dic.nicovideo.jp/a/ザ・警察官
etc. 
Note that it's not a reading of 警察官; it's more an alternative written form.
Frankly I don't care too much whether it's there or not. I'll just note that without it WWWJDIC's text-glossing will not handle it in katakana.

I'm posting this edit for the sake of clarification and better understanding the 
Japanese language: The (alternative) reading ケイサツカン is uncommon and was 
deleted, then re-added to this entry before. I searched Google for any uses of it 
but only other sites using JMdict data came up. Google suggested the kanji word 
as search term. It would be good to state the marginal usage of this katakana 
reading to avoid confusion. Thank you!

@@ -12,4 +11,0 @@
-<r_ele>
-<reb>ケイサツカン</reb>
-<re_nokanji/>
-</r_ele>

https://kakaku.com/bb/hikari/

Common as part of product or business names.

@@ -42,0 +43,7 @@
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="2844299">光回線</xref>
+<misc>&abbr;</misc>
+<gloss>optical fiber</gloss>
+<gloss>optical fibre</gloss>
+</sense>

Daijr,GG5, 中辞, etc.

Refs are divided on the split of senses. I'm mainly following GG5 here.
I'm seeing Naomi Kawase's ひかり later this week, and the English title is "Radiance", which got me thinking about the breadth of meanings for 光.

@@ -19,0 +20,23 @@
+<sense>
+<pos>&n;</pos>
+<gloss>illumination</gloss>
+<gloss>ray</gloss>
+<gloss>beam</gloss>
+<gloss>gleam</gloss>
+<gloss>glow</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>happiness</gloss>
+<gloss>hope</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>influence</gloss>
+<gloss>power</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>vision</gloss>
+<gloss>eyesight</gloss>
+</sense>

gg5

I think "harshness of the world" is a translation of "世の荒波".

@@ -16,0 +17 @@
+<gloss>raging waves</gloss>
@@ -18 +18,0 @@
-<gloss>raging waves</gloss>
@@ -22 +21,0 @@
-<pos>&adj-no;</pos>
@@ -24 +23,2 @@
-<gloss>harshness of the world</gloss>
+<gloss>troubles</gloss>
+<gloss>adversities</gloss>

daijr/s, prog, Luminous, 新和英中辞典

@@ -20,0 +20,6 @@
+<sense>
+<pos>&n;</pos>
+<pos>&adj-no;</pos>
+<gloss>hardships</gloss>
+<gloss>harshness of the world</gloss>
+</sense>

@@ -11 +11 @@
-<reb>さたん</reb>
+<reb>ひだりはし</reb>
@@ -14 +14,2 @@
-<reb>ひだりはし</reb>
+<reb>さたん</reb>
+<re_restr>左端</re_restr>

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>左はし</keb>

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

gg5 koj daijs

none of the refs mention cocoa

@@ -12 +12,3 @@
-<gloss>light (cocoa) brown</gloss>
+<gloss>light brown</gloss>
+<gloss>golden brown</gloss>
+<gloss>tan</gloss>

@@ -20 +20 @@
-<gloss>to scotch</gloss>
+<gloss>to scorch</gloss>

gg5, prog

Wasn't sure whether to put these glosses into the passive form but with the [vi] tag they're probably fine.

@@ -20 +20,3 @@
-<gloss>to be burned</gloss>
+<gloss>to scotch</gloss>
+<gloss>to char</gloss>
+<gloss>to singe</gloss>

There's no need to include "be" with intransitive verb translations unless it's the only way to do them. You need it in cases like "to be amazed" or "to be torn off", but "to burn" is fine for 焦げる.

To be consistent with other intransitive verbs' definition, the format of "to BE [past participle]" should be used.

@@ -19,4 +19,4 @@
-<gloss>to burn</gloss>
-<gloss>to scorch</gloss>
-<gloss>to char</gloss>
-<gloss>to singe</gloss>
+<gloss>to be burned</gloss>
+<gloss>to be scorched</gloss>
+<gloss>to be charred</gloss>
+<gloss>to be singed</gloss>

@@ -20 +20 @@
-<gloss>to scotch</gloss>
+<gloss>to scorch</gloss>

gg5, prog

Wasn't sure whether to put these glosses into the passive form but with the [vi] tag they're probably fine.

@@ -20 +20,3 @@
-<gloss>to be burned</gloss>
+<gloss>to scotch</gloss>
+<gloss>to char</gloss>
+<gloss>to singe</gloss>

Tidying

@@ -16 +16,2 @@
-<gloss>wind (instrument) music</gloss>
+<gloss>wind music</gloss>
+<gloss>wind instrument music</gloss>

eij
jwiki(水色) <-> wiki(aqua (color))
www images

@@ -19,0 +20,2 @@
+<gloss>pale blue</gloss>
+<gloss>aqua</gloss>

gg5, prog
随時	4856406
随時が	109
随時を	346

副 in daijr/s, meikyo and shinmeikai. Not seeing any examples of noun usage.

@@ -15,2 +15,2 @@
-<pos>&n;</pos>
-<pos>&n-adv;</pos>
+<pos>&adv;</pos>
+<gloss>whenever necessary</gloss>
@@ -17,0 +18 @@
+<gloss>as required</gloss>
@@ -21,2 +22 @@
-<pos>&n;</pos>
-<pos>&n-adv;</pos>
+<pos>&adv;</pos>
@@ -23,0 +24 @@
+<gloss>at all times</gloss>

Unidic classifies as 名詞, 普通名詞, 副詞可能, -> Noun, Common Noun, Adverb-able
Wiktionary classifies as a Noun

Changed from adverb to noun and adverbial noun to be consistent with Unidic and Wiktionary

@@ -15 +15,2 @@
-<pos>&adv;</pos>
+<pos>&n;</pos>
+<pos>&n-adv;</pos>
@@ -20 +21,2 @@
-<pos>&adv;</pos>
+<pos>&n;</pos>
+<pos>&n-adv;</pos>

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

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

GG5, etc.

Don't like partial words as a noun gloss.

@@ -21 +21 @@
-<gloss>-ectomy (surgical removal)</gloss>
+<gloss>surgical removal</gloss>

eij

@@ -19,0 +20,2 @@
+<gloss>resection</gloss>
+<gloss>-ectomy (surgical removal)</gloss>

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

@@ -18,0 +19 @@
+<pos>&vt;</pos>

gg5, daij

A bit clearer.

@@ -19 +19 @@
-<gloss>collection</gloss>
+<gloss>collection (of fees, taxes, etc.)</gloss>

GG5, etc.

All 3 of my JEs have "slow" as the first gloss.
DO NOT remove glosses without any supporting evidence.

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

@@ -30 +30 @@
-<gloss>slow</gloss>
+<gloss>clumsy</gloss>

G n-grams.

@@ -5 +5 @@
-<keb>鈍臭い</keb>
+<keb>鈍くさい</keb>
@@ -8 +8 @@
-<keb>鈍くさい</keb>
+<keb>鈍臭い</keb>
@@ -14,0 +15 @@
+<re_restr>鈍くさい</re_restr>
@@ -16 +16,0 @@
-<re_restr>鈍くさい</re_restr>
@@ -19,0 +20 @@
+<re_restr>鈍くさい</re_restr>
@@ -21 +21,0 @@
-<re_restr>鈍くさい</re_restr>

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>鈍くさい</keb>
@@ -12,0 +16 @@
+<re_restr>鈍くさい</re_restr>
@@ -16,0 +21 @@
+<re_restr>鈍くさい</re_restr>

not sure

@@ -25 +25 @@
-<gloss>slow (opposite of fast)</gloss>
+<gloss>slow</gloss>

eij

@@ -13,0 +14 @@
+<gloss>aphorism</gloss>

WWW hits.

Seems that way.

@@ -13,3 +12,0 @@
-<reb>うたん</reb>
-</r_ele>
-<r_ele>
@@ -18,0 +16,4 @@
+</r_ele>
+<r_ele>
+<reb>うたん</reb>
+<re_restr>右端</re_restr>

みぎはし the usual reading?

@@ -7,0 +8,3 @@
+</k_ele>
+<k_ele>
+<keb>右はし</keb>

daij, gg5, prog

Added sense.

@@ -22,0 +23,2 @@
+<gloss>to save up</gloss>
+<gloss>to stock up on</gloss>
@@ -23,0 +26 @@
+<gloss>to set aside</gloss>
@@ -28,2 +31,9 @@
-<gloss>to have a beard</gloss>
-<gloss>to grow a beard</gloss>
+<gloss>to accumulate (e.g. knowledge)</gloss>
+<gloss>to build up (e.g. experience)</gloss>
+<gloss>to develop (e.g. one's skills)</gloss>
+</sense>
+<sense>
+<pos>&v1;</pos>
+<pos>&vt;</pos>
+<gloss>to grow (a beard, moustache, etc.)</gloss>
+<gloss>to wear</gloss>

Small English typo.

@@ -29,1 +29,1 @@
-<gloss>tp grow a beard</gloss>
+<gloss>to grow a beard</gloss>

Google N-gram Corpus Counts
╭─ーーーー─┬─────╮
│ バラ蒔く │ 249 │
╰─ーーーー─┴─────╯

@@ -14,0 +15,4 @@
+</k_ele>
+<k_ele>
+<keb>バラ蒔く</keb>
+<ke_inf>&sK;</ke_inf>

I don't think バラ撒く, ばら蒔く or バラまく need to be visible.

@@ -7,7 +6,0 @@
-</k_ele>
-<k_ele>
-<keb>バラ撒く</keb>
-</k_ele>
-<k_ele>
-<keb>ばら蒔く</keb>
-<ke_inf>&rK;</ke_inf>
@@ -22,0 +16,8 @@
+<k_ele>
+<keb>バラ撒く</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>ばら蒔く</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
@@ -30 +31 @@
-<re_nokanji/>
+<re_inf>&sk;</re_inf>

@@ -18 +17,0 @@
-<ke_pri>ichi2</ke_pri>

G n-grams:

ばら撒く 42,112 37.0%
バラ撒く  4,578  4.0% <- adding
ばら蒔く    825  0.7%
バラ蒔く    249  0.2%
散蒔く　     75  0.1%
バラ播く     30  0.0%
散播く　      0  0.0%
ばらまく 55,456 48.7%
バラまく 10,622  9.3% <- adding

@@ -6,0 +7,3 @@
+</k_ele>
+<k_ele>
+<keb>バラ撒く</keb>
@@ -24,0 +28,4 @@
+</r_ele>
+<r_ele>
+<reb>バラまく</reb>
+<re_nokanji/>

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

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

gg5, prog

@@ -13,2 +13,2 @@
-<gloss>stating</gloss>
-<gloss>expressing (one's opinion)</gloss>
+<gloss>stating (one's views)</gloss>
+<gloss>expressing</gloss>

リーダーズ+プラス

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ピョコン</reb>

gg5 koj daijs

the kokugos have a second sense

@@ -4,3 +3,0 @@
-<r_ele>
-<reb>ぴょこんと</reb>
-</r_ele>
@@ -10,0 +8 @@
+<pos>&adv-to;</pos>
@@ -11,0 +10 @@
+<misc>&on-mim;</misc>
@@ -13 +11,0 @@
-<gloss>action of quickly bowing or lowering one's head</gloss>

WWW hits. The JEs split senses

I think it should be.

@@ -10 +10 @@
-<reb>せいぎょう</reb>
+<reb>なりわい</reb>
@@ -15 +15 @@
-<reb>なりわい</reb>
+<reb>せいぎょう</reb>
@@ -28 +27,0 @@
-<gloss>livelihood</gloss>
@@ -30,0 +30,4 @@
+<sense>
+<pos>&n;</pos>
+<gloss>livelihood</gloss>
+</sense>

Thoughts on making なりわい the first reading?

I did find a couple of non-EDICT derived uses of 業わい, but it's a distraction here.

@@ -9,3 +8,0 @@
-<k_ele>
-<keb>業わい</keb>
-</k_ele>
@@ -14 +10,0 @@
-<re_restr>生業</re_restr>
@@ -27 +22,0 @@
-<re_restr>生業</re_restr>

Should なりわい not go first? It's the only reading I hear people use.
Also, I think we can drop 業わい. It's definitely a 変換ミス and isn't at all common.

gg5, prog

Don't agree with "outfit".

@@ -16 +16 @@
-<gloss>(personal) accessories (ornaments, outfit)</gloss>
+<gloss>personal accessories (ornaments, adornments)</gloss>

The original source is lost. A comment was made in 2006 that sense 2 wasn't in Daijr/s.

@@ -15 +15 @@
-<gloss>our gracious (Queen)</gloss>
+<gloss>our gracious (e.g. Queen)</gloss>
@@ -18,4 +17,0 @@
-<sense>
-<pos>&n;</pos>
-<gloss>agreeable condition</gloss>
-</sense>

What does sense 2 mean and where does it come from?

Google N-gram Corpus Counts
╭─ーーー─┬─────────┬───────╮
│ 講和　 │ 199,465 │ 99.7% │
│ 媾和　 │     562 │  0.3% │ 🡠 rK (daijr/s, koj, etc.)
│ こうわ │   9,174 │  N/A  │
╰─ーーー─┴─────────┴───────╯

@@ -11,0 +12 @@
+<ke_inf>&rK;</ke_inf>

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

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

daij, gg5, prog

Trying to make the glosses more specific.

@@ -22,2 +22,2 @@
-<gloss>reconciliation</gloss>
-<gloss>peace</gloss>
+<gloss>reconciliation (between warring nations)</gloss>
+<gloss>(making of) peace</gloss>

OK, I was trying to keep it simpler. I'll revive that other one,

@@ -16,3 +15,0 @@
-<r_ele>
-<reb>あざまる</reb>
-</r_ele>

I agree it shouldn't be merged with this entry. All the other glosses are variations on the same abbreviation whereas あざまる is quite different. Also, あざまる is far less ubiquitous than あざーっす. I've never even seen/heard it before.

I mean in pronunciation.  All the others end 
in っす or す and contain the 3 same sounds - あ 
and ざ and す. あざまる  is obviously an outlier 
and I think throwing it in here is just 
confusing.

Since it's also a slangy abbreviation of ありがとうございます, what particular difference do you mean? If it inflected as a 五段 verb that might be a reason, but I can't see that taking place.
It's certainly convenient to keep slang variants together if appropriate.

I think あざまる is different enough (though not 
in meaning) from the others to warrant a 
separate entry.

Agree.

standard addition of お- to 墓参り.  none of my sources bothers with an entry for this one

@@ -5 +5 @@
-<keb>おはか参り</keb>
+<keb>お墓参り</keb>

Entry created

@@ -22 +22 @@
-<gloss>to argue over</gloss>
+<gloss>to argue</gloss>

daij, 斎藤和英大辞典

Added sense.

@@ -10 +10 @@
-<xref type="see" seq="1004930">ごたごた・1</xref>
+<xref type="see" seq="1004930">ごたごた・2</xref>
@@ -12,0 +13,11 @@
+<gloss>to be chaotic</gloss>
+<gloss>to be crowded</gloss>
+</sense>
+<sense>
+<pos>&v5k;</pos>
+<pos>&vi;</pos>
+<xref type="see" seq="1004930">ごたごた・1</xref>
+<gloss>to have troubles</gloss>
+<gloss>to be in a dispute</gloss>
+<gloss>to argue over</gloss>
+<gloss>to be entangled (in a situation)</gloss>

Entry created

Aligning with 遠め.

@@ -10,0 +11 @@
+<pos>&adj-no;</pos>
@@ -12 +13 @@
-<pos>&adj-no;</pos>
+<pos>&n;</pos>
@@ -14,2 +15,2 @@
-<gloss>near</gloss>
-<gloss>close</gloss>
+<gloss>somewhat near</gloss>
+<gloss>fairly close</gloss>

Restore vanished xref.

@@ -13,0 +13,1 @@
+<xref type="ant" seq="2526130">遠め</xref>

GG5, etc.

Changed my mind.

@@ -6,3 +6,0 @@
-</k_ele>
-<k_ele>
-<keb>近目</keb>

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>近目</keb>
@@ -13,1 +16,1 @@
-<xref type="see">遠め</xref>
+<xref type="see" seq="2526130">遠め</xref>

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>遠目</keb>

gg5, daij, googits

Differentiating from 遠い.
Usually [adj-no].

@@ -10,0 +11,2 @@
+<pos>&adj-no;</pos>
+<pos>&adj-na;</pos>
@@ -12,3 +14,3 @@
-<pos>&adj-na;</pos>
-<gloss>distant</gloss>
-<gloss>far</gloss>
+<xref type="ant" seq="2526120">近め</xref>
+<gloss>somewhat far</gloss>
+<gloss>fairly distant</gloss>

Changed my mind

@@ -6,3 +6,0 @@
-</k_ele>
-<k_ele>
-<keb>遠目</keb>

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>遠目</keb>
@@ -13,1 +16,1 @@
-<xref type="see">近め</xref>
+<xref type="see" seq="2526120">近め</xref>

typo

@@ -18 +18 @@
-<gloss>fragrant screw pint</gloss>
+<gloss>fragrant screw pine</gloss>

eol wiki

seems Pandanus fascicularis has been renamed
the common names "screw pine" etc refer to the whole genus
eol and wiki have common names for species

@@ -17,3 +17,3 @@
-<gloss>screw pine (Pandanus fascicularis)</gloss>
-<gloss>pandanus palm</gloss>
-<gloss>pandanus fruit</gloss>
+<gloss>umbrella tree (Pandanus odorifer)</gloss>
+<gloss>fragrant screw pint</gloss>
+<gloss>kewda</gloss>

http://ja.wikipedia.org/wiki/アダン says 「ポリネシアを中心に生育する P. tectorius も混同される場合があるが、これは別種であるとされる。」
http://en.wikipedia.org/wiki/Pandanus_odoratissimus
http://en.wikipedia.org/wiki/Pandanus_tectorius
http://en.wikipedia.org/wiki/Pandanus_fascicularis

not the same species, which is clear from comparing species distributions.  'Pandanus odoratissimus' appears to be used for both 'P. fascicularis' and 'P. tectorius', which may have been the source of the confusion here.  gg5 has this as 'Pandanus odoratissimus, Pandanus tectorius', but i think it actually refers to Pandanus fascicularis.

@@ -17,1 +17,1 @@
-<gloss>screw pine (Pandanus odoratissimus, P. tectorius)</gloss>
+<gloss>screw pine (Pandanus fascicularis)</gloss>

googits

@@ -5,0 +6,6 @@
+</k_ele>
+<k_ele>
+<keb>見境無く</keb>
+</k_ele>
+<k_ele>
+<keb>見さかいなく</keb>
@@ -13 +18,0 @@
-<xref type="see" seq="1259480">見境</xref>

見境なくセックスしまくる人はエイズなどの性病が怖くないのですか？
Aren't people who have promiscuous sex afraid of VDs like AIDS?

Seeing as there's a 見境なしに entry I think this one is worth having. 

見境なく Yahoo hit estimate 747,000
見境なしに 47,500

Remove from WIP file 1, whether or not you use this in Edict.

daij, daijs

No idea about the order. Googits are pretty useless here.

@@ -3,0 +4,12 @@
+<k_ele>
+<keb>塗り籠め</keb>
+</k_ele>
+<k_ele>
+<keb>塗り篭め</keb>
+</k_ele>
+<k_ele>
+<keb>塗籠め</keb>
+</k_ele>
+<k_ele>
+<keb>塗篭め</keb>
+</k_ele>

@@ -16,1 +16,1 @@
-<gloss>interior closed room with heavily plastered walls in an Heian palace</gloss>
+<gloss>interior closed room with heavily plastered walls in a Heian palace</gloss>

daij koj JAANUS

@@ -13,0 +14 @@
+<pos>&exp;</pos>
@@ -17,0 +19 @@
+<pos>&exp;</pos>
@@ -23,0 +26 @@
+<pos>&exp;</pos>

@@ -25 +25 @@
-<gloss>this person</gloss>
+<gloss>that person</gloss>

koj, daij, gg5

@@ -5 +5,4 @@
-<keb>その人あり</keb>
+<keb>その人</keb>
+</k_ele>
+<k_ele>
+<keb>其の人</keb>
@@ -8 +11 @@
-<reb>そのひとあり</reb>
+<reb>そのひと</reb>
@@ -11,2 +14,12 @@
-<pos>&exp;</pos>
-<gloss>famous?</gloss>
+<pos>&n;</pos>
+<gloss>the person in question</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<s_inf>as その人あり</s_inf>
+<gloss>prominent figure</gloss>
+<gloss>distinguished person</gloss>
+</sense>
+<sense>
+<pos>&pn;</pos>
+<gloss>this person</gloss>

https://kotobank.jp/word/其の人-555009
大辞泉　２ その分野ですぐれた力をもっている人。その分野で著名な人。「政界に其の人ありと言われた男」

大辞林　②（「その人あり」の形で）代表的人物。 「財界に－ありと知られた人」

I'm sorry, I leave translations up to you.

「そんな有名人だったのか？あの婆さん・・・」
「有名も何も、アルティアにその人ありといわれた占い師ですよ！」

It sounds more superlative than plain "famous"

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

I want to add 吹部 which is defined in daijr as "「吹奏楽部」の略。".

gg5

We don't usually add exp when the kokugos include a PoS (which is 代 in this case).

@@ -15 +14,0 @@
-<pos>&exp;</pos>
@@ -17,0 +17,2 @@
+<gloss>he</gloss>
+<gloss>she</gloss>

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

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

gg5, daij

I think so.

@@ -14,0 +15 @@
+<xref type="see" seq="1264100">言い切る・1</xref>
@@ -17,0 +19,3 @@
+</sense>
+<sense>
+<pos>&n;</pos>

ルミナス has these glosses.

Possibly two senses?

@@ -14,0 +15,3 @@
+<gloss>affirmation</gloss>
+<gloss>declaration</gloss>
+<gloss>assertion</gloss>

daijr, daijs, koj

Not sure about the gloss.

gg5 koj daijs jwiki

jwiki, リーダーズ

We already have 精神分析.

gg5, jwiki

@@ -13 +13,2 @@
-<gloss>non-ego (philosophy)</gloss>
+<field>&phil;</field>
+<gloss>non-ego</gloss>

ルミナス

gg5, prog, daij, etc.

www-images

worth mentioning

@@ -10 +10 @@
-<gloss>small folding knife used to sharpen pencils</gloss>
+<gloss>small folding knife with a rectangular blade used to sharpen pencils</gloss>

@@ -8,0 +9 @@
+<xref type="see" seq="2832984">ミッキーナイフ</xref>

Some WWW images show non-folding versions. Usually have rectangular blades. Also known as a Mickey knofe.

https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q14175277394

in the book I'm reading, they are also used for that purpose
(by elementary school students around 1970)

@@ -9 +9 @@
-<gloss>??? knife</gloss>
+<gloss>small folding knife used to sharpen pencils</gloss>

WWW images mostly show slip-joint pliers.

@@ -6,0 +7,3 @@
+<r_ele>
+<reb>コンビネーション・プライヤー</reb>
+</r_ele>
@@ -8,0 +12 @@
+<lsource xml:lang="eng">combination plier</lsource>

wiki web (e.g. https://www.amazon.co.jp/gp/product/B00DFYUTUY/)

Doesn't seem to correspond to combination pliers (https://en.wikipedia.org/wiki/Lineman's_pliers) but to slip joint pliers (https://en.wikipedia.org/wiki/Slip_joint_pliers)

There's no cutter.

ＫＯＤ追加語彙

@@ -6,0 +7,3 @@
+<r_ele>
+<reb>ポブラーノ</reb>
+</r_ele>
@@ -9 +12 @@
-<gloss>Poblano (pepper)</gloss>
+<gloss>poblano (pepper)</gloss>

wiki

ＫＯＤ追加語彙

@@ -9 +9,2 @@
-<gloss>mole (sauce)</gloss>
+<field>&food;</field>
+<gloss>mole (Mexican sauce)</gloss>

@@ -14 +14 @@
-<gloss>concert band</gloss>
+<gloss>concert band (at a school)</gloss>

Daijr, Unidic

See comment on 吹奏楽部.

http://shobuno.hatenablog.com/entry/2014/04/04/234515:
関西では「ミッキーナイフ」、関東では「ボンナイフ」と　呼ばれていたそうです。

@@ -11,0 +12 @@
+<xref type="see" seq="2832979">ボンナイフ</xref>
@@ -12,0 +14 @@
+<dial>&ksb;</dial>

not many web hits for "Mickey knife"

I don't think "Mickey knife" is an English word at all
Maybe better this way

@@ -12 +12 @@
-<lsource xml:lang="eng">Mickey knife</lsource>
+<s_inf>from Mickey Mouse</s_inf>

www-images

worth mentioning

@@ -13 +13 @@
-<gloss>small folding knife used to sharpen pencils</gloss>
+<gloss>small folding knife with a rectangular blade used to sharpen pencils</gloss>

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ミッキー・ナイフ</reb>

http://www.weblio.jp/content/最怖
googits

~700k googits for "最恐の".

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

www-images
jwiki(テクニカラー):  日本では「総天然色」と訳されて宣伝された。
https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1437762439

koj daijs jwiki wiki
324 K raw googits for "higonokami"

genericized trade mark