xpinyin (7apr19)

git-svn-id: svn://tug.org/texlive/trunk@50849 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 49 insertions, 40 deletions

diff --git a/Master/texmf-dist/doc/latex/xpinyin/README.md b/Master/texmf-dist/doc/latex/xpinyin/README.md
index 0844f16349c..7c11c0fb0a3 100644
--- a/Master/texmf-dist/doc/latex/xpinyin/README.md
+++ b/Master/texmf-dist/doc/latex/xpinyin/README.md
@@ -20,7 +20,7 @@ Issues and pull requests are welcome.
 Copyright and Licence
 ---------------------
 
-    Copyright (C) 2012-2018 by Qing Lee <sobenlee@gmail.com>
+    Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com>
     ----------------------------------------------------------------------
 
     This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf b/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf
index b1fb6aa25d8..e3ab9f27a2e 100644
--- a/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf
+++ b/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf
diff --git a/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx b/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx
index edfa571f401..8d50b231f21 100644
--- a/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx
+++ b/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx
@@ -26,7 +26,7 @@ Issues and pull requests are welcome.
 Copyright and Licence
 ---------------------
 
-    Copyright (C) 2012-2018 by Qing Lee <sobenlee@gmail.com>
+    Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com>
     ----------------------------------------------------------------------
 
     This work may be distributed and/or modified under the
@@ -81,7 +81,7 @@ Copyright and Licence
 
 \preamble
 
-    Copyright (C) 2012-2018 by Qing Lee <sobenlee@gmail.com>
+    Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com>
 --------------------------------------------------------------------------
 
     This work may be distributed and/or modified under the
@@ -167,12 +167,12 @@ Copyright and Licence
 %</internal>
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\RequirePackage{expl3}
-%<+package>\GetIdInfo$Id: xpinyin.dtx fafc2d9 2018-01-28 19:09:20 +0800 Qing Lee <sobenlee@gmail.com> $
+%<+package>\GetIdInfo$Id: xpinyin.dtx 81bb941 2019-04-07 23:27:58 +0800 Qing Lee <sobenlee@gmail.com> $
 %<package>  {Automatically add pinyin to Chinese characters}
 %<package>\ProvidesExplPackage{\ExplFileName}
-%<package>  {\ExplFileDate}{2.6}{\ExplFileDescription}
+%<package>  {\ExplFileDate}{2.7}{\ExplFileDescription}
 %<database>\ProvidesFile{xpinyin-database.def}%
-%<database>  [2018/01/28 v2.6 xpinyin database]
+%<database>  [2019/04/07 v2.7 xpinyin database]
 %<*driver>
 \documentclass{ctxdoc}
 \usepackage{xpinyin}
@@ -186,7 +186,7 @@ Copyright and Licence
 %</driver>
 % \fi
 %
-% \CheckSum{703}
+% \CheckSum{696}
 % \GetFileId{xpinyin.sty}
 %
 % \title{\bfseries\pkg{xpinyin} 宏包}
@@ -407,7 +407,7 @@ Copyright and Licence
     'l3kernel'~and~'l3packages'\\\\
     using~your~TeX~package~manager~or~from~CTAN.
   }
-\@ifpackagelater { expl3 } { 2017/12/16 } { }
+\@ifpackagelater { expl3 } { 2019/03/05 } { }
   { \msg_error:nn { xpinyin } { l3-too-old } }
 %    \end{macrocode}
 %
