sense 2 is not really phrased like an adjective, but i can't do any better

daij, prog

Not a noun.
Specifically a liquid for sense 1.
Simplified sense 2 gloss.

@@ -7,0 +8,3 @@
+<r_ele>
+<reb>ガブガブ</reb>
+</r_ele>
@@ -8,0 +12 @@
+<pos>&adv;</pos>
@@ -10 +13,0 @@
-<pos>&n;</pos>
@@ -12 +15 @@
-<gloss>gulping down</gloss>
+<gloss>gulping down (a drink)</gloss>
@@ -13,0 +17 @@
+<gloss>chugging</gloss>
@@ -17 +20,0 @@
-<pos>&n;</pos>
@@ -19 +22 @@
-<gloss>sloshing around (e.g. liquid in one's stomach, esp. from drinking too much)</gloss>
+<gloss>sloshing around (of liquid in one's stomach)</gloss>

@@ -19,1 +19,1 @@
-<gloss>sloshing around (liquid in one's stomach, esp. from drinking too much)</gloss>
+<gloss>sloshing around (e.g. liquid in one's stomach, esp. from drinking too much)</gloss>

daijr shinkaisan
GG5 (example sentence and だぶだぶ)

* Add “sloshing around in stomach” sense
shinkaisan gives だぶだぶ as syn (for this sense), and GG5 defn/example corroborates
* fix pos (split, accord with daijr)

@@ -9,2 +9,1 @@
-<pos>&adj-na;</pos>
-<pos>&adv;</pos>
+<pos>&adv-to;</pos>
@@ -16,0 +15,6 @@
+<sense>
+<pos>&adj-na;</pos>
+<pos>&n;</pos>
+<misc>&on-mim;</misc>
+<gloss>sloshing around (liquid in one's stomach, esp. from drinking too much)</gloss>
+</sense>

meikyo, daijirin, obunsha, etc. say the と is optional

Google N-gram Corpus Counts
╭─ーーーーーーーー─┬───────╮
│ がやがや楽しく　 │ 1,036 │
│ がやがやと楽しく │   584 │
╰─ーーーーーーーー─┴───────╯

We don't normally put transitivity tags on adverbs, even though the kokugos do. See the discussion on 1012370 for example.

@@ -19,0 +20 @@
+<pos>&adv;</pos>
@@ -22 +22,0 @@
-<pos>&vi;</pos>

sankoku, smk, obunsha, shinkoku, iwakoku

@@ -20 +19,0 @@
-<pos>&adv;</pos>
@@ -22,0 +22 @@
+<pos>&vi;</pos>

daij, koj

かやかや appears to be [arch].
Added sense.

@@ -12,0 +13 @@
+<re_inf>&ok;</re_inf>
@@ -15,0 +17 @@
+<re_inf>&ok;</re_inf>
@@ -28,0 +31,9 @@
+<sense>
+<stagr>かやかや</stagr>
+<stagr>カヤカヤ</stagr>
+<pos>&adv;</pos>
+<pos>&adv-to;</pos>
+<misc>&on-mim;</misc>
+<misc>&arch;</misc>
+<gloss>loudly (laughing)</gloss>
+</sense>

gg5 daijs eij

@@ -22,2 +22 @@
-<gloss>noisily</gloss>
-<gloss>in a crowd of people talking</gloss>
+<gloss>noisily (crowd of people talking)</gloss>
@@ -25,0 +25,3 @@
+<gloss>jabberingly</gloss>
+<gloss>chatteringly</gloss>
+<gloss>buzzingly</gloss>

gg5, prog, daij, meikyo

Not a conjunction.

@@ -13,0 +14 @@
+<re_inf>&sk;</re_inf>
@@ -16 +16,0 @@
-<pos>&conj;</pos>
@@ -18 +18,2 @@
-<gloss>come</gloss>
+<s_inf>used to urge or encourage others</s_inf>
+<gloss>come (on)</gloss>
@@ -21,2 +22 @@
-<gloss>go on</gloss>
-<gloss>hurry up</gloss>
+<gloss>here</gloss>
@@ -25 +24,0 @@
-<pos>&conj;</pos>
@@ -27,5 +26,6 @@
-<gloss>well</gloss>
-<gloss>who knows</gloss>
-<gloss>I don't know...</gloss>
-<gloss>uh</gloss>
-<gloss>hmm</gloss>
+<s_inf>indicates resolve</s_inf>
+<gloss>all right</gloss>
+<gloss>right</gloss>
+<gloss>okay</gloss>
+<gloss>now</gloss>
+<gloss>here goes</gloss>
@@ -34 +33,0 @@
-<pos>&conj;</pos>
@@ -36,2 +35,4 @@
-<s_inf>said when surprised or happy</s_inf>
-<gloss>well now</gloss>
+<s_inf>indicates uncertainty or hesitation</s_inf>
+<gloss>well</gloss>
+<gloss>hmm</gloss>
+<gloss>uh</gloss>
@@ -39,2 +40 @@
-<gloss>there we go</gloss>
-<gloss>all right</gloss>
+<gloss>I'm not sure</gloss>
@@ -43 +42,0 @@
-<pos>&conj;</pos>
@@ -45,2 +44,12 @@
-<gloss>about that</gloss>
-<gloss>you see</gloss>
+<s_inf>said when something arrives, starts, finishes, etc.</s_inf>
+<gloss>here</gloss>
+<gloss>now</gloss>
+<gloss>there (we go)</gloss>
+<gloss>ah</gloss>
+<gloss>oh</gloss>
+</sense>
+<sense>
+<pos>&int;</pos>
+<s_inf>used when interrupting someone</s_inf>
+<gloss>about that, ...</gloss>
+<gloss>actually, ...</gloss>

G n-grams
  さあ	4765294
  さー	3733716
  さぁ No matches
7 examples of さぁ in Tatoeba

@@ -6,0 +7,7 @@
+</r_ele>
+<r_ele>
+<reb>さー</reb>
+<re_pri>spec1</re_pri>
+</r_ele>
+<r_ele>
+<reb>さぁ</reb>

not sure why ichi1 was removed

@@ -6 +6 @@
-<re_pri>spec1</re_pri>
+<re_pri>ichi1</re_pri>

G n-grams
まあ	27481121
まー	 5691357
No ngram hits for まぁ, but 9 examples in Tatoeba

@@ -6 +6,8 @@
-<re_pri>ichi1</re_pri>
+<re_pri>spec1</re_pri>
+</r_ele>
+<r_ele>
+<reb>まー</reb>
+<re_pri>spec1</re_pri>
+</r_ele>
+<r_ele>
+<reb>まぁ</reb>

I think we should take out an award for the most comprehensive まあ entry.

adding back glosses i removed when editing and forgot to re-add

@@ -34,0 +34,2 @@
+<gloss>you might say...</gloss>
+<gloss>Hmmm, I guess so...</gloss>
@@ -39,0 +41,1 @@
+<gloss>oh dear!</gloss>
@@ -40,0 +43,1 @@
+<gloss>wow!</gloss>

koj, daij, meikyo, prog, nc, gg5

i think there's something to be said for at least splitting by PoS (according to daijr, gg5, meikyo and koj, the [fem] tag is deserved for the [int] sense), although the japanese PoS don't necessarily match up with their best english translations

@@ -13,1 +13,23 @@
-<pos>&conj;</pos>
+<s_inf>when urging or consoling</s_inf>
+<gloss>just (e.g. "just wait here")</gloss>
+<gloss>come now</gloss>
+<gloss>now, now</gloss>
+</sense>
+<sense>
+<pos>&adv;</pos>
+<gloss>tolerably</gloss>
+<gloss>passably</gloss>
+<gloss>moderately</gloss>
+<gloss>reasonably</gloss>
+<gloss>fairly</gloss>
+<gloss>rather</gloss>
+<gloss>somewhat</gloss>
+</sense>
+<sense>
+<pos>&adv;</pos>
+<s_inf>when hesitating to express an opinion</s_inf>
+<gloss>well...</gloss>
+<gloss>I think...</gloss>
+<gloss>it would seem...</gloss>
+</sense>
+<sense>
@@ -15,6 +37,5 @@
-<gloss>You might say</gloss>
-<gloss>Oh!</gloss>
-<gloss>Oh dear!</gloss>
-<gloss>Wow!</gloss>
-<gloss>Well</gloss>
-<gloss>Hmmm, I guess so</gloss>
+<misc>&fem;</misc>
+<gloss>oh!</gloss>
+<gloss>oh, my!</gloss>
+<gloss>goodness gracious!</gloss>
+<gloss>good heavens!</gloss>

I think since アナウンサー != announcer in this respect, it is appropriate to reflect it somehow, and that should be kept away from the main sense. It's useful information and should be out there in some form.

adding back.  i suggest that the sense is unnecessary and should just be removed

@@ -19,0 +20,4 @@
+<sense>
+<pos>&n;</pos>
+<gloss>in-house television talent who does on-location fluff pieces for variety shows</gloss>
+</sense>

if that gloss is to be kept, it should be its own sense.  otherwise it pollutes sense 1 and makes it seem like it applies to all announcers.  this has been sitting for ages.  removing the sense to approve.

@@ -20,4 +19,0 @@
-<sense>
-<pos>&n;</pos>
-<gloss>in-house television talent who does on-location fluff pieces for variety shows</gloss>
-</sense>

I don't think it's really a separate sense, though. It's 
just that the job of an アナウンサー sometimes is rather 
broader (albeit in a quite specific way) compared to what 
"announcer" is in the English-speaking world.

Daijr, GG5, etc. GN-grams:
アナウンサー	1609072
アナウンサ	7888

Better to keep the アナウンサ.
I think that extended gloss would be better as a distinct sense. All the dictionary refs just have the vanilla announcer, and I'm sure I've seen/heard アナウンサーs doing the regular job.

@@ -8,0 +9,4 @@
+<r_ele>
+<reb>アナウンサ</reb>
+<re_inf>&ik;</re_inf>
+</r_ele>
@@ -11 +15 @@
-<gloss>(in-house) announcer (who also frequently functions as a television talent doing on-location fluff pieces for variety shows)</gloss>
+<gloss>announcer</gloss>
@@ -15 +19,4 @@
-<gloss>television talent</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>in-house television talent who does on-location fluff pieces for variety shows</gloss>

Because there are differences. ドラフト doesn't refer to a military draft, for example.

@@ -20,0 +21,5 @@
+<gloss>draught (beer)</gloss>
+<gloss>draft</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>

also draft beer, etc.  honestly, i don't know what is gained by enumerating these senses for a j-e where the appropriate translation is "draft" in every single case.

daij, gg5

"Draft" has lots of meanings. ドラフト only refers to a selection of them.

@@ -9,0 +10,5 @@
+<field>&sports;</field>
+<gloss>draft (esp. in baseball)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -10,0 +16,6 @@
+<gloss>rough copy</gloss>
+<gloss>rough sketch</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>draft (air current)</gloss>

Done

gg5
ひっきりなし	30,742		
ひっきりなしに	139,193		
ひっきりなしの	4,717		
ひっきりなしな	628

Might be worth having a separate ひっきりなしに entry for the adverbial glosses.

@@ -38,0 +39 @@
+<pos>&adj-no;</pos>
@@ -40 +40,0 @@
-<pos>&adj-no;</pos>
@@ -42,3 +42,5 @@
-<gloss>continually</gloss>
-<gloss>continuously</gloss>
-<gloss>incessantly</gloss>
+<s_inf>usu. adverbially as 〜に</s_inf>
+<gloss>continuous</gloss>
+<gloss>continual</gloss>
+<gloss>unceasing</gloss>
+<gloss>incessant</gloss>

Google N-gram Corpus Counts
╭─ーーーーーー─┬────────┬───────╮
│ 引っ切り無し │  7,689 │ 18.1% │ (daijr/s, obunsha, iwakoku, koj, smk)
│ 引っ切りなし │  1,589 │  3.7% │ add sK (sankoku)
│ ひっきり無し │  1,092 │  2.6% │ add sK
│ 引切り無し　 │    872 │  2.1% │ add, sK (iwakoku, smk, saito)
│ 引っきりなし │    391 │  0.9% │ add sK
│ 引切りなし　 │     90 │  0.2% │ add, sK
│ 引っきり無し │     28 │  0.1% │ add, sK (ruigo reikai)
│ 引切無し　　 │      0 │  0.0% │ add, sK (shinkoku, smk)
│ 引っ切無し　 │      0 │  0.0% │ (smk)
│ ひっきりなし │ 30,742 │ 72.3% │ (meikyo, gg5)
╰─ーーーーーー─┴────────┴───────╯

there's also the outdated reading ひききりなし, probably not worth adding

@@ -8,0 +9 @@
+<ke_inf>&sK;</ke_inf>
@@ -11,0 +13,5 @@
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>引切り無し</keb>
+<ke_inf>&sK;</ke_inf>
@@ -14,0 +21,13 @@
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>引切りなし</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>引っきり無し</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>引切無し</keb>
+<ke_inf>&sK;</ke_inf>

gg5
G n-grams:
 ひっきりなし	30742
 引っ切り無し	 7689
 引っ切りなし	 1589
 ひっきり無し	 1092
 引っきりなし	  391

@@ -7,0 +8,3 @@
+<keb>引っ切りなし</keb>
+</k_ele>
+<k_ele>
@@ -8,0 +12,3 @@
+</k_ele>
+<k_ele>
+<keb>引っきりなし</keb>
@@ -14,0 +21 @@
+<pos>&adj-no;</pos>
@@ -18,0 +26 @@
+<gloss>without interruption</gloss>

gg5, daij
jwiki: "「奥付」は「奥附」とも書くが[4]、「附」の字が1954年の当用漢字補正案で「削る字」とされたため現在でも多くのマスコミが使用を避けている"

奥附 isn't used any more. Not in the refs either.
I really don't think we need all these glosses.

@@ -8,0 +9 @@
+<ke_inf>&oK;</ke_inf>
@@ -19,5 +20,3 @@
-<gloss>colophon</gloss>
-<gloss>publication data</gloss>
-<gloss>production notes</gloss>
-<gloss>printer's mark</gloss>
-<gloss>publisher's emblem</gloss>
+<gloss>colophon (at the end of a book)</gloss>
+<gloss>imprint</gloss>
+<gloss>publication information</gloss>

i'd tend to say yes.  not in a single other ref (inc. gg5, which prog is kind of drawn from), not in my IME, etc.

奥付け is the only surface form listed in prog - is it 
necessarily io?

original version is io

@@ -4,3 +4,0 @@
-<k_ele>
-<keb>奥付け</keb>
-</k_ele>
@@ -12,0 +9,4 @@
+</k_ele>
+<k_ele>
+<keb>奥付け</keb>
+<ke_inf>&io;</ke_inf>

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

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

Daijr, GG5, etc. N-grams.

@@ -7,0 +8,3 @@
+</k_ele>
+<k_ele>
+<keb>横づけ</keb>
@@ -16,0 +20 @@
+<gloss>bringing alongside (ship, vehicle, etc.)</gloss>
@@ -17,0 +22 @@
+<gloss>mooring</gloss>

gg5, daij

Added sense.

@@ -21,0 +22,5 @@
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1208140">割烹店</xref>
+<gloss>(Japanese) restaurant</gloss>
+</sense>

Saw this 交ぜ書き form (not a surprise, as 烹  is not 常用.)

@@ -8,0 +8,3 @@
+</k_ele>
+<k_ele>
+<keb>割ぽう</keb>

@@ -22 +22 @@
-<xref type="see" seq="1839140">岩壁・がんぺき</xref>
+<xref type="see" seq="1839140">岩壁</xref>

Koj, Daijr/s

Trimming

@@ -23,3 +23,2 @@
-<gloss>steep cliff along the coast</gloss>
-<gloss>cliff wall at shoreline</gloss>
-<gloss>steep seabank</gloss>
+<gloss>wall-like shoreline</gloss>
+<gloss>cliff wall</gloss>

@@ -24,0 +25 @@
+<gloss>steep seabank</gloss>

大辞泉

@@ -23,2 +23,2 @@
-<gloss>steep cliff</gloss>
-<gloss>cliff wall</gloss>
+<gloss>steep cliff along the coast</gloss>
+<gloss>cliff wall at shoreline</gloss>

@@ -21,0 +22 @@
+<xref type="see" seq="1839140">岩壁・がんぺき</xref>

@@ -20 +20 @@
-<s_inf>used mainly in letters</s_inf>
+<s_inf>used mainly in letters or email</s_inf>

取り急ぎ	275,310	93.9%	
とり急ぎ	13,841	4.7%	
取急ぎ	4,156	1.4%

@@ -8,0 +9 @@
+<ke_inf>&sK;</ke_inf>
@@ -11,0 +13 @@
+<ke_inf>&sK;</ke_inf>
@@ -18 +20 @@
-<s_inf>often used in letters, e.g. in an opening phrase</s_inf>
+<s_inf>used mainly in letters</s_inf>

* meikyo/oukoku: とりあえず急いで…
* sankoku: ②〔俗〕とりあえず。

Some web pages suggest 一旦/まずは as alternatives in business contexts.

Google N-gram Corpus Counts
╭─ーーーー─┬─────────┬───────╮
│ 従う　　 │ 747,219 │ 95.2% │
│ 随う　　 │   6,111 │  0.8% │ - rK (daijr/s, koj, meikyo)
│ 順う　　 │   3,510 │  0.4% │ - rK (daijs, koj, meikyo)
│ 遵う　　 │     514 │  0.1% │ - rK (daijs, meikyo)
│ 從う　　 │     811 │  0.1% │ - sK (itaiji for 従)
│ 隨う　　 │     102 │  0.0% │ - sK (itaiji for 随)
│ したがう │  26,496 │  3.4% │
╰─ーーーー─┴─────────┴───────╯

@@ -11,0 +12 @@
+<ke_inf>&rK;</ke_inf>
@@ -14,0 +16 @@
+<ke_inf>&rK;</ke_inf>
@@ -17,0 +20 @@
+<ke_inf>&rK;</ke_inf>
@@ -21 +24 @@
-<ke_inf>&oK;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -25 +28 @@
-<ke_inf>&oK;</ke_inf>
+<ke_inf>&sK;</ke_inf>

meikyo, kanjigen

@@ -14,0 +15,3 @@
+</k_ele>
+<k_ele>
+<keb>遵う</keb>

daij, gg5, prog

Added senses. Some refs split even more finely but I think this is sufficient.
從う is [oK], not [iK].

@@ -17 +17 @@
-<keb>隨う</keb>
+<keb>從う</keb>
@@ -21,2 +21,2 @@
-<keb>從う</keb>
-<ke_inf>&iK;</ke_inf>
+<keb>隨う</keb>
+<ke_inf>&oK;</ke_inf>
@@ -33,2 +33,2 @@
-<gloss>to abide (by the rules)</gloss>
-<gloss>to obey</gloss>
+<gloss>to obey (an order, law, etc.)</gloss>
+<gloss>to abide by (a rule, custom, etc.)</gloss>
@@ -35,0 +36,8 @@
+<gloss>to observe</gloss>
+<gloss>to conform to</gloss>
+<gloss>to yield to</gloss>
+</sense>
+<sense>
+<pos>&v5u;</pos>
+<pos>&vi;</pos>
+<gloss>to follow (a person)</gloss>
@@ -36,0 +45,13 @@
+<gloss>to go with</gloss>
+</sense>
+<sense>
+<pos>&v5u;</pos>
+<pos>&vi;</pos>
+<gloss>to go alongside (e.g. a river)</gloss>
+<gloss>to follow (e.g. a sign)</gloss>
+</sense>
+<sense>
+<pos>&v5u;</pos>
+<pos>&vi;</pos>
+<gloss>to serve (as)</gloss>
+<gloss>to engage in (work)</gloss>

旧字

@@ -14,1 +14,1 @@
-<keb>隨う</keb>
+<keb>順う</keb>
@@ -17,1 +17,2 @@
-<keb>順う</keb>
+<keb>隨う</keb>
+<ke_inf>&oK;</ke_inf>

Goi Taikei

That's probably better.

@@ -11,0 +12 @@
+<gloss>street cleaner</gloss>

This isn't in the refs but Google image results suggest it means "(male) street cleaner".

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

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

seems ok to me

daijr: "機械・建築物・工作物などを製作するため，その形や大きさを書き表した図面を製作すること"

GG5 has "cartography" but I think it's misleading.

@@ -15,2 +15 @@
-<gloss>draughtsmanship</gloss>
-<gloss>draftsmanship</gloss>
+<gloss>drafting</gloss>
@@ -18,3 +16,0 @@
-<gloss>sketching</gloss>
-<gloss>mapmaking</gloss>
-<gloss>cartography</gloss>

ok

gg5, prog, daijs

I'm only seeing two senses here.

@@ -14,4 +13,0 @@
-</sense>
-<sense>
-<pos>&v5g;</pos>
-<pos>&vt;</pos>
@@ -19,4 +14,0 @@
-</sense>
-<sense>
-<pos>&v5g;</pos>
-<pos>&vt;</pos>
@@ -28 +20 @@
-<gloss>to graft (trees)</gloss>
+<gloss>to graft (onto a tree)</gloss>

@@ -42 +42 @@
-<gloss>open spot</gloss>
+<gloss>opening</gloss>

daijs: 活動などの盛んでない部分。「景気の―」「福祉の―」
meikyo: 高いものにはさまれた狭い所、また、盛んな活動にはさまれて取り残された部分などのたとえにも使う。「ビル［景気］の━」
shinmeikai: 好景気の―〔＝及ばない所。…から取り残された所〕」
prog: 彼らは人生の谷間を歩いてきた  They have experienced the seamy side of life.
Genius: 仕事の谷間は休みを取りやすい It's easy to take time off when work lets up.
        監督は彼がローテーションの谷間を埋めてくれるのではと期待している The manager expects him to fill one open spot in the rotation.

Difficult to translate. It's used in all sorts of contexts.

@@ -24,0 +25 @@
+<gloss>gorge</gloss>
@@ -26 +26,0 @@
-<gloss>dell</gloss>
@@ -28,0 +29 @@
+<stagr>たにま</stagr>
@@ -30 +31 @@
-<gloss>cleavage (between breasts)</gloss>
+<gloss>cleavage (of breasts)</gloss>
@@ -32,0 +34 @@
+<stagr>たにま</stagr>
@@ -34 +36 @@
-<gloss>left-behind place (e.g. slum)</gloss>
+<gloss>part or place that has been left behind</gloss>
@@ -35,0 +38,5 @@
+<gloss>bottom (of society)</gloss>
+<gloss>(economic) trough</gloss>
+<gloss>gap (in activity, one's work, etc.)</gloss>
+<gloss>lull</gloss>
+<gloss>open spot</gloss>

中辞典: 〈取り残された所〉

Maybe this?

@@ -34 +34,2 @@
-<gloss>slum</gloss>
+<gloss>left-behind place (e.g. slum)</gloss>
+<gloss>blind spot</gloss>

Is "slum" really a good gloss for sense 3? 
Chujiten does have
_社会の谷間_で生きる
live in a slum area [in the slums]

but also

福祉行政の谷間
a blind spot in the welfare policy.

it seems more abstract to me? "outside (of normal society, etc.); blind spot; gap; void; rift"

@@ -30 +30 @@
-<gloss>cleavage (breasts)</gloss>
+<gloss>cleavage (between breasts)</gloss>

@@ -12 +12 @@
-<ke_inf>&io;</ke_inf>
+<ke_inf>&sK;</ke_inf>

Google N-gram Corpus Counts

恥ずかしい	4028362	97.4%
恥かしい	97888	2.4%
恥しい	7973	0.2%
羞ずかしい	281	0.0%
羞しい	405	0.0%
羞かしい	192	0.0%

@@ -16 +16 @@
-<ke_inf>&io;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -20 +20 @@
-<ke_inf>&rK;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -24,2 +24 @@
-<ke_inf>&io;</ke_inf>
-<ke_inf>&rK;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -29,2 +28 @@
-<ke_inf>&io;</ke_inf>
-<ke_inf>&rK;</ke_inf>
+<ke_inf>&sK;</ke_inf>

I'm not sure that really fits. Resubmit with references/examples.

@@ -44 +43,0 @@
-<gloss>flustered</gloss>

@@ -43,0 +44 @@
+<gloss>flustered</gloss>

恥ずかしい	4028362
恥かしい	97888
恥しい	7973
羞ずかしい	281
羞しい	405
羞かしい	192

@@ -19,0 +20 @@
+<ke_inf>&rK;</ke_inf>
@@ -23,0 +25 @@
+<ke_inf>&rK;</ke_inf>
@@ -27,0 +30 @@
+<ke_inf>&rK;</ke_inf>

GG5, etc.

Sense [2] doesn't necessarily seem to be about an enemy

I think "rubbing salt" is typically how this is expressed

@@ -42 +41,0 @@
-<gloss>additional attack on a weakened enemy</gloss>
@@ -43,0 +43 @@
+<gloss>rubbing salt into a wound</gloss>

Yes.

@@ -5,0 +6,2 @@
+<ke_pri>news1</ke_pri>
+<ke_pri>nf16</ke_pri>
@@ -9,2 +10,0 @@
-<ke_pri>news1</ke_pri>
-<ke_pri>nf16</ke_pri>

╭─ーーーー─┬───────╮
│ 追いうち │ 3,571 │
╰─ーーーー─┴───────╯

Should the priority tag be moved?

@@ -13,0 +14,4 @@
+</k_ele>
+<k_ele>
+<keb>追いうち</keb>
+<ke_inf>&sK;</ke_inf>

I think they can.

@@ -16,0 +17 @@
+<ke_inf>&sK;</ke_inf>
@@ -19,0 +21 @@
+<ke_inf>&sK;</ke_inf>
@@ -22,0 +25 @@
+<ke_inf>&sK;</ke_inf>

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

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

gg5, prog

@@ -17,0 +18 @@
+<gloss>joining (a group, team, etc.)</gloss>

@@ -16,0 +17 @@
+<xref type="ant" seq="1779180">退団</xref>

typo fix

@@ -55 +55 @@
-<gloss>to rattle of (e.g. a joke)</gloss>
+<gloss>to rattle off (e.g. a joke)</gloss>

Got it. It will go live next week.

That sentence still needs updating (sense 6 -> sense 2).

the new senses 5 & 6 seem pretty close

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

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

e.g. for the first sense could probably be ditched altogether

GG5, 中辞典, etc.

Not only in  the air.

@@ -17 +17,4 @@
-<gloss>floating (in the air)</gloss>
+<gloss>floating (e.g. in air, water)</gloss>
+<gloss>floatation</gloss>
+<gloss>buoyancy</gloss>
+<gloss>buoying up (e.g. economy)</gloss>

無駄	7345062
ムダ	1600823
無駄な	1874553
ムダな	166755

Worth including? I've seen it written like this a few times. We also have 「ムダ毛」.

@@ -19,0 +20,4 @@
+<r_ele>
+<reb>ムダ</reb>
+<re_nokanji/>
+</r_ele>

Let's close this for now. If we want to move adj-na to the front we can do so later (pending the results of the discussion on the 
mailing list).

@@ -20,0 +21 @@
+<pos>&n;</pos>
@@ -22,8 +22,0 @@
-<gloss>futile</gloss>
-<gloss>wasteful</gloss>
-<gloss>useless</gloss>
-<gloss>pointless</gloss>
-<gloss>vain</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>

a topic for the mailing list?

I don't like splitting adj-na/n here because it's very inconsistent with how we usually format our entries. If we decided to always 
split out the various PoS (like GG5 does) that'd be one thing, but as we haven't, I don't really see how this is a special case that 
warrants splitting.
On glossing a single sense like an adj-na or n, I don't have a strong opinion but I don't have an issue with basing it on the most 
common usage. I do feel this is something that needs to be properly formalize in our editing guidelines though, instead of relying 
on editors being aware of "what we usually do in these cases."

no activity on this in ages.  implemented as suggested

@@ -10,3 +9,0 @@
-<k_ele>
-<keb>木造り</keb>
-</k_ele>
@@ -15 +11,0 @@
-<re_restr>木造</re_restr>
@@ -19,3 +14,0 @@
-</r_ele>
-<r_ele>
-<reb>きづくり</reb>
@@ -30,6 +22,0 @@
-<sense>
-<stagr>きづくり</stagr>
-<pos>&n;</pos>
-<misc>&arch;</misc>
-<gloss>gardener</gloss>
-</sense>

yeah, we generally use daijr/daijs as our okurigana standard, so i'd say probably don't merge but rather add 木造 as [io] to the 木造り entry

GG5 is the only ref which has 木造り without the okurigana. Not sure these should be combined.
I think sense 2 is [arch] rather than [obsc].

@@ -33 +33 @@
-<misc>&obsc;</misc>
+<misc>&arch;</misc>

Daijr (sense 2), GG5, ルミナス
木造り	43381
木造	1783551
きづくり	8045
もくぞう	7378
木造りの	25817
木造の	229623

Cancelled  2835075 proposal.

@@ -9,0 +10,3 @@
+<k_ele>
+<keb>木造り</keb>
+</k_ele>
@@ -11,0 +15 @@
+<re_restr>木造</re_restr>
@@ -14,0 +19,3 @@
+</r_ele>
+<r_ele>
+<reb>きづくり</reb>
@@ -20,0 +28,7 @@
+<gloss>wooden construction</gloss>
+</sense>
+<sense>
+<stagr>きづくり</stagr>
+<pos>&n;</pos>
+<misc>&obsc;</misc>
+<gloss>gardener</gloss>

gg5

@@ -18,0 +19,3 @@
+<gloss>plain</gloss>
+<gloss>prairie</gloss>
+<gloss>moor</gloss>

I think "kid" is too broad.

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

@@ -19,0 +20 @@
+<gloss>toddler</gloss>

wiki "The term "infant" is typically applied to young children between one month and one year of age"

I called an 9 month baby a 幼児 (in a casual conversation without any legal aspect to it) and the mother protested he's still a 乳児

@@ -18,3 +18,2 @@
-<gloss>infant</gloss>
-<gloss>baby</gloss>
-<gloss>child</gloss>
+<gloss>young child</gloss>
+<gloss>kid</gloss>

gg5, prog

Glosses to singular form.

@@ -18,2 +18,4 @@
-<gloss>tools</gloss>
-<gloss>implements</gloss>
+<gloss>tool</gloss>
+<gloss>implement</gloss>
+<gloss>instrument</gloss>
+<gloss>equipment</gloss>

daij, gg5

@@ -16 +16 @@
-<gloss>cold-weather damage</gloss>
+<gloss>cold-weather damage (to crops)</gloss>

G n-grams
 麝香      	22561
 じゃこう  	20227
 ジャコウ  	18814
-------------------------
　麝香の香り	1097
 ジャコウの香り	　813
 じゃこうの香り	　154

@@ -9,0 +10,4 @@
+<r_ele>
+<reb>ジャコウ</reb>
+<re_nokanji/>
+</r_ele>
@@ -12,0 +17 @@
+<misc>&uk;</misc>

@@ -32,0 +33 @@
+<misc>&on-mim;</misc>

Certainly the いらいら+する family dominates, but I wonder if this should perhaps be a case where the noun should dominate the POS ordering and glosses. GG5 leads with noun glosses followed by a ~する batch. As usual 中辞典 just has いらいらする. Daijirin has two sense tagged "（副） スル" and "（ 名 ）". Interesting that it classes the adverb form as the base for the する. There are 61 examples sentences and ALL are for いらいら+する in various forms.

G n-grams:
 いらいら 	364134	  
 いらいらし	160971
 いらいらする	 78795	 
 いらいらさ	 13816	 
 いらいらが	  7766
 いらいらを	  4563	      
 いらいらも	  3685	
 いらいらの	  3538   
 いらいらは	  3181

n/vs should basically never be phrased as a verb.  it's confusing

I think Rene's suggestion in 2010 to move ichi1 to 絨毯 makes the most sense. 絨緞 doesn't need a freq tag.

@@ -6 +6 @@
-<ke_pri>spec1</ke_pri>
+<ke_pri>ichi1</ke_pri>
@@ -11 +10,0 @@
-<ke_pri>ichi2</ke_pri>
@@ -19,2 +18 @@
-<re_pri>ichi2</re_pri>
-<re_pri>spec1</re_pri>
+<re_pri>ichi1</re_pri>

Regarding Rene's objection in the comments below, this info is found in the JMdict XML file:
>> The entries marked "ichi2" were demoted from ichi1 because they were observed to have low frequencies in the WWW and newspapers.

Google N-gram Corpus Counts
╭─ーーーーー─┬─────────┬───────╮
│ 絨毯　　　 │ 565,970 │ 58.4% │
│ 絨緞　　　 │   7,009 │  0.7% │ - rK, demoting to ichi2
│ 絨氈　　　 │     753 │  0.1% │ - [iK] to [sK]
│ じゅうたん │ 348,340 │ 36.0% │
│ ジュータン │  28,699 │  3.0% │
│ ジュウタン │  17,752 │  1.8% │ - [nokanji] to [sk]
╰─ーーーーー─┴─────────┴───────╯

@@ -10 +10,2 @@
-<ke_pri>ichi1</ke_pri>
+<ke_inf>&rK;</ke_inf>
+<ke_pri>ichi2</ke_pri>
@@ -14 +15 @@
-<ke_inf>&iK;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -18 +19 @@
-<re_pri>ichi1</re_pri>
+<re_pri>ichi2</re_pri>
@@ -27 +28 @@
-<re_nokanji/>
+<re_inf>&sk;</re_inf>

I don't think the chiefs/Indians idiom is racist, but I also don't think it fits the Japanese that well. I've added an alternative English translation, which will take effect next week.

この
そしき
組織は
かんぶ
幹部ばかり
な
名を
つらね
連ねているのではたして
けってい
決定を
くだ
下せるのかあやしいものだ。Since in this organization they're all chiefs and no Indians, it's a wonder any decisions get made.

The translation of this example sentence contains a racist reference, not included in the original text. It could be changed to read "managers" and 
"workers" to be less offensive, and arguably more accurate.

i partially agree, however the usage/meaning is less clear without

prog

I don't think we should have question marks in glosses (unless it's a complete sentence).

@@ -24 +23,0 @@
-<gloss>as a result</gloss>
@@ -28,2 +27,4 @@
-<gloss>really? (in questions)</gloss>
-<gloss>ever?</gloss>
+<s_inf>used in interrogative and hypothetical sentences</s_inf>
+<gloss>really</gloss>
+<gloss>actually</gloss>
+<gloss>ever</gloss>

冷奴	230870	69.8%
冷や奴	60148	18.2%
冷やっこ	22662	6.9%
冷ややっこ	7738	2.3%
ひややっこ	9385	2.8%

@@ -11,0 +12 @@
+<ke_inf>&sK;</ke_inf>
@@ -14,0 +16 @@
+<ke_inf>&sK;</ke_inf>

@@ -21 +21,2 @@
-<gloss>cold tofu</gloss>
+<field>&food;</field>
+<gloss>cold tofu (served with condiments)</gloss>

G n-grams:
冷や奴	60148
ひややっこ	9385
冷奴	230870
冷ややっこ	7738
冷やっこ	22662

Extra forms. It's usually served with soy and grated daikon, onion, ginger, etc.

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>冷奴</keb>
+</k_ele>
@@ -8 +11,4 @@
-<keb>冷奴</keb>
+<keb>冷やっこ</keb>
+</k_ele>
+<k_ele>
+<keb>冷ややっこ</keb>

I think [rK] is better for Meiji period things (so it's aligned with how we use [arch])

@@ -26 +26 @@
-<ke_inf>&oK;</ke_inf>
+<ke_inf>&rK;</ke_inf>

I'm comfortable with it being "oK" instead.

@@ -26 +26 @@
-<ke_inf>&iK;</ke_inf>
+<ke_inf>&oK;</ke_inf>

良い	107910497	99.4%
善い	151937	0.1%
好い	417612	0.4%
佳い	21884	0.0%
吉い	4341	0.0%
宜い	1645	0.0%

良くない	2745800	99.6%
善くない	5404	0.2%
好くない	4765	0.2%
佳くない	286	0.0%
吉くない	0	0.0%
宜くない	49	0.0%


not sure 宜い is really iK rather than old and obscure? Several Meiji-period examples on kotobank e.g. 福沢先生浮世談（1898）〈福沢諭吉〉「茶の湯をさせるが宜い、花を活けさせるが宜い

@@ -10,0 +11,3 @@
+<keb>好い</keb>
+</k_ele>
+<k_ele>
@@ -14,3 +16,0 @@
-<keb>好い</keb>
-</k_ele>
-<k_ele>
@@ -17,0 +18 @@
+<ke_inf>&rK;</ke_inf>
@@ -20,0 +22 @@
+<ke_inf>&rK;</ke_inf>

daij, meikyo

@@ -68,0 +69,6 @@
+</sense>
+<sense>
+<pos>&suf;</pos>
+<pos>&adj-i;</pos>
+<s_inf>after the -masu stem of a verb</s_inf>
+<gloss>easy to ...</gloss>

gg5, chujiten
長めの	374068
長めな	44027

@@ -13,0 +14 @@
+<pos>&adj-no;</pos>
@@ -15 +15,0 @@
-<pos>&adj-no;</pos>
@@ -19,0 +20,2 @@
+<gloss>somewhat long</gloss>
+<gloss>fairly long</gloss>

daij

matching 短め

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

daij

Split sense 1.
I think these are better glosses for sense 3.

@@ -17,2 +17,5 @@
-<gloss>brunt</gloss>
-<gloss>target</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>target of a flying arrow</gloss>
+<gloss>brunt (of an attack)</gloss>
@@ -23,2 +26,2 @@
-<gloss>being about to</gloss>
-<gloss>being on the point of</gloss>
+<gloss>the very moment (when)</gloss>
+<gloss>the point (of doing)</gloss>

daij, gg5

Added sense.

@@ -12 +11,0 @@
-<pos>&vs;</pos>
@@ -16,0 +16,5 @@
+<sense>
+<pos>&n;</pos>
+<gloss>rounding the edges (of a vegetable)</gloss>
+<gloss>trimming the corners</gloss>
+</sense>

Certainly isn't.
Not exp either.

@@ -20 +19,0 @@
-<pos>&exp;</pos>

https://yoji.jitenon.jp/cat/search.php?getdata=抜足差足

Doesn't appear to be yoji

@@ -22 +21,0 @@
-<misc>&yoji;</misc>

G n-grams:
 抜き足差し足	7131
 ぬき足さし足	 459
 抜き足さし足	 219
 抜足差足 	  23
 ぬきあしさしあし	 527

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>ぬき足さし足</keb>

G n-grams

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>抜き足さし足</keb>

G n-grams: usually followed by a particle

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

G n-grams:
小股	15928
小また	2699

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>小また</keb>

GG5

Splitting senses

@@ -12,0 +12,5 @@
+<gloss>short steps</gloss>
+<gloss>mincing stride</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -13,1 +18,2 @@
-<gloss>short steps</gloss>
+<gloss>groin</gloss>
+<gloss>thigh</gloss>

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

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

daij

@@ -17 +17,2 @@
-<gloss>leaving a group or troupe</gloss>
+<xref type="ant" seq="1466530">入団</xref>
+<gloss>leaving (a group, team, etc.)</gloss>

gg5

@@ -19,0 +20 @@
+<gloss>to blow across</gloss>

nikk

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

@@ -6,0 +6,6 @@
+</k_ele>
+<k_ele>
+<keb>吹きぬける</keb>
+</k_ele>
+<k_ele>
+<keb>吹抜ける</keb>

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>板きれ</keb>

gg5

Not [yoji]. Doesn't appear to be [adj-no].

@@ -12,2 +11,0 @@
-<pos>&adj-no;</pos>
-<misc>&yoji;</misc>
@@ -14,0 +13 @@
+<gloss>nonperforming loan</gloss>

Kanji Haitani list

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

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

prog, chujiten

@@ -31,0 +32 @@
+<gloss>shortish</gloss>

????  daij has it as a noun

@@ -29,0 +30 @@
+<pos>&n;</pos>

gg5 koj daijs G-ngrams

@@ -28 +28,2 @@
-<pos>&n;</pos>
+<pos>&adj-no;</pos>
+<pos>&adj-na;</pos>

Not a computing term

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

Added additional dotted reading(s) via batch update.Added additional dotted reading(s) via batch update.
-*- via bulkupd.py -*-

@@ -6,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>オンライン・ゲーム</reb>

@@ -13,3 +13,2 @@
-<xref type="see" seq="1102580">パラパラ・2</xref>
-<xref type="see" seq="1102580">パラパラ・2</xref>
-<gloss>to sprinkle (e.g. rain)</gloss>
+<xref type="see" seq="1102580">ぱらぱら・1</xref>
+<gloss>to sprinkle (of rain, etc.)</gloss>

gg5

intransitive, the rain might be the subject

@@ -14 +14 @@
-<gloss>to sprinkle (e.g. with rain)</gloss>
+<gloss>to sprinkle (e.g. rain)</gloss>

@@ -13,2 +13,2 @@
-<xref type="see" seq="1102580">パラパラ・1</xref>
-<xref type="see" seq="1102580">パラパラ・1</xref>
+<xref type="see" seq="1102580">パラパラ・2</xref>
+<xref type="see" seq="1102580">パラパラ・2</xref>

Whew!

@@ -23 +23 @@
-<pos>&unc;</pos>
+<pos>&cop;</pos>
@@ -25 +24,0 @@
-<s_inf>plain copula</s_inf>

Reopening.

I'm closing this off to reduce clutter, then reopening. I intend to get to adding some extra POS. etc. tags soon, and it can be fixed up then.

Also though changing the PoS abbreviation from [cop-da] to [cop] might be ideal, I wouldn't have a problem redefining [cop-da] to 
mean "the da copula" to "copula (such as the da copula)" - it's all about how we choose to describe it, isn't it?

Should we mabe consider changing cop-da to 
cop? What's the point of specifying it's "-da" 
in the PoS in the first place?

小股の切れ上がった	2454	89.9%
小股のきれ上がった	0	0.0%
小股の切れあがった	218	8.0%
小股のきれあがった	58	2.1%

@@ -5,0 +6,4 @@
+</k_ele>
+<k_ele>
+<keb>小股の切れあがった</keb>
+<ke_inf>&sK;</ke_inf>
@@ -13 +17 @@
-<gloss>(of a woman) slender and smartly shaped</gloss>
+<gloss>slender and smartly shaped (of a woman)</gloss>

小股の切れ上がった	2454
小股が切れ上がった	228

Sharp eyes.

@@ -8 +8 @@
-<reb>こまたがきれあがった</reb>
+<reb>こまたのきれあがった</reb>

kanji has の, reading が?

Agree. No sound clip.

@@ -5 +5 @@
-<keb>小股が切れ上がる</keb>
+<keb>小股の切れ上がった</keb>
@@ -8 +8 @@
-<reb>こまたがきれあがる</reb>
+<reb>こまたがきれあがった</reb>
@@ -12,2 +12,2 @@
-<pos>&v5r;</pos>
-<gloss>(of a woman) to be slender and smartly shaped</gloss>
+<pos>&adj-f;</pos>
+<gloss>(of a woman) slender and smartly shaped</gloss>

G n-grams:
小股の切れ上がった	2454
小股が切れ上がった	228
小股の切れ上がる	No matches
小股が切れ上がる	120

I suggest changing this to [adj-f] - 小股の切れ上がった

vs-c is for サ変 verbs that end in す rather than する

What does vs-c mean?
How does a vs-c verb differ (morphologically or syntactically) from a v5s verb?
(The definition "su verb - precursor to the modern suru" is not very helpful.)

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

Entry created

OK

daij, koj

I don't think there's two senses here.

@@ -15,6 +15,2 @@
-<gloss>(a) gathering</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>sorting</gloss>
-<gloss>collating</gloss>
+<gloss>collation of sections (bookbinding)</gloss>
+<gloss>gathering</gloss>

Entry created

Far less common than ネトゲ.

Not a technical term

@@ -13 +12,0 @@
-<field>&comp;</field>
@@ -14,0 +14 @@
+<misc>&sl;</misc>

ngrams 
オンゲー	48
オンゲ	33

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>オンゲ</reb>

https://ja.wikipedia.org/wiki/オンラインゲーム

2nd sense from 1534740

@@ -20,0 +21,5 @@
+<sense>
+<pos>&n;</pos>
+<misc>&arch;</misc>
+<gloss>gardener</gloss>
+</sense>

resurrecting.  see comments on 木造

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

Withdrawing this and proposing a merge.

Daijr, GG5, ルミナス. N-grams 43381

Possible merge with 1534740.

ＫＯＤ追加語彙

oops

@@ -16 +15,0 @@
-<re_restr>胡麻粒</re_restr>
@@ -20,0 +20 @@
+<re_restr>胡麻粒</re_restr>

www-images
G n-grams
 ゴマ粒	9178
 ごま粒	2112
 胡麻粒	1280
 ごまつぶ	1355
 ゴマつぶ	 450

not in the refs
cf 芥子粒

Eijiro, GG5 examples

chujiten
ngrams 
理解に苦しむ	5262

ＫＯＤ追加語彙, 中辞典

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

I think this is the correct translation.

Daijr, https://en.wikipedia.org/wiki/Taijitu

@@ -11,0 +12 @@
+<lsource xml:lang="chi"/>
@@ -12,0 +14 @@
+<gloss>cosmic dual forces symbol</gloss>

wiki

@@ -17 +17 @@
-<gloss>Angelica ursina</gloss>
+<gloss>Angelica ursina (species of perennial herb)</gloss>

GG5. N-grams:
蝦夷にゅう	45
えぞにゅう	52
エゾニュウ	742

@@ -3,0 +4,6 @@
+<k_ele>
+<keb>蝦夷にゅう</keb>
+</k_ele>
+<r_ele>
+<reb>えぞにゅう</reb>
+</r_ele>
@@ -5,0 +12 @@
+<re_nokanji/>
@@ -8,0 +16 @@
+<misc>&uk;</misc>

https://ja.wikipedia.org/wiki/エゾニュウ
http://www.forest-akita.jp/data/sansai/17-ezonew/ezonew.html

Plant (no common name).

gg5, prog

ＫＯＤ追加語彙

https://www.weblio.jp/content/無脂乳固形分