lipsum (24nov18)

git-svn-id: svn://tug.org/texlive/trunk@49241 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 31 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/latex/lipsum/README.txt b/Master/texmf-dist/doc/latex/lipsum/README.txt
index 533097fe91e..e10dd24b0d6 100644
--- a/Master/texmf-dist/doc/latex/lipsum/README.txt
+++ b/Master/texmf-dist/doc/latex/lipsum/README.txt
@@ -14,7 +14,7 @@ Patrick Happel (patrick.happel@rub.de)
    lipsum.dtx
    lipsum.ins 
    lipsum.pdf
-   README.1st (this file)
+   README.txt (this file)
 
 
 
diff --git a/Master/texmf-dist/doc/latex/lipsum/lipsum.pdf b/Master/texmf-dist/doc/latex/lipsum/lipsum.pdf
index 3e2fd2931cc..67e446c525c 100644
--- a/Master/texmf-dist/doc/latex/lipsum/lipsum.pdf
+++ b/Master/texmf-dist/doc/latex/lipsum/lipsum.pdf
diff --git a/Master/texmf-dist/source/latex/lipsum/lipsum.dtx b/Master/texmf-dist/source/latex/lipsum/lipsum.dtx
index 4ab7ae0097a..2853bcad774 100644
--- a/Master/texmf-dist/source/latex/lipsum/lipsum.dtx
+++ b/Master/texmf-dist/source/latex/lipsum/lipsum.dtx
@@ -21,7 +21,7 @@
 %    https://github.com/patta42/lipsum
 %
 %<*driver>
-\ProvidesFile{lipsum.dtx}[2018/11/07 v2.0 Access to 150 of Lorem Ipsum dummy text]
+\ProvidesFile{lipsum.dtx}[2018/11/24 v2.1a Access to 150 of Lorem Ipsum dummy text]
 \documentclass{l3doc}
 \usepackage[a4paper,
   top=2cm, left=8.8cm, right=2cm, bottom=3cm,
@@ -114,15 +114,15 @@
 \RequirePackage{xparse}
 \ProvidesExplPackage
   {lipsum}
-  {2018/11/07}
-  {2.0}
+  {2018/11/24}
+  {2.1a}
   {150 paragraphs of Lorem Ipsum dummy text}
 % </package>
 %   \fi
 %
 %   \title{\pkg{lipsum}}
 % \subtitle{Access to 150 paragraphs of Lorem Ipsum dummy
-% text\thanks{Version: 2.0}}
+% text\thanks{Version: 2.1a}}
 % \author{Patrick Happel\thanks{patrick.happel@rub.de}}
 % \date{\today}
 % \RecordChanges
@@ -141,7 +141,10 @@
 % \changes{v2.0}{2018/11/07}{Added the possibility to fetch a number of sentences from the
 % lipsum paragraphs (thanks to Frank Mittelbach).}
 % \changes{v2.0}{2018/11/07}{Rewritten code in \pkg{expl3} syntax.}
