Is チャイナ really close to シナ? I don't really think of it as such. I think an xref to an offensive term from a non-offensive one can be misconstrued, also. 

Adding "porcelain" to sense 2 for the benefit of ESL users who might be confused by "China/china".

@@ -11 +10,0 @@
-<xref type="see" seq="1638310">シナ</xref>
@@ -17,0 +17 @@
+<gloss>porcelain</gloss>

I wonder if it would be prudent to alert the reader to this
word's close proximity to (what I understand to be) an offensive
slur. I don't know what kind of nuances チャイナ usually conveys
in actual usage (a brief skim of the wiki page didn't lead me to
believe that it is 差別語), but the reference might be helpful
even if チャイナ is completely benign.

@@ -10,0 +11 @@
+<xref type="see" seq="1638310">シナ</xref>

gg5, daij, koj

@@ -9,0 +10 @@
+<xref type="see" seq="1424270">中国・1</xref>
@@ -11,0 +13,5 @@
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1450660">陶磁器</xref>
+<gloss>china</gloss>
+</sense>

Yes, I'll split it.

@@ -14,5 +13,0 @@
-</sense>
-<sense>
-<pos>&adj-no;</pos>
-<pos>&n;</pos>
-<gloss>high-touch</gloss>

As it's not wasei, sense 2 will need to be a separate entry when lsrc tags become entry-wide, right?

gg5, daij

@@ -14,0 +15,5 @@
+<sense>
+<pos>&adj-no;</pos>
+<pos>&n;</pos>
+<gloss>high-touch</gloss>
+</sense>

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>

Adding these back

@@ -7,0 +8,12 @@
+</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>

👍

@@ -9,6 +8,0 @@
-<k_ele>
-<keb>奥ふかい</keb>
-</k_ele>
-<k_ele>
-<keb>奥ぶかい</keb>
-</k_ele>
@@ -17,2 +10,0 @@
-<re_restr>奥深い</re_restr>
-<re_restr>奥ふかい</re_restr>
@@ -24,2 +15,0 @@
-<re_restr>奥深い</re_restr>
-<re_restr>奥ぶかい</re_restr>

Google N-gram Corpus Counts
456,825	 99.8%	奥深い
    301	  0.1%	奥ふかい
    162	  0.0%	奥ぶかい
    239	  0.1%	おくふかい
    150	  0.0%	おくぶかい

Perhaps 奥ふかい and 奥ぶかい should be removed? I don't see them
in any of the references.

This is another case where neither [rK] nor [io] seem to fit (I
don't know if ふ・ぶ technically counts as okurigana in this
case).

G n-grams:
奥深い	456825
奥ぶかい	162
おくふかい	239
おくぶかい	150
奥ふかい	301

@@ -9,0 +10,3 @@
+<keb>奥ふかい</keb>
+</k_ele>
+<k_ele>
@@ -14,0 +18 @@
+<re_restr>奥ふかい</re_restr>
@@ -19,0 +24,2 @@
+<re_restr>奥深い</re_restr>
+<re_restr>奥ぶかい</re_restr>

Minor mistake, "innkeeper" is one word and not two.

@@ -26 +26 @@
-<gloss>female inn keeper</gloss>
+<gloss>female innkeeper</gloss>

ルミナス (has "female inn keeper")

"Female inn keeper" wasn't listed and although "proprietress" is already listed, inn keeper is a more used word and also closer to this definition too just like "hostess" and "mistress".

@@ -25,0 +26 @@
+<gloss>female inn keeper</gloss>

https://news.yahoo.co.jp/articles/e5d8f15b5c641b171806e31896f1f2a33a4cc60f
濃いお茶に合う和菓子の代表格といえば羊羹（ようかん）だが、あんこがずっしりと感じられる伝統ある練り羊羹の売り上げは低迷している。創業200年以上
の京都の老舗和菓子店でも年間約50本しか売れないというから深刻だ。しかし、その老舗の女将が羊羹を薄くスライスして販売したところ人気に火が付き、
売り上げは1000倍に。

@@ -22 +22 @@
-<gloss>proprietress (of a traditional Japanese inn or restaurant)</gloss>
+<gloss>proprietress (of a traditional Japanese inn, restaurant, or shop)</gloss>

