Splitting on source word.

@@ -10,11 +9,0 @@
-</sense>
-<sense>
-<pos>&n;</pos>
-<xref type="see" seq="2437730">インターカム</xref>
-<misc>&abbr;</misc>
-<gloss>(portable) intercom</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>Incom (brand name)</gloss>
-<gloss>microphone headset</gloss>

ＫＯＤ追加語彙 sense 3: 【商標】 〔現場スタッフが装着する無線トランシーバー〕 Incom; a microphone headset.
http://www.incomtelecoms.co.uk/headsets

Need to be sensitive about terms from brand-names. I've had lawyers' letters.

@@ -19 +19,2 @@
-<gloss>headset</gloss>
+<gloss>Incom (brand name)</gloss>
+<gloss>microphone headset</gloss>

www-images
https://ja.wikipedia.org/wiki/インカム 
https://headlines.yahoo.co.jp/videonews/jnn?a=20180530-00000072-jnn-soci

Example of sense 2 in the article above.

@@ -10,0 +11,10 @@
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="2437730">インターカム</xref>
+<misc>&abbr;</misc>
+<gloss>(portable) intercom</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>headset</gloss>
+</sense>

gg5, daijs

Splitting on source word.

@@ -12,0 +13,3 @@
+<r_ele>
+<reb>ウェイスト</reb>
+</r_ele>
@@ -17,9 +20 @@
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>west</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
-<pos>&vs;</pos>
-<gloss>waste</gloss>
+<gloss>waist measurement</gloss>

gg5; genius J-E

@@ -15,0 +16 @@
+<gloss>waistline</gloss>

chujiten, daij
https://www.global-style.jp/enjoy-order/?p=27734#ワイシャツとカッターシャツの語源と由来？
"カッターシャツは、1906年大阪市北区で「水野兄弟商会」創業した日本のスポーツメーカーの『ミズノ』が1918年に発売したスポーツ用シャツ。元は商標名であったが、現在ではワイシャツのことを指します。"
https://www.itmedia.co.jp/lifestyle/articles/1603/27/news003.html

The original (brand name) カッターシャツ was a sports shirt but it doesn't have that meaning as a general noun.
I think we should include the other meanings.

@@ -13 +13 @@
-<s_inf>orig. a brand name</s_inf>
+<s_inf>orig. a brand name for a long-sleeved sports shirt</s_inf>
@@ -15 +14,0 @@
-<gloss>long-sleeved sports shirt</gloss>
@@ -16,0 +16,10 @@
+<gloss>dress shirt</gloss>
+<gloss>business shirt</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>shirt (as part of a school uniform)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>shirt with non-detachable cuffs and collar</gloss>

@@ -13 +13 @@
-<s_inf>from a brand name</s_inf>
+<s_inf>orig. a brand name</s_inf>

* gg5/genius: a (formal) shirt
* daijr: もと商標名
* koj: もとは運動着だが、今はワイシャツと区別なく用いる。

Interesting term. The kokugos anachronistically talk about shirts with non-removal collars and cuffs. nikk 
notes that the term is used in western Japan instead of 「ワイシャツ」. Some sites say that the terms are 
sometimes used to distinguish shirts worn under student uniforms vs suits.

@@ -12 +12,5 @@
-<gloss>cutter shirt (long-sleeved sports shirt)</gloss>
+<xref type="see" seq="1148640">ワイシャツ</xref>
+<s_inf>from a brand name</s_inf>
+<lsource ls_wasei="y">cutter shirt</lsource>
+<gloss>long-sleeved sports shirt</gloss>
+<gloss>(formal) shirt</gloss>

This is already in JMnedict. That's probably the best place for it as it's a fictional place.

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>シャングリ・ラ</reb>

@@ -9 +9 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

gg5

@@ -9 +9,2 @@
-<gloss>Pyroceram</gloss>
+<s_inf>trademark</s_inf>
+<gloss>Pyroceram (heat-resistant glass)</gloss>

@@ -13 +13 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

Some of the images I saw were not double-deckers or didn't have extra windows, so I suspect the term is used a bit loosely.

daijs: "《和vista＋car》観光用の二階式の展望バスや電車。◆英語ではdome car；observation carなどという。"
https://en.wikipedia.org/wiki/Observation_car
https://en.wikipedia.org/wiki/Kintetsu_Railway

@@ -13 +13 @@
-<s_inf>trademarked term</s_inf>
+<s_inf>trademark</s_inf>
@@ -15 +15 @@
-<gloss g_type="expl">used for trains owned and operated by Kinki Nippon Railway.</gloss>
+<gloss g_type="expl">double-decker observation car operated by Kintetsu Railway</gloss>

No sign of domes.

@@ -14,2 +14,2 @@
-<gloss>vista (dome) car</gloss>
-<gloss g_type="expl">nickname given to the trains owned and operated by Kinki Nippon Railway.</gloss>
+<gloss>vista car</gloss>
+<gloss g_type="expl">used for trains owned and operated by Kinki Nippon Railway.</gloss>

https://ja.wikipedia.org/wiki/ビスタカー

trademark Kintetsu (Japan No. 3085573)

@@ -12,0 +13 @@
+<s_inf>trademarked term</s_inf>
@@ -13,0 +15 @@
+<gloss g_type="expl">nickname given to the trains owned and operated by Kinki Nippon Railway.</gloss>

@@ -10 +10 @@
-<s_inf>brand name</s_inf>
+<field>&tradem;</field>

gg5, wiki, koj, etc.

it appears that Pianica is a brand name

@@ -9 +9,3 @@
-<gloss>pianica</gloss>
+<xref type="see" seq="2826273">鍵盤ハーモニカ</xref>
+<s_inf>brand name</s_inf>
+<gloss>Pianica</gloss>

GG5, etc.

@@ -10 +10 @@
-<gloss>piano and harmonica</gloss>
+<gloss>melodica</gloss>

@@ -12 +12 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

Aligning.

@@ -12 +12 @@
-<s_inf>trademarked name</s_inf>
+<s_inf>trademark</s_inf>
@@ -14 +14,2 @@
-<gloss>outdoor obstacle course</gloss>
+<gloss>adventure course</gloss>
+<gloss>(outdoor) obstacle course</gloss>

(daijr: 〔和 field＋athletics〕)

@@ -13 +13 @@
-<lsource ls_wasei="y">Field Athletic</lsource>
+<lsource ls_wasei="y">field athletic</lsource>

Google N-gram Corpus Counts
╭─ーーーーーーー─┬────────┬───────╮
│ ポストイット　 │ 62,149 │ 78.5% │
│ ポスト・イット │ 17,024 │ 21.5% │
╰─ーーーーーーー─┴────────┴───────╯

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ポスト・イット</reb>