-%
+% \changes{v2.1}{2018/11/18}{Changed defaults, now nothing is typeset at the
+% end of any list.}
+% \changes{v2.1a}{2018/11/24}{Added forgotten ins-file to CTAN. This requires
+% a new version number.}
 % \maketitle{\pkg{lipsum} is a \LaTeX{} package that produces dummy text
 % to be used in test documents or examples. The paragraphs are taken with
 % permission from \url{https://www.lipsum.com/}, thanks to James Wilson for
@@ -231,12 +234,12 @@
 %
 % \subsection{Package Options}
 % \pkg{lipsum} outputs a range of paragraphs taken from the \lips\ dummy
-% text. The package option control how a single paragraph
-% of \lips\ is terminated. The default is to terminate a paragaraph with
-% \cs{par}. One option is available to change the default behaviour:
+% text. The package option control how the single paragraphs of \lips\ are
+% separated. The default is to separate the paragaraph with \cs{par}. One
+% option is available to change the default behaviour:
 % \begin{description}
 % \item[\opt{nopar}:] Instead of \cs{par}, \cs{space} is used to
-% terminate every paragraph. 
+% separate the paragraphs.
 % \end{description}
 % 
 % \subsection{User Commands}
@@ -1552,16 +1555,16 @@
 \cs_new:Nn \@@_restore_sentence_list: {
   \SetLipsumSentenceListItemSeparator{\space}
   \SetLipsumSentenceListItemSeparator*{\space}
-  \SetLipsumSentenceListSurrounders{}{\tex_par:D}
-  \SetLipsumSentenceListSurrounders*{}{\space}
+  \SetLipsumSentenceListSurrounders{}{}
+  \SetLipsumSentenceListSurrounders*{}{}
   \SetLipsumSentenceListItemSurrounders*{}{}
   \SetLipsumSentenceListItemSurrounders{}{}
 }
 \cs_new:Nn \@@_restore_par_list: {
   \SetLipsumParListItemSeparator{\tex_par:D}
   \SetLipsumParListItemSeparator*{\space}
-  \SetLipsumParListSurrounders{}{\tex_par:D}
-  \SetLipsumParListSurrounders*{}{\space}
+  \SetLipsumParListSurrounders{}{}
+  \SetLipsumParListSurrounders*{}{}
   \SetLipsumParListItemSurrounders*{}{}
   \SetLipsumParListItemSurrounders{}{}
 }
@@ -1571,16 +1574,16 @@
   \cs_gset:Nn \@@_restore_sentence_list: {
     \SetLipsumSentenceListItemSeparator{\space}
     \SetLipsumSentenceListItemSeparator*{\space}
-    \SetLipsumSentenceListEnd{\space}
-    \SetLipsumSentenceListEnd*{\tex_par:D}
+    \SetLipsumSentenceListEnd{}
+    \SetLipsumSentenceListEnd*{}
     \SetLipsumSentenceListItemSurrounders*{}{}
     \SetLipsumSentenceListItemSurrounders{}{}
   }
   \cs_gset:Nn \@@_restore_par_list: {
     \SetLipsumParListItemSeparator{\space}
     \SetLipsumParListItemSeparator*{\tex_par:D}
-    \SetLipsumParListEnd{\space}
-    \SetLipsumParListEnd*{\tex_par:D}
+    \SetLipsumParListEnd{}
+    \SetLipsumParListEnd*{}
     \SetLipsumParListItemSurrounders*{}{}
     \SetLipsumParListItemSurrounders{}{}
   }
diff --git a/Master/texmf-dist/tex/latex/lipsum/lipsum.sty b/Master/texmf-dist/tex/latex/lipsum/lipsum.sty
index 07af7a3888a..7b2cfbe2a60 100644
--- a/Master/texmf-dist/tex/latex/lipsum/lipsum.sty
+++ b/Master/texmf-dist/tex/latex/lipsum/lipsum.sty
@@ -32,8 +32,8 @@
 \RequirePackage{xparse}
 \ProvidesExplPackage
   {lipsum}
-  {2018/11/07}
-  {2.0}
+  {2018/11/24}
+  {2.1a}
   {150 paragraphs of Lorem Ipsum dummy text}
 \@ifpackagelater { expl3 } { 2018/10/31 }
   { }
@@ -582,16 +582,16 @@
 \cs_new:Nn \__lipsum_restore_sentence_list: {
   \SetLipsumSentenceListItemSeparator{\space}
   \SetLipsumSentenceListItemSeparator*{\space}
-  \SetLipsumSentenceListSurrounders{}{\tex_par:D}
-  \SetLipsumSentenceListSurrounders*{}{\space}
+  \SetLipsumSentenceListSurrounders{}{}
+  \SetLipsumSentenceListSurrounders*{}{}
   \SetLipsumSentenceListItemSurrounders*{}{}
   \SetLipsumSentenceListItemSurrounders{}{}
 }
 \cs_new:Nn \__lipsum_restore_par_list: {
   \SetLipsumParListItemSeparator{\tex_par:D}
   \SetLipsumParListItemSeparator*{\space}
-  \SetLipsumParListSurrounders{}{\tex_par:D}
-  \SetLipsumParListSurrounders*{}{\space}
+  \SetLipsumParListSurrounders{}{}
+  \SetLipsumParListSurrounders*{}{}
   \SetLipsumParListItemSurrounders*{}{}
   \SetLipsumParListItemSurrounders{}{}
 }
@@ -600,16 +600,16 @@
   \cs_gset:Nn \__lipsum_restore_sentence_list: {
     \SetLipsumSentenceListItemSeparator{\space}
     \SetLipsumSentenceListItemSeparator*{\space}
-    \SetLipsumSentenceListEnd{\space}
-    \SetLipsumSentenceListEnd*{\tex_par:D}
+    \SetLipsumSentenceListEnd{}
+    \SetLipsumSentenceListEnd*{}
     \SetLipsumSentenceListItemSurrounders*{}{}
     \SetLipsumSentenceListItemSurrounders{}{}
   }
   \cs_gset:Nn \__lipsum_restore_par_list: {
     \SetLipsumParListItemSeparator{\space}
     \SetLipsumParListItemSeparator*{\tex_par:D}
-    \SetLipsumParListEnd{\space}
-    \SetLipsumParListEnd*{\tex_par:D}
+    \SetLipsumParListEnd{}
+    \SetLipsumParListEnd*{}
     \SetLipsumParListItemSurrounders*{}{}
     \SetLipsumParListItemSurrounders{}{}
   }