From c22890c46ab250bf72693f78d290576c71c3f46b Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 11 Apr 2020 22:25:18 +0000
Subject: zhlipsum (10apr20)

git-svn-id: svn://tug.org/texlive/trunk@54661 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/doc/latex/zhlipsum/zhlipsum-en.tex  | 42 ++++++++--------------
 1 file changed, 15 insertions(+), 27 deletions(-)

(limited to 'Master/texmf-dist/doc/latex/zhlipsum/zhlipsum-en.tex')

diff --git a/Master/texmf-dist/doc/latex/zhlipsum/zhlipsum-en.tex b/Master/texmf-dist/doc/latex/zhlipsum/zhlipsum-en.tex
index 355e31a149c..f43c8e85a30 100644
--- a/Master/texmf-dist/doc/latex/zhlipsum/zhlipsum-en.tex
+++ b/Master/texmf-dist/doc/latex/zhlipsum/zhlipsum-en.tex
@@ -6,7 +6,7 @@
 %%
 %% zhlipsum.dtx
 %% 
-%%     Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>
+%%     Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96@gmail.com>
 %% 
 %%     This work may be distributed and/or modified under the
 %%     conditions of the LaTeX Project Public License, either
@@ -37,7 +37,8 @@
 \PassOptionsToPackage{scheme=plain, linespread=1.1}{ctex}
 \documentclass{ctxdoc}
 \usepackage{multirow}
-\setCJKmonofont{FangSong}[ItalicFont=KaiTi]
+\setCJKmainfont{Source Han Serif SC}[ItalicFont=Kaiti SC]
+\setCJKmonofont{STFangsong}[ItalicFont=Kaiti SC]
 \hypersetup{%
   pdftitle={zhlipsum: Chinese dummy text},
   pdfauthor={Xiangdong Zeng},
@@ -49,17 +50,15 @@
 }
 \pagestyle{headings}
 % Use `!` for comment in `ctexexam`.
-\makeatletter
 \catcode`!=\active
 \RecustomVerbatimEnvironment{ctexexam}{Verbatim}{%
   frame=single, framesep=10pt,
- gobble=2,
- label=\rule{0pt}{12pt}\textnormal{\bfseries Example \arabic{ctexexam}},
+  gobble=2,
+  label=\rule{0pt}{12pt}\textnormal{\bfseries Example \arabic{ctexexam}},
+  defineactive=\def!{\color{gray}\itshape\%},
   listparameters=%
     \setlength\topsep{\bigskipamount}%
-    \refstepcounter{ctexexam}\ctexexamlabelref
-    \appto\FV@EndList{\nointerlineskip},
-  defineactive=\def!{\color{gray}\itshape\%}}
+    \refstepcounter{ctexexam}\ctexexamlabelref}
 \preto\ctexexam{\catcode`!=\active}
 \preto\endctexexam{\catcode`!=12}
 \catcode`!=12
@@ -78,17 +77,6 @@
         }
     \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}{}%
@@ -97,8 +85,8 @@
   {\endenumerate}
 \title{\textbf{The \pkg{zhlipsum} Package: Chinese Dummy Text}}
 \author{Xiangdong Zeng}
-\date{2018/09/08 \quad v1.1.1%
-  \thanks{\url{https://github.com/Stone-Zeng/zhlipsum}.}}
+\date{2020/04/10 \quad v1.2.0%
+  \thanks{\url{https://github.com/stone-zeng/zhlipsum}.}}
 
 \begin{document}
 
@@ -140,7 +128,7 @@ selected automatically according to \CTeX{}. Note that in \CTeX{}
 bundle, the correspoding options are \opt{UTF8} and \opt{GBK},
 while the options in \pkg{zhlipsum} are all in \emph{lowercase}.
 
-\begin{function}[updated=2018-04-08]{\zhlipsum}
+\begin{function}[updated=2020-04-08]{\zhlipsum}
   \begin{syntax}
     \cs{zhlipsum}\oarg{paragraph}\oarg{options}
     \cs{zhlipsum*}\oarg{paragraph}\oarg{options}
@@ -150,7 +138,7 @@ while the options in \pkg{zhlipsum} are all in \emph{lowercase}.
   between the arguments.
 \end{function}
 
-By default, the \cs{zhlipsum} command will insert \tn{par} before,
+By default, the \cs{zhlipsum} command will insert \tn{par}
 after and between dummy text paragraphs, while \cs{zhlipsum}|*|
 will not give any extra processing. To change the default
 behavior, you can use the \opt{before}, \opt{after} and
@@ -212,9 +200,9 @@ as well.
 
 \begin{function}[added=2018-03-29]{before,after,inter}
   \begin{syntax}
-    name  = \meta{content}
-    after = \meta{content}
-    inter = \meta{content}
+    before = \meta{content}
+    after  = \meta{content}
+    inter  = \meta{content}
   \end{syntax}
   Insert contents before, after or between dummy text paragraphs.
   Note that the \tn{par} command inserted when using \cs{zhlipsum}
@@ -311,7 +299,7 @@ order to avoid the problem temporarily.
 
   ! Using `\newzhlipsum{big5}{許蓋功, 蓋功許, 功許蓋}' directly will
   ! lead to an error.
-  ! Use <, >, + to replace {, } and \, and set the original {, } and \
+  ! Use <, >, + to replace {, } and \, then set the original {, } and \
   ! to be `other' category (i.e. catcode=12).
   \begingroup
     \catcode`\<=1
-- 
cgit v1.2.3

