Merge pull request #15 from mozillazg/develop

v0.4.1
mozillazg · Feb 12, 2017 · edb08de · edb08de
2 parents 0fec9a7 + 2fb6b6d
commit edb08de
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # ChangeLog
 
 
+## 0.4.1 (2017-02-12):
+
+* `妳` 的最常用拼音调整为 `nǐ` via [eb08200](https://github.com/mozillazg/pinyin-data/commit/eb08200d0a203c57ecc62ec7a118765518430238)
+* `钭` 的拼音更新为 `tǒu,dǒu` via [fb9e64e](https://github.com/mozillazg/pinyin-data/commit/fb9e64e6c0a20eb0e792e8a402dffbf8cc2dfa57)
+
+
 ## 0.4.0 (2016-10-17):
 
 * Update PUA.txt 详见 [#7](https://github.com/mozillazg/pinyin-data/issues/7) thanks [@Artoria2e5][@Artoria2e5]

diff --git a/README.md b/README.md
@@ -5,10 +5,15 @@
 
 ## 数据介绍
 
-数据格式：
+拼音数据的格式：
+
+    {code point}: {pinyins}  # {hanzi} {comments}
 
-* 格式：`{code point}: {pinyins}  # {hanzi} {comments}` （示例：`U+4E2D: zhōng,zhòng  # 中`）
 * 以 `#` 开头的行是注释
+* `{pinyins}` 中使用逗号分隔多个拼音
+* 示例：
+
+        U+4E2D: zhōng,zhòng  # 中
 
 
 [Unihan Database][unihan] 数据版本：
@@ -32,6 +37,7 @@
 * [Unihan Database Lookup](http://www.unicode.org/charts/unihan.html)
 * [汉典 zdic.net](http://www.zdic.net/)
 * [字海网，叶典网](http://zisea.com/)
+* [国学大师_国学网](http://www.guoxuedashi.com/)
 * [Unicode、GB2312、GBK和GB18030中的汉字](http://www.fmddlmyy.cn/text24.html)
 * [GB 18030 - 维基百科，自由的百科全书](https://zh.wikipedia.org/wiki/GB_18030#PUA)
 * [通用规范汉字表 - 维基百科，自由的百科全书](https://zh.wikipedia.org/wiki/%E9%80%9A%E7%94%A8%E8%A7%84%E8%8C%83%E6%B1%89%E5%AD%97%E8%A1%A8)

diff --git a/merge_unihan.py b/merge_unihan.py
@@ -108,6 +108,6 @@ def extend_pinyins(old_map, new_map, only_no_exists=False):
     assert set(overwrite_pinyin_map.keys()) - code_set == set()
     assert set(pua_pinyin_map.keys()) - code_set == set()
     with open('pinyin.txt', 'w') as fp:
-        fp.write('# version: 0.4.0\n')
+        fp.write('# version: 0.4.1\n')
         fp.write('# source: https://github.com/mozillazg/pinyin-data\n')
         save_data(new_pinyin_map, fp)
diff --git a/overwrite.txt b/overwrite.txt
@@ -3,7 +3,9 @@
 # 数据格式：{code point}: {pinyins}  # {hanzi}
 # 示例：
 # U+4E2D: zhōng,zhòng  # 中
+U+59B3: nǐ,nǎi  # 妳
 U+7F57: luó  # 罗
+U+94AD: tǒu,dǒu  # 钭
 U+E815: yè  # 
 U+E816: zuǒ,yǒu  # 
 U+E81B: zhòu,zhū  # 

diff --git a/pinyin.txt b/pinyin.txt
@@ -1,4 +1,4 @@
-# version: 0.4.0
+# version: 0.4.1
 # source: https://github.com/mozillazg/pinyin-data
 U+3007: líng  # 〇
 U+3400: qiū  # 㐀
@@ -8756,7 +8756,7 @@ U+59AF: zhóu,chōu  # 妯
 U+59B0: zhuó  # 妰
 U+59B1: zhāo  # 妱
 U+59B2: dá  # 妲
-U+59B3: nǎi,nǐ  # 妳
+U+59B3: nǐ,nǎi  # 妳
 U+59B4: yuàn  # 妴
 U+59B5: tǒu  # 妵
 U+59B6: xián,xuán,xù  # 妶
@@ -23847,7 +23847,7 @@ U+94A9: gōu  # 钩
 U+94AA: kàng  # 钪
 U+94AB: fāng  # 钫
 U+94AC: huǒ  # 钬
-U+94AD: tǒu  # 钭
+U+94AD: tǒu,dǒu  # 钭
 U+94AE: niǔ  # 钮
 U+94AF: bǎ,pá  # 钯
 U+94B0: yù  # 钰