From bbde8f2f326aa5d77b82d0fed87b086e8cbabc36 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Jul 2022 20:21:15 +0000 Subject: xpinyin (14jul22) git-svn-id: svn://tug.org/texlive/trunk@63897 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def | 4 ++-- Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def b/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def index 753956441fc..3a72386f1df 100644 --- a/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def +++ b/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def @@ -27,7 +27,7 @@ %% -------------------------------------------------------------------------- %% \ProvidesFile{xpinyin-database.def}% - [2022/06/04 v3.0 xpinyin database] + [2022/07/14 v3.1 xpinyin database] %% %% Do not edit this file! %% Created from Unihan database: @@ -36,7 +36,7 @@ %% Date: 2021-08-06 16:32:36 GMT [JHJ] %% Unicode version: 14.0.0 %% -%% by "texlua xpinyin.lua" on 2022-06-04 19:42:49 +0800 +%% by "texlua xpinyin.lua" on 2022-07-14 18:55:13 +0800 %% \XPYU{〇}{12295}{líng} \XPYU{㐀}{13312}{qiū} diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty index f96e9ee184c..914585cd0ca 100644 --- a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty +++ b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty @@ -27,10 +27,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xpinyin.dtx b319ff9 2022-06-04 19:40:35 +0800 Qing Lee $ +\GetIdInfo$Id: xpinyin.dtx dd0cc20 2022-07-14 18:53:49 +0800 Qing Lee $ {Automatically add pinyin to Chinese characters} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{3.0}{\ExplFileDescription} + {\ExplFileDate}{3.1}{\ExplFileDescription} \msg_new:nnn { xpinyin } { l3-too-old } { Support~package~'expl3'~too~old. \\\\ @@ -46,8 +46,8 @@ { \sys_if_engine_xetex_p: } { \sys_if_engine_pdftex_p: } { \msg_critical:nn { xpinyin } { engine-not-supported } } -\RequirePackage { xparse } -\RequirePackage { l3keys2e } +\cs_if_exist:NF \NewDocumentCommand + { \RequirePackage { xparse } } \prop_const_from_keyval:Nn \c__xpinyin_tone_prop { { ā } = { \@tabacckludge= a } , @@ -576,7 +576,12 @@ { c__xpinyin_ \__xpinyin_char_to_unicode:n {#1} _tl } { \__xpinyin_pinyin:n {#2} } } -\ProcessKeysOptions { xpinyin } +\cs_if_exist:NTF \ProcessKeyOptions + { \ProcessKeyOptions [ xpinyin ] } + { + \RequirePackage { l3keys2e } + \ProcessKeysOptions { xpinyin } + } %% %% This package consists of the file xpinyin.dtx, %% and the derived files xpinyin.sty, -- cgit v1.2.3