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

v0.8.0

Author: homu

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
 
+## 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 pinyin of 罗
+
+
 ## 0.7.0 (2016-08-02)
 
 * **Changed** use [pinyin-data](https://github.com/mozillazg/pinyin-data) v0.2.0

TODO.md

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

pinyin.go

@@ -18386,7 +18386,7 @@ var PinyinDict = map[int]string{
 	0x7F54:  "wǎng,wáng",
 	0x7F55:  "hǎn,hàn",
 	0x7F56:  "luó",
-	0x7F57:  "luō,luó",
+	0x7F57:  "luó",
 	0x7F58:  "fú",
 	0x7F59:  "shēn",
 	0x7F5A:  "fá",
@@ -26663,6 +26663,76 @@ var PinyinDict = map[int]string{
 	0x9FCF:  "mài",
 	0x9FD4:  "gē",
 	0x9FD5:  "dān",
+	0xE815:  "yè",
+	0xE816:  "zuǒ,yǒu",
+	0xE818:  "gǔn",
+	0xE81A:  "zhòu,zhū",
+	0xE81B:  "zhòu,zhū",
+	0xE81D:  "jié,jiē",
+	0xE81F:  "wāi",
+	0xE820:  "hǎn",
+	0xE821:  "hǎn",
+	0xE824:  "zhòu",
+	0xE825:  "zhòu",
+	0xE826:  "shǒu",
+	0xE827:  "gāng",
+	0xE828:  "kuǎi",
+	0xE829:  "sǒng",
+	0xE82A:  "sǒng",
+	0xE82B:  "fēng",
+	0xE82C:  "gòng",
+	0xE82D:  "gāng",
+	0xE82E:  "huì,kuì",
+	0xE82F:  "tà",
+	0xE830:  "jiān",
+	0xE831:  "ēn",
+	0xE832:  "xiǎo",
+	0xE834:  "lóu,lǘ",
+	0xE835:  "cǎn,shān,cēn",
+	0xE836:  "zhú",
+	0xE837:  "chōu,chóu",
+	0xE838:  "wǎng",
+	0xE83A:  "yáng,xiáng",
+	0xE83B:  "zāi",
+	0xE83C:  "bà,bēi",
+	0xE83D:  "bà,bēi",
+	0xE83F:  "zhuān,chuán,chún,zhuǎn",
+	0xE840:  "qióng",
+	0xE841:  "kuì,huì",
+	0xE842:  "kuì,huì",
+	0xE843:  "juǎn",
+	0xE844:  "xīn",
+	0xE845:  "yàn",
+	0xE846:  "qíng",
+	0xE847:  "qíng",
+	0xE849:  "shàn",
+	0xE84A:  "yé,yá",
+	0xE84B:  "pō",
+	0xE84C:  "shàn",
+	0xE84D:  "zhuō",
+	0xE84E:  "shàn",
+	0xE84F:  "jué",
+	0xE850:  "chuài",
+	0xE851:  "zhèng",
+	0xE852:  "chuài",
+	0xE853:  "zhèng",
+	0xE854:  "zhuó",
+	0xE855:  "yíng",
+	0xE856:  "yú",
+	0xE857:  "yìn",
+	0xE858:  "chūn",
+	0xE859:  "qiū",
+	0xE85A:  "yú",
+	0xE85B:  "téng",
+	0xE85C:  "shī",
+	0xE85D:  "jiāo",
+	0xE85E:  "liè",
+	0xE85F:  "jīng",
+	0xE860:  "jú",
+	0xE861:  "tī",
+	0xE862:  "pì",
+	0xE863:  "yǎn",
+	0xE864:  "luán",
 	0x20000: "hē",
 	0x20001: "qī",
 	0x20003: "qiě,jī",

pinyin_dict.go

@@ -31,6 +31,10 @@ var PinyinDict = map[int]string{
 		} else if err != nil {
 			panic(err)
 		}
+		if strings.HasPrefix(line, "#") {
+			continue
+		}
+
 		// line: `U+4E2D: zhōng,zhòng  # 中`
 		dataSlice := strings.Split(line, "  #")
 		dataSlice = strings.Split(dataSlice[0], ": ")