OK

https://furigana.info/r/まとも
まともにでき	34,620		
正面にでき	108		
真面にでき	0		
真正面にでき	23	
---
まともな人	51,119		
正面な人	        23		
真面な人	        0		
真正面な人	0

真正面(まとも) appears quite a bit in literature but presumably it would always have furigana. If we're including it here I think it needs to be visible. If it's only visible on ましょうめん, that'll only cause confusion for users looking up 真正面.

@@ -7 +6,0 @@
-<ke_pri>ichi2</ke_pri>
@@ -12 +10,0 @@
-<ke_pri>ichi2</ke_pri>

I think those counts for 真正面な mostly relate to ましょうめん(な).  I dug out a sample of sentences containing it and ran them through MeCab/Unidic. They all came up as ましょうめん. 
Sankoku is a bit of an outlier associating まとも with 真正面; none of my regular JEs or kokugos do it - they all have ましょうめん alone.
Of course we have 真正面/ましょうめん as an entry (1364060); I wouldn't have proposed hiding it in this entry otherwise.

Google N-gram Corpus Counts
╭─ーーーー─┬───────┬───────╮
│ 正面な　 │ 3,838 │ 57.9% │
│ 真正面な │ 2,036 │ 30.7% │
│ 真面な　 │   750 │ 11.3% │
╰─ーーーー─┴───────┴───────╯
╭─ーーーーーー─┬────╮
│ 真正面にでき │ 23 │
╰─ーーーーーー─┴────╯

i don't think it should be hidden

@@ -16 +16 @@
-<ke_inf>&sK;</ke_inf>
+<ke_inf>&rK;</ke_inf>

I think most of those counts for 真正面 relate to ましょうめん. I think the form should be hidden.
None of the 9 sentences using まとも had a sense setting, so they link to sense 1 by default. In fact, they are all for sense 2, and I've now set that as the sense number.

@@ -16 +16 @@
-<ke_inf>&rK;</ke_inf>
+<ke_inf>&sK;</ke_inf>

南京町	89264
中華街	1051509

@@ -11,0 +12 @@
+<xref type="see" seq="1423570">中華街</xref>

@@ -8,1 +8,1 @@
-<reb>なんきんまち</reb>
+<reb>ナンキンまち</reb>

疎覚え needs to be visible as it also appears on 2756630. See comments on that entry.
iK and rK shouldn't be used together.

@@ -14 +13,0 @@
-<ke_inf>&rK;</ke_inf>

うろ覚え	410633	88.7%
うろ憶え	2219	0.5%
疎覚え	357	0.1% <= Koj
うろおぼえ	36478	7.9%
ウロ覚え	13502	2.9%

The other two could be SK too.

@@ -14,0 +15,4 @@
+</k_ele>
+<k_ele>
+<keb>ウロ覚え</keb>
+<ke_inf>&sK;</ke_inf>

See 2756630.

@@ -8,0 +9,5 @@
+<ke_inf>&rK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>疎覚え</keb>
+<ke_inf>&iK;</ke_inf>

gg5, prog
うろ覚え	410633
うろ憶え	2219

@@ -8,0 +9 @@
+<ke_inf>&rK;</ke_inf>
@@ -14,0 +16,3 @@
+<gloss>faint memory</gloss>
+<gloss>vague memory</gloss>
+<gloss>dim memory</gloss>
@@ -16 +19,0 @@
-<gloss>faint memory</gloss>

盛りが付く	357
盛りがつく	272
さかりがつく	189
盛りの付いた	487
盛りのついた	3862
さかりのついた	1949

"get on heat" is not a common expression.

@@ -5 +5 @@
-<keb>盛りが付く</keb>
+<keb>盛りがつく</keb>
@@ -8 +8 @@
-<keb>盛りがつく</keb>
+<keb>盛りが付く</keb>
@@ -17 +17 @@
-<gloss>to get on heat</gloss>
+<gloss>to go into heat</gloss>

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

@@ -15,0 +15,1 @@
+<pos>&v5k;</pos>

アオメン is Chinese. I don't think we need it.
マカウ isn't in my refs.

