summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdfbin208401 -> 209536 bytes
-rw-r--r--Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx23
-rw-r--r--Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def4
-rw-r--r--Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty15
4 files changed, 26 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf b/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf
index b7037f95bf2..2d9870ae510 100644
--- a/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf
+++ b/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx b/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx
index e142fba5ce1..31d960cd665 100644
--- a/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx
+++ b/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx
@@ -167,12 +167,12 @@ Copyright and Licence
%</internal>
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\RequirePackage{expl3}
-%<+package>\GetIdInfo$Id: xpinyin.dtx b319ff9 2022-06-04 19:40:35 +0800 Qing Lee <sobenlee@gmail.com> $
+%<+package>\GetIdInfo$Id: xpinyin.dtx dd0cc20 2022-07-14 18:53:49 +0800 Qing Lee <sobenlee@gmail.com> $
%<package> {Automatically add pinyin to Chinese characters}
%<package>\ProvidesExplPackage{\ExplFileName}
-%<package> {\ExplFileDate}{3.0}{\ExplFileDescription}
+%<package> {\ExplFileDate}{3.1}{\ExplFileDescription}
%<database>\ProvidesFile{xpinyin-database.def}%
-%<database> [2022/06/04 v3.0 xpinyin database]
+%<database> [2022/07/14 v3.1 xpinyin database]
%<*driver>
\documentclass{ctxdoc}
\usepackage{xpinyin}
@@ -186,7 +186,7 @@ Copyright and Licence
%</driver>
% \fi
%
-% \CheckSum{690}
+% \CheckSum{695}
% \GetFileId{xpinyin.sty}
%
% \title{\bfseries\pkg{xpinyin} 宏包}
@@ -279,7 +279,7 @@ Copyright and Licence
% 对于多音字,可以使用 \tn{xpinyin} 为其设置拼音;而 \tn{xpinyin*} 相当于
% \env{pinyinscope} 环境的命令形式。\tn{xpinyin} 可以在 \env{pinyinscope} 环境和
% \tn{xpinyin*} 中使用。例如,
-% \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.5\linewidth,gobble=5]
+% \begin{SideBySideExample}
% \xpinyin{长}{chang2}\\
% \xpinyin*{甄士隐梦幻识通灵}\\
% \xpinyin*{\xpinyin{重}{zhong4}要}
@@ -291,7 +291,7 @@ Copyright and Licence
% \tn{pinyin} \oarg{options} \Arg{拼音}
% \end{syntax}
% 用于输出拼音,为了输入的方便 \texttt{\"u} 可以用 |v| 代替。例如,
-% \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.5\linewidth,gobble=5]
+% \begin{SideBySideExample}
% \pinyin{lv2zi}\\
% \pinyin{nv3hai2zi}
% \end{SideBySideExample}
@@ -422,8 +422,8 @@ Copyright and Licence
% \end{macrocode}
%
% \begin{macrocode}
-\RequirePackage { xparse }
-\RequirePackage { l3keys2e }
+\cs_if_exist:NF \NewDocumentCommand
+ { \RequirePackage { xparse } }
% \end{macrocode}
%
% \begin{variable}{\c_@@_tone_prop}
@@ -1176,7 +1176,12 @@ Copyright and Licence
% \end{macro}
%
% \begin{macrocode}
-\ProcessKeysOptions { xpinyin }
+\cs_if_exist:NTF \ProcessKeyOptions
+ { \ProcessKeyOptions [ xpinyin ] }
+ {
+ \RequirePackage { l3keys2e }
+ \ProcessKeysOptions { xpinyin }
+ }
% \end{macrocode}
%
% \begin{macrocode}
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 <sobenlee@gmail.com> $
+\GetIdInfo$Id: xpinyin.dtx dd0cc20 2022-07-14 18:53:49 +0800 Qing Lee <sobenlee@gmail.com> $
{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,