From b822ced53565a353312443cd57ec92860787786e Mon Sep 17 00:00:00 2001
From: Huang Huang <mozillazg101@gmail.com>
Date: Sun, 14 Jun 2020 12:01:35 +0800
Subject: [PATCH 1/6] Test GitHub Action

---
 .github/workflows/go.yml | 52 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 .github/workflows/go.yml

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
new file mode 100644
index 0000000..9e47e39
--- /dev/null
+++ b/.github/workflows/go.yml
@@ -0,0 +1,52 @@
+name: Go
+
+on:
+  push:
+    branches: 
+    - master
+    - develop
+  pull_request:
+    branches:
+    - master
+    - develop
+
+jobs:
+
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    steps:
+
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.13
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Get dependencies
+      run: |
+        go get -v -t -d ./...
+        if [ -f Gopkg.toml ]; then
+            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+            dep ensure
+        fi
+
+    - name: Build
+      run: go build -v .
+
+    - name: Test
+      run: go test -v .
+
+    - 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
+        echo 测试 > abc.txt && go run cmd/pinyin/main.go < abc.txt

From 5d38898d63ff466a2e63e498935186eb7d180527 Mon Sep 17 00:00:00 2001
From: Huang Huang <mozillazg101@gmail.com>
Date: Sun, 14 Jun 2020 12:05:22 +0800
Subject: [PATCH 2/6] Fix Windows CI

---
 .github/workflows/go.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 9e47e39..1d91159 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -32,10 +32,6 @@ jobs:
     - name: Get dependencies
       run: |
         go get -v -t -d ./...
-        if [ -f Gopkg.toml ]; then
-            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-            dep ensure
-        fi
 
     - name: Build
       run: go build -v .

From 09b1dc9d5f6eb46f5a3969f9621b64ea5e38d68b Mon Sep 17 00:00:00 2001
From: Huang Huang <mozillazg101@gmail.com>
Date: Sun, 14 Jun 2020 12:10:06 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=20Windows=20=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/go.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 1d91159..766ff94 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -45,4 +45,3 @@ jobs:
         go run cmd/pinyin/main.go 测试
         go run cmd/pinyin/main.go -s zhao 测试
         echo 测试 | go run cmd/pinyin/main.go
-        echo 测试 > abc.txt && go run cmd/pinyin/main.go < abc.txt

From b11a0a852304b347ab6aa2c8eab801dde6304326 Mon Sep 17 00:00:00 2001
From: mozillazg <mozillazg101@gmail.com>
Date: Sat, 11 Dec 2021 22:32:52 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20github=20action=20?=
 =?UTF-8?q?=E4=BB=A3=E6=9B=BF=20travis=20ci?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/go.yml | 47 ----------------------------------------
 .travis.yml              | 28 ------------------------
 README.md                |  2 +-
 3 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 .github/workflows/go.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
deleted file mode 100644
index 766ff94..0000000
--- a/.github/workflows/go.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Go
-
-on:
-  push:
-    branches: 
-    - master
-    - develop
-  pull_request:
-    branches:
-    - master
-    - develop
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    steps:
-
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
-      with:
-        go-version: ^1.13
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-
-    - name: Get dependencies
-      run: |
-        go get -v -t -d ./...
-
-    - name: Build
-      run: go build -v .
-
-    - name: Test
-      run: go test -v .
-
-    - 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
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f9ad1ce..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-language: go
-go:
-  - '1.9.x'
-  - '1.10.x'
-  - '1.11.x'
-  - '1.12.x'
-  - '1.13.x'
-  - '1.14.x'
-  - 'master'
-
-sudo: false
-
-before_install:
-  - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
-  - go get github.com/axw/gocov/gocov
-  - go get github.com/mattn/goveralls
-  - go get ./cmd/pinyin
-
-script:
-  - go run cmd/pinyin/main.go abc
-  - go run cmd/pinyin/main.go -s zhao abc
-  - 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/README.md b/README.md
index ee14847..d1feb97 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 go-pinyin
 =========
 