@@ -9,7 +8,0 @@
-</r_ele>
-<r_ele>
-<reb>マカウ</reb>
-</r_ele>
-<r_ele>
-<reb>アオメン</reb>
-<re_inf>&ok;</re_inf>

@@ -8,3 +7,0 @@
-<reb>まかお</reb>
-</r_ele>
-<r_ele>
@@ -12 +8,0 @@
-<re_nokanji/>
@@ -16 +11,0 @@
-<re_nokanji/>

KOD 英和: Aomen   澳門(アオメン) 《マカオ (MACAO) の中国語名》.
https://www.visitmacao.com.au/macao-tourism-blog/faq/is-it-macau-or-macao/   "Both spellings are correct, but in most English speaking countries, it’s “Macao”."

@@ -11 +11 @@
-<reb>マカウ</reb>
+<reb>マカオ</reb>
@@ -15 +15 @@
-<reb>マカオ</reb>
+<reb>マカウ</reb>
@@ -25,2 +25,2 @@
-<gloss>Macau (China)</gloss>
-<gloss>Macao</gloss>
+<gloss>Macao (China)</gloss>
+<gloss>Macau</gloss>

https://kotobank.jp/word/アオメン(澳門)-24182

@@ -17,0 +18,4 @@
+<r_ele>
+<reb>アオメン</reb>
+<re_inf>&ok;</re_inf>
+</r_ele>
@@ -21 +25 @@
-<gloss>Macau</gloss>
+<gloss>Macau (China)</gloss>

Google N-gram Corpus Counts
357,296	 98.9%	鑑
  4,058	  1.1%	鑒

456,232	   -  	かがみ

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

GG5

"Model" by itself is a vague definition, and you could take "model" with "pattern" as referring to physical attributes. GG5 uses "shining example", but I feel "exemplar" coneys the same.

@@ -16,0 +17,2 @@
+<gloss>paragon</gloss>
+<gloss>exemplar</gloss>

Entry created

more commonly as xref

daij, koj
チャイナタウン	160383
中華街	        1051509

@@ -8,0 +9 @@
+<xref type="see" seq="1423570">中華街</xref>

Entry created

Thanks

I think it's non-standard but it's rather common. Plenty of web hits. I've drafted an entry.

棒にもかから	10690	80.2%
棒にも引っかから	2631	19.8%

Possibly common enough to have as an entry. 引っかかる and 掛かる don't mean the same thing but some of the discussion implies that the かから is derived from 引っかから.
I'll leave this open for a short while in case anyone wants to create an entry (with proper references.)

there's a variant form 箸にも棒にも引っかからない

Not sure the quotes were needed.

@@ -11,0 +12 @@
+<pos>&adj-no;</pos>
@@ -14 +15 @@
-<s_inf>gay slang; from non + 気</s_inf>
+<s_inf>gay slang; from "non" + 気</s_inf>

@@ -14 +14 @@
-<s_inf>gay slang; from non- + 気</s_inf>
+<s_inf>gay slang; from non + 気</s_inf>

I think this is clearer.
The ゲイ x-ref doesn't seem necessary.

@@ -12,2 +12 @@
-<xref type="see" seq="1048470">ゲイ</xref>
-<xref type="see" seq="2106720">その気・そのけ</xref>
+<xref type="see" seq="2106720">その気</xref>
@@ -15,2 +14,3 @@
-<s_inf>from non-ケ (気)</s_inf>
-<gloss>heterosexual person (as viewed by homosexual person)</gloss>
+<s_inf>gay slang; from non- + 気</s_inf>
+<gloss>heterosexual person</gloss>
+<gloss>straight person</gloss>

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

I don't cisgender, i.e. non-transgender, is correct here. This term is about sexual orientation, not gender orientation.

They're actually very useful in text-glossing systems, where straight katakana/hiragana matching is not always a good approach. Here the counts are not that high, so I won't push the issue, but frankly I think they're harmless and at times useful.

It only has 5% of the hits of びっくりパーティー. We usually ignore less commonly used katakana forms.

In fact it was the ビックリパーティー form I encountered in text, which led me to submitting the entry.

びっくりパーティ	432  <-- in GG5
ビックリパーティ	96

I don't think we need the ビックリ forms.

