Auto merge of #16 - mozillazg:develop, r=mozillazg

v0.10.0

Author: homu

.travis.yml

@@ -21,4 +21,4 @@ script:
   - go run pinyin/main.go -s Normal abc
   - echo "abc" | go run pinyin/main.go
   - echo "abc" > abc.txt && go run pinyin/main.go < abc.txt
-  - $HOME/gopath/bin/goveralls -repotoken WAzmh3gmiQEUYEHM2wkwSH4oTrshvMmll
+  - $HOME/gopath/bin/goveralls -service=travis-ci -v -package .

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
 
+## 0.10.0 (2016-10-18)
+
+* **Changed** use [pinyin-data](https://github.com/mozillazg/pinyin-data) v0.4.0
+
+
 ## 0.9.0 (2016-09-04):
 
 * **NEW** 新增 `func Convert(s string, a *Args) [][]string`
@@ -13,7 +18,7 @@
 ## 0.8.0 (2016-08-19)
 
 * **Changed** use [pinyin-data](https://github.com/mozillazg/pinyin-data) v0.3.0
-  * Fixed [#13](https://github.com/mozillazg/go-pinyin/issues/13)
+  * Fixed [#13](https://github.com/mozillazg/go-pinyin/issues/13) . thanks [@aisq2008](https://github.com/aisq2008)
   * Fixed pinyin of 罗
 
 

pinyin.go

@@ -7,7 +7,7 @@ import (
 
 // Meta
 const (
-	Version   = "0.9.0"
+	Version   = "0.10.0"
 	Author    = "mozillazg, 闲耘"
 	License   = "MIT"
 	Copyright = "Copyright (c) 2016 mozillazg, 闲耘"

pinyin_dict.go

@@ -2118,6 +2118,7 @@ var PinyinDict = map[int]string{
 	0x3E03:  "diǎn",
 	0x3E04:  "jì",
 	0x3E05:  "jié,jí",
+	0x3E06:  "kào",
 	0x3E07:  "zuǎn",
 	0x3E09:  "xiè",
 	0x3E0A:  "lài,là",
@@ -3712,6 +3713,7 @@ var PinyinDict = map[int]string{
 	0x44E7:  "cì",
 	0x44E8:  "yīng",
 	0x44EB:  "qí",
+	0x44EC:  "zhuó",
 	0x44ED:  "chà",
 	0x44EE:  "mào",
 	0x44EF:  "dú",
@@ -5891,7 +5893,7 @@ var PinyinDict = map[int]string{
 	0x4E7B:  "yú",
 	0x4E7C:  "cui",
 	0x4E7D:  "zhě",
-	0x4E7E:  "gān,qián",
+	0x4E7E:  "qián,gān",
 	0x4E7F:  "zhì,luàn",
 	0x4E80:  "guī",
 	0x4E81:  "gān",
@@ -5950,7 +5952,7 @@ var PinyinDict = map[int]string{
 	0x4EB6:  "dǎn,dàn,chán,zhān",
 	0x4EB7:  "lián",
 	0x4EB8:  "duǒ",
-	0x4EB9:  "mén,wěi",
+	0x4EB9:  "wěi,mén",
 	0x4EBA:  "rén",
 	0x4EBB:  "rén",
 	0x4EBC:  "jí",
@@ -5977,7 +5979,7 @@ var PinyinDict = map[int]string{
 	0x4ED1:  "lún",
 	0x4ED2:  "bīng",
 	0x4ED3:  "cāng",
-	0x4ED4:  "zǐ,zī,zǎi",
+	0x4ED4:  "zǎi,zǐ,zī",
 	0x4ED5:  "shì",
 	0x4ED6:  "tā,tuó",
 	0x4ED7:  "zhàng",
@@ -6056,7 +6058,7 @@ var PinyinDict = map[int]string{
 	0x4F20:  "chuán,zhuàn",
 	0x4F21:  "chē",
 	0x4F22:  "yá",
-	0x4F23:  "xiàn",
+	0x4F23:  "qiàn,xiàn",
 	0x4F24:  "shāng",
 	0x4F25:  "chāng",
 	0x4F26:  "lún",
@@ -6082,7 +6084,7 @@ var PinyinDict = map[int]string{
 	0x4F3A:  "cì,sì",
 	0x4F3B:  "bēng",
 	0x4F3C:  "shì,sì",
-	0x4F3D:  "jiā,qié,gā",
+	0x4F3D:  "gā,jiā,qié",
 	0x4F3E:  "pī",
 	0x4F3F:  "yì",
 	0x4F40:  "sì",
@@ -13577,7 +13579,7 @@ var PinyinDict = map[int]string{
 	0x6C85:  "yuán",
 	0x6C86:  "hàng,háng,kàng",
 	0x6C87:  "yǎn,wěi",
-	0x6C88:  "chén,shěn,tán",
+	0x6C88:  "shěn,chén,tán",
 	0x6C89:  "chén",
 	0x6C8A:  "dàn",
 	0x6C8B:  "yóu",
@@ -26696,7 +26698,7 @@ var PinyinDict = map[int]string{
 	0xE83B:  "zāi",
 	0xE83C:  "bà,bēi",
 	0xE83D:  "bà,bēi",
-	0xE83F:  "zhuān,chuán,chún,zhuǎn",
+	0xE83F:  "zhuān,zhuán,chuǎn,chún",
 	0xE840:  "qióng",
 	0xE841:  "kuì,huì",
 	0xE842:  "kuì,huì",
@@ -26792,6 +26794,7 @@ var PinyinDict = map[int]string{
 	0x2014C: "yí",
 	0x20157: "diè",
 	0x2015A: "qí",
+	0x20164: "xí",
 	0x2016C: "bāo",
 	0x20171: "xiè",
 	0x20179: "zhàng",
@@ -31588,7 +31591,7 @@ var PinyinDict = map[int]string{
 	0x241F0: "fá",
 	0x241F3: "xù,xuè",
 	0x241F4: "yí,xī",
-	0x241FE: "yìng",
+	0x241FE: "yíng",
 	0x24214: "chí",
 	0x24219: "yí",
 	0x24225: "dí",
@@ -34728,6 +34731,7 @@ var PinyinDict = map[int]string{
 	0x26671: "sān",
 	0x26674: "zhù",
 	0x26675: "wàn",
+	0x26676: "gǔ",
 	0x26678: "sān",
 	0x26679: "bàn",
 	0x2667A: "jià,jiā",
@@ -35251,6 +35255,7 @@ var PinyinDict = map[int]string{
 	0x26C18: "zhǐ",
 	0x26C19: "bì",
 	0x26C1B: "fén",
+	0x26C21: "nà",
 	0x26C25: "bāng",
 	0x26C2A: "qiú",
 	0x26C2B: "nǐ",
@@ -41235,11 +41240,17 @@ var PinyinDict = map[int]string{
 	0x2A6CE: "pì",
 	0x2A6D2: "lián",
 	0x2A79D: "duó",
+	0x2A7DD: "jì",
 	0x2A848: "bái",
 	0x2A84F: "zhān",
 	0x2A8AE: "luán",
+	0x2A8FB: "lóu",
+	0x2A917: "liào",
 	0x2AA0A: "sóng",
 	0x2AA17: "juē",
+	0x2AA30: "qū",
+	0x2AA36: "shē",
+	0x2AA58: "yǎn",
 	0x2AA9D: "yōng",
 	0x2AEB9: "nǔ",
 	0x2AED0: "cōng",
@@ -41248,46 +41259,185 @@ var PinyinDict = map[int]string{
 	0x2B088: "fèi",
 	0x2B099: "sù",
 	0x2B0DC: "kòu",
+	0x2B127: "yán",
 	0x2B128: "chī",
+	0x2B137: "yì",
 	0x2B138: "xūn",
+	0x2B1ED: "wěi",
 	0x2B230: "qià",
 	0x2B2D0: "gǒng",
 	0x2B300: "jī",
 	0x2B328: "luó",
 	0x2B359: "yì",
 	0x2B35F: "yí",
 	0x2B362: "náo",
+	0x2B363: "tóng",
+	0x2B36F: "xián",
 	0x2B370: "xǐ",
 	0x2B372: "xiǎo",
+	0x2B37D: "xuān",
 	0x2B3CB: "juē,qiāo",
 	0x2B404: "yuè",
 	0x2B406: "kuài",
 	0x2B409: "líng",
 	0x2B410: "ní",
 	0x2B413: "bù",
+	0x2B461: "méng",
 	0x2B4B6: "hán",
 	0x2B4E7: "fū",
 	0x2B4E9: "cōng",
+	0x2B4EF: "jī",
+	0x2B4F6: "xuān",
+	0x2B4F9: "jī",
+	0x2B50D: "fán",
 	0x2B50E: "jué",
+	0x2B536: "niè",
+	0x2B5AE: "yǐ",
+	0x2B5AF: "fǔ",
+	0x2B5B3: "yūn",
 	0x2B5E0: "zhāng",
 	0x2B5E6: "bù",
 	0x2B5E7: "sù",
 	0x2B5EE: "huáng",
 	0x2B5F4: "zhān",
+	0x2B61C: "wén",
 	0x2B61D: "jué",
 	0x2B623: "hàn",
 	0x2B624: "ái",
+	0x2B626: "táo",
+	0x2B627: "lù",
 	0x2B628: "tí",
+	0x2B62A: "yuán",
+	0x2B62C: "xí",
 	0x2B688: "xù",
 	0x2B689: "hóng",
 	0x2B692: "fú",
 	0x2B694: "huí",
 	0x2B695: "shī",
+	0x2B696: "cǐ",
 	0x2B699: "pū",
+	0x2B6AD: "liè",
 	0x2B6DB: "zhī",
 	0x2B6DE: "jué",
 	0x2B6E2: "níng",
+	0x2B6ED: "kuáng",
 	0x2B6F6: "chì",
 	0x2B6F8: "tí",
+	0x2B7A9: "mén",
+	0x2B7C5: "liáng",
+	0x2B7E6: "suì",
+	0x2B7F9: "hóng",
+	0x2B7FC: "dá",
+	0x2B806: "kuǐ",
+	0x2B80A: "xuán",
+	0x2B81C: "ní",
 	0x2B851: "yīn",
+	0x2B8B8: "dàn",
+	0x2BAC7: "ě",
+	0x2BB5F: "ōu",
+	0x2BB62: "lǔn",
+	0x2BB7C: "láo",
+	0x2BB83: "shàn",
+	0x2BC1B: "xíng",
+	0x2BD77: "lì",
+	0x2BD87: "dié",
+	0x2BDF7: "xīn",
+	0x2BE29: "kōu",
+	0x2C029: "wěi",
+	0x2C02A: "xiàn",
+	0x2C0A9: "jiā",
+	0x2C0CA: "zhì",
+	0x2C1D5: "wàn",
+	0x2C1D9: "pèi",
+	0x2C1F9: "guó",
+	0x2C27C: "ōu",
+	0x2C288: "xún",
+	0x2C2A4: "chǎn",
+	0x2C317: "hé",
+	0x2C35B: "lì",
+	0x2C361: "dàng",
+	0x2C364: "xún",
+	0x2C488: "què",
+	0x2C494: "gěng",
+	0x2C497: "lán",
+	0x2C542: "gōng",
+	0x2C613: "xún",
+	0x2C618: "dǎn",
+	0x2C621: "yīn",
+	0x2C629: "tīng",
+	0x2C62B: "huán",
+	0x2C62C: "qiàn",
+	0x2C62D: "lín",
+	0x2C62F: "zhǔn",
+	0x2C642: "yǎn",
+	0x2C64A: "mò",
+	0x2C64B: "xiāng",
+	0x2C72C: "màn",
+	0x2C72F: "liǎng",
+	0x2C79F: "pín",
+	0x2C7C1: "yì",
+	0x2C7FD: "dōng",
+	0x2C8D9: "xū",
+	0x2C8DE: "zhǔ",
+	0x2C8E1: "jiàn",
+	0x2C8F3: "hěn",
+	0x2C907: "yīn",
+	0x2C90A: "shì",
+	0x2C91D: "huì",
+	0x2CA02: "qí",
+	0x2CA0E: "yóu",
+	0x2CA7D: "xún",
+	0x2CAA9: "nóng",
+	0x2CB29: "yì",
+	0x2CB2D: "lún",
+	0x2CB2E: "chǎng",
+	0x2CB31: "jīn",
+	0x2CB38: "shù",
+	0x2CB39: "shén",
+	0x2CB3B: "lú",
+	0x2CB3F: "zhāo",
+	0x2CB41: "mǔ",
+	0x2CB4A: "dù",
+	0x2CB4E: "hóng",
+	0x2CB5A: "chún",
+	0x2CB5B: "bō",
+	0x2CB64: "hóu",
+	0x2CB69: "wēng",
+	0x2CB6C: "wèi",
+	0x2CB6F: "piě",
+	0x2CB73: "xǐ",
+	0x2CB76: "hēi",
+	0x2CB78: "lín",
+	0x2CB7C: "suì",
+	0x2CBB1: "yīn",
+	0x2CBBF: "qí",
+	0x2CBC0: "jī",
+	0x2CBCE: "tuí",
+	0x2CC56: "dí",
+	0x2CC5F: "wěi",
+	0x2CCF5: "pī",
+	0x2CCF6: "jiōng",
+	0x2CCFD: "shēn",
+	0x2CCFF: "tú",
+	0x2CD02: "fēi",
+	0x2CD03: "huō",
+	0x2CD0A: "lín",
+	0x2CD8B: "jū",
+	0x2CD8D: "tuó",
+	0x2CD8F: "wéi",
+	0x2CD90: "zhào",
+	0x2CD9F: "là",
+	0x2CDA0: "liàn",
+	0x2CDA8: "jì",
+	0x2CDAD: "jì",
+	0x2CDAE: "xǐ",
+	0x2CDD5: "bū",
+	0x2CE18: "yǎn",
+	0x2CE1A: "yuè",
+	0x2CE23: "xiān",
+	0x2CE26: "zhuó",
+	0x2CE2A: "fán",
+	0x2CE7C: "xiè",
+	0x2CE88: "yǐ",
+	0x2CE93: "chǔ",
 }