I think it's best to keep that ®. It was specifically requested by 3M's lawyers. (I've forwarded Robin copies of the correspondence.)

gg5
https://en.wikipedia.org/wiki/Post-it_Note

I'd love to see the email they sent you. It fascinates me that companies care so much about this sort of thing.
Can we drop the ® symbol now that we have a trademark tag?

@@ -9 +9,4 @@
-<gloss>Post-it® (brand name)</gloss>
+<field>&tradem;</field>
+<gloss>Post-it®</gloss>
+<gloss>Post-it note</gloss>
+<gloss>sticky note</gloss>

Requested by 3M's lawyers.

@@ -9 +9 @@
-<gloss>Post-it (brand name)</gloss>
+<gloss>Post-it® (brand name)</gloss>

@@ -12 +12,2 @@
-<s_inf>from Japanese brand name "Magic Ink"</s_inf>
+<field>&tradem;</field>
+<lsource xml:lang="eng">Magic Ink</lsource>

@@ -12 +12,3 @@
-<gloss>felt pen</gloss>
+<s_inf>from Japanese brand name "Magic Ink"</s_inf>
+<gloss>Magic Marker</gloss>
+<gloss>felt-tip pen</gloss>
@@ -15,5 +16,0 @@
-<sense>
-<pos>&n;</pos>
-<misc>&abbr;</misc>
-<gloss>Magic Ink-brand marker</gloss>
-</sense>

http://ejje.weblio.jp/content/マジッ�%
82%AF%E3%82%A4%E3%83%B3%E3%82%AF

http://ja.wikipedia.org/wiki/マジッ�%8
2%AF%E3%82%A4%E3%83%B3%E3%82%AD

"Magic ink" in English refers to "disappearing ink," a 
novelty item (http://www.forexmindgames.com/2013/04/we-have-
eyes-yet-we-do-not-see.html). In Japanese, it's a brand of 
felt pens, permanent markers, and other legitimate ink-based 
office supplies.

@@ -11,0 +12,5 @@
+<gloss>felt pen</gloss>
+<gloss>permanent marker</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -13 +18 @@
-<gloss>magic ink marker</gloss>
+<gloss>Magic Ink-brand marker</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>

Looks good to me.
I think we should have an x-ref to the generic term.

@@ -11,0 +12 @@
+<xref type="see" seq="2061600">面ファスナー</xref>

* https://www.scotchbrand.com/3M/en_US/scotch-brand/products/catalog/~/Scotch-Magic-Tape-Dispensered-Rolls/?N=4335+3294529207+3294603601&preselect=3293786499&rt=rud
* https://en.wikipedia.org/wiki/Scotch_Tape#Magic_tape

The Japanese brand Magic Tape isn't known in English so shouldn't be a gloss. Besides, when I read it, I thought it was referring to Scotch Tape.

@@ -12,0 +13 @@
+<lsource xml:lang="eng">Magic Tape</lsource>
@@ -15 +15,0 @@
-<gloss g_type="tm">Magic Tape</gloss>

GG5: 〔日本での商標〕 ＝めんファスナー. [a hook-and-loop fastener; 【商標】 Velcro.]
中辞典: 【商標】 Velcro
ルミナス: hook and loop fastener; 〔商標〕 Velcro　★「マジックテープ」は日本の商標名.

I think there's only one sense.

@@ -13,4 +12,0 @@
-<gloss>Magic Tape (brand of hook-and-loop fastener produced by Kuraray Fastening)</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
@@ -18 +14,2 @@
-<gloss g_type="tm">velcro</gloss>
+<gloss g_type="tm">Velcro</gloss>
+<gloss g_type="tm">Magic Tape</gloss>

Shouldn't this be split into two separate senses? Most usages are probably not referring to the brand.

Kuraray Fastening: https://www.magic-tape.com/en/

Google N-gram Corpus Counts
| マジックテープ　　 | 307,179 | 73.9% |
| ベルクロ　　　　　 |  74,124 | 17.8% |
| 面ファスナー　　　 |  34,220 |  8.2% |
| パイルアンドフック |     104 |  0.0% |

@@ -13 +13,6 @@
-<gloss>Magic Tape (brand of hook-and-loop fastener, equiv. to Velcro)</gloss>
+<gloss>Magic Tape (brand of hook-and-loop fastener produced by Kuraray Fastening)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>hook-and-loop fastener</gloss>
+<gloss g_type="tm">velcro</gloss>

@@ -12 +12 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

mk (single sense)

@@ -16,0 +17,2 @@
+<pos>&vt;</pos>
+<pos>&vi;</pos>
@@ -22,0 +25,2 @@
+<pos>&vt;</pos>
+<pos>&vi;</pos>

daijr, shinmeikai, gg5

Added sense.

@@ -19,0 +20,5 @@
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<gloss>competition between theatres putting on the same show</gloss>
+</sense>

gg5

More general.

@@ -17 +17,2 @@
-<gloss>recital contest</gloss>
+<gloss>contest (between performers)</gloss>
+<gloss>competitive performance</gloss>

OK.

gg5; genius; wisdom

"back" is too broad and most of the J-Es qualify it as the "small of the back" or "lower back".

@@ -22 +21,0 @@
-<gloss>back</gloss>

The body region is usually "hips". GG5 and most JE dictionaries translate it that way.

should it be "hip" rather than "hips"?

meikyo: 〔古い言い方で〕勘定書。請求書。

@@ -26,0 +27 @@
+<misc>&dated;</misc>

書き出し	646059
書出し	23044
書きだし	15176
Daijisen 開巻 entry uses 書きだし.

@@ -10,0 +11,3 @@
+</k_ele>
+<k_ele>
+<keb>書きだし</keb>

Daijr (has 書出し), GG5, etc.

Merging 2164200.

@@ -7,0 +8,3 @@
+</k_ele>
+<k_ele>
+<keb>書出し</keb>
@@ -16,2 +19,2 @@
-<gloss>beginning</gloss>
-<gloss>opening sentence or paragraph</gloss>
+<gloss>beginning (of writing)</gloss>
+<gloss>opening passage (sentence, paragraph, etc.)</gloss>
@@ -21,0 +25 @@
+<gloss>bill</gloss>

@@ -18 +17,0 @@
-<pos>&adj-no;</pos>

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

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

gg5, prog

@@ -19 +19 @@
-<gloss>conservation of water</gloss>
+<gloss>economizing on water</gloss>

GG5 Genius daijr

alt wordings, esp. simple “saving water”

@@ -17,0 +17,2 @@
+<gloss>saving water</gloss>
+<gloss>water conservation</gloss>

I think it's "esp. in sport" rather than [sports]

Looks OK. Could have a "sports" tag? For 戦国時代 maybe some extension of sense 3 would be better.

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

https://toyokeizai.net/articles/amp/22771?
display=b&amp_event=read-body
2013年春、大学野球日本一に輝いたのは、群馬県伊勢崎市に
本拠を構える上武大学だった。東京六大学や「戦国」と言われ
る東都大学勢に比べ、個々の能力で劣る地方大学が創部32年
目にして全国の頂点に立てた背景には、谷口英規監督が“格差
社会”で生き抜く術を説いたことにある。


https://sports.yahoo.co.jp/m/column/detail/200
806140010-spnavi
それは、“戦国”と言われる東都リーグを３季連続で制し、昨
秋の明治神宮大会でも優勝と勝利を積み重ねてきたがゆえの自
信にほかならない。
https://www.nishinippon.co.jp/nsp/item/n/58842
6/
レース後、大迫の日本新よりも高久龍（ヤクルト）と上門大祐
（大塚製薬）が2時間6分台を出したことに驚いた。これまで
現役で2時間6分台を出していたのは大迫、設楽、井上の3人だ
けだっただけに「3強、4強の時代は終わりましたね」と戦国
時代の到来を実感していた。
https://news.livedoor.com/article/detail/11486
813/
この夏も戦国千葉を予感させる春季大会決勝！ 
...　
望洋を初めとした各校の進化ぶりを見るとやはり2016年の千
葉の夏も、戦国になるのではないかと思わせる決勝戦だった。

What does everyone think of something like 
this? It seems like this usage is especially 
well-established in sports, while it seems to 
be more commonly ”戦国時代" within quotes when 
it's non-sports contexts (e.g. food delivery 
apps, idol groups), which seems less 
dictionary entry-worthy, but there's a lot of 
overlap. If this goes in, 戦国時代 should 
probably have a similar sense.