@@ -493,9 +493,9 @@ Copyright and Licence
           {
             \int_case:nn { \tl_count:n {#3} }
               {
-                { \c_two   } { ##1 }
-                { \c_three } { ##1##2 }
-                { \c_four  } { ##1##2##3 }
+                { 2 } { ##1 }
+                { 3 } { ##1##2 }
+                { 4 } { ##1##2##3 }
               }
           }
           {#1} {#2}
@@ -746,7 +746,7 @@ Copyright and Licence
 \tl_new:N \l_@@_restore_footnote_tl
 \tl_set:Nn \l_@@_restore_footnote_tl
   {
-    \int_compare:nNnT \etex_currentgrouptype:D = \c_eleven
+    \int_compare:nNnT \tex_currentgrouptype:D = { 11 }
       { \disablepinyin }
   }
 %    \end{macrocode}
@@ -806,7 +806,7 @@ Copyright and Licence
       {
         \tl_set:Nx \l_@@_current_coor_tl { \l_@@_coor_tl }
         \@@_select_font_aux:
-        \int_compare:nNnF { \xetex_fonttype:D \tex_font:D } = \c_zero
+        \int_compare:nNnF { \tex_XeTeXfonttype:D \tex_font:D } = \c_zero_int
           {
             \exp_last_unbraced:NNV
             \cs_gset_eq:cN \l_@@_current_coor_tl \tex_font:D
@@ -821,7 +821,7 @@ Copyright and Licence
 \cs_new_protected_nopar:Npn \@@_select_font_aux:
   {
     \fontsize
-      { \l_@@_ratio_tl \etex_dimexpr:D \f@size pt \scan_stop: }
+      { \l_@@_ratio_tl \tex_dimexpr:D \f@size pt \scan_stop: }
       { \f@baselineskip }
     \normalfont
     \l_@@_font_tl
@@ -1074,7 +1074,7 @@ Copyright and Licence
 %    \begin{macrocode}
 \prg_new_conditional:Npnn \@@_if_number:n #1 { TF }
   {
-    \if_int_compare:w \c_one < 1 \tl_to_str:n {#1} \exp_stop_f:
+    \if_int_compare:w \c_one_int < 1 \tl_to_str:n {#1} \exp_stop_f:
       \prg_return_true: \else: \prg_return_false: \fi:
   }
 %    \end{macrocode}
@@ -1102,14 +1102,14 @@ Copyright and Licence
 %    \begin{macrocode}
 \cs_new_protected_nopar:Npn \@@_num_to_tone:Nn #1#2
   {
-    \if_case:w \int_eval:n { #2 - \c_one } \exp_stop_f:
+    \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f:
       \= {#1}  \or: \'{#1}  \or: \v {#1}  \or: \` {#1}  \else: #1 \fi:
   }
 \tl_map_inline:nn { a o e u }
   { \cs_new_eq:cN { @@_num_to_tone_ #1 :Nn } \@@_num_to_tone:Nn }
 \cs_new_nopar:Npn \@@_num_to_tone_i:Nn #1#2
   {
-    \if_case:w \int_eval:n { #2 - \c_one } \exp_stop_f:
+    \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f:
       ī  \or: í  \or: ǐ  \or: ì \else: i \fi:
   }
 \cs_new_protected_nopar:Npn \@@_num_to_tone_v:Nn #1#2
@@ -1117,7 +1117,7 @@ Copyright and Licence
     \str_case:onTF { \l_@@_pre_tl }
       { { l } { }  { n } { }  { L } { } { N } { } }
       {
-        \if_case:w \int_eval:n { #2 - \c_one } \exp_stop_f:
+        \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f:
           ǖ  \or: ǘ  \or: ǚ  \or: ǜ \else: ü \fi:
       }
       { \@@_num_to_tone:Nn u {#2} }
diff --git a/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins b/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins
index af724367e44..bc0657b87a2 100644
--- a/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins
+++ b/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins
@@ -6,7 +6,7 @@
 %%
 %% xpinyin.dtx  (with options: `install')
 %% 
-%%     Copyright (C) 2012-2018 by Qing Lee <sobenlee@gmail.com>
+%%     Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com>
 %% --------------------------------------------------------------------------
 %% 
 %%     This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
 
 \preamble
 
-    Copyright (C) 2012-2018 by Qing Lee <sobenlee@gmail.com>
+    Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com>
 --------------------------------------------------------------------------
 
     This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def b/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def
index e1fb64ca19e..4b768954548 100644
--- a/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def
+++ b/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def
@@ -7,7 +7,7 @@
 %% xpinyin.dtx  (with options: `database')
 %% xpinyin.db 
 %% 
-%%     Copyright (C) 2012-2018 by Qing Lee <sobenlee@gmail.com>
+%%     Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com>
 %% --------------------------------------------------------------------------
 %% 
 %%     This work may be distributed and/or modified under the
@@ -27,16 +27,16 @@
 %% --------------------------------------------------------------------------
 %% 
 \ProvidesFile{xpinyin-database.def}%
-  [2018/01/28 v2.6 xpinyin database]
+  [2019/04/07 v2.7 xpinyin database]
 %%
 %%  Do not edit this file!
 %%  Created from Unihan database:
 %%
 %%    Unihan_Readings.txt
-%%    Date: 2017-05-14 07:01:48 GMT [JHJ]
-%%    Unicode version: 10.0.0
+%%    Date: 2018-11-09 21:36:19 GMT [JHJ]
+%%    Unicode version: 12.0.0
 %%
-%%  by "texlua xpinyin.lua" on 2018-01-28 19:21:49 +0800
+%%  by "texlua xpinyin.lua" on 2019-04-07 23:39:52 +0800
 %%
 \XPYU{〇}{12295}{líng}
 \XPYU{㐀}{13312}{qiū}
@@ -26699,6 +26699,9 @@
 \XPYU{鿏}{40911}{mài}
 \XPYU{鿔}{40916}{gē}
 \XPYU{鿕}{40917}{dān}
+\XPYU{鿫}{40939}{ào}
+\XPYU{鿬}{40940}{tián}
+\XPYU{鿭}{40941}{nǐ}
 \XPYU{𠀀}{131072}{hē}
 \XPYU{𠀁}{131073}{qī}
 \XPYU{𠀃}{131075}{qiě}
@@ -33347,6 +33350,7 @@
 \XPYU{𥝄}{153412}{wàn}
 \XPYU{𥝊}{153418}{fèi}
 \XPYU{𥝋}{153419}{fèi}
+\XPYU{𥝌}{153420}{jī}
 \XPYU{𥝍}{153421}{yù}
 \XPYU{𥝑}{153425}{zhī}
 \XPYU{𥝒}{153426}{guà}
@@ -41263,6 +41267,11 @@
 \XPYU{𫛶}{177910}{chì}
 \XPYU{𫛸}{177912}{tí}
 \XPYU{𫡑}{178257}{yīn}
+\XPYU{𬓼}{181500}{tuí}
+\XPYU{𬘭}{181805}{chēn}
+\XPYU{𬤥}{182565}{zhuàn}
+\XPYU{𬯎}{183246}{tuí}
+\XPYU{𬸣}{183843}{xiān}
 \XPYUM{㐤}{13348}{dān,qiú}
 \XPYUM{㐸}{13368}{qiàn,cì}
 \XPYUM{㐺}{13370}{yín,zhòng}
@@ -42038,7 +42047,7 @@
 \XPYUM{䞵}{18357}{juě,zhuò}
 \XPYUM{䞶}{18358}{tāng,tàng}
 \XPYUM{䞾}{18366}{chí,dì}
-\XPYUM{䟁}{18369}{xiáo,chāo}
+\XPYUM{䟁}{18369}{xiāo,chāo}
 \XPYUM{䟃}{18371}{cān,cà}
 \XPYUM{䟄}{18372}{qì,zuó,zè}
 \XPYUM{䟅}{18373}{jiàn,zàn}
diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty
index 4472e79ca81..f9de62c3e1e 100644
--- a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty
+++ b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty
@@ -6,7 +6,7 @@
 %%
 %% xpinyin.dtx  (with options: `package')
 %% 
-%%     Copyright (C) 2012-2018 by Qing Lee <sobenlee@gmail.com>
+%%     Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com>
 %% --------------------------------------------------------------------------
 %% 
 %%     This work may be distributed and/or modified under the
@@ -27,10 +27,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xpinyin.dtx fafc2d9 2018-01-28 19:09:20 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xpinyin.dtx 81bb941 2019-04-07 23:27:58 +0800 Qing Lee <sobenlee@gmail.com> $
   {Automatically add pinyin to Chinese characters}
 \ProvidesExplPackage{\ExplFileName}
-  {\ExplFileDate}{2.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.7}{\ExplFileDescription}
 \msg_new:nnn { xpinyin } { l3-too-old }
   {
     Support~package~'expl3'~too~old. \\\\
@@ -38,7 +38,7 @@
     'l3kernel'~and~'l3packages'\\\\
     using~your~TeX~package~manager~or~from~CTAN.
   }
-\@ifpackagelater { expl3 } { 2017/12/16 } { }
+\@ifpackagelater { expl3 } { 2019/03/05 } { }
   { \msg_error:nn { xpinyin } { l3-too-old } }
 \msg_new:nnn { xpinyin } { engine-not-supported }
   { Engine~`\c_sys_engine_str'~is~not~yet~supported,~xpinyin~will~abort! }
@@ -100,9 +100,9 @@
           {
             \int_case:nn { \tl_count:n {#3} }
               {
-                { \c_two   } { ##1 }
-                { \c_three } { ##1##2 }
-                { \c_four  } { ##1##2##3 }
+                { 2 } { ##1 }
+                { 3 } { ##1##2 }
+                { 4 } { ##1##2##3 }
               }
           }
           {#1} {#2}
@@ -285,7 +285,7 @@
 \tl_new:N \l__xpinyin_restore_footnote_tl
 \tl_set:Nn \l__xpinyin_restore_footnote_tl
   {
-    \int_compare:nNnT \etex_currentgrouptype:D = \c_eleven
+    \int_compare:nNnT \tex_currentgrouptype:D = { 11 }
       { \disablepinyin }
   }
 \dim_new:N \l__xpinyin_CJKglue_dim
@@ -320,7 +320,7 @@
       {
         \tl_set:Nx \l__xpinyin_current_coor_tl { \l__xpinyin_coor_tl }
         \__xpinyin_select_font_aux:
-        \int_compare:nNnF { \xetex_fonttype:D \tex_font:D } = \c_zero
+        \int_compare:nNnF { \tex_XeTeXfonttype:D \tex_font:D } = \c_zero_int
           {
             \exp_last_unbraced:NNV
             \cs_gset_eq:cN \l__xpinyin_current_coor_tl \tex_font:D
@@ -330,7 +330,7 @@
 \cs_new_protected_nopar:Npn \__xpinyin_select_font_aux:
   {
     \fontsize
-      { \l__xpinyin_ratio_tl \etex_dimexpr:D \f@size pt \scan_stop: }
+      { \l__xpinyin_ratio_tl \tex_dimexpr:D \f@size pt \scan_stop: }
       { \f@baselineskip }
     \normalfont
     \l__xpinyin_font_tl
@@ -518,7 +518,7 @@
   }
 \prg_new_conditional:Npnn \__xpinyin_if_number:n #1 { TF }
   {
-    \if_int_compare:w \c_one < 1 \tl_to_str:n {#1} \exp_stop_f:
+    \if_int_compare:w \c_one_int < 1 \tl_to_str:n {#1} \exp_stop_f:
       \prg_return_true: \else: \prg_return_false: \fi:
   }
 \bool_new:N \l__xpinyin_first_bool
@@ -530,14 +530,14 @@
 \tl_const:Nn \c__xpinyin_v_tl { 1 }
 \cs_new_protected_nopar:Npn \__xpinyin_num_to_tone:Nn #1#2
   {
-    \if_case:w \int_eval:n { #2 - \c_one } \exp_stop_f:
+    \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f:
       \= {#1}  \or: \'{#1}  \or: \v {#1}  \or: \` {#1}  \else: #1 \fi:
   }
 \tl_map_inline:nn { a o e u }
   { \cs_new_eq:cN { __xpinyin_num_to_tone_ #1 :Nn } \__xpinyin_num_to_tone:Nn }
 \cs_new_nopar:Npn \__xpinyin_num_to_tone_i:Nn #1#2
   {
-    \if_case:w \int_eval:n { #2 - \c_one } \exp_stop_f:
+    \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f:
       ī  \or: í  \or: ǐ  \or: ì \else: i \fi:
   }
 \cs_new_protected_nopar:Npn \__xpinyin_num_to_tone_v:Nn #1#2
@@ -545,7 +545,7 @@
     \str_case:onTF { \l__xpinyin_pre_tl }
       { { l } { }  { n } { }  { L } { } { N } { } }
       {
-        \if_case:w \int_eval:n { #2 - \c_one } \exp_stop_f:
+        \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f:
           ǖ  \or: ǘ  \or: ǚ  \or: ǜ \else: ü \fi:
       }
       { \__xpinyin_num_to_tone:Nn u {#2} }