From fa02c7417cb6920fb203f2a7e4fe0365cebb54b0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 Aug 2017 21:08:55 +0000 Subject: xpinyin (7aug17) git-svn-id: svn://tug.org/texlive/trunk@44976 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xpinyin/README.md | 2 +- Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf | Bin 216916 -> 209303 bytes Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx | 20 +++---- Master/texmf-dist/source/latex/xpinyin/xpinyin.ins | 4 +- .../tex/latex/xpinyin/xpinyin-database.def | 64 ++++++++++++--------- Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty | 16 +++--- 6 files changed, 55 insertions(+), 51 deletions(-) diff --git a/Master/texmf-dist/doc/latex/xpinyin/README.md b/Master/texmf-dist/doc/latex/xpinyin/README.md index 63b183a3737..165b9338eb9 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-2016 by Qing Lee + Copyright (C) 2012-2017 by Qing Lee ---------------------------------------------------------------------- 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 c8f604263eb..fd9b8bb76b9 100644 Binary files a/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf and b/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf differ diff --git a/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx b/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx index 9dfe136cb4c..e03c63b2b50 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-2016 by Qing Lee + Copyright (C) 2012-2017 by Qing Lee ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -81,7 +81,7 @@ Copyright and Licence \preamble - Copyright (C) 2012-2016 by Qing Lee + Copyright (C) 2012-2017 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 e088f7d 2016-08-27 11:01:45 +0800 Qing Lee $ +%<+package>\GetIdInfo$Id: xpinyin.dtx 52c78f6 2017-08-07 17:04:25 +0800 Qing Lee $ % {Automatically add pinyin to Chinese characters} %\ProvidesExplPackage{\ExplFileName} -% {\ExplFileDate}{2.4}{\ExplFileDescription} +% {\ExplFileDate}{2.5}{\ExplFileDescription} %\ProvidesFile{xpinyin-database.def}% -% [2016/08/27 v2.4 xpinyin database] +% [2017/08/07 v2.5 xpinyin database] %<*driver> \documentclass{ctxdoc} \usepackage{xpinyin} @@ -407,18 +407,16 @@ Copyright and Licence 'l3kernel'~and~'l3packages'\\\\ using~your~TeX~package~manager~or~from~CTAN. } -\@ifpackagelater { expl3 } { 2015/09/24 } { } +\@ifpackagelater { expl3 } { 2017/07/19 } { } { \msg_error:nn { xpinyin } { l3-too-old } } % \end{macrocode} % % \begin{macrocode} \msg_new:nnn { xpinyin } { engine-not-supported } { Engine~`\c_sys_engine_str'~is~not~yet~supported,~xpinyin~will~abort! } -\bool_if:nF - { - \sys_if_engine_xetex_p: || - \sys_if_engine_pdftex_p: - } +\bool_lazy_or:nnF + { \sys_if_engine_xetex_p: } + { \sys_if_engine_pdftex_p: } { \msg_critical:nn { xpinyin } { engine-not-supported } } % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins b/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins index 8fa9f9989b2..506823d7b4c 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-2016 by Qing Lee +%% Copyright (C) 2012-2017 by Qing Lee %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -45,7 +45,7 @@ \preamble - Copyright (C) 2012-2016 by Qing Lee + Copyright (C) 2012-2017 by Qing Lee -------------------------------------------------------------------------- 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 cc47ac5f6c9..954bea32078 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-2016 by Qing Lee +%% Copyright (C) 2012-2017 by Qing Lee %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -27,16 +27,16 @@ %% -------------------------------------------------------------------------- %% \ProvidesFile{xpinyin-database.def}% - [2016/08/27 v2.4 xpinyin database] + [2017/08/07 v2.5 xpinyin database] %% %% Do not edit this file! %% Created from Unihan database: %% %% Unihan_Readings.txt -%% Date: 2016-06-01 07:01:48 GMT [JHJ] -%% Unicode version: 9.0.0 +%% Date: 2017-05-14 07:01:48 GMT [JHJ] +%% Unicode version: 10.0.0 %% -%% by "texlua xpinyin.lua" on 2016-08-27 11:25:02 +0800 +%% by "texlua xpinyin.lua" on 2017-08-07 17:10:33 +0800 %% \XPYU{〇}{12295}{líng} \XPYU{㐀}{13312}{qiū} @@ -1963,6 +1963,7 @@ \XPYU{㴈}{15624}{yìn} \XPYU{㴉}{15625}{jǐ} \XPYU{㴋}{15627}{sù} +\XPYU{㴎}{15630}{nài} \XPYU{㴏}{15631}{wǎng} \XPYU{㴐}{15632}{miàn} \XPYU{㴑}{15633}{sù} @@ -28594,6 +28595,7 @@ \XPYU{𡬎}{137998}{qiāng} \XPYU{𡬐}{138000}{mí} \XPYU{𡬓}{138003}{yí} +\XPYU{𡬕}{138005}{lóng} \XPYU{𡬖}{138006}{hān} \XPYU{𡬗}{138007}{nì} \XPYU{𡬘}{138008}{lào} @@ -29420,6 +29422,7 @@ \XPYU{𢒱}{140465}{suì} \XPYU{𢒲}{140466}{xǐ} \XPYU{𢒷}{140471}{póu} +\XPYU{𢒹}{140473}{shǎn} \XPYU{𢒾}{140478}{jiào} \XPYU{𢓀}{140480}{yì} \XPYU{𢓃}{140483}{wán} @@ -29641,6 +29644,7 @@ \XPYU{𢜽}{141117}{kuǐ} \XPYU{𢜿}{141119}{jià} \XPYU{𢝀}{141120}{tú} +\XPYU{𢝁}{141121}{hōng} \XPYU{𢝂}{141122}{dú} \XPYU{𢝅}{141125}{xiá} \XPYU{𢝆}{141126}{zhòng} @@ -33446,6 +33450,7 @@ \XPYU{𥢌}{153740}{fán} \XPYU{𥢍}{153741}{suì} \XPYU{𥢎}{153742}{zùn} +\XPYU{𥢏}{153743}{diàn} \XPYU{𥢐}{153744}{gāo} \XPYU{𥢑}{153745}{gǎo} \XPYU{𥢒}{153746}{láo} @@ -33482,6 +33487,7 @@ \XPYU{𥣰}{153840}{biǎn} \XPYU{𥣸}{153848}{mù} \XPYU{𥣹}{153849}{ràn} +\XPYU{𥣺}{153850}{ràn} \XPYU{𥤂}{153858}{niǎo} \XPYU{𥤊}{153866}{quán} \XPYU{𥤋}{153867}{zhé} @@ -37397,6 +37403,7 @@ \XPYU{𨋩}{164585}{bì} \XPYU{𨋫}{164587}{tiāo} \XPYU{𨋬}{164588}{zhěng} +\XPYU{𨋮}{164590}{hōng} \XPYU{𨋯}{164591}{yì} \XPYU{𨋰}{164592}{cì} \XPYU{𨋲}{164594}{bìng} @@ -38099,6 +38106,7 @@ \XPYU{𨪹}{166585}{lì} \XPYU{𨪺}{166586}{chā} \XPYU{𨪾}{166590}{dì} +\XPYU{𨪿}{166591}{liú} \XPYU{𨫀}{166592}{zhǎn} \XPYU{𨫁}{166593}{pō} \XPYU{𨫒}{166610}{lòu} @@ -41435,6 +41443,7 @@ \XPYUM{㤴}{14644}{chè,shè,dié} \XPYUM{㤶}{14646}{máng,màng} \XPYUM{㤹}{14649}{qiú,jiù} +\XPYUM{㤾}{14654}{sàn,tàn} \XPYUM{㥀}{14656}{zhí,dé} \XPYUM{㥊}{14666}{péng,pēng} \XPYUM{㥒}{14674}{cǎi,cāi} @@ -42262,6 +42271,7 @@ \XPYUM{䳀}{19648}{dié,yì} \XPYUM{䳂}{19650}{diāo,chāo,tiáo,xiāo} \XPYUM{䳅}{19653}{zhǐ,zhì} +\XPYUM{䳉}{19657}{dōng,dàn} \XPYUM{䳋}{19659}{tóng,tōng,xiāo} \XPYUM{䳏}{19663}{guì,jué} \XPYUM{䳔}{19668}{jú,jiù} @@ -42931,13 +42941,13 @@ \XPYUM{娻}{23099}{dōng,dòng} \XPYUM{娾}{23102}{ǎi,ái,è} \XPYUM{婄}{23108}{pǒu,péi,bù} -\XPYUM{婏}{23119}{fàn,fù} +\XPYUM{婏}{23119}{fù,fàn} \XPYUM{婑}{23121}{ruí,wǒ,něi} \XPYUM{婘}{23128}{quán,juàn} \XPYUM{婜}{23132}{qiān,jǐn} \XPYUM{婠}{23136}{wān,guàn} \XPYUM{婡}{23137}{lái,lài} -\XPYUM{婤}{23140}{chōu,zhōu} +\XPYUM{婤}{23140}{zhōu,chōu} \XPYUM{婥}{23141}{nào,chuò} \XPYUM{婩}{23145}{àn,nüè} \XPYUM{婫}{23147}{kūn,hùn} @@ -42975,7 +42985,7 @@ \XPYUM{嬮}{23342}{yān,yàn} \XPYUM{嬰}{23344}{yīng,yìng} \XPYUM{嬹}{23353}{xìng,xīng} -\XPYUM{孅}{23365}{qiān,xiān} +\XPYUM{孅}{23365}{xiān,qiān} \XPYUM{孈}{23368}{huì,xié} \XPYUM{孉}{23369}{quán,huān} \XPYUM{孋}{23371}{lí,lì} @@ -43127,7 +43137,7 @@ \XPYUM{彊}{24394}{jiàng,qiáng,qiǎng} \XPYUM{当}{24403}{dāng,dàng} \XPYUM{彡}{24417}{shān,xiǎn} -\XPYUM{彯}{24431}{piǎo,piào,miǎo} +\XPYUM{彯}{24431}{piāo,piào,miǎo} \XPYUM{彴}{24436}{zhuó,bó} \XPYUM{彵}{24437}{tuǒ,yí} \XPYUM{彷}{24439}{fǎng,páng} @@ -43171,7 +43181,7 @@ \XPYUM{怙}{24601}{hù,tiē} \XPYUM{怚}{24602}{jù,qū,cū,zū} \XPYUM{思}{24605}{sāi,sī} -\XPYUM{怞}{24606}{chóu,yòu} +\XPYUM{怞}{24606}{chóu,yóu} \XPYUM{怢}{24610}{tū,dié,tuì} \XPYUM{怮}{24622}{yōu,yào} \XPYUM{怴}{24628}{xù,xuè} @@ -43195,7 +43205,6 @@ \XPYUM{悙}{24729}{hēng,hèng} \XPYUM{悝}{24733}{kuī,lǐ} \XPYUM{悶}{24758}{mèn,mēn} -\XPYUM{悷}{24759}{sàn,tàn} \XPYUM{惀}{24768}{lún,lùn} \XPYUM{惌}{24780}{yuān,wǎn,yù} \XPYUM{惏}{24783}{lán,lín} @@ -43476,7 +43485,7 @@ \XPYUM{旋}{26059}{xuán,xuàn} \XPYUM{无}{26080}{mó,wú} \XPYUM{旲}{26098}{tái,yīng} -\XPYUM{旽}{26109}{tùn,zhùn} +\XPYUM{旽}{26109}{tūn,zhùn} \XPYUM{旿}{26111}{wǔ,wù} \XPYUM{昋}{26123}{guì,jiǒng} \XPYUM{昢}{26146}{pò,pèi} @@ -43843,7 +43852,7 @@ \XPYUM{湅}{28229}{liàn,làn} \XPYUM{湏}{28239}{huì,mǐn} \XPYUM{湑}{28241}{xū,xǔ} -\XPYUM{湞}{28254}{chēng,zhēn} +\XPYUM{湞}{28254}{zhēn,chēng} \XPYUM{湩}{28265}{dòng,dǒng,tóng} \XPYUM{湪}{28266}{tuàn,nuǎn} \XPYUM{湫}{28267}{jiǎo,qiū} @@ -43886,7 +43895,7 @@ \XPYUM{潦}{28518}{lǎo,liǎo} \XPYUM{潨}{28520}{cóng,zōng} \XPYUM{潪}{28522}{zhè,zhì} -\XPYUM{潬}{28524}{shàn,tān} +\XPYUM{潬}{28524}{tān,shàn} \XPYUM{潰}{28528}{kuì,xiè} \XPYUM{潳}{28531}{tú,zhā} \XPYUM{澄}{28548}{chéng,dèng} @@ -44025,7 +44034,7 @@ \XPYUM{猚}{29466}{yá,wèi} \XPYUM{猫}{29483}{māo,máo} \XPYUM{猭}{29485}{chuān,chuàn,shān} -\XPYUM{猲}{29490}{xiē,hè,gé} +\XPYUM{猲}{29490}{xiē,hè,gé,hài} \XPYUM{猵}{29493}{biān,piàn} \XPYUM{猼}{29500}{bó,pò} \XPYUM{獁}{29505}{mà,mǎ} @@ -44075,7 +44084,7 @@ \XPYUM{璯}{29871}{huì,kuài} \XPYUM{璷}{29879}{lú,fū} \XPYUM{璸}{29880}{bīn,pián} -\XPYUM{璾}{29886}{zī,jì} +\XPYUM{璾}{29886}{jì,zī} \XPYUM{瓕}{29909}{mí,xǐ} \XPYUM{瓗}{29911}{qióng,wěi,wèi} \XPYUM{瓟}{29919}{bó,páo} @@ -45228,7 +45237,7 @@ \XPYUM{轂}{36674}{gǔ,gū} \XPYUM{轄}{36676}{xiá,hé} \XPYUM{轉}{36681}{zhuǎi,zhuǎn,zhuàn} -\XPYUM{轑}{36689}{lǎo,láo,liáo,liǎo} +\XPYUM{轑}{36689}{lǎo,láo,liáo,liǎo,liào} \XPYUM{轔}{36692}{lín,lìn} \XPYUM{轘}{36696}{huán,huàn} \XPYUM{车}{36710}{chē,jū} @@ -45450,6 +45459,7 @@ \XPYUM{鎑}{37777}{yè,tà,gé} \XPYUM{鎘}{37784}{lì,gé} \XPYUM{鎞}{37790}{bī,pī} +\XPYUM{鎦}{37798}{liú,liù} \XPYUM{鎬}{37804}{hào,gǎo} \XPYUM{鎮}{37806}{zhèn,zhēn,tián} \XPYUM{鏂}{37826}{ōu,kōu} @@ -45536,7 +45546,7 @@ \XPYUM{閛}{38299}{pēng,pèng} \XPYUM{閜}{38300}{xiǎ,ě} \XPYUM{閞}{38302}{biàn,guān} -\XPYUM{閡}{38305}{ài,hé} +\XPYUM{閡}{38305}{ài,hé,hài,gāi,kǎi} \XPYUM{閤}{38308}{gé,hé} \XPYUM{閧}{38311}{hòng,xiàng} \XPYUM{閬}{38316}{làng,lǎng,liǎng} @@ -45844,14 +45854,14 @@ \XPYUM{鳷}{40183}{zhī,chì} \XPYUM{鳺}{40186}{fū,guī} \XPYUM{鳻}{40187}{bān,fén} -\XPYUM{鳽}{40189}{jiān,qiān,zhàn} +\XPYUM{鳽}{40189}{jiān,qiān,zhān} \XPYUM{鴁}{40193}{yāo,ǎo} \XPYUM{鴉}{40201}{yā,yǎ} \XPYUM{鴋}{40203}{fāng,fǎng} \XPYUM{鴓}{40211}{miè,bì} \XPYUM{鴖}{40214}{mín,wén} +\XPYUM{鴝}{40221}{qú,gōu,gòu} \XPYUM{鴢}{40226}{yǎo,āo} -\XPYUM{鴤}{40228}{dōng,dàn} \XPYUM{鴩}{40233}{tiě,hú} \XPYUM{鴹}{40249}{yáng,xiáng} \XPYUM{鴺}{40250}{tí,yí} @@ -45885,7 +45895,7 @@ \XPYUM{鷜}{40412}{lǘ,lǚ} \XPYUM{鷤}{40420}{tí,tán} \XPYUM{鷸}{40440}{yù,shù} -\XPYUM{鸀}{40448}{chǔ,zhú,chù} +\XPYUM{鸀}{40448}{shǔ,zhú,chù} \XPYUM{鸂}{40450}{xī,qī} \XPYUM{鸊}{40458}{pì,bì} \XPYUM{鸏}{40463}{méng,máng} @@ -46097,7 +46107,7 @@ \XPYUM{𡫁}{137921}{qī,chèn} \XPYUM{𡫽}{137981}{rǔ,yù} \XPYUM{𡬆}{137990}{měng,mèng} -\XPYUM{𡬐}{138000}{mí,mǐ} +\XPYUM{𡬍}{137997}{mí,mǐ} \XPYUM{𡬳}{138035}{xuān,shòu} \XPYUM{𡯑}{138193}{shuǐ,zhuǐ} \XPYUM{𡯵}{138229}{tuǐ,kuì} @@ -46381,7 +46391,7 @@ \XPYUM{𤢓}{149651}{jù,qú} \XPYUM{𤢖}{149654}{sāo,shān} \XPYUM{𤢴}{149684}{shuò,lì} -\XPYUM{𤧫}{149995}{jìn,duī} +\XPYUM{𤧫}{149995}{jīn,duī} \XPYUM{𤨐}{150032}{xǐ,tāo} \XPYUM{𤩱}{150129}{diàn,tiàn} \XPYUM{𤪪}{150186}{zhuàn,chūn} @@ -46512,7 +46522,6 @@ \XPYUM{𥮾}{154558}{cǎn,zān} \XPYUM{𥯦}{154598}{jiàn,shà} \XPYUM{𥰞}{154654}{chōu,sǒu} -\XPYUM{𥰟}{154655}{gǎn,lǒng} \XPYUM{𥰭}{154669}{cuō,zhǎ,cī} \XPYUM{𥰰}{154672}{shì,shé} \XPYUM{𥱵}{154741}{huì,suì,xí} @@ -46714,7 +46723,7 @@ \XPYUM{𧤜}{162076}{nè,lì} \XPYUM{𧤯}{162095}{guó,yuè} \XPYUM{𧤽}{162109}{yuè,jiàn} -\XPYUM{𧥖}{162134}{lì,shǐ} +\XPYUM{𧥖}{162134}{lí,shǐ} \XPYUM{𧥤}{162148}{xī,xiē} \XPYUM{𧥮}{162158}{hù,dǐ} \XPYUM{𧥺}{162170}{jùn,yùn} @@ -46824,7 +46833,7 @@ \XPYUM{𨋚}{164570}{niǎn,ruǎn} \XPYUM{𨋩}{164585}{bì,fú} \XPYUM{𨋬}{164588}{zhěng,chèng} -\XPYUM{𨌁}{164609}{hōng,chūn} +\XPYUM{𨋮}{164590}{hōng,chūn} \XPYUM{𨌔}{164628}{wǎn,wàn} \XPYUM{𨌝}{164637}{wò,huò} \XPYUM{𨌤}{164644}{chéng,chèng} @@ -46948,7 +46957,7 @@ \XPYUM{𩆓}{168339}{mán,màn} \XPYUM{𩆯}{168367}{zhàn,jiān} \XPYUM{𩆵}{168373}{sī,xiàn} -\XPYUM{𩇜}{168412}{zhēn,chēng} +\XPYUM{𩇜}{168412}{zhēn,chèng,chēng} \XPYUM{𩇠}{168416}{è,yǎn} \XPYUM{𩈊}{168458}{dān,dàn} \XPYUM{𩈏}{168463}{ǎo,yǒu} @@ -47103,7 +47112,6 @@ \XPYUM{𩿈}{171976}{fén,fēn} \XPYUM{𩿩}{172009}{qú,duó} \XPYUM{𪀉}{172041}{gē,kě} -\XPYUM{𪀊}{172042}{qú,gōu,gòu} \XPYUM{𪀏}{172047}{jù,jiū} \XPYUM{𪀝}{172061}{è,yuān} \XPYUM{𪀩}{172073}{qí,dàn,chú} diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty index 278e7de2af1..f47a873d1e0 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-2016 by Qing Lee +%% Copyright (C) 2012-2017 by Qing Lee %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -27,10 +27,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xpinyin.dtx e088f7d 2016-08-27 11:01:45 +0800 Qing Lee $ +\GetIdInfo$Id: xpinyin.dtx 52c78f6 2017-08-07 17:04:25 +0800 Qing Lee $ {Automatically add pinyin to Chinese characters} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.5}{\ExplFileDescription} \msg_new:nnn { xpinyin } { l3-too-old } { Support~package~'expl3'~too~old. \\\\ @@ -38,15 +38,13 @@ 'l3kernel'~and~'l3packages'\\\\ using~your~TeX~package~manager~or~from~CTAN. } -\@ifpackagelater { expl3 } { 2015/09/24 } { } +\@ifpackagelater { expl3 } { 2017/07/19 } { } { \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! } -\bool_if:nF - { - \sys_if_engine_xetex_p: || - \sys_if_engine_pdftex_p: - } +\bool_lazy_or:nnF + { \sys_if_engine_xetex_p: } + { \sys_if_engine_pdftex_p: } { \msg_critical:nn { xpinyin } { engine-not-supported } } \RequirePackage { xparse } \RequirePackage { l3keys2e } -- cgit v1.2.3