-[![Build Status](https://travis-ci.org/mozillazg/go-pinyin.svg?branch=master)](https://travis-ci.org/mozillazg/go-pinyin)
+[![Build Status](https://github.com/mozillazg/go-pinyin/actions/workflows/go.yml/badge.svg?branch=master)](https://github.com/mozillazg/go-pinyin/actions/workflows/ci.yml)
 [![Coverage Status](https://coveralls.io/repos/mozillazg/go-pinyin/badge.svg?branch=master)](https://coveralls.io/r/mozillazg/go-pinyin?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/mozillazg/go-pinyin)](https://goreportcard.com/report/github.com/mozillazg/go-pinyin)
 [![GoDoc](https://godoc.org/github.com/mozillazg/go-pinyin?status.svg)](https://godoc.org/github.com/mozillazg/go-pinyin)

From 35cfa2f760a2466f192273f14328d3cbae7581c7 Mon Sep 17 00:00:00 2001
From: mozillazg <mozillazg101@gmail.com>
Date: Sat, 11 Dec 2021 22:37:39 +0800
Subject: [PATCH 5/6] fix missing files

---
 .github/workflows/ci.yml | 47 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..264c0ab
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,47 @@
+name: CI
+
+on:
+  push:
+    branches:
+    - master
+    - develop
+  pull_request:
+    branches:
+    - master
+    - develop
+
+jobs:
+
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    steps:
+
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.17
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Get dependencies
+      run: |
+        go get -v -t -d ./...
+
+    - name: Build
+      run: go build -v .
+
+    - name: Test
+      run: go test -v .
+
+    - 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

From 773f9d0b8dc6cc36c359e8010cab829798a20161 Mon Sep 17 00:00:00 2001
From: mozillazg <mozillazg101@gmail.com>
Date: Sat, 11 Dec 2021 22:47:45 +0800
Subject: [PATCH 6/6] v0.19.0

---
 CHANGELOG.md       |   5 +
 TODO.md            |   4 +
 _tools/pinyin-data |   2 +-
 pinyin.go          |   2 +-
 pinyin_dict.go     | 478 ++++++++++++++++++++++++---------------------
 5 files changed, 271 insertions(+), 220 deletions(-)
 create mode 100644 TODO.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3110629..72c4811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [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]
@@ -233,3 +237,4 @@
 [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
 [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
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..7cb88ec
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,4 @@
+
+
+* [ ] 重构 
+* [ ]
diff --git a/_tools/pinyin-data b/_tools/pinyin-data
index 7f9278b..57cc2bd 160000
--- a/_tools/pinyin-data
+++ b/_tools/pinyin-data
@@ -1 +1 @@
-Subproject commit 7f9278b53b3f81e5fe5f852e6045f391973bcbd3
+Subproject commit 57cc2bdd0709b42867c861168df73e73953ba92b
diff --git a/pinyin.go b/pinyin.go
index ca71d25..15b5938 100644
--- a/pinyin.go
+++ b/pinyin.go
@@ -7,7 +7,7 @@ import (
 
 // Meta
 const (
-	Version   = "0.18.0"
+	Version   = "0.19.0"
 	Author    = "mozillazg, 闲耘"
 	License   = "MIT"
 	Copyright = "Copyright (c) 2016 mozillazg, 闲耘"
diff --git a/pinyin_dict.go b/pinyin_dict.go
index 9e54120..494a290 100644
--- a/pinyin_dict.go
+++ b/pinyin_dict.go
@@ -94,6 +94,7 @@ var PinyinDict = map[int]string{
 	0x3488: "hàn",
 	0x3489: "tǎng",
 	0x348A: "sè",
+	0x348B: "sī",
 	0x348C: "qióng",
 	0x348D: "léi",
 	0x348E: "sà",
@@ -167,6 +168,7 @@ var PinyinDict = map[int]string{
 	0x34E9: "xuān,jiē",
 	0x34EA: "lǎng",
 	0x34ED: "shé",
+	0x34EE: "diāo",
 	0x34EF: "lí",
 	0x34F0: "huà",
 	0x34F1: "tóu,shū",
@@ -795,6 +797,7 @@ var PinyinDict = map[int]string{
 	0x37D3: "qí",
 	0x37D4: "hán",
 	0x37D6: "lòng,lóng",
+	0x37D7: "bīn",
 	0x37D8: "tiáo",
 	0x37D9: "zé",
 	0x37DA: "qí",
@@ -1034,6 +1037,7 @@ var PinyinDict = map[int]string{
 	0x38F5: "tà",
 	0x38F6: "zhān",
 	0x38F7: "nìng",
+	0x38FA: "xīn",
 	0x38FB: "yì",
 	0x38FC: "rěn",
 	0x38FD: "shù,nù",
@@ -1391,6 +1395,7 @@ var PinyinDict = map[int]string{
 	0x3A82: "kū",
 	0x3A83: "hé",
 	0x3A84: "fú",
+	0x3A85: "gèng,gēng",
 	0x3A86: "dǐ",
 	0x3A87: "xiàn",
 	0x3A88: "guì",
@@ -1645,6 +1650,7 @@ var PinyinDict = map[int]string{
 	0x3BC0: "xuàn",
 	0x3BC1: "péi",
 	0x3BC2: "dài",
+	0x3BC3: "qī",
 	0x3BC4: "zhī",
 	0x3BC5: "pí,bī",
 	0x3BC6: "chǎn,shàn",
@@ -1694,6 +1700,7 @@ var PinyinDict = map[int]string{
 	0x3BF9: "biǎo",
 	0x3BFA: "jiàn",
 	0x3BFB: "gǔn",
+	0x3BFD: "bīn",
 	0x3BFE: "zāo",
 	0x3BFF: "liè,là",
 	0x3C00: "lí",
@@ -1934,7 +1941,7 @@ var PinyinDict = map[int]string{
 	0x3D11: "sù",
 	0x3D12: "yì",
 	0x3D13: "shāi",
-	0x3D14: "xī,yì,sè",
+	0x3D14: "xī,jí,yì,sè",
 	0x3D15: "jí",
 	0x3D16: "luò",
 	0x3D17: "yōu",
@@ -2801,6 +2808,7 @@ var PinyinDict = map[int]string{
 	0x4100: "huò",
 	0x4101: "yì",
 	0x4102: "liù",
+	0x4103: "yāng",
 	0x4104: "yīn",
 	0x4105: "juàn",
 	0x4106: "huó,huàn",
@@ -4064,6 +4072,7 @@ var PinyinDict = map[int]string{
 	0x4670: "lí",
 	0x4671: "dú",
 	0x4673: "biāo,è",
+	0x4674: "qiān",
 	0x4675: "xī",
 	0x4677: "dé",
 	0x4678: "dé",
@@ -5381,6 +5390,7 @@ var PinyinDict = map[int]string{
 	0x4C14: "pán",
 	0x4C15: "lú",
 	0x4C16: "zuǎn",
+	0x4C17: "jiū",
 	0x4C18: "liú,jiǎo",
 	0x4C19: "yǐ",
 	0x4C1A: "wén",
@@ -5475,6 +5485,7 @@ var PinyinDict = map[int]string{
 	0x4C7A: "hái",
 	0x4C7B: "huá",
 	0x4C7C: "zhǎn",
+	0x4C7D: "chāng",
 	0x4C7E: "lóu",
 	0x4C7F: "chàn",
 	0x4C80: "zhì",
@@ -5782,7 +5793,7 @@ var PinyinDict = map[int]string{
 	0x4E0B: "xià",
 	0x4E0C: "jī,qí",
 	0x4E0D: "bù,fǒu,fōu,fū,bú",
-	0x4E0E: "yǔ,yú,yù",
+	0x4E0E: "yǔ,yù,yú",
 	0x4E0F: "miǎn",
 	0x4E10: "gài",
 	0x4E11: "chǒu",
@@ -5810,7 +5821,7 @@ var PinyinDict = map[int]string{
 	0x4E27: "sàng,sāng",
 	0x4E28: "gǔn",
 	0x4E29: "jiū",
-	0x4E2A: "gè,gàn,gě",
+	0x4E2A: "gè,gě,gàn",
 	0x4E2B: "yā",
 	0x4E2C: "qiáng",
 	0x4E2D: "zhōng,zhòng",
@@ -5974,7 +5985,7 @@ var PinyinDict = map[int]string{
 	0x4ECB: "jiè,gè",
 	0x4ECC: "bīng",
 	0x4ECD: "réng",
-	0x4ECE: "cóng,cōng",
+	0x4ECE: "cóng,zòng",
 	0x4ECF: "fó",
 	0x4ED0: "sǎn",
 	0x4ED1: "lún",
@@ -5996,7 +6007,7 @@ var PinyinDict = map[int]string{
 	0x4EE1: "gē,yì,wù",
 	0x4EE2: "bó",
 	0x4EE3: "dài",
-	0x4EE4: "lìng,líng,lián,lǐng",
+	0x4EE4: "lìng,líng,lǐng,lián",
 	0x4EE5: "yǐ,sì",
 	0x4EE6: "chào",
 	0x4EE7: "cháng",
@@ -6004,7 +6015,7 @@ var PinyinDict = map[int]string{
 	0x4EE9: "cháng",
 	0x4EEA: "yí",
 	0x4EEB: "mù",
-	0x4EEC: "men",
+	0x4EEC: "men,mén",
 	0x4EED: "rèn",
 	0x4EEE: "fǎn",
 	0x4EEF: "chào,miǎo",
@@ -6015,7 +6026,7 @@ var PinyinDict = map[int]string{
 	0x4EF4: "wò",
 	0x4EF5: "wǔ",
 	0x4EF6: "jiàn,móu",
-	0x4EF7: "jià,jiè,jie",
+	0x4EF7: "jià,jie,jiè",
 	0x4EF8: "yǎo,fó",
 	0x4EF9: "fēng",
 	0x4EFA: "cāng",
@@ -6071,10 +6082,10 @@ var PinyinDict = map[int]string{
 	0x4F2C: "ze",
 	0x4F2D: "xián",
 	0x4F2E: "nǔ",
-	0x4F2F: "bó,mò,bà,bǎi",
+	0x4F2F: "bó,bǎi,mò,bà",
 	0x4F30: "gū,gù",
 	0x4F31: "nǐ",
-	0x4F32: "nì,nǐ",
+	0x4F32: "nì,ní,nǐ",
 	0x4F33: "xiè",
 	0x4F34: "bàn,pàn",
 	0x4F35: "xù",
@@ -6107,7 +6118,7 @@ var PinyinDict = map[int]string{
 	0x4F50: "zuǒ",
 	0x4F51: "yòu",
 	0x4F52: "yǎng,yāng",
-	0x4F53: "tǐ,bèn,cuì,tī",
+	0x4F53: "tǐ,tī,bèn,cuì",
 	0x4F54: "zhàn,chān,diān",
 	0x4F55: "hé,hè",
 	0x4F56: "bì",
@@ -6115,7 +6126,7 @@ var PinyinDict = map[int]string{
 	0x4F58: "shé",
 	0x4F59: "yú,tú,xú,yù",
 	0x4F5A: "yì,dié",
-	0x4F5B: "fú,bó,bì,fó",
+	0x4F5B: "fú,fó,bó,bì",
 	0x4F5C: "zuò,zuō,zuó",
 	0x4F5D: "gōu,kòu,jū",
 	0x4F5E: "nìng",
@@ -6408,7 +6419,7 @@ var PinyinDict = map[int]string{
 	0x507D: "wěi,wéi,é,guì",
 	0x507E: "fèn",
 	0x507F: "cháng",
-	0x5080: "guī,kuài,kuǐ",
+	0x5080: "guī,kuǐ,kuài",
 	0x5081: "sǒu",
 	0x5082: "zhì,sī",
 	0x5083: "sù",
@@ -6599,7 +6610,7 @@ var PinyinDict = map[int]string{
 	0x513C: "yǎn",
 	0x513D: "léi,lěi,luǒ",
 	0x513E: "nàng",
-	0x513F: "ér,rén",
+	0x513F: "ér,er,rén",
 	0x5140: "wù,wū",
 	0x5141: "yǔn,yuán",
 	0x5142: "zān",
@@ -6650,7 +6661,7 @@ var PinyinDict = map[int]string{
 	0x5171: "gòng,gōng,gǒng,hóng",
 	0x5172: "tiān",
 	0x5173: "guān",
-	0x5174: "xìng,xīng",
+	0x5174: "xīng,xìng",
 	0x5175: "bīng",
 	0x5176: "qí,jī,jì",
 	0x5177: "jù",
@@ -6808,7 +6819,7 @@ var PinyinDict = map[int]string{
 	0x520F: "jī",
 	0x5210: "dǎn",
 	0x5211: "xíng",
-	0x5212: "huà,guò,guǒ,huá,huai",
+	0x5212: "huà,huá,guò,guǒ,huai",
 	0x5213: "wán",
 	0x5214: "jué",
 	0x5215: "lí",
@@ -6848,7 +6859,7 @@ var PinyinDict = map[int]string{
 	0x5237: "shuā,shuà",
 	0x5238: "quàn,xuàn",
 	0x5239: "shā,chà",
-	0x523A: "cì,qì,cī",
+	0x523A: "cì,cī,qì",
 	0x523B: "kè,kēi",
 	0x523C: "jié",
 	0x523D: "guì",
@@ -6864,7 +6875,7 @@ var PinyinDict = map[int]string{
 	0x5247: "zé",
 	0x5248: "yuān",
 	0x5249: "cuò",
-	0x524A: "xuē,qiào,xiāo,shào",
+	0x524A: "xuē,xiāo,qiào,shào",
 	0x524B: "kè,kēi",
 	0x524C: "lá,là",
 	0x524D: "qián,jiǎn",
@@ -6944,7 +6955,7 @@ var PinyinDict = map[int]string{
 	0x5297: "jiǎn,zuān",
 	0x5298: "mó,mí",
 	0x5299: "lí",
-	0x529A: "zhǔ",
+	0x529A: "zhú",
 	0x529B: "lì",
 	0x529C: "yà",
 	0x529D: "quàn",
@@ -7092,7 +7103,7 @@ var PinyinDict = map[int]string{
 	0x532B: "hū",
 	0x532C: "yǔ",
 	0x532D: "guǐ",
-	0x532E: "kuì",
+	0x532E: "kuì,guì",
 	0x532F: "huì",
 	0x5330: "dān",
 	0x5331: "guì,kuì",
@@ -7124,7 +7135,7 @@ var PinyinDict = map[int]string{
 	0x534B: "shì",
 	0x534C: "xì",
 	0x534D: "wàn",
-	0x534E: "huá,huà",
+	0x534E: "huá,huà,huā",
 	0x534F: "xié",
 	0x5350: "wàn",
 	0x5351: "bēi,bǐ,bì,pí,bān",
@@ -7278,15 +7289,15 @@ var PinyinDict = map[int]string{
 	0x53E5: "jù,gōu,gòu,qú",
 	0x53E6: "lìng",
 	0x53E7: "guǎ",
-	0x53E8: "dāo,tāo,dáo",
+	0x53E8: "dāo,dáo,tāo",
 	0x53E9: "kòu",
 	0x53EA: "zhǐ,zhī",
 	0x53EB: "jiào",
 	0x53EC: "zhào,shào",
 	0x53ED: "bā,pā,ba",
 	0x53EE: "dīng",
-	0x53EF: "kě,gē,kè",
-	0x53F0: "tái,yí,sì,tāi",
+	0x53EF: "kě,kè,gē",
+	0x53F0: "tái,tāi,yí,sì",
 	0x53F1: "chì,huà,é",
 	0x53F2: "shǐ",
 	0x53F3: "yòu",
@@ -7303,7 +7314,7 @@ var PinyinDict = map[int]string{
 	0x53FE: "liǎo",
 	0x53FF: "hōng,hóng",
 	0x5400: "miē",
-	0x5401: "xū,yù,yū",
+	0x5401: "xū,yū,yù",
 	0x5402: "máng,màng",
 	0x5403: "chī,qī",
 	0x5404: "gè,gě",
@@ -7321,7 +7332,7 @@ var PinyinDict = map[int]string{
 	0x5410: "tǔ,tù",
 	0x5411: "xiàng",
 	0x5412: "zhā,zhà",
-	0x5413: "xià,hà,hè",
+	0x5413: "xià,hè,hà",
 	0x5414: "yě,yē",
 	0x5415: "lǚ",
 	0x5416: "yā,ā",
@@ -7355,7 +7366,7 @@ var PinyinDict = map[int]string{
 	0x5432: "yǐn,shěn",
 	0x5433: "wú,yú",
 	0x5434: "wú,tūn",
-	0x5435: "chǎo,miǎo,chāo,chào",
+	0x5435: "chǎo,chāo,miǎo,chào",
 	0x5436: "nà",
 	0x5437: "xuè,chuò,jué",
 	0x5438: "xī",
@@ -7366,14 +7377,14 @@ var PinyinDict = map[int]string{
 	0x543D: "hōng,ōu,hǒu",
 	0x543E: "wú,yú,yá",
 	0x543F: "gào",
-	0x5440: "ya,xiā,yā",
+	0x5440: "ya,yā,xiā",
 	0x5441: "jùn",
 	0x5442: "lǚ",
-	0x5443: "è,ài,e",
+	0x5443: "è,e,ài",
 	0x5444: "gé",
 	0x5445: "méi,wěn",
 	0x5446: "dāi,bǎo,ái",
-	0x5447: "qǐ",
+	0x5447: "qǐ,mèn",
 	0x5448: "chéng,kuáng,chěng",
 	0x5449: "wú",
 	0x544A: "gào,jū,gù",
@@ -7387,10 +7398,10 @@ var PinyinDict = map[int]string{
 	0x5452: "wǔ,ḿ",
 	0x5453: "yì",
 	0x5454: "dāi,tǎi",
-	0x5455: "ǒu,òu",
+	0x5455: "ǒu,ōu,òu",
 	0x5456: "lì",
 	0x5457: "bei,bài",
-	0x5458: "yuán,yún,yùn",
+	0x5458: "yuán,yùn,yún",
 	0x5459: "guō",
 	0x545A: "wen",
 	0x545B: "qiāng,qiàng",
@@ -7401,7 +7412,7 @@ var PinyinDict = map[int]string{
 	0x5460: "pěn",
 	0x5461: "wěn,mǐn",
 	0x5462: "ne,ní,nǐ,nī",
-	0x5463: "ḿ,móu,m̀",
+	0x5463: "ḿ,m̀,móu",
 	0x5464: "lìng,líng",
 	0x5465: "rán",
 	0x5466: "yōu",
@@ -7431,7 +7442,7 @@ var PinyinDict = map[int]string{
 	0x547E: "dá,yà,tǎ,dàn",
 	0x547F: "qù,kā",
 	0x5480: "jǔ,zuǐ",
-	0x5481: "hán,xián,gàn",
+	0x5481: "gàn,hán,xián",
 	0x5482: "zā",
 	0x5483: "tuō",
 	0x5484: "duō",
@@ -7441,8 +7452,8 @@ var PinyinDict = map[int]string{
 	0x5488: "fú",
 	0x5489: "yāng,yǎng",
 	0x548A: "hé",
-	0x548B: "zǎ,zé,zhà,zhā",
-	0x548C: "hé,hè,huò,huó,hú",
+	0x548B: "zǎ,zé,zhā,zhà",
+	0x548C: "hé,hè,hú,huó,huò,huo",
 	0x548D: "hāi,tāi",
 	0x548E: "jiù,gāo",
 	0x548F: "yǒng",
@@ -7450,9 +7461,9 @@ var PinyinDict = map[int]string{
 	0x5491: "dā",
 	0x5492: "zhòu",
 	0x5493: "wǎ",
-	0x5494: "kā,nòng,kǎ",
+	0x5494: "kā,kǎ,nòng",
 	0x5495: "gū,gu",
-	0x5496: "kā,jiā,gā",
+	0x5496: "kā,gā,jiā",
 	0x5497: "zuo",
 	0x5498: "bù",
 	0x5499: "lóng",
@@ -7469,19 +7480,19 @@ var PinyinDict = map[int]string{
 	0x54A4: "zhà",
 	0x54A5: "xì,xī,dié,zhì",
 	0x54A6: "yí,xī",
-	0x54A7: "liě,liè,liē,lié,lie",
+	0x54A7: "liě,liē,liè,lié,lie",
 	0x54A8: "zī",
 	0x54A9: "miē,mie",
-	0x54AA: "mī,miē,mǎi,mǐ",
+	0x54AA: "mī,mǐ,miē,mǎi",
 	0x54AB: "zhǐ",
 	0x54AC: "yǎo,jiāo,yāo,jiǎo",
 	0x54AD: "jī,xī,qià",
 	0x54AE: "zhòu,zhù,zhū,rú",
-	0x54AF: "gē,luò,kǎ,kā,lo",
+	0x54AF: "gē,kǎ,lo,luò,kā",
 	0x54B0: "shù,xún",
 	0x54B1: "zán,zá,zǎ,zan",
 	0x54B2: "xiào",
-	0x54B3: "hāi,hái,ké,gāi",
+	0x54B3: "ké,hāi,hái,gāi",
 	0x54B4: "huī,hái",
 	0x54B5: "kuǎ",
 	0x54B6: "huài,shì,guō,guā,huà",
@@ -7498,11 +7509,11 @@ var PinyinDict = map[int]string{
 	0x54C1: "pǐn",
 	0x54C2: "shěn",
 	0x54C3: "tóng",
-	0x54C4: "hōng,hòng,hǒng",
+	0x54C4: "hǒng,hōng,hòng",
 	0x54C5: "xiōng,hōng",
 	0x54C6: "duō,chǐ,zhà,chì,duò,diě",
 	0x54C7: "wa,wā,guī,huá,wá",
-	0x54C8: "hā,hà,hē,hé,hǎ,tà,shà",
+	0x54C8: "hā,hǎ,hà,hē,hé,tà,shà",
 	0x54C9: "zāi",
 	0x54CA: "yòu",
 	0x54CB: "diè,dì",
@@ -7512,7 +7523,7 @@ var PinyinDict = map[int]string{
 	0x54CF: "gén,hěn,ǹ",
 	0x54D0: "kuāng,qiāng",
 	0x54D1: "yǎ,yā",
-	0x54D2: "dá",
+	0x54D2: "dá,dā",
 	0x54D3: "xiāo",
 	0x54D4: "bì",
 	0x54D5: "huì,yuě",
@@ -7535,8 +7546,8 @@ var PinyinDict = map[int]string{
 	0x54E6: "ó,é,ò",
 	0x54E7: "chī,xià,hè",
 	0x54E8: "shào,sāo,xiāo,xiào,sào",
-	0x54E9: "lī,lì,li,lǐ,mái,yīng",
-	0x54EA: "nǎ,nuó,na,nǎi,nà,niè,né,něi",
+	0x54E9: "lī,li,lì,lǐ,mái,yīng",
+	0x54EA: "nǎ,na,né,nuó,nǎi,nà,niè,něi",
 	0x54EB: "zú",
 	0x54EC: "hé",
 	0x54ED: "kū",
@@ -7567,7 +7578,7 @@ var PinyinDict = map[int]string{
 	0x5506: "suō,shuà",
 	0x5507: "chún,zhēn,zhèn",
 	0x5508: "yì",
-	0x5509: "āi,ǎi,ài",
+	0x5509: "āi,ài,ǎi",
 	0x550A: "jiá,qiǎn",
 	0x550B: "tū",
 	0x550C: "xián,yán,dàn",
@@ -7585,7 +7596,7 @@ var PinyinDict = map[int]string{
 	0x5518: "qǐ",
 	0x5519: "dí",
 	0x551A: "qìn,qīn",
-	0x551B: "mà",
+	0x551B: "mà,mài",
 	0x551C: "mò",
 	0x551D: "gòng,hǒng",
 	0x551E: "dǒu",
@@ -7623,7 +7634,7 @@ var PinyinDict = map[int]string{
 	0x553E: "tuò",
 	0x553F: "hū",
 	0x5540: "ái",
-	0x5541: "zhāo,dāo,zhōu,tiáo,diào",
+	0x5541: "zhāo,zhōu,dāo,tiáo,diào",
 	0x5542: "nǒu",
 	0x5543: "kěn",
 	0x5544: "zhuó,zhòu",
@@ -7632,7 +7643,7 @@ var PinyinDict = map[int]string{
 	0x5547: "dì,shì,zhāi",
 	0x5548: "hēng,hèng,è,zá",
 	0x5549: "lín,lán,lèn",
-	0x554A: "a,è,ā,á,ǎ,à",
+	0x554A: "a,ā,á,ǎ,à,è",
 	0x554B: "cǎi,cāi,xiāo",
 	0x554C: "xiāng,qiāng",
 	0x554D: "tūn,zhūn,xiāng,tuī,duǐ",
@@ -7670,7 +7681,7 @@ var PinyinDict = map[int]string{
 	0x556D: "zhuàn",
 	0x556E: "niè",
 	0x556F: "guō",
-	0x5570: "luō",
+	0x5570: "luō,luó,luo",
 	0x5571: "yán",
 	0x5572: "dī",
 	0x5573: "quán,jué",
@@ -7715,13 +7726,13 @@ var PinyinDict = map[int]string{
 	0x559A: "huàn",
 	0x559B: "huàn,yuán,xuǎn,hé",
 	0x559C: "xǐ,xī,chì",
-	0x559D: "hē,yè,hè,kài",
+	0x559D: "hē,hè,yè,kài",
 	0x559E: "jī",
 	0x559F: "kuì,huài",
 	0x55A0: "zhǒng,chǒng",
 	0x55A1: "wéi,wèi",
 	0x55A2: "shà,chè",
-	0x55A3: "xù",
+	0x55A3: "xǔ",
 	0x55A4: "huáng",
 	0x55A5: "duó,zhà",
 	0x55A6: "niè,yì",
@@ -7737,7 +7748,7 @@ var PinyinDict = map[int]string{
 	0x55B0: "cān,sūn,qī",
 	0x55B1: "lí",
 	0x55B2: "yō,yo",
-	0x55B3: "zhā,zha,chā",
+	0x55B3: "zhā,chā,zha",
 	0x55B4: "wēi",
 	0x55B5: "miāo",
 	0x55B6: "yíng",
@@ -7796,7 +7807,7 @@ var PinyinDict = map[int]string{
 	0x55EC: "hē",
 	0x55ED: "zhí",
 	0x55EE: "sài",
-	0x55EF: "ń,ńg,ňg,ň,ǹg,ǹ",
+	0x55EF: "ń,ńg,ňg,ǹg,ň,ǹ",
 	0x55F0: "gě",
 	0x55F1: "ná",
 	0x55F2: "diē,diǎ",
@@ -7839,7 +7850,7 @@ var PinyinDict = map[int]string{
 	0x5617: "cháng",
 	0x5618: "xū,shī",
 	0x5619: "pó",
-	0x561A: "dē,dé,dāi,dēi",
+	0x561A: "dē,dēi,dé,dāi",
 	0x561B: "ma,má",
 	0x561C: "mà",
 	0x561D: "hú",
@@ -8077,7 +8088,7 @@ var PinyinDict = map[int]string{
 	0x5705: "hán",
 	0x5706: "yuán",
 	0x5707: "lún",
-	0x5708: "quān,juàn,juān,quán,juǎn",
+	0x5708: "quān,juān,juàn,quán,juǎn",
 	0x5709: "yǔ",
 	0x570A: "qīng",
 	0x570B: "guó",
@@ -8110,14 +8121,14 @@ var PinyinDict = map[int]string{
 	0x5726: "kuài",
 	0x5727: "yā",
 	0x5728: "zài",
-	0x5729: "wéi,yú,xū",
+	0x5729: "wéi,xū,yú",
 	0x572A: "gē,yì",
-	0x572B: "yù,zhūn",
+	0x572B: "yù,tuō,zhūn",
 	0x572C: "wū",
 	0x572D: "guī",
 	0x572E: "pǐ",
 	0x572F: "yí",
-	0x5730: "de,dì",
+	0x5730: "dì,de",
 	0x5731: "qiān,sú",
 	0x5732: "qiān",
 	0x5733: "zhèn,quǎn,chóu,huái",
@@ -8177,7 +8188,7 @@ var PinyinDict = map[int]string{
 	0x5769: "gān",
 	0x576A: "píng",
 	0x576B: "diàn,zhēn",
-	0x576C: "guà",
+	0x576C: "guà,wā",
 	0x576D: "ní",
 	0x576E: "tái",
 	0x576F: "pī,huài",
@@ -8209,7 +8220,7 @@ var PinyinDict = map[int]string{
 	0x5789: "páo",
 	0x578A: "min",
 	0x578B: "xíng",
-	0x578C: "dòng,tǒng,tóng",
+	0x578C: "dòng,tóng,tǒng",
 	0x578D: "jì,jī",
 	0x578E: "hè",
 	0x578F: "lǜ",
@@ -8250,12 +8261,12 @@ var PinyinDict = map[int]string{
 	0x57B2: "kǎi",
 	0x57B3: "háng",
 	0x57B4: "nǎo",
-	0x57B5: "ǎn",
+	0x57B5: "ǎn,ān",
 	0x57B6: "xīng",
 	0x57B7: "xiàn",
 	0x57B8: "yuàn,huán",
 	0x57B9: "bāng",
-	0x57BA: "fū,fóu,pēi,póu",
+	0x57BA: "fū,fú,fóu,pēi,póu",
 	0x57BB: "bà,bèi",
 	0x57BC: "yì",
 	0x57BD: "yìn",
@@ -8297,14 +8308,14 @@ var PinyinDict = map[int]string{
 	0x57E1: "yā,è,wǔ,yà",
 	0x57E2: "quán,juǎn",
 	0x57E3: "suì,sù",
-	0x57E4: "pí,bì,pì,bēi",
+	0x57E4: "pí,pì,bì,bēi",
 	0x57E5: "qīng,zhēng",
 	0x57E6: "wǎn,wān",
 	0x57E7: "jù",
 	0x57E8: "lǔn,lùn",
 	0x57E9: "zhēng,chéng",
 	0x57EA: "kōng",
-	0x57EB: "chǒng,shǎng",
+	0x57EB: "chǒng,tǎng,shǎng",
 	0x57EC: "dōng",
 	0x57ED: "dài",
 	0x57EE: "tàn,tán",
@@ -8365,7 +8376,7 @@ var PinyinDict = map[int]string{
 	0x5825: "máo,móu,wǔ",
 	0x5826: "jiē",
 	0x5827: "ruán,nuò",
-	0x5828: "yè,ài,è",
+	0x5828: "yè,è,ài",
 	0x5829: "gèng",
 	0x582A: "kān,chěn",
 	0x582B: "zōng",
@@ -8419,7 +8430,7 @@ var PinyinDict = map[int]string{
 	0x585B: "lì",
 	0x585C: "zhǒng,péng",
 	0x585D: "bàng",
-	0x585E: "sāi,sè,sài",
+	0x585E: "sāi,sài,sè",
 	0x585F: "zàng",
 	0x5860: "duī",
 	0x5861: "tián",
@@ -8474,7 +8485,7 @@ var PinyinDict = map[int]string{
 	0x5892: "shāng",
 	0x5893: "mù",
 	0x5894: "cuī",
-	0x5895: "yàn",
+	0x5895: "yàn,yān",
 	0x5896: "tǎ",
 	0x5897: "zēng",
 	0x5898: "qián",
@@ -9148,7 +9159,7 @@ var PinyinDict = map[int]string{
 	0x5B34: "yíng",
 	0x5B35: "mián",
 	0x5B36: "bí",
-	0x5B37: "mā",
+	0x5B37: "mā,mó",
 	0x5B38: "shěn",
 	0x5B39: "xìng,xīng",
 	0x5B3A: "nì",
@@ -9222,7 +9233,7 @@ var PinyinDict = map[int]string{
 	0x5B7E: "yīng",
 	0x5B7F: "luán",
 	0x5B80: "mián",
-	0x5B81: "níng,zhù,nìng",
+	0x5B81: "níng,nìng,zhù",
 	0x5B82: "rǒng",
 	0x5B83: "tā,tuó,yí",
 	0x5B84: "guǐ",
@@ -9275,7 +9286,7 @@ var PinyinDict = map[int]string{
 	0x5BB3: "hài,hé",
 	0x5BB4: "yàn",
 	0x5BB5: "xiāo",
-	0x5BB6: "jiā,jià,jia,jie,gū",
+	0x5BB6: "jiā,jia,jià,jie,gū",
 	0x5BB7: "shěn",
 	0x5BB8: "chén",
 	0x5BB9: "róng,yǒng",
@@ -9284,7 +9295,7 @@ var PinyinDict = map[int]string{
 	0x5BBC: "kòu",
 	0x5BBD: "kuān",
 	0x5BBE: "bīn",
-	0x5BBF: "sù,xiù,xiǔ,qī",
+	0x5BBF: "sù,xiǔ,xiù,qī",
 	0x5BC0: "cǎi,cài",
 	0x5BC1: "zǎn",
 	0x5BC2: "jì",
@@ -9479,7 +9490,7 @@ var PinyinDict = map[int]string{
 	0x5C7F: "yǔ",
 	0x5C80: "chū",
 	0x5C81: "suì",
-	0x5C82: "qǐ",
+	0x5C82: "qǐ,kǎi",
 	0x5C83: "rèn",
 	0x5C84: "yuè",
 	0x5C85: "bǎn",
@@ -9517,7 +9528,7 @@ var PinyinDict = map[int]string{
 	0x5CA5: "pō",
 	0x5CA6: "lì",
 	0x5CA7: "tiáo",
-	0x5CA8: "qū,zǔ,jǔ",
+	0x5CA8: "qū,jū,zǔ,jǔ",
 	0x5CA9: "yán",
 	0x5CAA: "fú",
 	0x5CAB: "xiù",
@@ -9568,7 +9579,7 @@ var PinyinDict = map[int]string{
 	0x5CD8: "huán",
 	0x5CD9: "zhì,shì",
 	0x5CDA: "mì",
-	0x5CDB: "lǐ",
+	0x5CDB: "lǐ,liè",
 	0x5CDC: "jì",
 	0x5CDD: "tóng",
 	0x5CDE: "wéi,wěi",
@@ -9667,7 +9678,7 @@ var PinyinDict = map[int]string{
 	0x5D3B: "zhì",
 	0x5D3C: "shì,dié",
 	0x5D3D: "zǎi",
-	0x5D3E: "yǎo",
+	0x5D3E: "yǎo,yào",
 	0x5D3F: "è",
 	0x5D40: "zhù",
 	0x5D41: "kān,zhàn",
@@ -9721,7 +9732,7 @@ var PinyinDict = map[int]string{
 	0x5D71: "yǒng,yóng",
 	0x5D72: "niè",
 	0x5D73: "cuó",
-	0x5D74: "jǐ",
+	0x5D74: "jǐ,jí",
 	0x5D75: "shí",
 	0x5D76: "ruò",
 	0x5D77: "sǒng",
@@ -9843,7 +9854,7 @@ var PinyinDict = map[int]string{
 	0x5DEB: "wū",
 	0x5DEC: "pu",
 	0x5DED: "pu",
-	0x5DEE: "chà,chā,chāi,chài,cī,cuō,jiē",
+	0x5DEE: "chà,chā,chāi,cī,chài,cuō,jiē",
 	0x5DEF: "qiú",
 	0x5DF0: "qiú",
 	0x5DF1: "jǐ,qǐ",
@@ -9883,7 +9894,7 @@ var PinyinDict = map[int]string{
 	0x5E13: "mò,wà",
 	0x5E14: "pèi,pī",
 	0x5E15: "pà,mò",
-	0x5E16: "tiē,tiè,tiě",
+	0x5E16: "tiē,tiě,tiè",
 	0x5E17: "bō,fú",
 	0x5E18: "lián,chén",
 	0x5E19: "zhì",
@@ -9900,7 +9911,7 @@ var PinyinDict = map[int]string{
 	0x5E24: "rú",
 	0x5E25: "shuài",
 	0x5E26: "dài",
-	0x5E27: "zhèng",
+	0x5E27: "zhēn,zhèng",
 	0x5E28: "shuì",
 	0x5E29: "qiào",
 	0x5E2A: "zhēn",
@@ -10059,7 +10070,7 @@ var PinyinDict = map[int]string{
 	0x5EC3: "fèi",
 	0x5EC4: "jiù",
 	0x5EC5: "è",
-	0x5EC6: "guī,huì,wěi",
+	0x5EC6: "guī,wěi,huì",
 	0x5EC7: "liù",
 	0x5EC8: "shà,xià",
 	0x5EC9: "lián",
@@ -10175,7 +10186,7 @@ var PinyinDict = map[int]string{
 	0x5F37: "qiáng,jiàng,qiǎng",
 	0x5F38: "péng,pēng",
 	0x5F39: "dàn,tán",
-	0x5F3A: "qiáng,qiǎng,jiàng",
+	0x5F3A: "qiáng,jiàng,qiǎng",
 	0x5F3B: "bì",
 	0x5F3C: "bì",
 	0x5F3D: "shè",
@@ -10268,7 +10279,7 @@ var PinyinDict = map[int]string{
 	0x5F94: "zhi",
 	0x5F95: "lái,lài",
 	0x5F96: "cóng",
-	0x5F97: "dé,děi,de",
+	0x5F97: "dé,de,děi",
 	0x5F98: "pái",
 	0x5F99: "xǐ,sī",
 	0x5F9A: "dōng",
@@ -10491,7 +10502,7 @@ var PinyinDict = map[int]string{
 	0x6073: "kěn",
 	0x6074: "dé",
 	0x6075: "huì",
-	0x6076: "è,ě,wū,wù",
+	0x6076: "è,ě,wù,wū",
 	0x6077: "xiao",
 	0x6078: "tòng",
 	0x6079: "yān",
@@ -10703,7 +10714,7 @@ var PinyinDict = map[int]string{
 	0x6147: "yīn",
 	0x6148: "cí",
 	0x6149: "xù,chù",
-	0x614A: "qiàn,xián,qiǎn,qiè",
+	0x614A: "qiàn,qiè,xián,qiǎn",
 	0x614B: "tài",
 	0x614C: "huāng,huǎng,huang",
 	0x614D: "yùn",
@@ -10912,7 +10923,7 @@ var PinyinDict = map[int]string{
 	0x6218: "zhàn",
 	0x6219: "dòng",
 	0x621A: "qī,cù",
-	0x621B: "jiá",
+	0x621B: "jiá,gā",
 	0x621C: "dié",
 	0x621D: "zéi",
 	0x621E: "jiá",
@@ -10963,11 +10974,11 @@ var PinyinDict = map[int]string{
 	0x624B: "shǒu",
 	0x624C: "shou",
 	0x624D: "cái,zāi",
-	0x624E: "zhā,zhá,zhǎ,zā",
+	0x624E: "zhā,zā,zhá,zhǎ",
 	0x624F: "qiú",
 	0x6250: "lè,lì,cái",
 	0x6251: "pū,pì",
-	0x6252: "bā,bài,bié,pá",
+	0x6252: "bā,pá,bài,bié",
 	0x6253: "dǎ,dá",
 	0x6254: "rēng,rèng",
 	0x6255: "fǎn",
@@ -11037,7 +11048,7 @@ var PinyinDict = map[int]string{
 	0x6295: "tóu,dòu",
 	0x6296: "dǒu",
 	0x6297: "kàng,gāng",
-	0x6298: "zhé,shé,tí,zhē",
+	0x6298: "zhé,shé,zhē,tí",
 	0x6299: "póu",
 	0x629A: "fǔ",
 	0x629B: "pāo",
@@ -11070,7 +11081,7 @@ var PinyinDict = map[int]string{
 	0x62B6: "chì",
 	0x62B7: "pī,pēi",
 	0x62B8: "jiā",
-	0x62B9: "mǒ,mò,mā",
+	0x62B9: "mǒ,mā,mò",
 	0x62BA: "mèi",
 	0x62BB: "chēn,shēn",
 	0x62BC: "yā,xiá,jiǎ",
@@ -11082,7 +11093,7 @@ var PinyinDict = map[int]string{
 	0x62C2: "fú,bì,pì,fèi",
 	0x62C3: "zhǎ,zhǎn,zhà,zhá",
 	0x62C4: "zhǔ",
-	0x62C5: "dān,dǎn,jiē,dàn",
+	0x62C5: "dān,dàn,dǎn,jiē",
 	0x62C6: "chāi,chè,chì,cā",
 	0x62C7: "mǔ",
 	0x62C8: "niān,niǎn,diān",
@@ -11096,7 +11107,7 @@ var PinyinDict = map[int]string{
 	0x62D0: "guǎi",
 	0x62D1: "qián",
 	0x62D2: "jù,jǔ",
-	0x62D3: "tà,zhí,tuò",
+	0x62D3: "tuò,tà,zhí",
 	0x62D4: "bá,bō,bié,fá,bèi",
 	0x62D5: "tuō",
 	0x62D6: "tuō,chǐ",
@@ -11105,7 +11116,7 @@ var PinyinDict = map[int]string{
 	0x62D9: "zhuō",
 	0x62DA: "pàn,biàn,fèn,fān,pīn",
 	0x62DB: "zhāo,qiáo,sháo",
-	0x62DC: "bài",
+	0x62DC: "bài,bái",
 	0x62DD: "bài",
 	0x62DE: "dǐ",
 	0x62DF: "nǐ",
@@ -11138,7 +11149,7 @@ var PinyinDict = map[int]string{
 	0x62FA: "cè,sè,chuò",
 	0x62FB: "huī",
 	0x62FC: "pīn,bìng",
-	0x62FD: "zhuāi,yè,zhuài",
+	0x62FD: "zhuāi,zhuài,yè",
 	0x62FE: "shí,shè,jiè",
 	0x62FF: "ná",
 	0x6300: "bāi",
@@ -11219,7 +11230,7 @@ var PinyinDict = map[int]string{
 	0x634B: "lǚ,luō",
 	0x634C: "bā,bié",
 	0x634D: "hàn,xiàn,gǎn",
-	0x634E: "shāo,shǎo,xiāo,qiào,shào",
+	0x634E: "shāo,shào,shǎo,xiāo,qiào",
 	0x634F: "niē",
 	0x6350: "juān,yuán",
 	0x6351: "zè",
@@ -11287,7 +11298,7 @@ var PinyinDict = map[int]string{
 	0x638F: "tāo,táo",
 	0x6390: "qiā",
 	0x6391: "qí",
-	0x6392: "pái,bài,pǎi",
+	0x6392: "pái,pǎi,bài",
 	0x6393: "shū",
 	0x6394: "qiān,wàn",
 	0x6395: "líng",
@@ -11349,7 +11360,7 @@ var PinyinDict = map[int]string{
 	0x63CD: "zòu,còu",
 	0x63CE: "xuān",
 	0x63CF: "miáo,mào",
-	0x63D0: "tí,chí,shí,dǐ,dī",
+	0x63D0: "tí,dī,chí,shí,dǐ",
 	0x63D1: "niē",
 	0x63D2: "chā,zhǎ",
 	0x63D3: "shì",
@@ -11368,7 +11379,7 @@ var PinyinDict = map[int]string{
 	0x63E0: "yà",
 	0x63E1: "wò,òu",
 	0x63E2: "ké,qiā",
-	0x63E3: "chuāi,chuǎi,duǒ,zhuī,tuán,chuài",
+	0x63E3: "chuāi,chuǎi,chuài,duǒ,zhuī,tuán",
 	0x63E4: "jí",
 	0x63E5: "tì,dì",
 	0x63E6: "lá,là",
@@ -11502,7 +11513,7 @@ var PinyinDict = map[int]string{
 	0x6466: "huà",
 	0x6467: "cuī,zuì,cuò",
 	0x6468: "nái,zhì",
-	0x6469: "mó,mí,mā",
+	0x6469: "mó,mā,mí",
 	0x646A: "jiāng,qiàng",
 	0x646B: "guī",
 	0x646C: "yǐng",
@@ -11522,7 +11533,7 @@ var PinyinDict = map[int]string{
 	0x647A: "zhé,lā,xié",
 	0x647B: "càn,shǎn,shān,chān,sēn",
 	0x647C: "kēng,qiān",
-	0x647D: "biāo,piāo,biào,pāo",
+	0x647D: "biāo,biào,piāo,pāo",
 	0x647E: "jiàng",
 	0x647F: "yáo",
 	0x6480: "gòu",
@@ -11532,7 +11543,7 @@ var PinyinDict = map[int]string{
 	0x6484: "yīng",
 	0x6485: "juē,juè,jué,guì",
 	0x6486: "piē",
-	0x6487: "piē,biē,piě",
+	0x6487: "piē,piě,biē",
 	0x6488: "lāo",
 	0x6489: "dūn",
 	0x648A: "xiàn",
@@ -11571,7 +11582,7 @@ var PinyinDict = map[int]string{
 	0x64AB: "fǔ,mó",
 	0x64AC: "qiào",
 	0x64AD: "bō,bǒ",
-	0x64AE: "cuō,zuì,zuān,chuā,zuǒ",
+	0x64AE: "cuō,zuǒ,zuì,zuān,chuā",
 	0x64AF: "zhuó",
 	0x64B0: "zhuàn,xuǎn,suàn",
 	0x64B1: "wěi,tuǒ",
@@ -11841,7 +11852,7 @@ var PinyinDict = map[int]string{
 	0x65B9: "fāng,fáng,fǎng,páng,wǎng,fēng",
 	0x65BA: "chǎn,jiè",
 	0x65BB: "háng",
-	0x65BC: "yú,wū,yū",
+	0x65BC: "yú,yū,wū",
 	0x65BD: "shī,yì,shǐ",
 	0x65BE: "pèi",
 	0x65BF: "yóu,liú",
@@ -12130,7 +12141,7 @@ var PinyinDict = map[int]string{
 	0x66DA: "méng",
 	0x66DB: "xūn",
 	0x66DC: "yào",
-	0x66DD: "pù",
+	0x66DD: "pù,bào",
 	0x66DE: "lì",
 	0x66DF: "chén",
 	0x66E0: "kuàng",
@@ -12212,12 +12223,12 @@ var PinyinDict = map[int]string{
 	0x672C: "běn,bēn",
 	0x672D: "zhá,yà",
 	0x672E: "shù,zhú",
-	0x672F: "shù,shú,zhú",
+	0x672F: "shù,zhú,shú",
 	0x6730: "mù",
 	0x6731: "zhū,shū",
 	0x6732: "rén",
 	0x6733: "bā",
-	0x6734: "pǔ,pò,pū,pō,piáo",
+	0x6734: "pǔ,piáo,pò,pū,pō",
 	0x6735: "duǒ",
 	0x6736: "duǒ",
 	0x6737: "dāo,mù,tiáo",
@@ -12235,7 +12246,7 @@ var PinyinDict = map[int]string{
 	0x6743: "quán",
 	0x6744: "qiān",
 	0x6745: "yú,wū",
-	0x6746: "gān,gàn,gǎn",
+	0x6746: "gān,gǎn,gàn",
 	0x6747: "wū",
 	0x6748: "chā,chà",
 	0x6749: "shān,shā",
@@ -12261,7 +12272,7 @@ var PinyinDict = map[int]string{
 	0x675D: "lí,zhì,yí,tuò,duò",
 	0x675E: "qǐ",
 	0x675F: "shù",
-	0x6760: "gāng,gōng,gàng",
+	0x6760: "gāng,gàng,gōng",
 	0x6761: "tiáo",
 	0x6762: "jiang",
 	0x6763: "mián",
@@ -12349,7 +12360,7 @@ var PinyinDict = map[int]string{
 	0x67B5: "xiāo",
 	0x67B6: "jià",
 	0x67B7: "jiā,jià",
-	0x67B8: "gǒu,jǔ,gōu,qú",
+	0x67B8: "gǒu,gōu,jǔ,qú",
 	0x67B9: "bāo,fú",
 	0x67BA: "mò",
 	0x67BB: "yì,xiè",
@@ -12477,7 +12488,7 @@ var PinyinDict = map[int]string{
 	0x6835: "liè",
 	0x6836: "yīn",
 	0x6837: "yàng,yáng",
-	0x6838: "hé,gāi,kài,hú",
+	0x6838: "hé,hú,gāi,kài",
 	0x6839: "gēn",
 	0x683A: "yì,zhī,zhǐ",
 	0x683B: "shì",
@@ -12583,7 +12594,7 @@ var PinyinDict = map[int]string{
 	0x68A0: "lǚ",
 	0x68A1: "hún,kuǎn",
 	0x68A2: "shāo,shào,xiāo,sào",
-	0x68A3: "cén",
+	0x68A3: "cén,chén,qín",
 	0x68A4: "fén",
 	0x68A5: "sōng",
 	0x68A6: "mèng",
@@ -12631,7 +12642,7 @@ var PinyinDict = map[int]string{
 	0x68D0: "fěi,féi",
 	0x68D1: "pái,bèi,pèi",
 	0x68D2: "bàng",
-	0x68D3: "bàng,pǒu,bèi,péi,bēi",
+	0x68D3: "bàng,bèi,pǒu,péi,bēi",
 	0x68D4: "hūn",
 	0x68D5: "zōng",
 	0x68D6: "chéng,cháng",
@@ -12661,7 +12672,7 @@ var PinyinDict = map[int]string{
 	0x68EE: "sēn",
 	0x68EF: "rěn,shěn",
 	0x68F0: "chuí,duǒ",
-	0x68F1: "léng,lèng,lēng,líng,chēng",
+	0x68F1: "léng,lēng,líng,lèng,chēng",
 	0x68F2: "qī,xī",
 	0x68F3: "zhuō",
 	0x68F4: "fú,sù",
@@ -12795,7 +12806,7 @@ var PinyinDict = map[int]string{
 	0x6974: "tì,dǐ,shì",
 	0x6975: "jí,jǐ",
 	0x6976: "jié",
-	0x6977: "kǎi,jiè,jiē",
+	0x6977: "kǎi,jiē,jiè",
 	0x6978: "qiū",
 	0x6979: "yíng",
 	0x697A: "rǒu,ròu",
@@ -12913,7 +12924,7 @@ var PinyinDict = map[int]string{
 	0x69EA: "gài",
 	0x69EB: "tuán,shuàn,quán",
 	0x69EC: "huà",
-	0x69ED: "qī,zú,sè",
+	0x69ED: "qī,qì,zú,sè",
 	0x69EE: "sēn,shěn",
 	0x69EF: "cuī,zuǐ",
 	0x69F0: "péng",
@@ -13013,7 +13024,7 @@ var PinyinDict = map[int]string{
 	0x6A4E: "fán",
 	0x6A4F: "zhǎn,jiǎn",
 	0x6A50: "tuó,dù,luò",
-	0x6A51: "lǎo",
+	0x6A51: "lǎo,liáo",
 	0x6A52: "yún",
 	0x6A53: "shùn",
 	0x6A54: "dūn,tuí",
@@ -13244,8 +13255,8 @@ var PinyinDict = map[int]string{
 	0x6B35: "kuǎn",
 	0x6B36: "shuò,sòu",
 	0x6B37: "xī",
-	0x6B38: "āi,ǎi,xiè,ế,éi,ê̌,ěi,ề,èi,ê̄,ēi",
-	0x6B39: "yī",
+	0x6B38: "āi,ǎi,ê̄,ế,ê̌,ề,xiè,éi,ěi,èi,ēi",
+	0x6B39: "yī,qī",
 	0x6B3A: "qī",
 	0x6B3B: "chuā,xū",
 	0x6B3C: "chǐ,chuài",
@@ -13338,7 +13349,7 @@ var PinyinDict = map[int]string{
 	0x6B93: "liàn",
 	0x6B94: "yì",
 	0x6B95: "fǒu,yè,bó",
-	0x6B96: "zhí,shì,shi",
+	0x6B96: "zhí,shi,shì",
 	0x6B97: "yè,yàn,yān",
 	0x6B98: "cán",
 	0x6B99: "hūn,mèn",
@@ -13371,7 +13382,7 @@ var PinyinDict = map[int]string{
 	0x6BB4: "ōu",
 	0x6BB5: "duàn",
 	0x6BB6: "zhù",
-	0x6BB7: "yīn,yǐn,yān",
+	0x6BB7: "yīn,yān,yǐn",
 	0x6BB8: "qìng,kēng,shēng",
 	0x6BB9: "yì",
 	0x6BBA: "shā,shài,sà,xiè,shì",
@@ -13507,7 +13518,7 @@ var PinyinDict = map[int]string{
 	0x6C3C: "nì,mèi",
 	0x6C3D: "tǔn,qiú",
 	0x6C3E: "fàn,fán",
-	0x6C3F: "guǐ,qiú,jiǔ",
+	0x6C3F: "guǐ,jiǔ,qiú",
 	0x6C40: "tīng,tìng,dìng",
 	0x6C41: "zhī,xié,shí",
 	0x6C42: "qiú",
@@ -13584,7 +13595,7 @@ var PinyinDict = map[int]string{
 	0x6C89: "chén",
 	0x6C8A: "dàn",
 	0x6C8B: "yóu",
-	0x6C8C: "dùn,tún,chún,zhuàn",
+	0x6C8C: "dùn,zhuàn,tún,chún",
 	0x6C8D: "hù,hú",
 	0x6C8E: "huò",
 	0x6C8F: "qī,qiè",
@@ -13812,7 +13823,7 @@ var PinyinDict = map[int]string{
 	0x6D6D: "gēng",
 	0x6D6E: "fú",
 	0x6D6F: "wú",
-	0x6D70: "liàn",
+	0x6D70: "liàn,lì",
 	0x6D71: "chún",
 	0x6D72: "féng,hóng",
 	0x6D73: "yì",
@@ -13880,7 +13891,7 @@ var PinyinDict = map[int]string{
 	0x6DB1: "zhàng",
 	0x6DB2: "yè,shì",
 	0x6DB3: "kōng,náng",
-	0x6DB4: "wò,wǎn,yuān",
+	0x6DB4: "wò,yuān,wǎn",
 	0x6DB5: "hán,hàn",
 	0x6DB6: "tuō,tuò",
 	0x6DB7: "dōng",
@@ -14037,7 +14048,7 @@ var PinyinDict = map[int]string{
 	0x6E4E: "miǎn",
 	0x6E4F: "huì,mǐn",
 	0x6E50: "mò",
-	0x6E51: "xū,xǔ,xù",
+	0x6E51: "xū,xù,xǔ",
 	0x6E52: "jí",
 	0x6E53: "pén,pèn",
 	0x6E54: "jiān,zàn,zhǎn,qián,jiàn",
@@ -14063,7 +14074,7 @@ var PinyinDict = map[int]string{
 	0x6E68: "jú",
 	0x6E69: "dòng,dǒng,tóng",
 	0x6E6A: "tuàn,nuǎn",
-	0x6E6B: "jiǎo,jiù,jiū,qiū,jiāo",
+	0x6E6B: "jiǎo,qiū,jiù,jiū,jiāo",
 	0x6E6C: "jiǎo",
 	0x6E6D: "qiú",
 	0x6E6E: "yān,yīn",
@@ -14141,7 +14152,7 @@ var PinyinDict = map[int]string{
 	0x6EB6: "róng",
 	0x6EB7: "hùn,hún",
 	0x6EB8: "sù",
-	0x6EB9: "suò,sè",
+	0x6EB9: "suò,suǒ,sè",
 	0x6EBA: "nì,ruò,niào",
 	0x6EBB: "tā",
 	0x6EBC: "shī",
@@ -14187,7 +14198,7 @@ var PinyinDict = map[int]string{
 	0x6EE4: "lǜ",
 	0x6EE5: "làn",
 	0x6EE6: "luán",
-	0x6EE7: "yáo",
+	0x6EE7: "yáo,xiào",
 	0x6EE8: "bīn",
 	0x6EE9: "tān",
 	0x6EEA: "yù",
@@ -14214,7 +14225,7 @@ var PinyinDict = map[int]string{
 	0x6EFF: "mǎn,mèn",
 	0x6F00: "qǐng,qīng",
 	0x6F01: "yú",
-	0x6F02: "piào,piāo,piǎo,biāo",
+	0x6F02: "piāo,piào,piǎo,biāo",
 	0x6F03: "jì",
 	0x6F04: "yá",
 	0x6F05: "cháo",
@@ -14264,7 +14275,7 @@ var PinyinDict = map[int]string{
 	0x6F31: "shù",
 	0x6F32: "zhǎng,zhàng,zhāng",
 	0x6F33: "zhāng",
-	0x6F34: "zhuàng,chuáng,chóng",
+	0x6F34: "zhuàng,chóng,shuāng,chuáng",
 	0x6F35: "xù",
 	0x6F36: "huàn",
 	0x6F37: "huǒ,kuò,huò",
@@ -14314,7 +14325,7 @@ var PinyinDict = map[int]string{
 	0x6F63: "mǐn",
 	0x6F64: "rùn",
 	0x6F65: "sù",
-	0x6F66: "lǎo,lào,láo,liáo,liǎo",
+	0x6F66: "lǎo,liáo,lào,láo,liǎo",
 	0x6F67: "zhēn",
 	0x6F68: "cóng,zōng",
 	0x6F69: "yì",
@@ -14397,7 +14408,7 @@ var PinyinDict = map[int]string{
 	0x6FB6: "chán,dàn,zhān",
 	0x6FB7: "màn",
 	0x6FB8: "dǎn",
-	0x6FB9: "dàn,dān,shàn,tán",
+	0x6FB9: "dàn,tán,dān,shàn",
 	0x6FBA: "yì",
 	0x6FBB: "suì",
 	0x6FBC: "pì",
@@ -14528,7 +14539,7 @@ var PinyinDict = map[int]string{
 	0x7039: "yuè,yào",
 	0x703A: "chán",
 	0x703B: "dài",
-	0x703C: "ráng,nǎng,ràng",
+	0x703C: "ráng,ràng,nǎng",
 	0x703D: "jiǎn",
 	0x703E: "lán",
 	0x703F: "fán",
@@ -14616,7 +14627,7 @@ var PinyinDict = map[int]string{
 	0x7091: "mù",
 	0x7092: "chǎo",
 	0x7093: "liào",
-	0x7094: "guì,xuè,quē",
+	0x7094: "guì,quē,xuè",
 	0x7095: "kàng,hāng",
 	0x7096: "dùn,tún",
 	0x7097: "guāng",
@@ -14642,7 +14653,7 @@ var PinyinDict = map[int]string{
 	0x70AB: "xuàn",
 	0x70AC: "jù",
 	0x70AD: "tàn",
-	0x70AE: "pào,páo,bāo",
+	0x70AE: "pào,bāo,páo",
 	0x70AF: "jiǒng",
 	0x70B0: "páo,fǒu",
 	0x70B1: "tái",
@@ -15074,7 +15085,7 @@ var PinyinDict = map[int]string{
 	0x725C: "niú",
 	0x725D: "pìn",
 	0x725E: "jiū,lè",
-	0x725F: "móu,mào,mù",
+	0x725F: "móu,mù,mào",
 	0x7260: "tā,tuó",
 	0x7261: "mǔ",
 	0x7262: "láo,lào,lóu",
@@ -15159,11 +15170,11 @@ var PinyinDict = map[int]string{
 	0x72B1: "jǐ",
 	0x72B2: "chái",
 	0x72B3: "zhuó",
-	0x72B4: "àn,án,jiàn,hān",
+	0x72B4: "àn,hān,án,jiàn",
 	0x72B5: "gē,hé",
 	0x72B6: "zhuàng",
 	0x72B7: "guǎng",
-	0x72B8: "mà",
+	0x72B8: "mà,mǎ",
 	0x72B9: "yóu,yòu",
 	0x72BA: "kàng,gǎng",
 	0x72BB: "bó,pèi,fèi",
@@ -15800,7 +15811,7 @@ var PinyinDict = map[int]string{
 	0x7537: "nán",
 	0x7538: "diān,diàn,tián,shèng,yìng",
 	0x7539: "pīng",
-	0x753A: "tīng,tǐng,zhèng,tiǎn,dīng",
+	0x753A: "tīng,dīng,tǐng,zhèng,tiǎn",
 	0x753B: "huà",
 	0x753C: "tǐng",
 	0x753D: "zhèn,quǎn,zhùn",
@@ -15848,7 +15859,7 @@ var PinyinDict = map[int]string{
 	0x7567: "lüè",
 	0x7568: "pān,fān",
 	0x7569: "yī",
-	0x756A: "fān,fán,bō,pó,pān,pán,pàn,pí",
+	0x756A: "fān,pān,fán,bō,pó,pán,pàn,pí",
 	0x756B: "huà",
 	0x756C: "shē,yú",
 	0x756D: "yú",
@@ -16039,7 +16050,7 @@ var PinyinDict = map[int]string{
 	0x7626: "shòu",
 	0x7627: "nüè,yào",
 	0x7628: "diān,chēn",
-	0x7629: "da,dá",
+	0x7629: "dā,da,dá",
 	0x762A: "biě,biē",
 	0x762B: "tān",
 	0x762C: "zhàng",
@@ -16125,12 +16136,12 @@ var PinyinDict = map[int]string{
 	0x767C: "fā,bō",
 	0x767D: "bái,bó",
 	0x767E: "bǎi,bó,mò",
-	0x767F: "qié",
+	0x767F: "qié,bié",
 	0x7680: "jí,xiāng,bī",
 	0x7681: "zào",
 	0x7682: "zào",
 	0x7683: "mào",
-	0x7684: "de,dì,dí",
+	0x7684: "de,dī,dí,dì",
 	0x7685: "pā,bà",
 	0x7686: "jiē",
 	0x7687: "huáng,wǎng",
@@ -16301,7 +16312,7 @@ var PinyinDict = map[int]string{
 	0x772C: "lóng",
 	0x772D: "suī,huī,xié,wèi",
 	0x772E: "tóng",
-	0x772F: "mī,mǐ,mì,mí",
+	0x772F: "mī,mí,mǐ,mì",
 	0x7730: "diè,zhì",
 	0x7731: "dì",
 	0x7732: "nè",
@@ -16318,7 +16329,7 @@ var PinyinDict = map[int]string{
 	0x773D: "mò,mì",
 	0x773E: "zhòng",
 	0x773F: "mò",
-	0x7740: "zhe,zhuó,zhāo,zháo",
+	0x7740: "zhe,zhāo,zháo,zhuó",
 	0x7741: "zhēng",
 	0x7742: "méi",
 	0x7743: "suō,jùn,juān",
@@ -16401,7 +16412,7 @@ var PinyinDict = map[int]string{
 	0x7790: "mò",
 	0x7791: "míng,méng,mián",
 	0x7792: "mán",
-	0x7793: "shuì",
+	0x7793: "fèn",
 	0x7794: "zé",
 	0x7795: "zhàng",
 	0x7796: "yì",
@@ -16519,7 +16530,7 @@ var PinyinDict = map[int]string{
 	0x7806: "fū",
 	0x7807: "mín",
 	0x7808: "ě",
-	0x7809: "huò,xū,huā",
+	0x7809: "huò,huā,xū",
 	0x780A: "kāng,kàng",
 	0x780B: "zhǐ",
 	0x780C: "qì,qiè",
@@ -16539,7 +16550,7 @@ var PinyinDict = map[int]string{
 	0x781A: "yàn",
 	0x781B: "jīn",
 	0x781C: "fēng",
-	0x781D: "fá,jié,gé,fǎ",
+	0x781D: "fá,fǎ,jié,gé",
 	0x781E: "mò",
 	0x781F: "zhǎ,zhà,zuó",
 	0x7820: "jū,zū",
@@ -16584,17 +16595,17 @@ var PinyinDict = map[int]string{
 	0x7847: "náo",
 	0x7848: "qià",
 	0x7849: "lù",
-	0x784A: "wěi,guì",
+	0x784A: "wěi,huì,guì",
 	0x784B: "ài",
 	0x784C: "gè,luò,lì",
-	0x784D: "xiàn,kèn,kēng,yǐn",
+	0x784D: "xiàn,yín,kèn,kēng,yǐn",
 	0x784E: "xíng,kēng",
 	0x784F: "yán,yàn",
 	0x7850: "dòng,tóng,liú",
 	0x7851: "pēng,píng",
 	0x7852: "xī",
 	0x7853: "lǎo",
-	0x7854: "hóng",
+	0x7854: "hóng,gǒng",
 	0x7855: "shuò",
 	0x7856: "xiá",
 	0x7857: "qiāo",
@@ -16637,7 +16648,7 @@ var PinyinDict = map[int]string{
 	0x787C: "péng,pēng",
 	0x787D: "yān,yǎn",
 	0x787E: "zhuì,duǒ",
-	0x787F: "kōng",
+	0x787F: "kōng,kòng",
 	0x7880: "chéng",
 	0x7881: "qí",
 	0x7882: "zòng,cóng",
@@ -16646,11 +16657,11 @@ var PinyinDict = map[int]string{
 	0x7885: "jūn",
 	0x7886: "bō",
 	0x7887: "dìng",
-	0x7888: "mín",
+	0x7888: "mín,hūn",
 	0x7889: "diāo",
 	0x788A: "jiān,zhàn",
 	0x788B: "hè",
-	0x788C: "lù,luò,liù",
+	0x788C: "lù,liù,luò",
 	0x788D: "ài",
 	0x788E: "suì",
 	0x788F: "què,xī",
@@ -16707,7 +16718,7 @@ var PinyinDict = map[int]string{
 	0x78C2: "liú,liù",
 	0x78C3: "sī,tí",
 	0x78C4: "táng",
-	0x78C5: "bàng,pāng,páng",
+	0x78C5: "bàng,páng,pāng",
 	0x78C6: "huá,kě,gū",
 	0x78C7: "pī",
 	0x78C8: "wěi,kuǐ",
@@ -17144,7 +17155,7 @@ var PinyinDict = map[int]string{
 	0x7A77: "qióng",
 	0x7A78: "xī",
 	0x7A79: "qióng,qiōng,kōng",
-	0x7A7A: "kōng,kǒng,kòng",
+	0x7A7A: "kōng,kòng,kǒng",
 	0x7A7B: "yū,yǔ",
 	0x7A7C: "shēn",
 	0x7A7D: "jǐng",
@@ -17324,7 +17335,7 @@ var PinyinDict = map[int]string{
 	0x7B2B: "zǐ",
 	0x7B2C: "dì",
 	0x7B2D: "líng",
-	0x7B2E: "zé,zhà,zuó",
+	0x7B2E: "zé,zuó,zhà",
 	0x7B2F: "nú",
 	0x7B30: "fú,fèi",
 	0x7B31: "gǒu",
@@ -17403,7 +17414,7 @@ var PinyinDict = map[int]string{
 	0x7B7A: "kuāng",
 	0x7B7B: "gàng",
 	0x7B7C: "yún",
-	0x7B7D: "o",
+	0x7B7D: "ōu,wú",
 	0x7B7E: "qiān",
 	0x7B7F: "xiǎo",
 	0x7B80: "jiǎn",
@@ -17837,7 +17848,7 @@ var PinyinDict = map[int]string{
 	0x7D2C: "chóu,chōu,zhòu",
 	0x7D2D: "hóng",
 	0x7D2E: "zā,zhā",
-	0x7D2F: "lèi,lěi,léi,lǜ,liè",
+	0x7D2F: "lèi,léi,lěi,lǜ,liè",
 	0x7D30: "xì",
 	0x7D31: "fú",
 	0x7D32: "xiè,yì",
@@ -18111,7 +18122,7 @@ var PinyinDict = map[int]string{
 	0x7E3E: "jī",
 	0x7E3F: "shān,xiān,xiāo,sāo,cǎn",
 	0x7E40: "suì,cuǐ",
-	0x7E41: "fán,pán,pó",
+	0x7E41: "fán,pó,pán",
 	0x7E42: "lǜ",
 	0x7E43: "běng,bēng,bèng",
 	0x7E44: "yī,yì",
@@ -18279,7 +18290,7 @@ var PinyinDict = map[int]string{
 	0x7EE6: "tāo",
 	0x7EE7: "jì",
 	0x7EE8: "tí,tì",
-	0x7EE9: "jī",
+	0x7EE9: "jì,jī",
 	0x7EEA: "xù",
 	0x7EEB: "líng",
 	0x7EEC: "yīng",
@@ -18389,7 +18400,7 @@ var PinyinDict = map[int]string{
 	0x7F54: "wǎng,wáng",
 	0x7F55: "hǎn,hàn",
 	0x7F56: "luó",
-	0x7F57: "luó",
+	0x7F57: "luó,luō",
 	0x7F58: "fú",
 	0x7F59: "shēn",
 	0x7F5A: "fá",
@@ -18612,7 +18623,7 @@ var PinyinDict = map[int]string{
 	0x8033: "ěr,réng",
 	0x8034: "yì",
 	0x8035: "dīng",
-	0x8036: "yé,xié,yē",
+	0x8036: "yé,yē,xié",
 	0x8037: "dā,zhé",
 	0x8038: "sǒng",
 	0x8039: "qín",
@@ -18772,7 +18783,7 @@ var PinyinDict = map[int]string{
 	0x80D3: "píng,pēng",
 	0x80D4: "zì,cí,jí",
 	0x80D5: "fǔ,fū,fú,zhǒu",
-	0x80D6: "pàng,pàn,pán",
+	0x80D6: "pàng,pán,pàn",
 	0x80D7: "zhēn,zhěn,zhūn",
 	0x80D8: "xián",
 	0x80D9: "zuò",
@@ -18877,7 +18888,7 @@ var PinyinDict = map[int]string{
 	0x813C: "liǎng,lǎng",
 	0x813D: "shuí",
 	0x813E: "pí,pái,bì,pì",
-	0x813F: "biāo,biào,biǎo",
+	0x813F: "biāo,biǎo,biào",
 	0x8140: "lún",
 	0x8141: "pián",
 	0x8142: "lěi,guò,huà",
@@ -18942,7 +18953,7 @@ var PinyinDict = map[int]string{
 	0x817D: "wà",
 	0x817E: "téng",
 	0x817F: "tuǐ",
-	0x8180: "bǎng,páng,pāng,bàng,pǎng",
+	0x8180: "bǎng,pāng,páng,bàng,pǎng",
 	0x8181: "qiǎn,xiàn,yán",
 	0x8182: "lǚ",
 	0x8183: "wà",
@@ -19222,7 +19233,7 @@ var PinyinDict = map[int]string{
 	0x8295: "suī",
 	0x8296: "zhì",
 	0x8297: "xiāng",
-	0x8298: "pí,bì",
+	0x8298: "pí,bǐ,bì",
 	0x8299: "fú",
 	0x829A: "tún,chūn",
 	0x829B: "wěi",
@@ -19236,7 +19247,7 @@ var PinyinDict = map[int]string{
 	0x82A3: "fú,fǒu,fū",
 	0x82A4: "kōu",
 	0x82A5: "jiè,gài",
-	0x82A6: "lú,hù,lǔ",
+	0x82A6: "lú,lǔ,hù",
 	0x82A7: "xù,zhù",
 	0x82A8: "jī",
 	0x82A9: "qín,yín",
@@ -19337,7 +19348,7 @@ var PinyinDict = map[int]string{
 	0x8308: "cí,zǐ,cǐ,chái",
 	0x8309: "mò",
 	0x830A: "zī",
-	0x830B: "zhǐ",
+	0x830B: "zhǐ,dǐ",
 	0x830C: "chí",
 	0x830D: "jì",
 	0x830E: "jīng",
@@ -19484,7 +19495,7 @@ var PinyinDict = map[int]string{
 	0x839B: "tíng,tǐng",
 	0x839C: "yóu,diào,dí",
 	0x839D: "cuò",
-	0x839E: "guǎn,guān,wǎn",
+	0x839E: "guǎn,wǎn,guān",
 	0x839F: "hàn",
 	0x83A0: "yǒu,xiù",
 	0x83A1: "cuò",
@@ -19494,7 +19505,7 @@ var PinyinDict = map[int]string{
 	0x83A5: "niǔ,ròu",
 	0x83A6: "shāo,xiāo",
 	0x83A7: "xiàn,wàn",
-	0x83A8: "làng,láng,liáng",
+	0x83A8: "làng,liáng,láng",
 	0x83A9: "fú,piǎo",
 	0x83AA: "é",
 	0x83AB: "mò,mù",
@@ -19596,7 +19607,7 @@ var PinyinDict = map[int]string{
 	0x840B: "qī",
 	0x840C: "méng,míng",
 	0x840D: "píng",
-	0x840E: "wēi,wèi,wěi",
+	0x840E: "wēi,wěi,wèi",
 	0x840F: "dàn",
 	0x8410: "shà",
 	0x8411: "huán,zhuī",
@@ -19669,7 +19680,7 @@ var PinyinDict = map[int]string{
 	0x8454: "hóu",
 	0x8455: "yàn",
 	0x8456: "tū",
-	0x8457: "zhù,zhe,chú,zhuó,zhāo,zháo",
+	0x8457: "zhù,zhe,zhuó,chú,zhāo,zháo",
 	0x8458: "zī",
 	0x8459: "xiāng",
 	0x845A: "rèn,shèn",
@@ -19735,7 +19746,7 @@ var PinyinDict = map[int]string{
 	0x8496: "zhēn",
 	0x8497: "làng",
 	0x8498: "rú,ná",
-	0x8499: "méng,měng,mēng",
+	0x8499: "méng,mēng,měng",
 	0x849A: "lì",
 	0x849B: "quē",
 	0x849C: "suàn",
@@ -19846,9 +19857,9 @@ var PinyinDict = map[int]string{
 	0x8505: "yán",
 	0x8506: "líng",
 	0x8507: "jì,xì",
-	0x8508: "biāo,piǎo,biào",
+	0x8508: "biāo,piào,piǎo,biào",
 	0x8509: "gǔn",
-	0x850A: "hǎn",
+	0x850A: "hǎn,hàn",
 	0x850B: "dí",
 	0x850C: "sù",
 	0x850D: "lù,cū",
@@ -19857,7 +19868,7 @@ var PinyinDict = map[int]string{
 	0x8510: "dí",
 	0x8511: "miè",
 	0x8512: "xūn",
-	0x8513: "màn,wàn,mán",
+	0x8513: "màn,mán,wàn",
 	0x8514: "bó,bo",
 	0x8515: "dì,dài,chài",
 	0x8516: "cuó,cǔ,zhā",
@@ -19905,7 +19916,7 @@ var PinyinDict = map[int]string{
 	0x8540: "jí",
 	0x8541: "qián,tán,xún",
 	0x8542: "shèng",
-	0x8543: "fān,fán,pí,bō",
+	0x8543: "fān,bō,fán,pí",
 	0x8544: "méng",
 	0x8545: "ǒu",
 	0x8546: "chǎn",
@@ -19967,10 +19978,10 @@ var PinyinDict = map[int]string{
 	0x857E: "lěi",
 	0x857F: "xuān",
 	0x8580: "yùn",
-	0x8581: "yù",
+	0x8581: "yù,ào",
 	0x8582: "xí,xiào",
 	0x8583: "hào",
-	0x8584: "báo,bó,bù,bò",
+	0x8584: "báo,bó,bò,bù",
 	0x8585: "hāo",
 	0x8586: "ài",
 	0x8587: "wēi",
@@ -20068,7 +20079,7 @@ var PinyinDict = map[int]string{
 	0x85E3: "bēi",
 	0x85E4: "téng",
 	0x85E5: "yào,shuò,lüè",
-	0x85E6: "mò",
+	0x85E6: "mò,mó",
 	0x85E7: "huàn",
 	0x85E8: "biāo,pāo",
 	0x85E9: "fān,fán",
@@ -20215,7 +20226,7 @@ var PinyinDict = map[int]string{
 	0x8676: "yū",
 	0x8677: "hán,gān",
 	0x8678: "zǐ",
-	0x8679: "hóng,hòng,gòng,jiàng",
+	0x8679: "hóng,jiàng,hòng,gòng",
 	0x867A: "huī,huǐ",
 	0x867B: "méng",
 	0x867C: "gè",
@@ -20224,7 +20235,7 @@ var PinyinDict = map[int]string{
 	0x867F: "chài",
 	0x8680: "shí",
 	0x8681: "yǐ",
-	0x8682: "mǎ,mā,mà",
+	0x8682: "mǎ,mà,mā",
 	0x8683: "xiǎng",
 	0x8684: "fāng,bàng",
 	0x8685: "è",
@@ -20234,7 +20245,7 @@ var PinyinDict = map[int]string{
 	0x8689: "wén",
 	0x868A: "wén",
 	0x868B: "ruì",
-	0x868C: "bàng,pí,fēng,bèng",
+	0x868C: "bàng,bèng,pí,fēng",
 	0x868D: "pí",
 	0x868E: "yuè",
 	0x868F: "yuè",
@@ -20450,7 +20461,7 @@ var PinyinDict = map[int]string{
 	0x8761: "rú,ruǎn",
 	0x8762: "xié",
 	0x8763: "yóu",
-	0x8764: "qiú,jiū,yóu",
+	0x8764: "qiú,yóu,jiū",
 	0x8765: "máo,wú,wù",
 	0x8766: "xiā,há,jiǎ",
 	0x8767: "yīng",
@@ -20521,7 +20532,7 @@ var PinyinDict = map[int]string{
 	0x87A8: "mǎn",
 	0x87A9: "tiao",
 	0x87AA: "shāng",
-	0x87AB: "shì",
+	0x87AB: "shì,zhē",
 	0x87AC: "cáo",
 	0x87AD: "chī",
 	0x87AE: "dì,dài",
@@ -20682,7 +20693,7 @@ var PinyinDict = map[int]string{
 	0x8849: "kā",
 	0x884A: "miè",
 	0x884B: "xì",
-	0x884C: "xíng,háng,xìng,hàng,héng",
+	0x884C: "xíng,háng,héng,xìng,hàng",
 	0x884D: "yǎn,yán",
 	0x884E: "kàn,kǎn",
 	0x884F: "yuàn",
@@ -20789,7 +20800,7 @@ var PinyinDict = map[int]string{
 	0x88B4: "kù",
 	0x88B5: "rèn",
 	0x88B6: "jiàng",
-	0x88B7: "jiá,jiā,jié,qiā",
+	0x88B7: "jiá,qiā,jiā,jié",
 	0x88B8: "jiàn,zùn",
 	0x88B9: "bó,mò",
 	0x88BA: "jié",
@@ -20993,7 +21004,7 @@ var PinyinDict = map[int]string{
 	0x8980: "xī",
 	0x8981: "yào,yāo,yǎo",
 	0x8982: "fěng,bǎn",
-	0x8983: "tán,yǎn,qín",
+	0x8983: "tán,qín,yǎn",
 	0x8984: "fù",
 	0x8985: "fiào",
 	0x8986: "fù",
@@ -21412,7 +21423,7 @@ var PinyinDict = map[int]string{
 	0x8B23: "yú,xū",
 	0x8B24: "biāo,piāo",
 	0x8B25: "còng",
-	0x8B26: "qìng,qǐng",
+	0x8B26: "qǐng,qìng",
 	0x8B27: "lí",
 	0x8B28: "mó",
 	0x8B29: "mó",
@@ -21602,7 +21613,7 @@ var PinyinDict = map[int]string{
 	0x8BE1: "guǐ",
 	0x8BE2: "xún",
 	0x8BE3: "yì",
-	0x8BE4: "zhēng",
+	0x8BE4: "zhèng,zhēng",
 	0x8BE5: "gāi",
 	0x8BE6: "xiáng",
 	0x8BE7: "chà",
@@ -21631,7 +21642,7 @@ var PinyinDict = map[int]string{
 	0x8BFE: "kè",
 	0x8BFF: "wěi",
 	0x8C00: "yú",
-	0x8C01: "shéi,shuí",
+	0x8C01: "shuí,shéi",
 	0x8C02: "shěn",
 	0x8C03: "diào,tiáo",
 	0x8C04: "chǎn",
@@ -21750,7 +21761,7 @@ var PinyinDict = map[int]string{
 	0x8C75: "zōng",
 	0x8C76: "fén",
 	0x8C77: "yì",
-	0x8C78: "zhì",
+	0x8C78: "zhì,zhài",
 	0x8C79: "bào",
 	0x8C7A: "chái",
 	0x8C7B: "àn",
@@ -21767,7 +21778,7 @@ var PinyinDict = map[int]string{
 	0x8C86: "huán,huān",
 	0x8C87: "kūn,mào,kěn",
 	0x8C88: "hé,mò",
-	0x8C89: "háo,mò,hé,mà",
+	0x8C89: "háo,hé,mò,mà",
 	0x8C8A: "mò,má",
 	0x8C8B: "àn",
 	0x8C8C: "mào,mò",
@@ -22132,7 +22143,7 @@ var PinyinDict = map[int]string{
 	0x8DF3: "tiào,diào,táo",
 	0x8DF4: "cǎi",
 	0x8DF5: "jiàn",
-	0x8DF6: "dá",
+	0x8DF6: "dá,da",
 	0x8DF7: "qiāo",
 	0x8DF8: "bì",
 	0x8DF9: "xiān",
@@ -22151,7 +22162,7 @@ var PinyinDict = map[int]string{
 	0x8E06: "cūn,qūn,cún,zūn,qiù,zhūn",
 	0x8E07: "mǔ",
 	0x8E08: "shū",
-	0x8E09: "liáng,láng,liàng,làng",
+	0x8E09: "liáng,liàng,láng,làng",
 	0x8E0A: "yǒng",
 	0x8E0B: "jiǎo",
 	0x8E0C: "chóu",
@@ -22260,7 +22271,7 @@ var PinyinDict = map[int]string{
 	0x8E73: "bō",
 	0x8E74: "cù,zú,jiu",
 	0x8E75: "cù",
-	0x8E76: "jué,guì,juě",
+	0x8E76: "jué,juě,guì",
 	0x8E77: "jué",
 	0x8E78: "lìn,lín",
 	0x8E79: "tá",
@@ -22501,12 +22512,12 @@ var PinyinDict = map[int]string{
 	0x8F64: "lú",
 	0x8F65: "lìn",
 	0x8F66: "chē,jū",
-	0x8F67: "yà,gá,zhá",
+	0x8F67: "yà,zhá,gá",
 	0x8F68: "guǐ",
 	0x8F69: "xuān",
 	0x8F6A: "dài",
 	0x8F6B: "rèn",
-	0x8F6C: "zhuǎn,zhuǎi,zhuàn",
+	0x8F6C: "zhuǎn,zhuàn,zhuǎi",
 	0x8F6D: "è",
 	0x8F6E: "lún",
 	0x8F6F: "ruǎn",
@@ -22614,7 +22625,7 @@ var PinyinDict = map[int]string{
 	0x8FD5: "wù,wǔ",
 	0x8FD6: "dá",
 	0x8FD7: "é",
-	0x8FD8: "hái,fú,huán",
+	0x8FD8: "hái,huán,fú",
 	0x8FD9: "zhè,zhèi",
 	0x8FDA: "dá",
 	0x8FDB: "jìn",
@@ -22752,7 +22763,7 @@ var PinyinDict = map[int]string{
 	0x905F: "chí,zhì,xī",
 	0x9060: "yuǎn,yuàn",
 	0x9061: "sù",
-	0x9062: "tà",
+	0x9062: "tà,tā",
 	0x9063: "qiǎn,qiàn",
 	0x9064: "mǎ",
 	0x9065: "yáo",
@@ -22817,7 +22828,7 @@ var PinyinDict = map[int]string{
 	0x90A0: "bīn",
 	0x90A1: "fāng,fàng",
 	0x90A2: "xíng,gěng",
-	0x90A3: "nà,nuó,nuò,nèi,nǎ,něi,né,nā,nǎi,nè",
+	0x90A3: "nà,nā,nuó,nuò,nèi,nǎ,něi,né,nǎi,nè",
 	0x90A4: "xīn",
 	0x90A5: "shěn",
 	0x90A6: "bāng",
@@ -23012,7 +23023,7 @@ var PinyinDict = map[int]string{
 	0x9163: "hān,hàn",
 	0x9164: "gū",
 	0x9165: "sū",
-	0x9166: "pò,fā,pō",
+	0x9166: "pò,pō,fā",
 	0x9167: "chóu",
 	0x9168: "zài,zuì",
 	0x9169: "mǐng",
@@ -23678,7 +23689,7 @@ var PinyinDict = map[int]string{
 	0x93FD: "xiù",
 	0x93FE: "sǎn,xiàn,sà",
 	0x93FF: "chēng",
-	0x9400: "kuì",
+	0x9400: "kuì,guì",
 	0x9401: "sī",
 	0x9402: "liú",
 	0x9403: "náo,nào",
@@ -24376,7 +24387,7 @@ var PinyinDict = map[int]string{
 	0x96B7: "lì",
 	0x96B8: "lì",
 	0x96B9: "zhuī,cuī,wéi",
-	0x96BA: "hú,què,hè",
+	0x96BA: "hú,hè,què",
 	0x96BB: "zhī,huò",
 	0x96BC: "sǔn",
 	0x96BD: "juàn,jùn",
@@ -24494,7 +24505,7 @@ var PinyinDict = map[int]string{
 	0x972D: "ǎi",
 	0x972E: "dàn",
 	0x972F: "tèng",
-	0x9730: "sǎn,xiàn",
+	0x9730: "xiàn,sǎn",
 	0x9731: "yù",
 	0x9732: "lù,lòu",
 	0x9733: "lóng",
@@ -24579,7 +24590,7 @@ var PinyinDict = map[int]string{
 	0x9782: "jiē",
 	0x9783: "hóng",
 	0x9784: "páo",
-	0x9785: "yāng,yǎng,yàng",
+	0x9785: "yāng,yàng,yǎng",
 	0x9786: "bǐng",
 	0x9787: "yīn",
 	0x9788: "gé,sǎ,tà",
@@ -25079,7 +25090,7 @@ var PinyinDict = map[int]string{
 	0x9976: "ráo",
 	0x9977: "xiǎng",
 	0x9978: "hé",
-	0x9979: "le",
+	0x9979: "le,gē",
 	0x997A: "jiǎo",
 	0x997B: "xī",
 	0x997C: "bǐng",
@@ -25093,7 +25104,7 @@ var PinyinDict = map[int]string{
 	0x9984: "hún",
 	0x9985: "xiàn",
 	0x9986: "guǎn",
-	0x9987: "chā",
+	0x9987: "chā,zha",
 	0x9988: "kuì",
 	0x9989: "gǔ",
 	0x998A: "sōu",
@@ -25325,7 +25336,7 @@ var PinyinDict = map[int]string{
 	0x9A6C: "mǎ",
 	0x9A6D: "yù",
 	0x9A6E: "tuó,duò",
-	0x9A6F: "xún",
+	0x9A6F: "xùn,xún",
 	0x9A70: "chí",
 	0x9A71: "qū",
 	0x9A72: "rì",
@@ -25382,7 +25393,7 @@ var PinyinDict = map[int]string{
 	0x9AA5: "jì",
 	0x9AA6: "shuāng",
 	0x9AA7: "xiāng",
-	0x9AA8: "gǔ,gú,gū",
+	0x9AA8: "gǔ,gū,gú",
 	0x9AA9: "wěi",
 	0x9AAA: "wěi",
 	0x9AAB: "wěi,wán",
@@ -26492,7 +26503,7 @@ var PinyinDict = map[int]string{
 	0x9EFB: "fú",
 	0x9EFC: "fǔ",
 	0x9EFD: "miǎn,měng,mǐn,méng",
-	0x9EFE: "miǎn,mǐn",
+	0x9EFE: "mǐn,miǎn,měng",
 	0x9EFF: "yuán",
 	0x9F00: "cù",
 	0x9F01: "qù",
@@ -26662,7 +26673,7 @@ var PinyinDict = map[int]string{
 	0x9FA5: "yù",
 	0x9FC3: "shǎn",
 	0x9FCD: "gàng",
-	0x9FCE: "tǎ",
+	0x9FCE: "tǎ,dá",
 	0x9FCF: "mài",
 	0x9FD4: "gē",
 	0x9FD5: "dān",
@@ -26739,6 +26750,7 @@ var PinyinDict = map[int]string{
 	0xE862: "pì",
 	0xE863: "yǎn",
 	0xE864: "luán",
+	0xFA18: "lǐ",
 	0x20000: "hē",
 	0x20001: "qī",
 	0x20003: "qiě,jī",
@@ -26758,6 +26770,7 @@ var PinyinDict = map[int]string{
 	0x20039: "jūn",
 	0x2003C: "qián,xià",
 	0x2003D: "lù",
+	0x20041: "dòu",
 	0x20049: "chū",
 	0x20057: "shì,hè",
 	0x20060: "qiè",
@@ -26770,6 +26783,7 @@ var PinyinDict = map[int]string{
 	0x20088: "jié,tiǎn",
 	0x20091: "zōu",
 	0x20094: "zǐ",
+	0x2009D: "zā",
 	0x2009F: "jīn",
 	0x200A2: "pài",
 	0x200A4: "duī",
@@ -30629,6 +30643,7 @@ var PinyinDict = map[int]string{
 	0x23539: "hóu",
 	0x2353A: "mào",
 	0x2353B: "tú,chán",
+	0x2353C: "gān",
 	0x2353D: "jì",
 	0x23541: "yí",
 	0x23543: "yù",
@@ -31658,6 +31673,7 @@ var PinyinDict = map[int]string{
 	0x24355: "yǒu",
 	0x24356: "jiān",
 	0x2435C: "zào",
+	0x24360: "rè",
 	0x24364: "zhāng",
 	0x2437D: "ruò",
 	0x24384: "yān",
@@ -31723,6 +31739,7 @@ var PinyinDict = map[int]string{
 	0x24500: "ná",
 	0x24509: "páo",
 	0x2450B: "jù",
+	0x24514: "luàn",
 	0x24516: "luǒ",
 	0x24519: "shuǎ",
 	0x2451A: "shàng",
@@ -32759,6 +32776,7 @@ var PinyinDict = map[int]string{
 	0x25075: "chōng",
 	0x25078: "quān",
 	0x25079: "shè",
+	0x25081: "yán",
 	0x25082: "měng",
 	0x25083: "jù",
 	0x2508B: "tú",
@@ -33305,6 +33323,7 @@ var PinyinDict = map[int]string{
 	0x255F5: "xiàng",
 	0x255F6: "lèi",
 	0x255FA: "làn",
+	0x255FD: "lán",
 	0x255FF: "lǎ",
 	0x25601: "lǎ",
 	0x25604: "yù",
@@ -34838,7 +34857,7 @@ var PinyinDict = map[int]string{
 	0x26773: "xù",
 	0x26774: "yìn",
 	0x26777: "bèng",
-	0x2677C: "lǘ",
+	0x2677C: "lǘ,lóu",
 	0x26781: "zāi",
 	0x26782: "dā,da",
 	0x26786: "niè",
@@ -35266,7 +35285,7 @@ var PinyinDict = map[int]string{
 	0x26C18: "zhǐ",
 	0x26C19: "bì",
 	0x26C1B: "fén",
-	0x26C21: "nà",
+	0x26C21: "nà,nuó",
 	0x26C25: "bāng",
 	0x26C2A: "qiú",
 	0x26C2B: "nǐ",
@@ -35616,6 +35635,7 @@ var PinyinDict = map[int]string{
 	0x27034: "fū",
 	0x27035: "jiàn,shǎn",
 	0x27036: "dì",
+	0x27039: "zhè",
 	0x2703A: "xié",
 	0x2703B: "dān",
 	0x2703F: "zhí",
@@ -36911,6 +36931,7 @@ var PinyinDict = map[int]string{
 	0x27DA1: "mì",
 	0x27DB2: "duǎn,zhuàn",
 	0x27DB5: "chà",
+	0x27DB6: "fàn",
 	0x27DB7: "zé",
 	0x27DB8: "chèng",
 	0x27DBA: "tíng",
@@ -38076,6 +38097,7 @@ var PinyinDict = map[int]string{
 	0x289B0: "liú",
 	0x289B1: "cōng",
 	0x289B3: "nǎn",
+	0x289C0: "dù",
 	0x289D0: "tūn",
 	0x289D1: "xiàng",
 	0x289D5: "biàn",
@@ -38093,6 +38115,7 @@ var PinyinDict = map[int]string{
 	0x289F1: "qū",
 	0x289F3: "chì",
 	0x289F5: "zhì",
+	0x28A0F: "bō",
 	0x28A17: "quàn",
 	0x28A18: "qiān",
 	0x28A19: "yā",
@@ -38173,6 +38196,7 @@ var PinyinDict = map[int]string{
 	0x28B45: "zhù",
 	0x28B46: "hēi",
 	0x28B49: "bān",
+	0x28B4E: "xǐ",
 	0x28B53: "dié",
 	0x28B56: "zhǎn",
 	0x28B57: "guó",
@@ -41294,7 +41318,7 @@ var PinyinDict = map[int]string{
 	0x2B406: "kuài",
 	0x2B409: "líng",
 	0x2B410: "ní",
-	0x2B413: "bù",
+	0x2B413: "bù,róu",
 	0x2B461: "méng",
 	0x2B4B6: "hán",
 	0x2B4E7: "fū",
@@ -41336,6 +41360,8 @@ var PinyinDict = map[int]string{
 	0x2B6ED: "kuáng",
 	0x2B6F6: "chì",
 	0x2B6F8: "tí",
+	0x2B737: "shòu",
+	0x2B738: "huà",
 	0x2B7A9: "mén",
 	0x2B7C5: "liáng",
 	0x2B7E6: "suì",
@@ -41345,22 +41371,28 @@ var PinyinDict = map[int]string{
 	0x2B806: "kuǐ",
 	0x2B80A: "xuán",
 	0x2B81C: "ní",
+	0x2B825: "lòu",
 	0x2B851: "yīn",
 	0x2B8B8: "dàn",
 	0x2BAC7: "ě,è",
-	0x2BB5F: "ōu",
+	0x2BB5F: "ōu,qū",
 	0x2BB62: "lǔn",
 	0x2BB7C: "láo",
 	0x2BB83: "shàn",
+	0x2BBAC: "jiàng",
 	0x2BC1B: "xíng",
 	0x2BD77: "lì",
 	0x2BD87: "dié",
 	0x2BDF7: "xīn",
 	0x2BE29: "kōu",
+	0x2BF1B: "diào",
+	0x2BF6E: "dǎng",
 	0x2C029: "wěi",
 	0x2C02A: "xiàn",
+	0x2C037: "shāng",
 	0x2C0A9: "jiā",
 	0x2C0CA: "zhì",
+	0x2C19B: "nǎo",
 	0x2C1D5: "wàn",
 	0x2C1D9: "pèi,bèi",
 	0x2C1F9: "guó",
@@ -41371,9 +41403,13 @@ var PinyinDict = map[int]string{
 	0x2C35B: "lì",
 	0x2C361: "dàng",
 	0x2C364: "xún",
+	0x2C41A: "hǎi",
+	0x2C454: "zhòng",
+	0x2C461: "chǒu",
 	0x2C488: "què",
 	0x2C494: "gěng",
 	0x2C497: "lán",
+	0x2C498: "xìn",
 	0x2C4FC: "tuí",
 	0x2C542: "gōng,lǒng",
 	0x2C613: "xún",
@@ -41387,6 +41423,7 @@ var PinyinDict = map[int]string{
 	0x2C642: "yǎn",
 	0x2C64A: "mò",
 	0x2C64B: "xiāng",
+	0x2C6F8: "niē",
 	0x2C72C: "màn",
 	0x2C72F: "liǎng",
 	0x2C79F: "pín",
@@ -41429,8 +41466,11 @@ var PinyinDict = map[int]string{
 	0x2CBBF: "qí,gài",
 	0x2CBC0: "jī",
 	0x2CBCE: "tuí",
+	0x2CC03: "mù",
 	0x2CC56: "dí",
 	0x2CC5F: "wěi",
+	0x2CC9C: "chēng",
+	0x2CCF2: "chǎn",
 	0x2CCF5: "pī",
 	0x2CCF6: "jiōng",
 	0x2CCFD: "shēn",
@@ -41456,6 +41496,8 @@ var PinyinDict = map[int]string{
 	0x2CE7C: "xiè",
 	0x2CE88: "yǐ",
 	0x2CE93: "chǔ",
+	0x2D016: "lí",
+	0x2F835: "huī",
 	0x30EDD: "biáng",
 	0x30EDE: "biáng",
 }