summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/zhlipsum/zhlipsum.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/zhlipsum/zhlipsum.dtx')
-rw-r--r--Master/texmf-dist/source/latex/zhlipsum/zhlipsum.dtx53
1 files changed, 31 insertions, 22 deletions
diff --git a/Master/texmf-dist/source/latex/zhlipsum/zhlipsum.dtx b/Master/texmf-dist/source/latex/zhlipsum/zhlipsum.dtx
index 3eb9bac2031..3ef3fd63a81 100644
--- a/Master/texmf-dist/source/latex/zhlipsum/zhlipsum.dtx
+++ b/Master/texmf-dist/source/latex/zhlipsum/zhlipsum.dtx
@@ -183,7 +183,7 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\RequirePackage{expl3}
%<*!(driver|install)>
-%<!readme>\GetIdInfo $Id: zhlipsum.dtx 1.1.0 2018-04-08 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
+%<!readme>\GetIdInfo $Id: zhlipsum.dtx 1.1.1 2018-09-08 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
%<package> {Chinese dummy text}
%<package>\ProvidesExplPackage{\ExplFileName}
%<utf8> {Chinese dummy text with UTF-8 encoding (for zhlipsum)}
@@ -237,7 +237,6 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
\preto\ctexexam{\catcode`!=\active}
\preto\endctexexam{\catcode`!=12}
\catcode`!=12
-\makeatother
% Do not add hyperlink for `TF`, and do not change color.
\ExplSyntaxOn
\cs_set_protected:Npn \__codedoc_typeset_TF:
@@ -253,7 +252,19 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
}
\group_end:
}
+% From l3doc, to make @@ -> <module> while @@@@ -> @@
+\cs_set_protected:Npn \__ctxdoc_replace_at_at_aux:Nn #1#2
+ {
+ \tl_replace_all:Nnn #1 { \token_to_str:N @ } { @ }
+ \tl_replace_all:Nnn #1 { \token_to_str:N _ } { _ }
+ \tl_replace_all:Nnn #1 { @ @ @ @ } { \token_to_str:N a a }
+ \tl_replace_all:Nnn #1 { _ _ @ @ } { _ _ #2 }
+ \tl_replace_all:Nnn #1 { _ @ @ } { _ _ #2 }
+ \tl_replace_all:Nnn #1 { @ @ } { _ _ #2 }
+ \tl_replace_all:Nnn #1 { \token_to_str:N a a } { @ @ }
+ }
\ExplSyntaxOff
+\makeatother
\RenewDocumentEnvironment{arguments}{}%
{\enumerate[label={\texttt{\#\arabic*:~}},
leftmargin=2em, labelsep=0pt, nolistsep]}%
@@ -280,6 +291,7 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \changes{v0.4}{2017/09/16}{将安装、测试文件集成进源文件。}
% \changes{v0.4}{2017/09/16}{优化宏包实现。}
% \changes{v0.5}{2018/01/06}{添加英文版用户文档。}
+% \changes{v1.1.1}{2018/09/08}{完善持续集成系统,在多平台上进行测试。}
%
% \CheckSum{0}
%
@@ -301,11 +313,11 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
%
% \title{\textbf{zhlipsum: 中文乱数假文(Lorem ipsum)}}
% \author{曾祥东}
-% \date{2018/04/08 \quad v1.1.0^^A
+% \date{2018/09/08 \quad v1.1.1^^A
% \thanks{\url{https://github.com/Stone-Zeng/zhlipsum}.}}
%^^A! \title{\textbf{The \pkg{zhlipsum} Package: Chinese Dummy Text}}
%^^A! \author{Xiangdong Zeng}
-%^^A! \date{2018/04/08 \quad v1.1.0%
+%^^A! \date{2018/09/08 \quad v1.1.1%
%^^A! \thanks{\url{https://github.com/Stone-Zeng/zhlipsum}.}}
%^^A!
%
@@ -814,7 +826,7 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
}
\clist_map_inline:nn { expl3, xparse, l3keys2e }
{
- \@ifpackagelater {#1} { 2017/12/16 }
+ \@ifpackagelater {#1} { 2018/05/12 }
{ } { \msg_error:nnn { zhlipsum } { l3-too-old } {#1} }
}
% \end{macrocode}
@@ -921,7 +933,7 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macrocode}
\keys_define:nn { zhlipsum / option }
{
- encoding .choices:nn =
+ encoding .choices:nn =
{ utf8, gbk, big5 }
{
\tl_gset_eq:NN \g_@@_encoding_tl \l_keys_choice_tl
@@ -944,7 +956,7 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
%
% 处理未知选项。
% \begin{macrocode}
- unknown .code:n = { \@@_error:n { unknown-option } }
+ unknown .code:n = { \@@_error:n { unknown-option } }
}
% \end{macrocode}
%
@@ -1195,10 +1207,8 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
}
\@@_msg_new:nn { CJK-invalid-encoding }
{
-%<@@=>
- The~ current~ CJK~ environment~ uses~ "\tl_use:N \CJK@@@enc"~
+ The~ current~ CJK~ environment~ uses~ "\tl_use:N \CJK@@@@@enc"~
encoding,\\
-%<@@=zhlipsum>
but~ zhlipsum~ package~ has~ been~ loaded~ with~ the~ option~
"encoding=\tl_use:N \g_@@_encoding_tl".\\\\
Please~ check~ the~ package~ options.
@@ -1211,11 +1221,9 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \@@_if_cjk_valid_encoding: { TF }
{
-%<@@=>
- \tl_if_exist:NTF \CJK@@@enc
+ \tl_if_exist:NTF \CJK@@@@@enc
{
- \tl_set:Nx \l__zhlipsum_tmpa_tl { \str_lower_case:f { \CJK@@@enc } }
-%<@@=zhlipsum>
+ \tl_set:Nx \l_@@_tmpa_tl { \str_lower_case:f { \CJK@@@@@enc } }
% TODO: str or tl?
\str_if_eq:NNTF \g_@@_encoding_tl \l_@@_tmpa_tl
{ \prg_return_true: }
@@ -1311,12 +1319,12 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macrocode}
\seq_pop_left:NN \l_@@_tmpb_seq \l_@@_tmpa_tl
\tl_if_empty:NTF \l_@@_tmpa_tl
- { \int_set_eq:NN \l_@@_begin_int \c_one }
+ { \int_set_eq:NN \l_@@_begin_int \c_one_int }
{
\int_set:Nn \l_@@_begin_int { \l_@@_tmpa_tl }
- \int_compare:nNnT \l_@@_begin_int < \c_one
+ \int_compare:nNnT \l_@@_begin_int < \c_one_int
{
- \int_set_eq:NN \l_@@_begin_int \c_one
+ \int_set_eq:NN \l_@@_begin_int \c_one_int
\bool_set_true:N \l_@@_modified_range_bool
}
}
@@ -1343,8 +1351,8 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
{ \int_compare_p:nNn \l_@@_begin_int > \l_@@_end_int }
{ \bool_set_true:N \l_@@_invalid_range_bool }
{
- \int_step_inline:nnnn
- { \l_@@_begin_int } { \c_one } { \l_@@_end_int }
+ \int_step_inline:nnn
+ { \l_@@_begin_int } { \l_@@_end_int }
{ \seq_put_right:Nn \l_@@_tmpa_seq {##1} }
}
}
@@ -1353,8 +1361,8 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
% 单个数字的处理。
% \begin{macrocode}
\bool_lazy_or:nnTF
- { \int_compare_p:nNn {#1} > { \l_@@_max_int } }
- { \int_compare_p:nNn {#1} < { \c_one } }
+ { \int_compare_p:nNn {#1} > \l_@@_max_int }
+ { \int_compare_p:nNn {#1} < \c_one_int }
{ \bool_set_true:N \l_@@_invalid_range_bool }
{ \seq_put_right:Nn \l_@@_tmpa_seq {#1} }
}
@@ -1479,7 +1487,7 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
%<*!utf8>
\cs_new_protected:Npx \@@_active_first_byte:
{
- \int_step_function:nnnN { "81 } { 1 } { "FE }
+ \int_step_function:nnN { "81 } { "FE }
\char_set_catcode_active:n
}
%</!utf8>
@@ -1488,6 +1496,7 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \end{macro}
%
% \changes{v1.0.0}{2018/03/26}{增加预定义假文。}
+% \changes{v1.1.1}{2018/07/19}{更新假文文本。}
%
% 预定义假文的声明放置在分组内,利用 \cs{@@_set_special_catcode:} 切换
% 类别码后可以不再需要 \pkg{CJK} 的预处理操作。具体声明此处不再列出。