summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-04-07 21:27:36 +0000
committerKarl Berry <karl@freefriends.org>2019-04-07 21:27:36 +0000
commit57743d04f297f59db111746883531b66be1e9910 (patch)
tree453c5eaeba5958c48d7abd66c786c9450d5d56ba /Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty
parent5dd4414e6769b73891da81fda61328e0357a9a91 (diff)
xpinyin (7apr19)
git-svn-id: svn://tug.org/texlive/trunk@50849 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty')
-rw-r--r--Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty28
1 files changed, 14 insertions, 14 deletions
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} }