@@ -6,2 +5,0 @@
-<ke_pri>news1</ke_pri>
-<ke_pri>nf14</ke_pri>
@@ -11,2 +8,0 @@
-<re_pri>news1</re_pri>
-<re_pri>nf14</re_pri>
@@ -23,0 +20,6 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>competiton in which there are several evenly-matched participants</gloss>
+<gloss>hotly-contested game (match, market, etc.)</gloss>
+<gloss>anybody's game</gloss>

「誰が勝ってもおかしくない、超超戦国駅伝」
↑ just heard on tv
https://runnerspulse.jp/column191223
今年の箱根駅伝は、「戦国駅伝」と言われている。(2019)
apparently used to mean "hotly-contested" in 
this context. I don't think it needs to be a 
separate sense just based on these examples, 
just wanted to note it down here for now.

Koj, etc.

I don't think "belligerent" is quite right. One xref anough.

@@ -17 +17 @@
-<gloss>belligerent country</gloss>
+<gloss>country disarrayed by war</gloss>
@@ -21,2 +21,2 @@
-<xref type="see" seq="1390220">戦国時代</xref>
-<xref type="see" seq="1390220">戦国時代</xref>
+<xref type="see" seq="1390220">戦国時代・1</xref>
+<xref type="see" seq="1390220">戦国時代・1</xref>
@@ -24 +24 @@
-<gloss>Warring States period</gloss>
+<gloss>Warring States period (Japan, China)</gloss>

fork

daijs etc. all refer to おかず (日常のおかず 
etc.)

Tried aligning it better with my new 
suggestion for おかず - whqt do you think?

@@ -21 +21,3 @@
-<gloss>side dish (served with an ordinary household meal)</gloss>
+<field>&food;</field>
+<gloss>small dish (served as a part of an ordinary household meal)</gloss>
+<gloss>side dish</gloss>

daijr, wisdom

I agree it isn't great. How about this?

@@ -21,2 +21 @@
-<gloss>side dish</gloss>
-<gloss>daily (household) dish</gloss>
+<gloss>side dish (served with an ordinary household meal)</gloss>

is "daily (household) dish" a good gloss? It 
strikes me as a little weird.

I think that will work.

@@ -21,6 +21,2 @@
-<gloss>side dish (served with an ordinary household meal)</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>everyday food</gloss>
-<gloss>household dish</gloss>
+<gloss>small dish (served as a part of an ordinary household meal)</gloss>
+<gloss>side dish</gloss>

I don't think this is 2 senses, I think it's 
just different ways of describing the same 
thing. (see also my forked entry for a 
different suggestion)

GG5: a daily (household) dish; 〔調理済みの〕 precooked [ready-prepared] food [provisions]; delicatessen.
中辞典: an everyday (household) dish
ルミナス: (日常的な料理) daily [ordinary] dish [C]; (添え料理) side dish [C].
Koj: 日々の食事の副食物。飯のおかず。菜の物。
Daijr: 日常の食事の副食物。ふだんのおかず。
Daijs: 日常のおかず。副食物。

So the JEs and the kokugos are taking differing positions on this. WWW images seem to have both. Perhaps two senses?

@@ -22,0 +23,5 @@
+<sense>
+<pos>&n;</pos>
+<gloss>everyday food</gloss>
+<gloss>household dish</gloss>
+</sense>

daijr, wisdom

I agree it isn't great. How about this?

@@ -21,2 +21 @@
-<gloss>side dish</gloss>
-<gloss>daily (household) dish</gloss>
+<gloss>side dish (served with an ordinary household meal)</gloss>

is "daily (household) dish" a good gloss? It 
strikes me as a little weird.

@@ -16,3 +16,3 @@
-<xref type="see" seq="2275790">グルタミン酸ソーダ・グルタミンさんソーダ</xref>
-<xref type="see" seq="1963660">グルタミン酸ナトリウム・グルタミンさんナトリウム</xref>
-<s_inf>registered trademark</s_inf>
+<xref type="see" seq="2275790">グルタミン酸ソーダ</xref>
+<xref type="see" seq="1963660">グルタミン酸ナトリウム</xref>
+<field>&tradem;</field>

yes, it's in enamdict, so it seems unnecessary/redundant

@@ -22,4 +21,0 @@
-<sense>
-<pos>&n;</pos>
-<gloss>Japanese food company name</gloss>
-</sense>

do we need sense 2, with it being in enam? if so, shouldn't 
it rather read "Ajinomoto Co., Inc."?

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

I guess so.

@@ -19 +19 @@
-<gloss>brand name of monosodium glutamate (MSG)</gloss>
+<gloss g_type="expl">brand name of monosodium glutamate (MSG)</gloss>

@@ -14 +14 @@
-<gloss>Sellotape (brand name)</gloss>
+<gloss g_type="tm">Sellotape</gloss>

@@ -10 +10 @@
-<s_inf>brand name</s_inf>
+<field>&tradem;</field>

daij, gg5

I think "Sellotape (brand name)" is a bit confusing given that セロテープ itself is a brand name. Can we just go with "sellotape"? It's a generic trademark in the UK.

Also, I think "cellotape" (a contraction of "cellophane tape") belongs in a language source tag rather than the glosses. It's not (commonly) used in English.
Don't need セロ・テープ. It's one word.