@@ -8 +8 @@
-<reb>ビックリパーティー</reb>
+<reb>びっくりパーティ</reb>

ビックリパーティー	276
びっくりパーティー	5505
GG5

https://en.wikipedia.org/wiki/Kantō_region

@@ -14 +14 @@
-<gloss>Shuto Expressway (network of toll expressways in Kanto)</gloss>
+<gloss>Shuto Expressway (network of toll expressways in the Kanto region)</gloss>

OK

首都高	366863
https://news.yahoo.co.jp/articles/35cfa4b644f48a3b43b77809a56ae64269b5b967
今年は、依然として高騰の続く小麦粉や食用油のほか、電気料金や首都高料金など、多くの商品・サービスが値上がりしています。

probably worth having in jmdict considering the high ngrmas

See comments on 1575760.

@@ -11,0 +12 @@
+<xref type="see" seq="1575760">つわり</xref>
@@ -15 +15,0 @@
-<gloss>hyperemesis gravidarum</gloss>

Aligning.

@@ -13,0 +14 @@
+<gloss>nausea and vomiting of pregnancy</gloss>

It doesn't necessarily refer to the severe form of morning sickness. I don't think "hyperemesis gravidarum" should lead.

@@ -12,0 +13 @@
+<gloss>morning sickness</gloss>
@@ -14 +14,0 @@
-<gloss>morning sickness</gloss>

Split from 1575760. See discussion there.

https://www.lexico.com/definition/pozidriv

Trademarked.

@@ -9 +9,2 @@
-<gloss>Pozidriv (var. of cross-head screw)</gloss>
+<field>&tradem;</field>
+<gloss>Pozidriv (type of cross-head screw)</gloss>

ポジドライブ	517

@@ -9 +9 @@
-<gloss>Pozidriv (screw)</gloss>
+<gloss>Pozidriv (var. of cross-head screw)</gloss>

グローリーホール	693
https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q11197809026

None

@@ -6,0 +7,3 @@
+<r_ele>
+<reb>グローリー・ホール</reb>
+</r_ele>
@@ -9 +12 @@
-<gloss>Glory hole</gloss>
+<gloss>glory hole</gloss>

Wasn't already on here and while not as widely known, it is still used.

No comments. Closing.

https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q13126894093
担外	259

Very difficult to get a succinct gloss.

@@ -12 +12,2 @@
-<gloss>Out of charge (opposite to in charge). Usually used in reference to regular members of a specific group. E.g. staff, club members, PTA, etc.</gloss>
+<xref type="see" seq="1418200">担任・たんにん・1</xref>
+<gloss>not being in charge (e.g. of a class, in the case of music, art, etc. teachers)</gloss>

Compare to　担当 and 担任.

This use of the word is used on many PTA documents in Japan and many other places. It's a common word often overlooked by students of Japanese.

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

無家賃	91
無家賃の	23
GG5

@@ -12 +12,3 @@
-<gloss>Free of rent, rent-free</gloss>
+<pos>&adj-no;</pos>
+<gloss>free of rent</gloss>
+<gloss>rent-free</gloss>

https://ejje.weblio.jp/content/無家賃

Need to disconnect the clip.

@@ -3 +2,0 @@
-<ent_seq>1967540</ent_seq>

gg5, jwiki
フェルマの問題	        50
フェルマーの問題	        228
フェルマーの最終定理	49846

I don't know what "Fermat's problem" is supposed to be. I suggest changing it to this.

@@ -5,4 +5 @@
-<keb>フェルマの問題</keb>
-</k_ele>
-<k_ele>
-<keb>フェルマーの問題</keb>
+<keb>フェルマーの最終定理</keb>
@@ -11,6 +8 @@
-<reb>フェルマーのもんだい</reb>
-<re_restr>フェルマーの問題</re_restr>
-</r_ele>
-<r_ele>
-<reb>フェルマのもんだい</reb>
-<re_restr>フェルマの問題</re_restr>
+<reb>フェルマーのさいしゅうていり</reb>
@@ -18,0 +11 @@
+<pos>&exp;</pos>
@@ -20 +13,2 @@
-<gloss>Fermat's problem</gloss>
+<field>&math;</field>
+<gloss>Fermat's last theorem</gloss>

exp not needed here.

