diff options
author | Karl Berry <karl@freefriends.org> | 2018-04-08 20:06:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-04-08 20:06:41 +0000 |
commit | 6cb924f47ebd6e1c719259e4c6d0fe613968e8fd (patch) | |
tree | 3eccc079a1287c01f575cd628270aee2472eade0 /Master/texmf-dist/tex/latex/zhlipsum | |
parent | 65a6cc78ea8d1397df8fd68fb8379d54ce8d63b9 (diff) |
zhlipsum (8apr18)
git-svn-id: svn://tug.org/texlive/trunk@47383 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/zhlipsum')
4 files changed, 27 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-big5.def b/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-big5.def index af2917b984a..44d3e671f61 100644 --- a/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-big5.def +++ b/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-big5.def @@ -35,7 +35,7 @@ %% zhlipsum-en.pdf, %% and README.md. %% -\GetIdInfo $Id: zhlipsum.dtx 1.0.0 2018-04-03 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $ +\GetIdInfo $Id: zhlipsum.dtx 1.1.0 2018-04-08 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $ {Chinese dummy text with Big5 encoding (for zhlipsum)} \ProvidesExplFile{\ExplFileName-big5.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-gbk.def b/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-gbk.def index fb8034a509b..7114dcf3114 100644 --- a/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-gbk.def +++ b/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-gbk.def @@ -35,7 +35,7 @@ %% zhlipsum-en.pdf, %% and README.md. %% -\GetIdInfo $Id: zhlipsum.dtx 1.0.0 2018-04-03 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $ +\GetIdInfo $Id: zhlipsum.dtx 1.1.0 2018-04-08 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $ {Chinese dummy text with GBK encoding (for zhlipsum)} \ProvidesExplFile{\ExplFileName-gbk.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-utf8.def b/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-utf8.def index fa71efdfdf9..af7d4b3c65c 100644 --- a/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-utf8.def +++ b/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum-utf8.def @@ -35,7 +35,7 @@ %% zhlipsum-en.pdf, %% and README.md. %% -\GetIdInfo $Id: zhlipsum.dtx 1.0.0 2018-04-03 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $ +\GetIdInfo $Id: zhlipsum.dtx 1.1.0 2018-04-08 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $ {Chinese dummy text with UTF-8 encoding (for zhlipsum)} \ProvidesExplFile{\ExplFileName-utf8.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum.sty b/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum.sty index e2819da5521..4797617e17f 100644 --- a/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum.sty +++ b/Master/texmf-dist/tex/latex/zhlipsum/zhlipsum.sty @@ -36,7 +36,7 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo $Id: zhlipsum.dtx 1.0.0 2018-04-03 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $ +\GetIdInfo $Id: zhlipsum.dtx 1.1.0 2018-04-08 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $ {Chinese dummy text} \ProvidesExplPackage{\ExplFileName} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -188,7 +188,7 @@ \__zhlipsum_if_encoding:nTF { big5 } { \keys_set:nn { zhlipsum } { name = trad } } { \keys_set:nn { zhlipsum } { name = simp } } -\NewDocumentCommand \zhlipsum { s G { 1 - 3 } +o } +\NewDocumentCommand \zhlipsum { s o +o } { \group_begin: \IfBooleanF {#1} @@ -197,10 +197,30 @@ \tl_set:Nn \l__zhlipsum_after_tl { \__zhlipsum_par: } \tl_set:Nn \l__zhlipsum_inter_tl { \__zhlipsum_par: } } - \IfValueT {#3} { \keys_set:nn { zhlipsum } {#3} } - \zhlipsum_use:Vn \l__zhlipsum_name_tl {#2} + \IfValueTF {#3} + { + \keys_set:nn { zhlipsum } {#3} + \zhlipsum_use:Vn \l__zhlipsum_name_tl {#2} + } + { + \IfValueTF {#2} + { + \__zhlipsum_if_key_value_list:nTF {#2} + { + \keys_set:nn { zhlipsum } {#2} + \zhlipsum_use:Vn \l__zhlipsum_name_tl { 1 - 3 } + } + { \zhlipsum_use:Vn \l__zhlipsum_name_tl {#2} } + } + { \zhlipsum_use:Vn \l__zhlipsum_name_tl { 1 - 3 } } + } \group_end: } +\prg_new_protected_conditional:Npnn \__zhlipsum_if_key_value_list:n #1 { TF } + { + \tl_if_in:nnTF {#1} { = } + { \prg_return_true: } { \prg_return_false: } + } \seq_new:N \l__zhlipsum_par_num_seq \cs_new_protected:Npn \zhlipsum_use:nn #1#2 { |