Merge remote-tracking branch 'origin/develop'

Author: mozillazg

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: gomod
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "21:00"
+  open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -14,20 +14,22 @@ jobs:
 
   build:
     name: Build
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        go-version: [1.17, 1.18, 1.19, '1.20']
     steps:
 
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+    - name: Set up Go
+      uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: ${{ matrix.go-version }}
+      env:
+        GOPATH: ${{ env.HOME }}
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Get dependencies
       run: |
@@ -41,7 +43,7 @@ jobs:
 
     - name: Test cmd
       run: |
-        go get ./cmd/pinyin
-        go run cmd/pinyin/main.go 测试
-        go run cmd/pinyin/main.go -s zhao 测试
-        echo 测试 | go run cmd/pinyin/main.go
+        cd cli/pinyin/
+        go run ./main.go 测试
+        go run ./main.go -s zhao 测试
+        echo 测试 | go run ./main.go

CHANGELOG.md

@@ -1,10 +1,17 @@
 # Changelog
 
+## [0.20.0] (2023-05-14)
+
+* **Changed** 使用 [pinyin-data][pinyin-data] v0.13.0 的拼音数据
+
+
 ## [0.19.0] (2021-12-11)
+
 * **Changed** 使用 [pinyin-data][pinyin-data] v0.12.0 的拼音数据
 
 
 ## [0.18.0] (2020-06-13)
+
 * **Changed** 使用 [pinyin-data][pinyin-data] v0.9.0 的拼音数据
 * **Bugfixed** 修复自定义的 Fallback 函数可能会导致结果乱码的问题 Fixes [#35]
 
@@ -238,3 +245,4 @@
 [0.17.0]: https://github.com/mozillazg/go-pinyin/compare/v0.16.0...v0.17.0
 [0.18.0]: https://github.com/mozillazg/go-pinyin/compare/v0.17.0...v0.18.0
 [0.19.0]: https://github.com/mozillazg/go-pinyin/compare/v0.18.0...v0.19.0
+[0.20.0]: https://github.com/mozillazg/go-pinyin/compare/v0.19.0...v0.20.0

README.md

@@ -13,13 +13,18 @@ Installation
 ------------
 
 ```
-go get -u github.com/mozillazg/go-pinyin
+go get github.com/mozillazg/go-pinyin
 ```
 
 install CLI tool:
 
 ```
-go get -u github.com/mozillazg/go-pinyin/cmd/pinyin
+# go version>=1.17
+go install github.com/mozillazg/go-pinyin/cli/pinyin@latest
+
+# go version<1.17
+go get -u github.com/mozillazg/go-pinyin/cli/pinyin
+
 $ pinyin 中国人
 zhōng guó rén
 ```
@@ -87,7 +92,7 @@ func main() {
   详见 [示例](https://godoc.org/github.com/mozillazg/go-pinyin#example-Pinyin--FallbackCustom1)）。
 * 根据 [《汉语拼音方案》](http://www.moe.gov.cn/s78/A19/yxs_left/moe_810/s230/195802/t19580201_186000.html) y，w，ü (yu) 都不是声母，
   以及不是所有拼音都有声母，如果这不是你预期的话，你可能需要的是首字母风格 `FirstLetter`
-（ [详细信息](https://github.com/mozillazg/python-pinyin#%E4%B8%BA%E4%BB%80%E4%B9%88%E6%B2%A1%E6%9C%89-y-w-yu-%E5%87%A0%E4%B8%AA%E5%A3%B0%E6%AF%8D) ）。
+  （ [详细信息](https://github.com/mozillazg/python-pinyin#%E4%B8%BA%E4%BB%80%E4%B9%88%E6%B2%A1%E6%9C%89-y-w-yu-%E5%87%A0%E4%B8%AA%E5%A3%B0%E6%AF%8D) ）。
 
 
 Related Projects

_tools/pinyin-data

@@ -0,0 +1,10 @@
+module github.com/mozillazg/go-pinyin/cli/pinyin
+
+go 1.17
+
+require (
+	github.com/mattn/go-isatty v0.0.18
+	github.com/mozillazg/go-pinyin v0.19.0
+)
+
+require golang.org/x/sys v0.6.0 // indirect

cli/pinyin/go.mod

@@ -0,0 +1,6 @@
+github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
+github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mozillazg/go-pinyin v0.19.0 h1:p+J8/kjJ558KPvVGYLvqBhxf8jbZA2exSLCs2uUVN8c=
+github.com/mozillazg/go-pinyin v0.19.0/go.mod h1:iR4EnMMRXkfpFVV5FMi4FNB6wGq9NV6uDWbUuPhP4Yc=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

cli/pinyin/go.sum

@@ -15779,7 +15779,7 @@ var PinyinDict = map[int]string{
 	0x7517: "yǎn",
 	0x7518: "gān,hān",
 	0x7519: "dài",
-	0x751A: "shén,shèn",
+	0x751A: "shèn,shén",
 	0x751B: "tián",
 	0x751C: "tián",
 	0x751D: "hán",