@@ -8,3 +7,0 @@
-<r_ele>
-<reb>セロ・テープ</reb>
-</r_ele>
@@ -12,0 +10,2 @@
+<s_inf>brand name</s_inf>
+<lsource xml:lang="eng">cellotape</lsource>
@@ -13,0 +13 @@
+<gloss>adhesive tape</gloss>
@@ -15,2 +14,0 @@
-<gloss>cellotape</gloss>
-<gloss>adhesive tape</gloss>

I think this is slightly clearer.

@@ -16,2 +16,2 @@
-<gloss>to read out and compare (e.g. draft document)</gloss>
-<gloss>to check (e.g. accounts)</gloss>
+<gloss>to read out and compare (e.g. proofs against a manuscript)</gloss>
+<gloss>to check (accounts, etc.) by reading aloud</gloss>

Daijr (1) 原稿と校正刷，下書きと清書したものなどを，ひとりが読み上げ，他の人が聞いて誤りを訂正する。
GG5: read out and collate 《one copy with another》; read out 「in [for] collation; verify; 〔表などを〕 check.
中辞典: read out and collate 《one copy》 《with another》; check 《accounts》
ルミナス: 	(照らし合わせる) collate
Cambridge ALD: (collate) - to collect and arrange in correct order the sheets of a document:

All the JEs use "collate" but that term is not usually used in modern English for this sort of action, and I think it is best avoided.

@@ -16 +16,2 @@
-<gloss>to read out and compare or collate</gloss>
+<gloss>to read out and compare (e.g. draft document)</gloss>
+<gloss>to check (e.g. accounts)</gloss>

kanji:
* jawiki: https://ja.wikipedia.org/wiki/ホオズキ
* daijr: https://kotobank.jp/gs/?q=鬼燈 (actual definition doesn't want to load though)

second sense:
* gg5; prog calls it a "mouth hooter"

@@ -8,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>鬼燈</keb>
@@ -40,0 +44,5 @@
+<sense>
+<pos>&n;</pos>
+<misc>&uk;</misc>
+<gloss>children's noisemaking toy</gloss>
+</sense>

@@ -28,1 +28,0 @@
-<re_restr>酸漿</re_restr>

meikyo

@@ -12,0 +12,3 @@
+</r_ele>
+<r_ele>
+<reb>ほおづき</reb>

daij, koj

@@ -20 +20,5 @@
-<gloss>to begin to squeeze</gloss>
+</sense>
+<sense>
+<pos>&v5s;</pos>
+<pos>&vt;</pos>
+<gloss>to remove (dirt, stains, etc.) by washing and rubbing</gloss>

gg5 example

揉み出す	1871
もみ出す	1479
揉出す	No matches

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>もみ出す</keb>

daijr, gg5

@@ -12,2 +12,2 @@
-<gloss>rag (for wiping)</gloss>
-<gloss>waste (cloth)</gloss>
+<lsource xml:lang="eng">waste</lsource>
+<gloss>rag (for wiping machines)</gloss>

@@ -9 +9 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

I don't think we need abbr on a trademark.

@@ -9 +8,0 @@
-<misc>&abbr;</misc>

Looks fine. We need to get the "trademark" in somewhere - I've had enough lawyer letters already.

https://en.wikipedia.org/wiki/Pokémon

It's a lot more than an RPG. "Pocket Monsters" isn't used in English. I don't think it needs to be a gloss.
Can we move "trademark" to a note?

@@ -10,2 +10,2 @@
-<gloss>Pokemon (RPG series) (trademark)</gloss>
-<gloss>Pocket Monsters</gloss>
+<s_inf>trademark</s_inf>
+<gloss>Pokémon</gloss>

ポケモン	3018131
ポケットモンスター	499965
Daijr, ＫＯＤ追加語彙