@@ -16 +15,0 @@
-<pos>&exp;</pos>
@@ -27 +25,0 @@
-<pos>&exp;</pos>
@@ -34 +31,0 @@
-<pos>&exp;</pos>

正面に	672161	25.4%
まともに	1969712	74.5%
真面に	1117	0.0%
GG5, etc.

Moving the senses to match the examples. 真面に  is quite rare.

@@ -5 +5 @@
-<keb>真面に</keb>
+<keb>正面に</keb>
@@ -9,2 +9,2 @@
-<keb>正面に</keb>
-<ke_inf>&rK;</ke_inf>
+<keb>真面に</keb>
+<ke_inf>&sK;</ke_inf>
@@ -30,4 +30,2 @@
-<gloss>honestly</gloss>
-<gloss>decently</gloss>
-<gloss>seriously</gloss>
-<gloss>fairly</gloss>
+<gloss>properly</gloss>
+<gloss>normally</gloss>
@@ -39,2 +37,4 @@
-<gloss>properly</gloss>
-<gloss>normally</gloss>
+<gloss>honestly</gloss>
+<gloss>decently</gloss>
+<gloss>seriously</gloss>
+<gloss>fairly</gloss>

まともに動け	6844	100.0%
正面に動け	0	0.0%
真面に動け	0	0.0%

https://eow.alc.co.jp/search?q=まともにまともに頭が働く
think properly
think straight

まともに振る舞う
behave normally

まともに結婚している
be properly married

まともに英語が読めない
can barely read English

https://context.reverso.net/翻訳/日本語-英語/まともに
I couldn't live properly even at the lowest level as a human.
まともに生きられない

トムはいつまでたってもまともにフランス語喋れるようにはならないんじゃないかな。
I doubt that Tom will ever learn how to speak French properly.

Properly glosses (20):
https://context.reverso.net/翻訳/日本語-英語/まともに#properly

Other comments on [rK] and kanji at the main まとも entry.  Not sure if/how my suggested change here might apply there.

Saw this in the context of an old man who had finally taken a tumble and found himself bedridden.  今までまともに動けたほうが奇跡のです。 Someone's translation: "If anything, it's been a miracle I've been mobile till now". (ie. that his body had been able to move properly) 

Looking into eijiro and reverso, I see several examples of "physically working properly" or "not working normally".  While we have/had "properly" as a gloss in [1], it blends in with a bunch of words that connote morality, not (physical) functionality.

This sense is not at all obvious in the kokugos. sankoku just says 1: しょうめん 2: 真面目・本気.

I'm suggesting this edit because I couldn't understand what I was looking at with only the previous sense[2], and had to go looking for other resources.  (I wondered if he was talking about "having lived an upright and honest life" to that point).  I think a separate sense [3] will make this entry generally more comprehensible.

@@ -4,0 +5,4 @@
+<keb>真面に</keb>
+<ke_inf>&rK;</ke_inf>
+</k_ele>
+<k_ele>
@@ -5,0 +10 @@
+<ke_inf>&rK;</ke_inf>
@@ -28 +32,0 @@
-<gloss>properly</gloss>
@@ -30,0 +35,7 @@
+</sense>
+<sense>
+<pos>&exp;</pos>
+<pos>&adv;</pos>
+<misc>&uk;</misc>
+<gloss>properly</gloss>
+<gloss>normally</gloss>

gg5, wisdom

We need the second sense as well.

@@ -13 +13 @@
-<xref type="see" seq="1378040">正面・まとも・1</xref>
+<xref type="see" seq="1378040">まとも・1</xref>
@@ -14,0 +15 @@
+<gloss>right (in front)</gloss>
@@ -16 +17,2 @@
-<gloss>in front (of)</gloss>
+<gloss>straight (in the face)</gloss>
+<gloss>head-on</gloss>
@@ -17,0 +20,10 @@
+</sense>
+<sense>
+<pos>&exp;</pos>
+<pos>&adv;</pos>
+<misc>&uk;</misc>
+<gloss>honestly</gloss>
+<gloss>decently</gloss>
+<gloss>properly</gloss>
+<gloss>seriously</gloss>
+<gloss>fairly</gloss>

正面に	672161
まともに	1969712
GG5, 中辞典

