From 57743d04f297f59db111746883531b66be1e9910 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 7 Apr 2019 21:27:36 +0000 Subject: xpinyin (7apr19) git-svn-id: svn://tug.org/texlive/trunk@50849 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx | 34 +++++++++++----------- Master/texmf-dist/source/latex/xpinyin/xpinyin.ins | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/source') 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 + Copyright (C) 2012-2019 by Qing Lee ---------------------------------------------------------------------- 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 + Copyright (C) 2012-2019 by Qing Lee -------------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -167,12 +167,12 @@ Copyright and Licence % %\NeedsTeXFormat{LaTeX2e} %\RequirePackage{expl3} -%<+package>\GetIdInfo$Id: xpinyin.dtx fafc2d9 2018-01-28 19:09:20 +0800 Qing Lee $ +%<+package>\GetIdInfo$Id: xpinyin.dtx 81bb941 2019-04-07 23:27:58 +0800 Qing Lee $ % {Automatically add pinyin to Chinese characters} %\ProvidesExplPackage{\ExplFileName} -% {\ExplFileDate}{2.6}{\ExplFileDescription} +% {\ExplFileDate}{2.7}{\ExplFileDescription} %\ProvidesFile{xpinyin-database.def}% -% [2018/01/28 v2.6 xpinyin database] +% [2019/04/07 v2.7 xpinyin database] %<*driver> \documentclass{ctxdoc} \usepackage{xpinyin} @@ -186,7 +186,7 @@ Copyright and Licence % % \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 +%% Copyright (C) 2012-2019 by Qing Lee %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -45,7 +45,7 @@ \preamble - Copyright (C) 2012-2018 by Qing Lee + Copyright (C) 2012-2019 by Qing Lee -------------------------------------------------------------------------- This work may be distributed and/or modified under the -- cgit v1.2.3