From e7c28e322ceb0496bd9cd27bd1965e5fdb01da33 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 4 Jun 2022 20:25:35 +0000 Subject: xpinyin (4jun22) git-svn-id: svn://tug.org/texlive/trunk@63485 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx | 23 +++++++++++----------- Master/texmf-dist/source/latex/xpinyin/xpinyin.ins | 4 ++-- 2 files changed, 14 insertions(+), 13 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 2983f3c5455..e142fba5ce1 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-2020 by Qing Lee + Copyright (C) 2012-2022 by Qing Lee ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -81,7 +81,7 @@ Copyright and Licence \preamble - Copyright (C) 2012-2020 by Qing Lee + Copyright (C) 2012-2022 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 d74fa10 2020-10-19 20:23:41 +0800 Qing Lee $ +%<+package>\GetIdInfo$Id: xpinyin.dtx b319ff9 2022-06-04 19:40:35 +0800 Qing Lee $ % {Automatically add pinyin to Chinese characters} %\ProvidesExplPackage{\ExplFileName} -% {\ExplFileDate}{2.9}{\ExplFileDescription} +% {\ExplFileDate}{3.0}{\ExplFileDescription} %\ProvidesFile{xpinyin-database.def}% -% [2020/10/19 v2.9 xpinyin database] +% [2022/06/04 v3.0 xpinyin database] %<*driver> \documentclass{ctxdoc} \usepackage{xpinyin} @@ -186,7 +186,7 @@ Copyright and Licence % % \fi % -% \CheckSum{691} +% \CheckSum{690} % \GetFileId{xpinyin.sty} % % \title{\bfseries\pkg{xpinyin} 宏包} @@ -366,8 +366,9 @@ Copyright and Licence % \begin{syntax} % multiple = \Arg{format} % \end{syntax} -% 设置多音字拼音的其他格式,缺省值为空。可以通过这个选项来提醒校正多音字的拼音。例如 -% 本文档设置多音字拼音的颜色是红色(需要载入 \pkg{color} 宏包): +% 设置多音字拼音的其他格式,缺省值为空。可以通过这个选项来提醒校正多音字的拼音。 +% 注意这个选项会覆盖 \opt{format} 设置的格式。例如本文档设置多音字拼音的颜色是 +% 红色(需要载入 \pkg{color} 宏包): % \begin{frameverb} % \xpinyinsetup{multiple={\color{red}}} % \end{frameverb} @@ -603,9 +604,9 @@ Copyright and Licence { \l_@@_pinyin_box_hook_tl \@@_select_font: - \clist_if_exist:cTF { c_@@_multiple_ #1 _clist } - { \l_@@_multiple_tl \l_@@_format_tl } - { \l_@@_format_tl } + \l_@@_format_tl + \clist_if_exist:cT { c_@@_multiple_ #1 _clist } + { \l_@@_multiple_tl } {#3} } \dim_compare:nNnT diff --git a/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins b/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins index bc25db75014..1eaec3f3cbd 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-2020 by Qing Lee +%% Copyright (C) 2012-2022 by Qing Lee %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -45,7 +45,7 @@ \preamble - Copyright (C) 2012-2020 by Qing Lee + Copyright (C) 2012-2022 by Qing Lee -------------------------------------------------------------------------- This work may be distributed and/or modified under the -- cgit v1.2.3