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/doc/latex/xpinyin/README.md | 2 +- Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf | Bin 202750 -> 208401 bytes Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx | 23 ++++--- Master/texmf-dist/source/latex/xpinyin/xpinyin.ins | 4 +- .../tex/latex/xpinyin/xpinyin-database.def | 76 ++++++++++++++++----- Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty | 12 ++-- 6 files changed, 80 insertions(+), 37 deletions(-) diff --git a/Master/texmf-dist/doc/latex/xpinyin/README.md b/Master/texmf-dist/doc/latex/xpinyin/README.md index b9f5f5c6cc1..7912a141d89 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-2020 by Qing Lee + Copyright (C) 2012-2022 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 938e8ae88b4..b7037f95bf2 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 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 diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def b/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def index bf46c705953..753956441fc 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-2020 by Qing Lee +%% Copyright (C) 2012-2022 by Qing Lee %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -27,16 +27,16 @@ %% -------------------------------------------------------------------------- %% \ProvidesFile{xpinyin-database.def}% - [2020/10/19 v2.9 xpinyin database] + [2022/06/04 v3.0 xpinyin database] %% %% Do not edit this file! %% Created from Unihan database: %% %% Unihan_Readings.txt -%% Date: 2020-02-18 18:27:33 GMT [JHJ] -%% Unicode version: 13.0.0 +%% Date: 2021-08-06 16:32:36 GMT [JHJ] +%% Unicode version: 14.0.0 %% -%% by "texlua xpinyin.lua" on 2020-10-19 20:27:50 +0800 +%% by "texlua xpinyin.lua" on 2022-06-04 19:42:49 +0800 %% \XPYU{〇}{12295}{líng} \XPYU{㐀}{13312}{qiū} @@ -129,6 +129,7 @@ \XPYU{㒈}{13448}{hàn} \XPYU{㒉}{13449}{tǎng} \XPYU{㒊}{13450}{sè} +\XPYU{㒋}{13451}{sī} \XPYU{㒌}{13452}{qióng} \XPYU{㒍}{13453}{léi} \XPYU{㒎}{13454}{sà} @@ -202,6 +203,7 @@ \XPYU{㓩}{13545}{xuān} \XPYU{㓪}{13546}{lǎng} \XPYU{㓭}{13549}{shé} +\XPYU{㓮}{13550}{diāo} \XPYU{㓯}{13551}{lí} \XPYU{㓰}{13552}{huà} \XPYU{㓱}{13553}{tóu} @@ -830,6 +832,7 @@ \XPYU{㟓}{14291}{qí} \XPYU{㟔}{14292}{hán} \XPYU{㟖}{14294}{lòng} +\XPYU{㟗}{14295}{bīn} \XPYU{㟘}{14296}{tiáo} \XPYU{㟙}{14297}{zé} \XPYU{㟚}{14298}{qí} @@ -1069,6 +1072,7 @@ \XPYU{㣵}{14581}{tà} \XPYU{㣶}{14582}{zhān} \XPYU{㣷}{14583}{nìng} +\XPYU{㣺}{14586}{xīn} \XPYU{㣻}{14587}{yì} \XPYU{㣼}{14588}{rěn} \XPYU{㣽}{14589}{shù} @@ -1426,6 +1430,7 @@ \XPYU{㪂}{14978}{kū} \XPYU{㪃}{14979}{hé} \XPYU{㪄}{14980}{fú} +\XPYU{㪅}{14981}{gèng} \XPYU{㪆}{14982}{dǐ} \XPYU{㪇}{14983}{xiàn} \XPYU{㪈}{14984}{guì} @@ -1680,6 +1685,7 @@ \XPYU{㯀}{15296}{xuàn} \XPYU{㯁}{15297}{péi} \XPYU{㯂}{15298}{dài} +\XPYU{㯃}{15299}{qī} \XPYU{㯄}{15300}{zhī} \XPYU{㯅}{15301}{pí} \XPYU{㯆}{15302}{chǎn} @@ -1729,6 +1735,7 @@ \XPYU{㯹}{15353}{biǎo} \XPYU{㯺}{15354}{jiàn} \XPYU{㯻}{15355}{gǔn} +\XPYU{㯽}{15357}{bīn} \XPYU{㯾}{15358}{zāo} \XPYU{㯿}{15359}{liè} \XPYU{㰀}{15360}{lí} @@ -2836,6 +2843,7 @@ \XPYU{䄀}{16640}{huò} \XPYU{䄁}{16641}{yì} \XPYU{䄂}{16642}{liù} +\XPYU{䄃}{16643}{yāng} \XPYU{䄄}{16644}{yīn} \XPYU{䄅}{16645}{juàn} \XPYU{䄆}{16646}{huó} @@ -4099,6 +4107,7 @@ \XPYU{䙰}{18032}{lí} \XPYU{䙱}{18033}{dú} \XPYU{䙳}{18035}{biāo} +\XPYU{䙴}{18036}{qiān} \XPYU{䙵}{18037}{xī} \XPYU{䙷}{18039}{dé} \XPYU{䙸}{18040}{dé} @@ -5416,6 +5425,7 @@ \XPYU{䰔}{19476}{pán} \XPYU{䰕}{19477}{lú} \XPYU{䰖}{19478}{zuǎn} +\XPYU{䰗}{19479}{jiū} \XPYU{䰘}{19480}{liú} \XPYU{䰙}{19481}{yǐ} \XPYU{䰚}{19482}{wén} @@ -5510,6 +5520,7 @@ \XPYU{䱺}{19578}{hái} \XPYU{䱻}{19579}{huá} \XPYU{䱼}{19580}{zhǎn} +\XPYU{䱽}{19581}{chāng} \XPYU{䱾}{19582}{lóu} \XPYU{䱿}{19583}{chàn} \XPYU{䲀}{19584}{zhì} @@ -5929,7 +5940,7 @@ \XPYU{乻}{20091}{yú} \XPYU{乼}{20092}{cui} \XPYU{乽}{20093}{zhě} -\XPYU{乾}{20094}{gān} +\XPYU{乾}{20094}{qián} \XPYU{乿}{20095}{zhì} \XPYU{亀}{20096}{guī} \XPYU{亁}{20097}{gān} @@ -6900,7 +6911,7 @@ \XPYU{剈}{21064}{yuān} \XPYU{剉}{21065}{cuò} \XPYU{削}{21066}{xuē} -\XPYU{剋}{21067}{kè} +\XPYU{剋}{21067}{kēi} \XPYU{剌}{21068}{lá} \XPYU{前}{21069}{qián} \XPYU{剎}{21070}{shā} @@ -7299,7 +7310,7 @@ \XPYU{受}{21463}{shòu} \XPYU{变}{21464}{biàn} \XPYU{叙}{21465}{xù} -\XPYU{叚}{21466}{jiǎ} +\XPYU{叚}{21466}{xiá} \XPYU{叛}{21467}{pàn} \XPYU{叜}{21468}{sǒu} \XPYU{叝}{21469}{jí} @@ -10333,7 +10344,7 @@ \XPYU{徲}{24498}{tí} \XPYU{徳}{24499}{dé} \XPYU{徴}{24500}{zhēng} -\XPYU{徵}{24501}{zhēng} +\XPYU{徵}{24501}{zhǐ} \XPYU{徶}{24502}{bié} \XPYU{德}{24503}{dé} \XPYU{徸}{24504}{chōng} @@ -13541,7 +13552,7 @@ \XPYU{氻}{27707}{lè} \XPYU{氼}{27708}{nì} \XPYU{氽}{27709}{tǔn} -\XPYU{氾}{27710}{fàn} +\XPYU{氾}{27710}{fán} \XPYU{氿}{27711}{guǐ} \XPYU{汀}{27712}{tīng} \XPYU{汁}{27713}{zhī} @@ -13615,7 +13626,7 @@ \XPYU{沅}{27781}{yuán} \XPYU{沆}{27782}{hàng} \XPYU{沇}{27783}{yǎn} -\XPYU{沈}{27784}{chén} +\XPYU{沈}{27784}{shěn} \XPYU{沉}{27785}{chén} \XPYU{沊}{27786}{dàn} \XPYU{沋}{27787}{yóu} @@ -16462,7 +16473,7 @@ \XPYU{瞪}{30634}{dèng} \XPYU{瞫}{30635}{shěn} \XPYU{瞬}{30636}{shùn} -\XPYU{瞭}{30637}{liǎo} +\XPYU{瞭}{30637}{liào} \XPYU{瞮}{30638}{chè} \XPYU{瞯}{30639}{xián} \XPYU{瞰}{30640}{kàn} @@ -17438,7 +17449,7 @@ \XPYU{筺}{31610}{kuāng} \XPYU{筻}{31611}{gàng} \XPYU{筼}{31612}{yún} -\XPYU{筽}{31613}{o} +\XPYU{筽}{31613}{ōu} \XPYU{签}{31614}{qiān} \XPYU{筿}{31615}{xiǎo} \XPYU{简}{31616}{jiǎn} @@ -20824,7 +20835,7 @@ \XPYU{袴}{34996}{kù} \XPYU{袵}{34997}{rèn} \XPYU{袶}{34998}{jiàng} -\XPYU{袷}{34999}{jiá} +\XPYU{袷}{34999}{qiā} \XPYU{袸}{35000}{jiàn} \XPYU{袹}{35001}{bó} \XPYU{袺}{35002}{jié} @@ -23153,7 +23164,7 @@ \XPYU{重}{37325}{zhòng} \XPYU{野}{37326}{yě} \XPYU{量}{37327}{liàng} -\XPYU{釐}{37328}{lí} +\XPYU{釐}{37328}{xī} \XPYU{金}{37329}{jīn} \XPYU{釒}{37330}{jīn} \XPYU{釓}{37331}{qiú} @@ -24529,7 +24540,7 @@ \XPYU{霭}{38701}{ǎi} \XPYU{霮}{38702}{dàn} \XPYU{霯}{38703}{tèng} -\XPYU{霰}{38704}{sǎn} +\XPYU{霰}{38704}{xiàn} \XPYU{霱}{38705}{yù} \XPYU{露}{38706}{lù} \XPYU{霳}{38707}{lóng} @@ -26704,6 +26715,7 @@ \XPYU{鿫}{40939}{ào} \XPYU{鿬}{40940}{tián} \XPYU{鿭}{40941}{nǐ} +\XPYU{礼}{64024}{lǐ} \XPYU{𠀀}{131072}{hē} \XPYU{𠀁}{131073}{qī} \XPYU{𠀃}{131075}{qiě} @@ -26723,6 +26735,7 @@ \XPYU{𠀹}{131129}{jūn} \XPYU{𠀼}{131132}{qián} \XPYU{𠀽}{131133}{lù} +\XPYU{𠁁}{131137}{dòu} \XPYU{𠁉}{131145}{chū} \XPYU{𠁗}{131159}{shì} \XPYU{𠁠}{131168}{qiè} @@ -26735,6 +26748,7 @@ \XPYU{𠂈}{131208}{jié} \XPYU{𠂑}{131217}{zōu} \XPYU{𠂔}{131220}{zǐ} +\XPYU{𠂝}{131229}{zā} \XPYU{𠂟}{131231}{jīn} \XPYU{𠂢}{131234}{pài} \XPYU{𠂤}{131236}{duī} @@ -30593,6 +30607,7 @@ \XPYU{𣔹}{144697}{hóu} \XPYU{𣔺}{144698}{mào} \XPYU{𣔻}{144699}{tú} +\XPYU{𣔼}{144700}{gān} \XPYU{𣔽}{144701}{jì} \XPYU{𣕁}{144705}{yí} \XPYU{𣕃}{144707}{yù} @@ -31622,6 +31637,7 @@ \XPYU{𤍕}{148309}{yǒu} \XPYU{𤍖}{148310}{jiān} \XPYU{𤍜}{148316}{zào} +\XPYU{𤍠}{148320}{rè} \XPYU{𤍤}{148324}{zhāng} \XPYU{𤍽}{148349}{ruò} \XPYU{𤎄}{148356}{yān} @@ -31687,6 +31703,7 @@ \XPYU{𤔀}{148736}{ná} \XPYU{𤔉}{148745}{páo} \XPYU{𤔋}{148747}{jù} +\XPYU{𤔔}{148756}{luàn} \XPYU{𤔖}{148758}{luǒ} \XPYU{𤔙}{148761}{shuǎ} \XPYU{𤔚}{148762}{shàng} @@ -32723,6 +32740,7 @@ \XPYU{𥁵}{151669}{chōng} \XPYU{𥁸}{151672}{quān} \XPYU{𥁹}{151673}{shè} +\XPYU{𥂁}{151681}{yán} \XPYU{𥂂}{151682}{měng} \XPYU{𥂃}{151683}{jù} \XPYU{𥂋}{151691}{tú} @@ -33269,6 +33287,7 @@ \XPYU{𥗵}{153077}{xiàng} \XPYU{𥗶}{153078}{lèi} \XPYU{𥗺}{153082}{làn} +\XPYU{𥗽}{153085}{lán} \XPYU{𥗿}{153087}{lǎ} \XPYU{𥘁}{153089}{lǎ} \XPYU{𥘄}{153092}{yù} @@ -35578,6 +35597,7 @@ \XPYU{𧀴}{159796}{fū} \XPYU{𧀵}{159797}{jiàn} \XPYU{𧀶}{159798}{dì} +\XPYU{𧀹}{159801}{zhè} \XPYU{𧀺}{159802}{xié} \XPYU{𧀻}{159803}{dān} \XPYU{𧀿}{159807}{zhí} @@ -36873,6 +36893,7 @@ \XPYU{𧶡}{163233}{mì} \XPYU{𧶲}{163250}{duǎn} \XPYU{𧶵}{163253}{chà} +\XPYU{𧶶}{163254}{fàn} \XPYU{𧶷}{163255}{zé} \XPYU{𧶸}{163256}{chèng} \XPYU{𧶺}{163258}{tíng} @@ -38037,6 +38058,7 @@ \XPYU{𨦰}{166320}{liú} \XPYU{𨦱}{166321}{cōng} \XPYU{𨦳}{166323}{nǎn} +\XPYU{𨧀}{166336}{dù} \XPYU{𨧐}{166352}{tūn} \XPYU{𨧑}{166353}{xiàng} \XPYU{𨧕}{166357}{biàn} @@ -38054,6 +38076,7 @@ \XPYU{𨧱}{166385}{qū} \XPYU{𨧳}{166387}{chì} \XPYU{𨧵}{166389}{zhì} +\XPYU{𨨏}{166415}{bō} \XPYU{𨨗}{166423}{quàn} \XPYU{𨨘}{166424}{qiān} \XPYU{𨨙}{166425}{yā} @@ -38134,6 +38157,7 @@ \XPYU{𨭅}{166725}{zhù} \XPYU{𨭆}{166726}{hēi} \XPYU{𨭉}{166729}{bān} +\XPYU{𨭎}{166734}{xǐ} \XPYU{𨭓}{166739}{dié} \XPYU{𨭖}{166742}{zhǎn} \XPYU{𨭗}{166743}{guó} @@ -41254,7 +41278,7 @@ \XPYU{𫐆}{177158}{kuài} \XPYU{𫐉}{177161}{líng} \XPYU{𫐐}{177168}{ní} -\XPYU{𫐓}{177171}{bù} +\XPYU{𫐓}{177171}{róu} \XPYU{𫑡}{177249}{méng} \XPYU{𫒶}{177334}{hán} \XPYU{𫓧}{177383}{fū} @@ -41296,6 +41320,8 @@ \XPYU{𫛭}{177901}{kuáng} \XPYU{𫛶}{177910}{chì} \XPYU{𫛸}{177912}{tí} +\XPYU{𫜷}{177975}{shòu} +\XPYU{𫜸}{177976}{huà} \XPYU{𫞩}{178089}{mén} \XPYU{𫟅}{178117}{liáng} \XPYU{𫟦}{178150}{suì} @@ -41305,6 +41331,7 @@ \XPYU{𫠆}{178182}{kuǐ} \XPYU{𫠊}{178186}{xuán} \XPYU{𫠜}{178204}{ní} +\XPYU{𫠥}{178213}{lòu} \XPYU{𫡑}{178257}{yīn} \XPYU{𫢸}{178360}{dàn} \XPYU{𫫇}{178887}{è} @@ -41312,15 +41339,20 @@ \XPYU{𫭢}{179042}{lǔn} \XPYU{𫭼}{179068}{láo} \XPYU{𫮃}{179075}{shàn} +\XPYU{𫮬}{179116}{jiàng} \XPYU{𫰛}{179227}{xíng} \XPYU{𫵷}{179575}{lì} \XPYU{𫶇}{179591}{dié} \XPYU{𫷷}{179703}{xīn} \XPYU{𫸩}{179753}{kōu} +\XPYU{𫼛}{179995}{diào} +\XPYU{𫽮}{180078}{dǎng} \XPYU{𬀩}{180265}{wěi} \XPYU{𬀪}{180266}{xiàn} +\XPYU{𬀷}{180279}{shāng} \XPYU{𬂩}{180393}{jiā} \XPYU{𬃊}{180426}{zhì} +\XPYU{𬆛}{180635}{nǎo} \XPYU{𬇕}{180693}{wàn} \XPYU{𬇙}{180697}{bèi} \XPYU{𬇹}{180729}{guó} @@ -41331,9 +41363,13 @@ \XPYU{𬍛}{181083}{lì} \XPYU{𬍡}{181089}{dàng} \XPYU{𬍤}{181092}{xún} +\XPYU{𬐚}{181274}{hǎi} +\XPYU{𬑔}{181332}{zhòng} +\XPYU{𬑡}{181345}{chǒu} \XPYU{𬒈}{181384}{què} \XPYU{𬒔}{181396}{gěng} \XPYU{𬒗}{181399}{lán} +\XPYU{𬒘}{181400}{xìn} \XPYU{𬓼}{181500}{tuí} \XPYU{𬕂}{181570}{lǒng} \XPYU{𬘓}{181779}{xún} @@ -41347,6 +41383,7 @@ \XPYU{𬙂}{181826}{yǎn} \XPYU{𬙊}{181834}{mò} \XPYU{𬙋}{181835}{xiāng} +\XPYU{𬛸}{182008}{niē} \XPYU{𬜬}{182060}{màn} \XPYU{𬜯}{182063}{liǎng} \XPYU{𬞟}{182175}{pín} @@ -41389,8 +41426,11 @@ \XPYU{𬮿}{183231}{gài} \XPYU{𬯀}{183232}{jī} \XPYU{𬯎}{183246}{tuí} +\XPYU{𬰃}{183299}{mù} \XPYU{𬱖}{183382}{dí} \XPYU{𬱟}{183391}{wěi} +\XPYU{𬲜}{183452}{chēng} +\XPYU{𬳲}{183538}{chǎn} \XPYU{𬳵}{183541}{pī} \XPYU{𬳶}{183542}{jiōng} \XPYU{𬳽}{183549}{shēn} @@ -41416,6 +41456,8 @@ \XPYU{𬹼}{183932}{xiè} \XPYU{𬺈}{183944}{yǐ} \XPYU{𬺓}{183955}{chǔ} +\XPYU{𭀖}{184342}{lí} +\XPYU{灰}{194613}{huī} \XPYU{𰻝}{200413}{biáng} \XPYU{𰻞}{200414}{biáng} \XPYUM{㐤}{13348}{dān,qiú} diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty index 7f4a5b2511e..f96e9ee184c 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-2020 by Qing Lee +%% Copyright (C) 2012-2022 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 d74fa10 2020-10-19 20:23:41 +0800 Qing Lee $ +\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} \msg_new:nnn { xpinyin } { l3-too-old } { Support~package~'expl3'~too~old. \\\\ @@ -187,9 +187,9 @@ { \l__xpinyin_pinyin_box_hook_tl \__xpinyin_select_font: - \clist_if_exist:cTF { c__xpinyin_multiple_ #1 _clist } - { \l__xpinyin_multiple_tl \l__xpinyin_format_tl } - { \l__xpinyin_format_tl } + \l__xpinyin_format_tl + \clist_if_exist:cT { c__xpinyin_multiple_ #1 _clist } + { \l__xpinyin_multiple_tl } {#3} } \dim_compare:nNnT -- cgit v1.2.3