Split from 正面 entry. I'll reindex the sentences.

https://bosesound.blog.fc2.com/blog-entry-906.html
https://kaisetu.org/gisuru/
https://meaning-book.com/blog/20180908114030.html
https://meaning-dictionary.com/「ギスる」とは？意味や言葉の使い方、概要元ネ/

I think these glosses are a better fit.

@@ -15,2 +15,2 @@
-<gloss>to become stiff (atmosphere, manner, etc.)</gloss>
-<gloss>to become cold</gloss>
+<gloss>to become strained (of a relationship)</gloss>
+<gloss>to become discordant</gloss>
@@ -17,0 +18,2 @@
+<gloss>to become awkward</gloss>
+<gloss>to go sour</gloss>

https://espo-game.jp/article/glossary/29588/#:~:text=ギスるとは「ギスギス,と起こりやすくなります。

@@ -13 +12,0 @@
-<pos>&vs;</pos>
@@ -16,6 +15,3 @@
-<misc>&abbr;</misc>
-<gloss>(for an atmosphere, manner, etc.) to become stiff</gloss>
-<gloss>cold</gloss>
-<gloss>unfriendly</gloss>
-<gloss>unsociable</gloss>
-<gloss>edgy</gloss>
+<gloss>to become stiff (atmosphere, manner, etc.)</gloss>
+<gloss>to become cold</gloss>
+<gloss>to become unfriendly</gloss>

https://youtu.be/WpHcd5iyW9c (0:17, 1:19, 2:17)

2.3m googits for ギスる

Meaning is a slightly modified version 1003570, may need some tweaking.

Also a potential noun form of "ギス" at 1:42 in the referenced video however could not find much about it.

The ギスギス entry already has the "vs" tag, indicating that it can take する to become a verb form.

デジタル大辞泉
weblio thesaurus

6m googits for ギスギスする

Copying glosses from 2854342.

I was struggling to find a "Fellmer". That's good enough.

@@ -12,2 +12,2 @@
-<misc>&place;</misc>
-<gloss>Vellmar (town in Hesse, Germany)</gloss>
+<misc>&surname;</misc>
+<gloss>Fellmer</gloss>
@@ -16,2 +16,2 @@
-<misc>&surname;</misc>
-<gloss>Fellmer</gloss>
+<misc>&place;</misc>
+<gloss>Vellmar (Germany)</gloss>

Vellmar (place):
https://ja.wikipedia.org/wiki/フェルマー_(ドイツ)

Fellmer (surname):
https://ja.wikipedia.org/wiki/ヘルムート・フェルマー

too obscure?

@@ -9,0 +10,8 @@
+</sense>
+<sense>
+<misc>&place;</misc>
+<gloss>Vellmar (town in Hesse, Germany)</gloss>
+</sense>
+<sense>
+<misc>&surname;</misc>
+<gloss>Fellmer</gloss>

https://ja.wikipedia.org/wiki/ピエール・ド・フェルマー

@@ -8,2 +8,2 @@
-<misc>&unclass;</misc>
-<gloss>Fellmer</gloss>
+<misc>&surname;</misc>
+<gloss>Fermat</gloss>

マカウ	4876
https://www.ritzcarlton.com/jp/hotels/china/macau
https://4travel.jp/os_hotel-10381592/travelogue

It was scraped from a Japanese names site many years back. A bit too common to ignore, and there are places where it's used instead ofマカオ.

Is there a source for this Macao reading?

@@ -8,0 +9 @@
+<gloss>Macao (China)</gloss>
@@ -10,0 +12,4 @@
+<sense>
+<misc>&surname;</misc>
+<gloss>McCaw</gloss>
+</sense>

https://en.wiktionary.org/wiki/アオメン
アオメン	2384

Dropped from JMdict so I'll note it here.

@@ -8,0 +9,3 @@
+</r_ele>
+<r_ele>
+<reb>アオメン</reb>

The entry Nicolas linked to is 澳門【まかお】in jmnedict.
I think they should be merged.

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>澳門</keb>
+</k_ele>

No problem with it being in both.

Merge with https://www.edrdg.org/jmdictdb/cgi-bin/entr.py?svc=jmdict&sid=&e=1893368