prog

@@ -7,0 +8 @@
+<pos>&adj-no;</pos>

daij
G n-grams:
コンサーバティブ	871
コンサバティブ	11981

コンサバティブ is more common.

@@ -4,0 +5,3 @@
+<reb>コンサバティブ</reb>
+</r_ele>
+<r_ele>
@@ -7,3 +9,0 @@
-<r_ele>
-<reb>コンサバティブ</reb>
-</r_ele>
@@ -10,0 +11 @@
+<pos>&adj-na;</pos>
@@ -12 +13 @@
-<pos>&adj-na;</pos>
+<xref type="ant" seq="1117130">プログレッシブ</xref>

@@ -7,0 +7,3 @@
+<r_ele>
+<reb>コンサバティブ</reb>
+</r_ele>
@@ -9,0 +12,1 @@
+<pos>&adj-na;</pos>

@@ -16 +16 @@
-<xref type="see" seq="1730060">日本工業規格</xref>
+<xref type="see" seq="2842035">日本産業規格</xref>

@@ -16,2 +16,2 @@
-<field>&comp;</field>
-<gloss>Japanese Industrial Standard</gloss>
+<xref type="see" seq="1730060">日本工業規格</xref>
+<gloss>Japanese Industrial Standards</gloss>

GG5 (has ジェーアイエス entry pointing to ＪＩＳ/ジス. Daijr's online system points ジェーアイエス to ジス.

@@ -10,0 +11,3 @@
+<r_ele>
+<reb>ジェーアイエス</reb>
+</r_ele>

@@ -14 +14 @@
-<gloss>NOR (boolean operator)</gloss>
+<gloss>NOR (Boolean operator)</gloss>

@@ -13 +13 @@
-<field>&comp;</field>
+<field>&logic;</field>

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

OK

@@ -9,0 +10 @@
+<xref type="ant" seq="1052000">コンサバティブ</xref>

daijr

@@ -7,0 +8 @@
+<pos>&adj-na;</pos>

Ho ho

this one is more accurate

@@ -33 +33 @@
-<gloss>link to previous post (e.g. in web forums)</gloss>
+<gloss>link back to discussion group, bulletin board, etc. posting</gloss>

https://en.wiktionary.org/wiki/安価

@@ -27,0 +28,6 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1019850">アンカー・6</xref>
+<misc>&net-sl;</misc>
+<gloss>link to previous post (e.g. in web forums)</gloss>

daij, gg5
G n-grams:
安価な	685789
安価を	6704
安価が	4437

Glosses to adjective form (to match 高価).
Added sense.

@@ -14,0 +15 @@
+<pos>&adj-na;</pos>
@@ -15,0 +17,6 @@
+<xref type="ant" seq="1283300">高価</xref>
+<gloss>low-priced</gloss>
+<gloss>cheap</gloss>
+<gloss>inexpensive</gloss>
+</sense>
+<sense>
@@ -17,4 +24,4 @@
-<pos>&adj-no;</pos>
-<xref type="ant" seq="1283300">高価</xref>
-<gloss>low price</gloss>
-<gloss>cheapness</gloss>
+<pos>&n;</pos>
+<gloss>shallow (e.g. sympathy)</gloss>
+<gloss>superficial</gloss>
+<gloss>cheap (e.g. government)</gloss>

copying from 机下

@@ -12 +11,0 @@
-<gloss>under the table</gloss>
@@ -14,0 +14,5 @@
+<sense>
+<pos>&n;</pos>
+<s_inf>orig. meaning</s_inf>
+<gloss>under the desk</gloss>
+</sense>

@@ -17,0 +18 @@
+<gloss>thoughtless</gloss>
@@ -19 +19,0 @@
-<gloss>thoughtless</gloss>

Google N-gram Corpus Counts
| 迂闊　 | 148,272 | 97.7% |
| 迂濶　 |   3,471 |  2.3% | <- apparently only in nikk
| うかつ | 193,892 |  N/A  |

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

thanks

@@ -21 +21 @@
-<gloss>inadvertant</gloss>
+<gloss>inadvertent</gloss>

G n-grams:
 鉛筆削り  	73570
 えんぴつ削り	 3327
 エンピツ削り	 2073
 えんぴつけずり	19260
 エンピツけずり	  131

@@ -6,0 +7,6 @@
+<k_ele>
+<keb>えんぴつ削り</keb>
+</k_ele>
+<k_ele>
+<keb>エンピツ削り</keb>
+</k_ele>
@@ -8,0 +15,6 @@
+<re_restr>鉛筆削り</re_restr>
+<re_restr>えんぴつ削り</re_restr>
+</r_ele>
+<r_ele>
+<reb>エンピツけずり</reb>
+<re_restr>エンピツ削り</re_restr>

Better.

gg5, daij

"area of Tokyo" isn't terribly helpful.

@@ -18 +18,2 @@
-<gloss>area in Tokyo</gloss>
+<gloss>Kasumigaseki</gloss>
+<gloss g_type="expl">district of Tokyo where most of Japan's government ministry offices are located</gloss>
@@ -22 +23,3 @@
-<gloss>Japanese government departments (euph)</gloss>
+<s_inf>metonymy</s_inf>
+<gloss>government ministries (of Japan)</gloss>
+<gloss>Japanese government bureaucracy</gloss>

gg5, prog

@@ -16 +16,2 @@
-<gloss>government administration office</gloss>
+<gloss>government and municipal offices</gloss>
+<gloss>public agencies</gloss>

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

daij, gg5

Also means "hard head" in the literal sense.

@@ -14 +14 @@
-<gloss>hard-headed person</gloss>
+<gloss>obstinate person</gloss>
@@ -16 +15,0 @@
-<gloss>obstinacy</gloss>
@@ -18,0 +18,4 @@
+<sense>
+<pos>&n;</pos>
+<gloss>hard head (like a rock)</gloss>
+</sense>

gg5, daij

Not an adjective.

@@ -14,4 +14,4 @@
-<pos>&adj-na;</pos>
-<pos>&adj-no;</pos>
-<gloss>inflexible person</gloss>
-<gloss>hardheadedness</gloss>
+<gloss>hard-headed person</gloss>
+<gloss>stubbornness</gloss>
+<gloss>obstinacy</gloss>
+<gloss>pigheadedness</gloss>

eij

@@ -16,0 +17 @@
+<gloss>hardheadedness</gloss>

Contrast rather than opposite.

@@ -18 +18 @@
-<xref type="ant" seq="1378380">清流</xref>
+<xref type="see" seq="1378380">清流</xref>

daijr, meikyo, shinmeikai, oukoku

@@ -17,0 +18 @@
+<xref type="ant" seq="1378380">清流</xref>

I agree with Robin. G n-grams = 54 is just noise.

@@ -9,3 +8,0 @@
-</k_ele>
-<k_ele>
-<keb>だく流</keb>

濁 is 常用漢字. I don't think だく流 is worth recording considering the extremely low n-gram counts (1:1400).

google n-gram
濁流	79017
だく流	54

@@ -8,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>だく流</keb>

G n-grams
 浸かっ	489177
 浸かり	199334
 浸かる	180733
 浸から	 17870
------------
 漬かっ	 73812
 漬かり	 32104
 漬かる	 18517
 漬から	  3294

The [spec2] tag should not be used this way.
It is *not* a lower prio version of [spec1],
the way [ichi2] is a lower prio version of [ichi1].
Items with [spec1], [spec2], [ich1], [news1] and [gai1] are marked as common,
while items with [ichi2], [news2] and [gai2] are not.
So despite the "2", [spec2] is a first level prio tag.
This is a source of confusion, and few third-party apps and sites get this right.
----
However, 浸かる is common enough for a [spec1].

@@ -6 +6 @@
-<ke_pri>spec2</ke_pri>
+<ke_pri>spec1</ke_pri>
@@ -19 +19 @@
-<re_pri>spec2</re_pri>
+<re_pri>spec1</re_pri>

つかる is in Koj 5th ed. as a kun reading. It's obviously rather marginal, but I'll add it to kanjidic.

i'm not sure it should be recorded.  it's not in daij, nor my kanji dictionary.  and kojien appears to have removed their kanwa jiten from newer editions.

regardless, 浸かる should get spec2 since the less common headword is tagged

@@ -5,0 +6 @@
+<ke_pri>spec2</ke_pri>
@@ -17,0 +19 @@
+<re_pri>spec2</re_pri>

koj (has つかる)

The kun-yomi つ.かる and つ.ける of 浸 are missing in KanjiDic

gg5

@@ -14,0 +15 @@
+<gloss>exhaustive</gloss>

seven strings not supported by any kokugo or encyclopedia

@@ -38 +38 @@
-<gloss g_type="expl">six- or seven-stringed native Japanese zither</gloss>
+<gloss g_type="expl">six-stringed native Japanese zither</gloss>

updating to match full form

@@ -35 +35,3 @@
-<gloss>six-stringed Japanese zither</gloss>
+<gloss>wagon</gloss>
+<gloss>yamatogoto</gloss>
+<gloss g_type="expl">six- or seven-stringed native Japanese zither</gloss>

GG5 daijr koj
daijs デジタル大辞泉
http://dictionary.goo.ne.jp/leaf/jn2/4242/m0u/あずま/

* Elab “eastern Japan” sense – it’s had specific Kantō meanings over the centuries.
* Move “east” sense down – only saw in daijs, which dicts preferring “eastern Japan”
* Also marked “eastern Japan” sense as [arch] – per dicts it’s used through Edo period, but doesn’t seem used later (GG5 marks as 古称).
(Anecdotally, mentioned in class, and teacher didn’t recognize it as a word, stating あずま was only used as a name, so doesn’t seem understandable.)

@@ -23,1 +23,2 @@
-<gloss>east</gloss>
+<gloss>eastern Japan (esp. Kamakura or Edo, from perspective of Kyoto or Nara)</gloss>
+<gloss>eastern provinces</gloss>
@@ -27,1 +28,2 @@
-<gloss>eastern Japan</gloss>
+<misc>&arch;</misc>
+<gloss>east</gloss>

daij prog

@@ -14,0 +15,2 @@
+<pos>&adj-no;</pos>
+<pos>&adj-na;</pos>
@@ -16 +17,0 @@
-<pos>&adj-no;</pos>
@@ -17,0 +19 @@
+<gloss>king-size</gloss>

OK

I agree. I'd also drop the corresponding sense from the 正字 entry.

I think this is bringing in a Chinese sense which is not relevant to the Japanese term. The kokugos have just the first three senses, and I feel that's enough.

@@ -21,4 +20,0 @@
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>original Chinese character before a different variant was listed in the Kangxi Dictionary</gloss>

https://web.archive.org/web/20090928045602/http://www.geocities.jp/umezu34/Kouza/kouza203.html
https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1434872324

to differentiate from 正字

@@ -20,0 +21,4 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>original Chinese character before a different variant was listed in the Kangxi Dictionary</gloss>

https://www.edrdg.org/wwwjdic/wwwverbinf.html#suru_tag (4th paragraph)

@@ -14 +14 @@
-<pos>&vs-s;</pos>
+<pos>&vs-i;</pos>

gg5

Don't like "to be implicated in".
Intransitive.

@@ -14,0 +15 @@
+<pos>&vi;</pos>
@@ -16 +17 @@
-<gloss>to be implicated in</gloss>
+<gloss>to be a party to</gloss>
@@ -18,0 +20 @@
+<gloss>to agree with</gloss>

Daijr

http://kotobank.jp/word/与する・組する　　
http://dictionary.goo.ne.jp/leaf/jn2/63013/m0u/

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>組する</keb>

gg5, prog, 中辞典

Don't like "trick".

@@ -15 +14,0 @@
-<gloss>trick</gloss>
@@ -17 +16,2 @@
-<gloss>sharp practice</gloss>
+<gloss>crafty plan</gloss>
+<gloss>plot</gloss>

rm 'practise' wherever it is being used as a noun

@@ -18,1 +18,0 @@
-<gloss>sharp practise</gloss>

@@ -20,0 +21 @@
+<misc>&dated;</misc>

Sounds very old-fashioned.

G n-grams:
写真機	64577
写真器	571

None of my refs have 写真器.

@@ -4,3 +3,0 @@
-<k_ele>
-<keb>写真器</keb>
-</k_ele>
@@ -10,0 +8,4 @@
+</k_ele>
+<k_ele>
+<keb>写真器</keb>
+<ke_inf>&iK;</ke_inf>
@@ -19 +20,2 @@
-<gloss>camera</gloss>
+<xref type="see" seq="1038350">カメラ</xref>
+<gloss>(photographic) camera</gloss>

OK

The other senses are covered by our よる and によって entries. I think it's best to keep them separate. The other senses aren't conjunctions.
I think we can drop 縁って from here (and possibly add it to よる [1168660]). Most of the hits seem to be for 縁(えん)+って(quotative particle).

@@ -12,3 +11,0 @@
-</k_ele>
-<k_ele>
-<keb>縁って</keb>

It gets quite a few hits, possibly because of things like 木に縁って魚を求む.
I see most JEs have multiple senses for this entry.

daijr

I'm not seeing 縁って in my refs. Can we drop it?
Don't like "because of".

@@ -15,0 +16,6 @@
+<k_ele>
+<keb>依て</keb>
+</k_ele>
+<k_ele>
+<keb>仍て</keb>
+</k_ele>
@@ -25 +31 @@
-<gloss>because of</gloss>
+<gloss>for that reason</gloss>

机下	3839
几下	No matches

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

"プリンタを机下に置く事で、デスクを広く使うことが出来ます"
"机下に置いたパソコン"
"机下で冷える足元を遠赤外線でぽかぽか温めます"
"机下収納"

GG5 has "under the desk" and there is evidence of it being used with this meaning.

@@ -16,0 +17,4 @@
+<sense>
+<pos>&n;</pos>
+<gloss>under the desk</gloss>
+</sense>

no dictionary (except my kanji dictionary) gives "under the desk" as an actual sense of 机下, just as etymology for this sense.  perhaps a note

@@ -17,4 +16,0 @@
-<sense>
-<pos>&n;</pos>
-<gloss>under the desk</gloss>
-</sense>

@@ -12 +12,2 @@
-<gloss>idle funds or capital</gloss>
+<gloss>idle funds</gloss>
+<gloss>idle capital</gloss>

Oops.

@@ -11 +11 @@
-<reb>おごごろ</reb>
+<reb>おごころ</reb>

gg5, daij, koj

Added reading.

@@ -9,0 +10,3 @@
+<r_ele>
+<reb>おごごろ</reb>
+</r_ele>
@@ -12,0 +16 @@
+<gloss>brave heart</gloss>
@@ -13,0 +18 @@
+<gloss>ambition</gloss>

Fair point. The kokugos to seem to support that it's nobel as such.

@@ -13 +13 @@
-<gloss>noble aspiration</gloss>
+<gloss>lofty aspiration</gloss>

does "noble" add an unintended value judgement here? i.e., it is possible for someone to have large, brave ambitions that are not noble

gg5
meikyo: "勇ましく立派なこころざし。雄大な意気。"

Not just any type of ambition.

@@ -12 +12,2 @@
-<gloss>ambition</gloss>
+<gloss>great ambition</gloss>
+<gloss>noble aspiration</gloss>

ご老体	27960
御老体	3914

@@ -18 +18 @@
-<s_inf>as 御老体</s_inf>
+<s_inf>as ご老体</s_inf>

daij, meikyo

Added sense.

@@ -14,0 +15,6 @@
+<sense>
+<pos>&n;</pos>
+<misc>&hon;</misc>
+<s_inf>as 御老体</s_inf>
+<gloss>elderly person</gloss>
+</sense>

I see it is in Halpern's NJECD, which is possibly the source of the entry.

no ngram matches; only found in my kanwa (which just says 順調な運命). must be obsc or arch. 

there is probably a better way of glossing than "good fortune" for purposes of distinguishing from 幸運.  this is more along the lines of "smooth sailing"

@@ -12 +12,2 @@
-<gloss>prosperity</gloss>
+<misc>&obsc;</misc>
+<gloss>good fortune</gloss>

shite range

A+B surely?

Added additional PoS via batch update.Added additional PoS via batch update.
-*- via bulkupd.py -*-

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

WWW pages

Already have: "彼は、よく書斎にこもって、こういうものを書きます".
The first form is much more common.

@@ -5,0 +5,3 @@
+<keb>書斎にこもる</keb>
+</k_ele>
+<k_ele>
@@ -6,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>書斎に籠る</keb>

example

Daijr

@@ -11,0 +12,2 @@
+<xref type="see" seq="1107250">ピント・1</xref>
+<s_inf>from ピントがぼける</s_inf>
@@ -12,0 +15,4 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1107250">ピント・2</xref>

km

ピンぼけ	3184
ピンボケ	3479

@@ -3,0 +4,3 @@
+<r_ele>
+<reb>ピンボケ</reb>
+</r_ele>

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

@@ -7,0 +8,3 @@
+<reb>エル・エル</reb>
+</r_ele>
+<r_ele>
@@ -8,0 +12 @@
+<re_inf>&sk;</re_inf>

Hmm. A bit wordy.

meikyo: large（＝大）の頭文字を重ねたもの。

Looks like an initialism, but isn't, so note seems helpful.

@@ -11,0 +12 @@
+<s_inf>from doubling of "L" for size large</s_inf>

@@ -12 +12,2 @@
-<gloss>XL (clothing size)</gloss>
+<gloss>extra-large (clothing size)</gloss>
+<gloss>XL</gloss>
@@ -15,0 +17 @@
+<xref type="see" seq="1140000">ランゲージラボラトリー</xref>

daijs

@@ -11,0 +12,4 @@
+<gloss>XL (clothing size)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>

daij, gg5
G n-grams:
しばらくぶり	130904
暫くぶり	        16761
しばらく振り	9157
暫く振り	        5333

Not an adverb.

@@ -3,0 +4,6 @@
+<k_ele>
+<keb>暫くぶり</keb>
+</k_ele>
+<k_ele>
+<keb>しばらく振り</keb>
+</k_ele>
@@ -12 +18,2 @@
-<pos>&adv;</pos>
+<pos>&adj-na;</pos>
+<pos>&adj-no;</pos>
@@ -14 +21 @@
-<gloss>long interval of time</gloss>
+<gloss>a long time (since the last time)</gloss>

Entry created

https://headlines.yahoo.co.jp/hl?a=20180928-00000167-jij-pol
G n-grams:
のど飴	192662
喉飴	8431
ノド飴	3292
喉あめ	686

I saw "喉あめ" in the above article.

@@ -9,0 +10,6 @@
+<k_ele>
+<keb>ノド飴</keb>
+</k_ele>
+<k_ele>
+<keb>喉あめ</keb>
+</k_ele>
@@ -11,0 +18,7 @@
+<re_restr>のど飴</re_restr>
+<re_restr>喉飴</re_restr>
+<re_restr>喉あめ</re_restr>
+</r_ele>
+<r_ele>
+<reb>ノドあめ</reb>
+<re_restr>ノド飴</re_restr>

Entry created

Daijr: バスケットシューズの略。

@@ -11,0 +12 @@
+<xref type="see" seq="2225080">バスケットシューズ</xref>

daijs

@@ -6,0 +7,3 @@
+<r_ele>
+<reb>バッシュー</reb>
+</r_ele>
@@ -9,0 +13 @@
+<misc>&col;</misc>

Entry created

@@ -30 +30 @@
-<gloss>next to impossible undertaking</gloss>
+<gloss>next-to-impossible undertaking</gloss>

G n-grams:
至難の業	        166906
至難の技	        53496
至難のわざ	8886
至難のワザ	9446

@@ -6,0 +7,9 @@
+<k_ele>
+<keb>至難の技</keb>
+</k_ele>
+<k_ele>
+<keb>至難のわざ</keb>
+</k_ele>
+<k_ele>
+<keb>至難のワザ</keb>
+</k_ele>
@@ -8,0 +18,7 @@
+<re_restr>至難の業</re_restr>
+<re_restr>至難の技</re_restr>
+<re_restr>至難のわざ</re_restr>
+</r_ele>
+<r_ele>
+<reb>しなんのワザ</reb>
+<re_restr>至難のワザ</re_restr>

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

Entry created

G n-grams:
 投げキッス	55780
 投げキス 	11857

aligning with  2836677

@@ -12 +12,4 @@
-<gloss>a blown kiss</gloss>
+<xref type="see" seq="2836677">投げキッス・なげキッス</xref>
+<gloss>thrown kiss</gloss>
+<gloss>blown kiss</gloss>
+<gloss>air kiss</gloss>

Entry created

ティーパーティー	35973
ティー・パーティー	2397
ティーパーティ	12415

@@ -7,0 +8,3 @@
+<reb>ティーパーティ</reb>
+</r_ele>
+<r_ele>
@@ -11 +14 @@
-<reb>ティーパーティ</reb>
+<reb>ティー・パーティ</reb>

@@ -9,0 +10,3 @@
+<r_ele>
+<reb>ティーパーティ</reb>
+</r_ele>

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>

Entry created

Sorry to have overlooked that. Yes, ゴン is in the kanwa part of 広辞苑. I've added it to kanjidic.

See edit #6 below

Shouldn't we add the go-on reading ゴン to KanjiDic?

I've been reading up on "zither" and it seems it's very widely used for plucked string instruments. Although "zither" is German it's from a Greek root; in fact the same root as "guitar". And it's used widely as a family name, so I guess I'll just have to accept it. "zither-like instrument" is too clumsy.

english wikipedia says six or seven but this is unreferenced and is not supported by japanese wikipedia, britannica or any japanese dictionary

@@ -14 +14 @@
-<gloss g_type="expl">six- or seven-stringed native Japanese zither</gloss>
+<gloss g_type="expl">six-stringed native Japanese zither</gloss>

koj:
  音: キン(漢)　ゴン(呉)
  訓: こと

let's leave this open until Jim has checked the KanjiDic entry 琴

I've only seen it as six-stringed.

all of my sources (encyclopedias and dictionaries) say six as in the original entry.  there is an unreferenced english wikipedia page that says six or seven

similar to a guitar, there may be variants with >6 strings.  but all japanese sources say this has six strings

@@ -19 +19 @@
-<gloss g_type="expl">six- or seven-stringed native Japanese zither</gloss>
+<gloss g_type="expl">six-stringed native Japanese zither</gloss>

koj

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>吾妻琴</keb>

aligning with 2204940
I don't think "azumagoto" works as a gloss, I cannot find many examples on the web

@@ -14 +14,3 @@
-<gloss>six-stringed Japanese zither</gloss>
+<gloss>wagon</gloss>
+<gloss>yamatogoto</gloss>
+<gloss g_type="expl">six- or seven-stringed native Japanese zither</gloss>

Entry created

I thought this might be wasei, but it gets lots of hits in English. Odd.

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>

Entry created

@@ -21 +21 @@
-<gloss>OR (boolean operator)</gloss>
+<gloss>OR (Boolean operator)</gloss>

@@ -19,0 +20 @@
+<field>&logic;</field>

Yes, I agree with this order.
The operator sense is always capitalised so I think the restriction is appropriate.

@@ -5 +5 @@
-<keb>ＯＲ</keb>
+<keb>ｏｒ</keb>
@@ -8 +8 @@
-<keb>ｏｒ</keb>
+<keb>ＯＲ</keb>

I propose moving the conj sense back up on top, as I think it's likely more common. Not sure we really need the restr for the 
operator.

@@ -13,0 +14,4 @@
+<pos>&conj;</pos>
+<gloss>or</gloss>
+</sense>
+<sense>
@@ -18,4 +21,0 @@
-<sense>
-<pos>&conj;</pos>
-<gloss>or</gloss>
-</sense>

@@ -6,0 +7,3 @@
+<k_ele>
+<keb>ｏｒ</keb>
+</k_ele>
@@ -10,0 +14 @@
+<stagk>ＯＲ</stagk>
@@ -13,0 +18,4 @@
+<sense>
+<pos>&conj;</pos>
+<gloss>or</gloss>
+</sense>

not that common, but there are examples on the web

@@ -11,0 +12 @@
+<xref type="see" seq="2836675">ＪＩＴコンパイラ・ジェーアイティーコンパイラ</xref>
@@ -13 +14,2 @@
-<gloss>Just-In-Time Compiler</gloss>
+<gloss>just-in-time compiler</gloss>
+<gloss>JIT compiler</gloss>

G n-grams:
ジャストインタイムコンパイラ	No matches
https://ja.wikipedia.org/wiki/実行時コンパイラ

"JITコンパイラ" and "実行時コンパイラ" appear to be the usual translations. Do we want to add those (or get rid of this)?

@@ -13 +13 @@
-<gloss>Just In Time Compiler</gloss>
+<gloss>Just-In-Time Compiler</gloss>

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>

Entry created

@@ -18 +18 @@
-<gloss g_type="expl">six- or seven-stringed native Japanese zither</gloss>
+<gloss g_type="expl">six or seven-stringed native Japanese zither</gloss>

aligning with 2204940

@@ -17 +17,3 @@
-<gloss>ancient Japanese koto (thought to be native to Japan)</gloss>
+<gloss>yamatogoto</gloss>
+<gloss>wagon</gloss>
+<gloss g_type="expl">six- or seven-stringed native Japanese zither</gloss>

Entry created

Botany.

Or [biol]? I'm not sure.

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

gg5, eij

G n-grams:
カタロニア	21654
カタルーニャ	86556
カタルニャ	1271

Swapping order.
I saw "カタルニャ" in an encylopedia.

@@ -3,0 +4,3 @@
+<r_ele>
+<reb>カタルーニャ</reb>
+</r_ele>
@@ -8 +11,2 @@
-<reb>カタルーニャ</reb>
+<reb>カタルニャ</reb>
+<re_inf>&ik;</re_inf>

Daijr, GG5, リーダーズ+プラス, ＫＯＤ追加語彙

Not sure about combining these. リーダーズ+プラス does, but the other refs have one or the other.

I didn't mind it, but let it be.

Mixing Jap and Eng like that is confusing

@@ -12 +12 @@
-<gloss>filled pause (e.g. um, er, ee-to)</gloss>
+<gloss>filled pause (e.g. um, er)</gloss>

@@ -12,0 +13 @@
+<gloss>filler word</gloss>

http://www.is.cs.cmu.edu/trl_conventions/filled_pauses.html

@@ -12,1 +12,1 @@
-<gloss>filled pause</gloss>
+<gloss>filled pause (e.g. um, er, ee-to)</gloss>

daijs, daijr

G n-grams:
キジ猫	14954
キジネコ	3456
雉猫	2417

@@ -10,0 +11,4 @@
+<reb>キジねこ</reb>
+<re_restr>キジ猫</re_restr>
+</r_ele>
+<r_ele>
@@ -11,0 +16,5 @@
+<re_restr>雉猫</re_restr>
+</r_ele>
+<r_ele>
+<reb>キジネコ</reb>
+<re_nokanji/>

https://meow-meow.jp/classify/2178

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>キジ猫</keb>
+</k_ele>
@@ -12 +15 @@
-<misc>&arch;</misc>
+<gloss>brown tabby</gloss>

daijs nikk
31k (g)

km
オーバーエージ	164
オーバーエイジ	346

Could be simplified, perhaps

@@ -4,0 +5,3 @@
+<reb>オーバーエイジ</reb>
+</r_ele>
+<r_ele>
@@ -5,0 +9,3 @@
+</r_ele>
+<r_ele>
+<reb>オーバー・エイジ</reb>
@@ -12 +18,2 @@
-<gloss>overage</gloss>
+<field>&sports;</field>
+<gloss>overage (player, i.e. one older than 23 in an under-23 tournament)</gloss>

daijs
http://www.yomiuri.co.jp/olympic/2016/20160421-
OYT1T50055.html
ngrams ca 2000

https://ja.wikipedia.org/wiki/潜水空母

lovely

https://ja.wikipedia.org/wiki/飲尿 
https://en.wikipedia.org/wiki/Urophagia
https://ejje.weblio.jp/content/飲尿

https://www.rakuten.ne.jp/gold/gunze/size/
size.html

http://belluna.jp/ryuryu/sp/02/030201/shop
/size/index/

Doing this as a suf on the "L" entry would 
probably be a little confusing.

G n-grams:
サバ猫	1970
鯖猫	2262
サバネコ	998

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>鯖猫</keb>
+</k_ele>
@@ -8,0 +12,9 @@
+<re_restr>鯖猫</re_restr>
+</r_ele>
+<r_ele>
+<reb>サバねこ</reb>
+<re_restr>サバ猫</re_restr>
+</r_ele>
+<r_ele>
+<reb>サバネコ</reb>
+<re_nokanji/>
@@ -12 +24 @@
-<gloss>mackerel tabby</gloss>
+<gloss>mackerel tabby (cat)</gloss>

https://meow-meow.jp/classify/2178

'returning' might be better

daij, koj

daij, koj

We now have an electronics field tag.

@@ -15 +15 @@
-<field>&comp;</field>
+<field>&electr;</field>

We have [comp] on OR回路.

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

gg5, daij

Shame we don't have an electronics field tag.

https://ja.wikipedia.org/wiki/ラーオ語
https://en.wikipedia.org/wiki/Lao_language

daij, gg5, prog

Surprised we didn't have his.

Yes, I think it can/should be merged.

merge with おす (poss. as ok)?  all dictionaries seem to define simply by saying おす.  koj also has this as おん 【雄・牡】, so no headword restriction would be needed

daij, gg5

https://ja.wikipedia.org/wiki/カタルーニャ語

daijr, jwiki
G n-grams:
カタロニア語	2736
カタルーニャ語	8966

jwiki
G n-grams:
カタラン語	2648
カタルーニャ語	8966

daij, koj

Seems to work.

@@ -13 +13 @@
-<gloss>fear of having blank days (e.g. freelancer unable to find work)</gloss>
+<gloss>fear of having blank days (e.g. for a freelancer)</gloss>

Trimming. I think with just "fear" it can be left as "col".

@@ -13 +13 @@
-<gloss>fear of having blank days in one's calendar (e.g. for a freelancer to be unable to find work)</gloss>
+<gloss>fear of having blank days (e.g. freelancer unable to find work)</gloss>

Or maybe [joc]? I assume it's not a real phobia.

@@ -11,0 +12 @@
+<misc>&col;</misc>
@@ -12,0 +14 @@
+<gloss>fear of not having anything planned</gloss>

@@ -16 +16 @@
-<xref type="see" seq="2039700">ＬＬ・エルエル・1</xref>
+<xref type="see" seq="2039700">ＬＬ・1</xref>

Style update.

@@ -8 +8 @@
-<reb>エックスエル</reb>
+<reb>エックス・エル</reb>
@@ -11 +11,2 @@
-<reb>エックス・エル</reb>
+<reb>エックスエル</reb>
+<re_inf>&sk;</re_inf>

https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1428436934
Daijr, GG5
エックス・エル	< 20
エックスエル	154

Obviously not used much.

@@ -8,0 +9 @@
+<xref type="see" seq="2271160">ランニングシューズ</xref>

https://yamahack.com/1110
google images

ハイカット	36430
ローカット	14636
ハイカットの	9941
ローカットの	3458
ハイカットが	1351
ローカットが	570
ＫＯＤ追加語彙, Daijr (バスケットシューズ entry)

ハイカット	36430
ローカット	14636
ハイカットの	9941
ローカットの	3458
ハイカットが	1351
ローカットが	570
ＫＯＤ追加語彙, Daijr (バスケットシューズ entry)

Homer nodded.

Jim, I note that this entry wasn't included in the batch update.

@@ -8 +8 @@
-<reb>ジェイアイティー</reb>
+<reb>ジェー・アイ・ティー</reb>
@@ -11,0 +12,5 @@
+<re_inf>&sk;</re_inf>
+</r_ele>
+<r_ele>
+<reb>ジェイアイティー</reb>
+<re_inf>&sk;</re_inf>

Daijr (both point to JIT)

The kana is not common. Worth filling in the gap.

daijs: ジェーアイティーコンパイラー
weblio: ジットコンパイラ

jwiki
googits: ＪＩＴコンパイラ is more common

gg5, daij
https://en.wikipedia.org/wiki/Air_kiss
G n-grams:

We already have 投げキス but I assume we need a new entry for this because of the 2/3 rule.

G n-grams:
市名	        158850	   
市名の由来	116884

Not in the refs but very common.

OK.

OK, I think Marcus has made a very good point about "or", etc. I propose we drop this version and put them back together with the restriction Robin suggested. If that's accepted this can be deleted.

We could have both "ｏｒ" and "ＯＲ" in the kanji field and put an ＯＲ restriction on the logical OR sense.

In response to the comments at the "OR" entry: ”or/オア" is definitely used as a conjugation in Japanese and not just with gairaigo:
https://www.excite.co.jp/News/column_g/20161020/TokyoFm_rtuwMQUVut.html
"ご馳走してもらうならどっち？「寿司 or 焼肉」"
https://news.mynavi.jp/article/20180320-602464/
"朝食はパンorご飯? 一生1種だけならパンorご飯or麺? 朝食事情を1,005人に調査"
https://fortune.woman.excite.co.jp/menu/M6010019
"【好きor嫌い!?】あの人の態度が思わせぶりすぎて毎日ツラい"

I don't see any good reason why this should be split out from "OR". This is most commonly written as "or", and on occasion "OR", only seldom 
"オア"

this is part of a suggested split at 2289030.

Messy.

http://psnews.jp/cat/p/39679/
www-images
G n-grams:
キジトラ	78661
きじトラ	7640
雉トラ	1202
キジ虎	913
きじ虎	733
雉虎	692

https://twitter.com/search?q="fan service"&src=typed_query&f=live
orig. wasei but it's been 逆輸入'd into English.

@@ -12,2 +12,3 @@
-<lsource ls_wasei="y">fan service</lsource>
-<gloss>action by a celebrity to please fans</gloss>
+<lsource ls_wasei="y"/>
+<gloss>fan service</gloss>
+<gloss>giving one's fans what they want</gloss>

A bit shorter.

@@ -13 +13 @@
-<gloss>something done by a celebrity to please fans</gloss>
+<gloss>action by a celebrity to please fans</gloss>

daijs, jwiki

There might be a more elegant way of translating this.

リーダーズ+プラス has it in the more general まず ....ない
まずない	237330
先ずない	2825
先ず無い	3050
まずないと思います	14091	  
まずないでしょう	25080
まずないです	19361	  
まずないだろう	15927

Useful, I think.

@@ -3,0 +4,6 @@
+<k_ele>
+<keb>先ず無い</keb>
+</k_ele>
+<k_ele>
+<keb>先ずない</keb>
+</k_ele>
@@ -7,0 +14 @@
+<pos>&exp;</pos>
@@ -8,0 +16 @@
+<misc>&uk;</misc>
@@ -10,0 +19 @@
+<gloss>scarcely</gloss>

@@ -7,0 +8 @@
+<pos>&adj-i;</pos>

full sentence
「この地方に、こんな激しい雨が降るなんて珍しい。まずないことなのに……」

@@ -10 +9,0 @@
-<gloss>Noah</gloss>
@@ -12,0 +12,4 @@
+<sense>
+<misc>&male;</misc>
+<gloss>Noah</gloss>
+</sense>

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

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

GG5, etc.

Moved from 1093690.