It's been suggested this be revived because it's common (it's in JMnedict, of course)

@@ -10 +10,2 @@
-<gloss>pocket monster (internationally popular cartoon series, originally a video game)</gloss>
+<gloss>Pokemon (RPG series) (trademark)</gloss>
+<gloss>Pocket Monsters</gloss>

The original Latin would not be written with a capital (in modern orthography.)

@@ -10 +10 @@
-<lsource xml:lang="lat">Orbis</lsource>
+<lsource xml:lang="lat">orbis</lsource>

daijs: 元来は商標名。
daijr: 速度違反を犯した自動車を発見し，違反速度と運転者・ナンバープレートの写真を自動的に記録する装置の俗称。日本では1978年（昭和53）より設置・運用を開始。〔商標名が一般化したもの〕

I believe it's no longer used as a brand name.

@@ -9 +9,2 @@
-<s_inf>from "Orbis" (brand name)</s_inf>
+<s_inf>orig. a trademark</s_inf>
+<lsource xml:lang="lat">Orbis</lsource>

Surely something like this is neater? Everyone calls it a speed camera, right?

@@ -9 +9,2 @@
-<gloss>automatic camera for detecting and recording speeding vehicles (from Orbis - brand name)</gloss>
+<s_inf>from "Orbis" (brand name)</s_inf>
+<gloss>speed camera</gloss>

理化学英和辞典: 【電子】 ピップ: blip.

gg5

@@ -9 +9 @@
-<gloss>pip</gloss>
+<gloss>pip (on a radar screen)</gloss>

@@ -12,2 +12,2 @@
-<s_inf>trademark</s_inf>
-<gloss>toilet device playing a melody or flushing sound</gloss>
+<field>&tradem;</field>
+<gloss>toilet device that plays a melody or flushing sound</gloss>

Best left to the imagination? I'll align them. (Wonderful pun this one.)

wiki トイレ用擬音装置: "一般的に「音姫」として定着しているが、「音姫」の名称はTOTOの登録商標..."

Does the purpose have to be spelled out?
トイレ用擬音装置 should be aligned with this

@@ -12 +12,2 @@
-<gloss>melody or flushing sound played by a Japanese toilet to mask excretion sounds</gloss>
+<s_inf>trademark</s_inf>
+<gloss>toilet device playing a melody or flushing sound</gloss>

Entry created

@@ -17 +17 @@
-<s_inf>brand name</s_inf>
+<field>&tradem;</field>

@@ -12 +12 @@
-<xref type="see" seq="2184800">写メ・2</xref>
+<xref type="see" seq="2184800">写メ・1</xref>

Plenty of results for "写メールを送る".

@@ -12,2 +12,7 @@
-<s_inf>from a trademark by SoftBank Mobile</s_inf>
-<gloss>email from mobile phones, containing pictures, etc.</gloss>
+<xref type="see" seq="2184800">写メ・2</xref>
+<gloss>email with attached photos sent from a mobile phone</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<s_inf>brand name</s_inf>
+<gloss>photo-email service provided by SoftBank Mobile</gloss>

Daijisen

@@ -11,0 +12 @@
+<s_inf>from a trademark by SoftBank Mobile</s_inf>
@@ -14,4 +14,0 @@
-<sense>
-<pos>&n;</pos>
-<gloss>brand name for photo-email service from SoftBank Mobile</gloss>
-</sense>

Yes, it's part of 開巻 + 第一XXX (ページ, etc.)

G n-grams: 230
gg5 example: 開巻第一に…と書いてある.　The book opens with….

The glosses aren't quite right but I don't think we need this as an entry. A+B. Uncommon.

Not idiomatic yojijukugo

@@ -12 +11,0 @@
-<misc>&yoji;</misc>
@@ -14 +13 @@
-<gloss>The book opens with ...</gloss>
+<gloss>the book opens with ...</gloss>

Kanji Haitani list

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

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

Entry created

@@ -24,0 +25,2 @@
+<misc>&col;</misc>
+<misc>&uk;</misc>

see results for おっぱいモミモミ etc. (nsfw, 
obviously)

@@ -20,0 +21,5 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<gloss>squeezing</gloss>

肩をもみもみ	411
肩をモミモミ	558

I disagree w "esp. sexual"

@@ -19 +19,2 @@
-<gloss>massage (esp. sexual)</gloss>
+<gloss>massage</gloss>
+<gloss>rub</gloss>

@@ -9 +9,2 @@
-<s_inf>brandname, from 'cut' and 'ban(dage)'</s_inf>
+<field>&tradem;</field>
+<lsource xml:lang="eng">cut + ban(dage)</lsource>
@@ -11 +12 @@
-<gloss>bandaid</gloss>
+<gloss>band-aid</gloss>

http://www.yutokuyakuhin.co.jp/product/NCB.html

Not "abbr" really.

@@ -9,3 +9,1 @@
-<xref type="see" seq="1037630">カット・1</xref>
-<misc>&abbr;</misc>
-<gloss>band aid</gloss>
+<s_inf>brandname, from 'cut' and 'ban(dage)'</s_inf>
@@ -13,0 +11,1 @@
+<gloss>bandaid</gloss>

Entry created

お番菜	5173	62.3%
御番菜	84	1.0%
お晩菜	2700	32.5%
御晩菜	234	2.8%
お晩彩	119	1.4%

@@ -8,0 +9 @@
+<ke_inf>&sK;</ke_inf>
@@ -14,0 +16 @@
+<ke_inf>&sK;</ke_inf>
@@ -18 +20 @@
-<ke_inf>&iK;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -28 +30 @@
-<xref type="see" seq="1399580">惣菜・そうざい</xref>
+<xref type="see" seq="1399580">惣菜</xref>

https://kyoumachi-shinjuku.com/blog/1381  (example)

That sounds correct.

@@ -29 +28,0 @@
-<xref type="see" seq="1399580">惣菜・そうざい</xref>
@@ -31,0 +31 @@
+<gloss>meal of side dishes</gloss>

native Kansai informer,
daij

To my native (non-kyoto) kansai informer, it's 
not any particular side dish, it's just what 
you call a (meal consisting only of) side 
dish(es) in Kyoto.
(I think there's still room for improving the 
entry)

@@ -31 +31 @@
-<gloss>light Kyoto-style home cooking with boiled vegetables and marinated food, also now served in restaurants</gloss>
+<gloss>Kyoto-style side dish</gloss>

Daij, GG5, etc.

@@ -4,3 +4,0 @@
-<k_ele>
-<keb>お晩彩</keb>
-</k_ele>
@@ -11,0 +8,6 @@
+<keb>御番菜</keb>
+</k_ele>
+<k_ele>
+<keb>お晩菜</keb>
+</k_ele>
+<k_ele>
@@ -12,0 +15,4 @@
+</k_ele>
+<k_ele>
+<keb>お晩彩</keb>
+<ke_inf>&iK;</ke_inf>
@@ -16,0 +23,3 @@
+<r_ele>
+<reb>おばんざい</reb>
+</r_ele>
@@ -18,0 +28,1 @@
+<xref type="see" seq="1399580">惣菜・そうざい</xref>
@@ -19,3 +30,1 @@
-<gloss>light Kyoto-style home cooking with boiled vegetables and marinated food served in restaurants</gloss>
-<gloss>cf. 惣菜</gloss>
-<gloss>総菜 (そうざい)</gloss>
+<gloss>light Kyoto-style home cooking with boiled vegetables and marinated food, also now served in restaurants</gloss>

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

Plently of English-language web results for "washlet".

@@ -14 +14,2 @@
-<lsource ls_wasei="y">wash toilet</lsource>
+<gloss g_type="tm">Washlet</gloss>
+<gloss>electronic bidet</gloss>

@@ -13 +13 @@
-<s_inf>Toto brandname</s_inf>
+<field>&tradem;</field>

Tidying.

@@ -12,1 +12,3 @@
-<lsource ls_wasei="y">wash toilet (Toto brandname)</lsource>
+<xref type="see" seq="2610100">温水洗浄便座</xref>
+<s_inf>Toto brandname</s_inf>
+<lsource ls_wasei="y">wash toilet</lsource>

daijs:「タッパー」も商標名。

I don't think there need to be two senses. We have a few genericised trademarks as entries and they're all one sense. We can tag both タッパー and "Tupperware" as trademarks.

@@ -12,4 +11,0 @@
-<gloss>lidded plastic container</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
@@ -17,2 +13,2 @@
-<misc>&abbr;</misc>
-<gloss>Tupperware</gloss>
+<gloss>plastic food storage container</gloss>
+<gloss g_type="tm">Tupperware</gloss>

If タッパー refers both to a generic lidded container, and to the branded product, there needs to be two senses. (We have to be VERY cautious in these cases.)

@@ -12,0 +13,5 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<field>&tradem;</field>
+<misc>&abbr;</misc>

Isn't "Tupperware" a genericized trademark in English too?

@@ -12,2 +12,2 @@
-<s_inf>from Tupperware</s_inf>
-<gloss>lidded plastic container, usually for food</gloss>
+<gloss>lidded plastic container</gloss>
+<gloss>Tupperware</gloss>

Proposed reinstatement. See comments on (deleted) 2847283 where Marcus wrote: "I would suggest re-instating the original タッパー, I hear that used all the time for non-branded plastic tubs with lids."

@@ -12,3 +12,2 @@
-<xref type="see" seq="5741065" corp="jmnedict">タッパーウェア</xref>
-<misc>&abbr;</misc>
-<gloss>Tupperware</gloss>
+<s_inf>from Tupperware</s_inf>
+<gloss>lidded plastic container, usually for food</gloss>

@@ -14 +14 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

Better?

@@ -14,2 +14,2 @@
-<gloss>Bufferin</gloss>
-<gloss g_type="expl">brand name of buffered aspirin</gloss>
+<s_inf>trademark</s_inf>
+<gloss>Bufferin (brand of buffered aspirin)</gloss>

"n-pr" to "n" conversion. Copied to JMnedict.

@@ -12 +12 @@
-<pos>&n-pr;</pos>
+<pos>&n;</pos>

I've reindexed the sentences.

gg5, daijr/s
https://context.reverso.net/翻訳/日本語-英語/どうかした

Indeed, どうかした doesn't belong with どうかして. The former is always prenominal whereas the latter functions like an adverb.
All of the sense 1 examples in GG5 and the Tanaka sentences are some variation on どうかしたの. Reverso has a few examples without の.
I don't think we need the polite form.

@@ -7,3 +6,0 @@
-<r_ele>
-<reb>どうかしました</reb>
-</r_ele>
@@ -12 +9 @@
-<gloss>is something up?</gloss>
+<s_inf>usu. as どうかしたの</s_inf>
@@ -13,0 +11,2 @@
+<gloss>what's wrong?</gloss>
+<gloss>what's the matter?</gloss>
@@ -17,5 +16,9 @@
-<xref type="see" seq="2407710">どうかした</xref>
-<gloss>by mere chance</gloss>
-<gloss>by some chance</gloss>
-<gloss>somehow or other</gloss>
-<gloss>in some way</gloss>
+<pos>&adj-f;</pos>
+<s_inf>usu. followed by はずみ or 拍子</s_inf>
+<gloss>slightest</gloss>
+<gloss>mere</gloss>
+<gloss>trivial</gloss>
+<gloss>some</gloss>
+<gloss>chance</gloss>
+<gloss>accidental</gloss>
+<gloss>unexpected</gloss>

https://ejje.weblio.jp/sentence/content/どうかした

I noticed that どうかした is currently the main headword for entry 2407710 (by mere chance, etc.), but in reality it seems far more commonly used in the "is something wrong?" sense covered by this entry. It seems to appear in more forms than just the set phrases that 
previously made up this reading, including どうかしたの, どうかしたか, どうかしましたか, or sometimes just どうかした.

So, I think it makes sense to convert this entry covering the "is something up/wrong" meaning to simply どうかした and どうかしました, and make entry 2407710 just cover "どうかして".

@@ -5 +5 @@
-<reb>どうかしたのか</reb>
+<reb>どうかした</reb>
@@ -8,4 +8 @@
-<reb>どうかしたのですか</reb>
-</r_ele>
-<r_ele>
-<reb>どうかしたんですか</reb>
+<reb>どうかしました</reb>
@@ -16,0 +14,8 @@
+</sense>
+<sense>
+<pos>&exp;</pos>
+<xref type="see" seq="2407710">どうかした</xref>
+<gloss>by mere chance</gloss>
+<gloss>by some chance</gloss>
+<gloss>somehow or other</gloss>
+<gloss>in some way</gloss>

Entry created

@@ -9,2 +9,2 @@
-<s_inf>brand-name methamphetamine</s_inf>
-<gloss>Philopon</gloss>
+<field>&tradem;</field>
+<gloss>Philopon (brand of methamphetamine)</gloss>
@@ -13,0 +14 @@
+<xref type="see" seq="1133480">メタンフェタミン</xref>

Closing

Reopen.

I'll lock down Richard's suggestion, which I think works OK, and reopen for further discussion, if any.

@@ -9 +9,6 @@
-<s_inf>from the registered trademark Philopon</s_inf>
+<s_inf>brand-name methamphetamine</s_inf>
+<gloss>Philopon</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<s_inf>generic usage</s_inf>
@@ -10,0 +16 @@
+<gloss>meth</gloss>

The grammar book says one should consult with 
a dictionary to check if specific compound 
adjectives are always hyphenated or not, which 
implies to me that we shouldn't use hyphens 
here.

https://www.grammarbook.com/punctuation/hyphens.asp
https://apastyle.apa.org/learn/faqs/when-use-hyphen

From my understanding, "it is dirt cheap" but "a dirt-cheap book".
adj-i implies both uses are OK, of course, but my impression is free-standing compound 
adjectives in jmdict are usually hyphenated.

https://www.lexico.com/definition/dirt_cheap
https://www.merriam-webster.com/dictionary/dirt cheap
https://dictionary.cambridge.org/dictionary/english/dirt-cheap

@@ -13,2 +13,2 @@
-<gloss>dirt-cheap</gloss>
-<gloss>super-cheap</gloss>
+<gloss>dirt cheap</gloss>
+<gloss>super cheap</gloss>

@@ -13,2 +13,2 @@
-<gloss>dirt cheap</gloss>
-<gloss>super cheap</gloss>
+<gloss>dirt-cheap</gloss>
+<gloss>super-cheap</gloss>

reverso examples

@@ -10,0 +11 @@
+<pos>&adj-no;</pos>
@@ -12 +12,0 @@
-<pos>&adj-no;</pos>
@@ -14 +14,2 @@
-<gloss>bargain priced</gloss>
+<gloss>super cheap</gloss>
+<gloss>bargain-priced</gloss>

@@ -13 +13 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

wiki, daijs

sense 1 to distinguish from クロイチゴ.  sense 2 is common enough to have entered english dictionaries, so should probably have its own real entry here

@@ -9 +9,6 @@
-<gloss>blackberry</gloss>
+<gloss>blackberry (esp. the common blackberry, Rubus fruticosus)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<s_inf>trademark</s_inf>
+<gloss>BlackBerry (mobile device)</gloss>

Entry created

藪雨	117
藪鮫	27

short‐tailed bush warbler (family: Muscicapidae) according to 世界大百科事典 第２版
family is Cettiidae according to brit
Muscicapidae according to mypedia and nipp
動物名辞典 says Muscicapidae, genus Cettia (full name Cettia squameiceps)
daijs says Cettiidae ヤブサメ属
jpwiki/enwiki has Asian stubtail (Urosphena squameiceps)
this seems to match what's in EOL too: http://media.eol.org/pages/45518953

@@ -3,0 +4,9 @@
+<k_ele>
+<keb>藪雨</keb>
+</k_ele>
+<k_ele>
+<keb>藪鮫</keb>
+</k_ele>
+<r_ele>
+<reb>やぶさめ</reb>
+</r_ele>
@@ -5,0 +15 @@
+<re_nokanji/>
@@ -9,2 +19,2 @@
-<gloss>Asian stubtail (bird), Urosphena squameiceps</gloss>
-<gloss>family of birds (stubtails), Urosphena, including the Asian stubtail, the Timor stubtail, etc.</gloss>
+<misc>&uk;</misc>
+<gloss>Asian stubtail (Urosphena squameiceps)</gloss>

Entry created

@@ -13,2 +13,2 @@
-<s_inf>trademark</s_inf>
-<gloss>Vegemite (paste made from yeast extract)</gloss>
+<field>&tradem;</field>
+<gloss>Vegemite (spread made from yeast extract)</gloss>

Don't need "food" twice.

@@ -14 +14 @@
-<gloss>Vegemite (food paste made from yeast extract)</gloss>
+<gloss>Vegemite (paste made from yeast extract)</gloss>

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

GG5 (only has ヴェジマイト) "〔オーストラリア製のサンドイッチスプレッド〕 Vegemite."  G-ngrams:
ヴェジマイト	162
ベジマイト	8021

More usually eaten on toast. I used to buy it at an international grocery next to 目白駅.

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ヴェジマイト</reb>

"food"

@@ -8,0 +9 @@
+<s_inf>trademark</s_inf>

@@ -9,2 +9,3 @@
-<s_inf>trademark</s_inf>
-<gloss>Marmite (food paste made from yeast extract)</gloss>
+<field>&food;</field>
+<field>&tradem;</field>
+<gloss>Marmite (spread made from yeast extract)</gloss>

@@ -8,0 +9 @@
+<s_inf>trademark</s_inf>

Entry created

https://en.wiktionary.org/wiki/onahole

https://www.toydemon.com/blog/masturbator-onahole-101 simply it's a male masturbator device, pocket pussy, artificial 
vagina/anus/mouth etc.

https://www.motsutoys.com/onaholes.html Onaholes, also called pocket pussies

@@ -11,0 +12 @@
+<gloss>pocket pussy</gloss>
@@ -13 +14 @@
-<gloss>masturbation device that mimics female genitalia</gloss>
+<gloss g_type="expl">masturbation device that mimics female genitalia</gloss>

Splitting out abbr form.

@@ -6,3 +5,0 @@
-</r_ele>
-<r_ele>
-<reb>オナホ</reb>

https://en.wiktionary.org/wiki/onahole  (a portmanteau of オナニー (onanī, “masturbation”, from German Onanie) and ホール (hōru, “hole”, from English hole))

@@ -11,0 +12 @@
+<xref type="see" seq="1034490">オナニー</xref>

https://www.vice.com/en/article/xgz8md/japanes
e-hentai-is-now-banned-in-australia

@@ -12 +12,2 @@
-<lsource ls_wasei="y">onanism hole</lsource>
+<lsource ls_wasei="y"/>
+<gloss>onahole</gloss>

gg5

@@ -12,0 +13 @@
+<gloss>trademark</gloss>

Not only comp.

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

Entry created

gg5, daij

Two senses.

@@ -9 +8,0 @@
-<gloss>by mere chance</gloss>
@@ -10,0 +10,5 @@
+<gloss>somehow</gloss>
+<gloss>in some way</gloss>
+</sense>
+<sense>
+<pos>&exp;</pos>
@@ -12 +16,3 @@
-<gloss>in some way</gloss>
+<gloss>one way or another</gloss>
+<gloss>by any means possible</gloss>
+<gloss>by hook or by crook</gloss>

https://ejje.weblio.jp/content/どうか

See comment in entry 2089480, suggesting that that entry take over the どうかした reading.

@@ -4,3 +3,0 @@
-<r_ele>
-<reb>どうかした</reb>
-</r_ele>

Entry created

@@ -12 +12 @@
-<pos>&adj-no;</pos>
+<field>&anat;</field>

Entry created

@@ -9 +9 @@
-<s_inf>brand name</s_inf>
+<field>&tradem;</field>

i see no reason to delete.

@@ -8,0 +9 @@
+<s_inf>brand name</s_inf>

-> enamdict (already there)

Entry created

@@ -9 +9 @@
-<s_inf>trademarked name</s_inf>
+<field>&tradem;</field>

a real note probably makes it more clear that it's the japanese name that's trademarked, not the english

@@ -10,1 +10,3 @@
-<gloss>white beech mushroom (trademarked name for white Hypsizygus marmoreus)</gloss>
+<xref type="see" seq="2678540">ブナシメジ</xref>
+<s_inf>trademarked name</s_inf>
+<gloss>white beech mushroom</gloss>

yahoo enc, wiki

@@ -9 +9 @@
-<s_inf>trademark of Pip Co., Ltd.</s_inf>
+<field>&tradem;</field>

@@ -9,1 +9,3 @@
-<gloss>hat put on when hair wash to prevent shampoo getting into eye</gloss>
+<s_inf>trademark of Pip Co., Ltd.</s_inf>
+<lsource ls_wasei="y">shampoo hat</lsource>
+<gloss>broad-rimmed topless cap worn (esp. by young children) to prevent shampoo getting into one's eyes</gloss>

@@ -9,1 +9,1 @@
-<gloss>hat put on when heir wash to prevent shampoo getting into eye</gloss>
+<gloss>hat put on when hair wash to prevent shampoo getting into eye</gloss>

http://ja.wikipedia.org/wiki/シャンプーハット

なるほど。

Not a literal lottery.

@@ -24 +24,3 @@
-<gloss>lottery</gloss>
+<xref type="see" seq="2850410">親ガチャ</xref>
+<misc>&col;</misc>
+<gloss>lottery (i.e. something decided by chance)</gloss>

Quiet

OK. Here's an attempt. I'll approve for the xref and reopen.

@@ -20,0 +21,4 @@
+</sense>
+<sense>
+<pos>&n-suf;</pos>
+<gloss>lottery</gloss>

揉み返し	9603
もみ返し	8785
もみかえし	2229

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>もみ返し</keb>

GG5
(various web hits confirm)

In conversation today

@@ -12 +12 @@
-<s_inf>brandname</s_inf>
+<field>&tradem;</field>
@@ -14,2 +14 @@
-<gloss>pasties</gloss>
-<gloss g_type="expl">adhesive nipple covering</gloss>
+<gloss>pasties (adhesive nipple covering)</gloss>

Wikip: "ニプレスは常盤薬品工業の登録商標である"

Seems they're also called "タック・トップ" and "ニップルカバー".

if it's a brand name, 'Pasties' should also be capitalized, unless we're generalizing it like "kleenex" (probably not a good idea)

which is the brand name?  ニプレス or "Pasties" or both?  and if both, are ニプレス and "Pasties" equivalent brand names?

http://en.wikipedia.org/wiki/Pasty_(disambiguation)

I'd never heard of this sense of "pasties" - I only knew the Cornish variety.

@@ -12,0 +12,2 @@
+<s_inf>brandname</s_inf>
+<lsource ls_wasei="y">nippless</lsource>
@@ -13,0 +15,1 @@
+<gloss g_type="expl">adhesive nipple covering</gloss>

@@ -12 +12 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

included as a noun here:  (Concise Oxford English 
Dictionary) 
https://en.oxforddictionaries.com/definition/jaws_of_life

@@ -13 +13 @@
-<gloss>Jaws of Life</gloss>
+<gloss>Jaws of Life (apparatus used to pry apart the wreckage of crashed vehicles)</gloss>

enamdic?

eij, random house eiwa, prog eiwa

only 2500 hits

@@ -13 +13 @@
-<gloss>toilet device playing a melody or flushing sound</gloss>
+<gloss>toilet device that plays a melody or flushing sound</gloss>

Aligning.

@@ -13 +13 @@
-<gloss>device that plays a melody or flushing sound to mask excretion sounds</gloss>
+<gloss>toilet device playing a melody or flushing sound</gloss>

Daijr, ＫＯＤ追加語彙

wiki web

@@ -9 +9 @@
-<s_inf>trademarked</s_inf>
+<field>&tradem;</field>

or as a proper noun, etc?

@@ -8,0 +9 @@
+<s_inf>trademarked</s_inf>

wiki koj

@@ -9 +9 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

@@ -8,0 +9 @@
+<s_inf>trademark</s_inf>

gg5 daij koj

@@ -9 +9 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

OK

Simple is best?

@@ -10,2 +10 @@
-<gloss>cronut</gloss>
-<gloss g_type="expl">doughnutlike pastry made from croissant dough</gloss>
+<gloss>cronut (pastry)</gloss>

wiki

@@ -10,0 +11 @@
+<gloss g_type="expl">doughnutlike pastry made from croissant dough</gloss>

https://ja.wikipedia.org/wiki/クロナ%E
3%83%83%E3%83%84
lots of hits on twitter

https://dentsu-ho.com/articles/7432
https://www.hitachi-systems.com/sp/newnormal/index.html

Also used to describe life under the pandemic 
(heard it on tv). I don't think we need any 
qualifiers.

@@ -12 +12 @@
-<gloss>new normal (state of new economic or financial conditions)</gloss>
+<gloss>new normal</gloss>

Could be an "expl".

daijs, jwiki

I believe it's only used in this sense.

@@ -12 +12 @@
-<gloss>new normal</gloss>
+<gloss>new normal (state of new economic or financial conditions)</gloss>

ＫＯＤ追加語彙

reverso and weblio examples

@@ -11,0 +12 @@
+<gloss>air supply port</gloss>

換気口	48900
給気口	18873
used in one brit entry:
換気設備 "建物内の空気を入替えて，室内の空気を清浄に保つための設備。排気筒や排気フードなどのように，風力や室内外の温度差によって自然に換気する
ものと，送風機や換気扇を用いて強制的に換気するものとがあり，前者を自然換気，後者を機械換気という。機械換気設備には，送風機によって室内に外部の
空気を吹込み，排気は排気口から自然に排出される第2種換気設備 (押込み換気ともいう) ，送風機によって室内の空気を吸出し，給気口から外気が自然に流入
する第3種換気設備 (吸出し換気ともいう) ..."

@@ -11 +11 @@
-<s_inf>brand name</s_inf>
+<field>&tradem;</field>

Maybe this is better.

@@ -10 +10,3 @@
-<gloss>Velcro (brand name)</gloss>
+<xref type="see" seq="2061600">面ファスナー</xref>
+<s_inf>brand name</s_inf>
+<gloss>Velcro</gloss>

gg5, daijr

@@ -12 +12 @@
-<s_inf>registered trademark</s_inf>
+<field>&tradem;</field>

チーズたら	1937
チーズ鱈	3809
鱈チーズ	137
たらチーズ	7017
チータラ	1047

Registered trademark but sold under this 
name by several manufacturers (7-Eleven)
Others sell them under names like "チータ
ラ、ホワイトチーズサンド" "チーズと鱈のサンド” 
etc.
たらチーズ gets the most hits but when 
checking google images, most of the 
results show チーズ鱈 so I think it's the 
most common

daijs: フルーツやチョコレート、バニラなど甘い風味をもつビール。フレーバービール。
[補説]「スイーツビール」は商標名。

スイーツビール is a trademark, not デザートビール.

@@ -12 +11,0 @@
-<s_inf>trademark</s_inf>

daijs

@@ -12 +12 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

"product" in the names dictionary?

https://eikaiwa.dmm.com/uknow/questions/24
952/

クイックルワイパー	29258
12 tweets past hour

I've heard this used for generic versions 
too. Much like "hoover" of course.
"MagiClean" is the English name of the 
same product from the same company. "easy 
sweeper mop"/"swiffer sweeper floor mop" 
are 2 other trademarks by scotch-brite and 
swffer for similar/nearly identical 
products

@@ -9,2 +9,2 @@
-<s_inf>Starbucks trademark</s_inf>
-<gloss>Frappuccino</gloss>
+<field>&tradem;</field>
+<gloss>Frappuccino (Starbucks brand of iced coffee)</gloss>

フラペチーノ	60326
10 or so tweets past 15 minutes

@@ -9 +9 @@
-<s_inf>from Malathon (trademark)</s_inf>
+<field>&tradem;</field>

Split from 1129290.

@@ -13 +13 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

Split from 2142130.

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

"lyocell" isn't in all English dictionaries.

@@ -10 +10 @@
-<gloss>Lyocell</gloss>
+<gloss>Lyocell (semi-synthetic fiber)</gloss>

@@ -9 +9 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

@@ -9 +9,2 @@
-<gloss>Lyocell (trademark)</gloss>
+<s_inf>trademark</s_inf>
+<gloss>Lyocell</gloss>

ＫＯＤ追加語彙, RP

@@ -9 +9 @@
-<gloss>lyocell</gloss>
+<gloss>Lyocell (trademark)</gloss>

@@ -10 +10 @@
-<s_inf>trademark</s_inf>
+<field>&tradem;</field>

GG5, サーモス  65454

gg5, daijr/s
何とかして	555683
なんとかして	499340

OK, I'll switch that entry (2084620).

I would suggest re-instating the original タッ
パー, I hear that used all the time for non-
branded plastic tubs with lids.

http://www.edrdg.org/jmdictdb/cgi-bin/entr.py?svc=jmdict&sid=&e=1917577

Tupperware? We had a タッパー entry some years back (2084620) but removed it.
It's an entry ij the names dictionary : タッパー (s) Tupper; (pr) Tupperware (abbr)

Saw on TV show caption.  Referring to buying household goods:
「いろいろ買ってきた、何かタッパーとか」「そうスリッパとか」

Different numbers from the ones I saw in the 
infographic...

ＫＯＤ追加語彙: partial but extensive damage; (serious) damage extending to at least 50% but not more than 70% of the surface area of building. ▲延べ床面積の 20% 以上 50% 未満の損壊を「半壊」, 50% 以上 70% 未満の損壊を「大規模半壊」という.

How's this? Perhaps should amend 半壊 to mention 20-50%.

@@ -13 +13 @@
-<gloss>partial destruction requiring large-scale reparations</gloss>
+<gloss>partial building damage comprising 50-70% of the surface area</gloss>

daijs

according to an infographic I saw on the 
news:
50%+ damage (to a house): 全壊
40-50% damage: 大規模半壊
20-40% : 半壊

I think it's OK.

赤パプリカ	14244

a little a+b maybe

aligning with the full form entry

@@ -12,0 +13 @@
+<gloss>pocket pussy</gloss>
@@ -14 +15 @@
-<gloss>masturbation device that mimics female genitalia</gloss>
+<gloss g_type="expl">masturbation device that mimics female genitalia</gloss>

Splitting out from オナホール
I guess the word itself isn't vulg?