Merge remote-tracking branch 'origin/develop'

mozillazg · Apr 9, 2020 · 63be21f · 63be21f
2 parents c9122b8 + 2ea80f6
commit 63be21f
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 41,476 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "_tools/pinyin-data"]
 	path = _tools/pinyin-data
 	url = https://github.com/mozillazg/pinyin-data.git
-[submodule "_tools/phrase-data"]
-	path = _tools/phrase-data
-	url = https://github.com/hotoo/pinyin.git
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,12 @@
 language: go
 go:
-  - "1.9.x"
-  - "1.10.x"
-  - "1.11.x"
-  - "1.12.x"
-  - "1.13.x"
+  - '1.9.x'
+  - '1.10.x'
+  - '1.11.x'
+  - '1.12.x'
+  - '1.13.x'
+  - '1.14.x'
+  - 'master'
 
 sudo: false
 
@@ -20,3 +22,7 @@ script:
   - echo "abc" | go run cmd/pinyin/main.go
   - echo "abc" > abc.txt && go run cmd/pinyin/main.go < abc.txt
   - $HOME/gopath/bin/goveralls -service=travis-ci -v -package .
+
+matrix:
+  allow_failures:
+    - go: master
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.17.0] (2020-04-09)
+
+* **Changed** 因为依赖的 gojieba 经常出现安装异常，撤销 v0.16.0 的修改，撤销后 v0.17.0 的代码跟 v0.15.0 基本是一样的。
+  如果有需要使用 v0.16.0 新增的 ``func Paragraph(p string) string`` 功能的请使用 v0.16.0 版本或者通过 v0.16.0 中相关代码实现类似的需求。
+
+
 ## [0.16.0] (2019-12-05)
 
 * **NEW** 增加 ``func Paragraph(p string) string`` 用于便捷处理大段文字
@@ -221,3 +227,5 @@
 [0.14.0]: https://github.com/mozillazg/go-pinyin/compare/v0.13.0...v0.14.0
 [0.15.0]: https://github.com/mozillazg/go-pinyin/compare/v0.14.0...v0.15.0
 [0.16.0]: https://github.com/mozillazg/go-pinyin/compare/v0.15.0...v0.16.0
+[0.17.0]: https://github.com/mozillazg/go-pinyin/compare/v0.16.0...v0.17.0
+
diff --git a/Makefile b/Makefile
@@ -10,12 +10,7 @@ test:
 
 .PHONY: gen_pinyin_dict
 gen_pinyin_dict:
-	@go run _tools/gen_pinyin_dict/main.go _tools/pinyin-data/pinyin.txt pinyin_dict.go
-
-.PHONY: gen_phrase_dict
-gen_phrase_dict:
-	@go run _tools/gen_phrase_dict/main.go _tools/phrase-data/data/phrases-dict.js phrase_dict.go
-	@goreturns -w phrase_dict.go
+	@go run _tools/gen_pinyin_dict.go _tools/pinyin-data/pinyin.txt pinyin_dict.go
 
 .PHONY: lint
 lint:

diff --git a/README.md b/README.md
@@ -78,10 +78,6 @@ func main() {
 
 	fmt.Println(pinyin.LazyConvert(hans, nil))
 	// [zhong guo ren]
-
-	// 段落转换，支持完整支持多音字，保留符号
-	fmt.Println(pinyin.Paragraph("交给团长，告诉他我们给予期望。前线的供给一定要能自给自足！"))
-	// jiao gei tuan zhang, gao su ta wo men ji yu qi wang. qian xian de gong ji yi ding yao neng zi ji zi zu!
 }
 ```
 

diff --git a/_tools/gen_phrase_dict/main.go b/_tools/gen_phrase_dict/main.go
diff --git a/_tools/gen_pinyin_dict/main.go → _tools/gen_pinyin_dict.go b/_tools/gen_pinyin_dict/main.go → _tools/gen_pinyin_dict.go
diff --git a/_tools/phrase-data b/_tools/phrase-data
diff --git a/example_test.go b/example_test.go
@@ -135,9 +135,3 @@ func ExampleSlug() {
 	fmt.Println(pinyin.Slug(hans, a))
 	// Output: zhong-guo-ren
 }
-
-func ExampleParagraph() {
-	hans := "人民银行旁边一行人abc字母【路牌】，平行宇宙发行股票。"
-	fmt.Println(pinyin.Paragraph(hans))
-	// Output: ren min yin xing pang bian yi xing ren abc zi mu [lu pai], ping xing yu zhou fa xing gu piao.
-}
diff --git a/go.mod b/go.mod
@@ -1,6 +1 @@
 module github.com/mozillazg/go-pinyin
-
-require (
-	github.com/mattn/go-isatty v0.0.10
-	github.com/yanyiwu/gojieba v1.1.0
-)
diff --git a/go.sum b/go.sum
diff --git a/paragraph.go b/paragraph.go
diff --git a/paragraph_test.go b/paragraph_test.go
diff --git a/phrase.go b/phrase.go