From ceb2b4332d87ef96a7c9e20b61a2ac9c9e524690 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Fri, 5 Mar 2021 03:00:50 +0000
Subject: CTAN sync 202103050300

---
 macros/latex/contrib/lipsum/lipsum.dtx | 283 +++++++++++++++++----------------
 1 file changed, 142 insertions(+), 141 deletions(-)

(limited to 'macros/latex/contrib/lipsum/lipsum.dtx')

diff --git a/macros/latex/contrib/lipsum/lipsum.dtx b/macros/latex/contrib/lipsum/lipsum.dtx
index 9160311869..233b5c359e 100644
--- a/macros/latex/contrib/lipsum/lipsum.dtx
+++ b/macros/latex/contrib/lipsum/lipsum.dtx
@@ -12,15 +12,17 @@
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 %
-% Please send error reports and suggestions for improvements to 
-%    Patrick Happel <patrick.happel@rub.de>.
-%
-% Alternatively, use github:
-%    https://github.com/patta42/lipsum
+% Please send error reports and suggestions for improvements to
+%    https://github.com/PhelypeOleinik/lipsum
 %
+\def\lipsumversion{2.3}
+\def\lipsumdate{2021-03-03}
 %<*driver>
-\ProvidesFile{lipsum.dtx}[2019/01/02 v2.2 Access to 150 of Lorem Ipsum dummy text]
+\ProvidesFile{lipsum.dtx}%
+  [\lipsumdate\space v\lipsumversion\space
+   Access to 150 of Lorem Ipsum dummy text]
 \documentclass{l3doc}
+\usepackage{xcolor}
 \usepackage[a4paper,
   top=2cm, left=8.8cm, right=2cm, bottom=3cm,
   marginparwidth=6.3cm, marginparsep=.5cm,
@@ -35,13 +37,13 @@
   middlelinewidth=0pt
 }
 \newmdenv[style=expl]{explbox}
-  
+
 \newmdenv[%
   style=expl,
   subtitlebackgroundcolor=yellow!5!white,
   frametitlebackgroundcolor=yellow!5!white,
   frametitle={Code},
-]  {exploutputbox}  
+]  {exploutputbox}
 
 \usepackage{lipsum,multicol}
 \usepackage[latin, english]{babel}
@@ -52,7 +54,7 @@
   \renewcommand\maketitle[1]{
   \noindent
   \hspace{-\fullmargin}%
-  \begin{minipage}{\textwidth+\fullmargin}  
+  \begin{minipage}{\textwidth+\fullmargin}
     \renewcommand\thefootnote{\fnsymbol{footnote}}
     \let\thanks\footnote
     {
@@ -111,23 +113,30 @@
 \RequirePackage{xparse}
 \ProvidesExplPackage
   {lipsum}
-  {2019/01/02}
-  {2.2}
+  {\lipsumdate}
+  {\lipsumversion}
   {150 paragraphs of Lorem Ipsum dummy text}
 %</package>
 %<*lipsum>
-\ProvidesFile{lipsum.ltd.tex}[2019/01/02 v2.2 The Lorem ipsum dummy text]
+\ProvidesFile{lipsum.ltd.tex}%
+  [\lipsumdate\space v\lipsumversion\space
+   The Lorem ipsum dummy text]
 
 %</lipsum>
 %<*cicero>
-\ProvidesFile{cicero.ltd.tex}[2019/01/02 v2.2 Text of Cicero's speech]
+\ProvidesFile{cicero.ltd.tex}%
+  [\lipsumdate\space v\lipsumversion\space
+   Text of Cicero's speech]
 
-%</cicero> 
+%</cicero>
 % \fi
 %
 % \title{\pkg{lipsum}}
 % \subtitle{Access to 150 paragraphs of Lorem Ipsum dummy
-% text\thanks{Version: 2.2}}
+% text\thanks{Version: \lipsumversion}^^A
+% \thanks{Since March 2021, Phelype Oleinik maintains this package
+%   (\href{mailto:phelype.oleinik@latex-project.org}
+%        {phelype.oleinik\meta{at}latex-project.org}).}}
 % \author{Patrick Happel\thanks{patrick.happel@rub.de}}
 % \date{\today}
 % \RecordChanges
@@ -139,7 +148,7 @@
 % \changes{v1.3}{2014/07/19}{Introduced some improvements and provided some
 % new macros (thanks to tex.stackexchange user egreg).}
 % \changes{v1.3a}{2017/08/10}{Fixed a type in the documentation (thanks to
-% Vincent Belaïche). This version never made its way on CTAN due to some 
+% Vincent Belaïche). This version never made its way on CTAN due to some
 % version naming conflicts. Since the change here was only in the
 % documentation, I first didn't want it to be 1.3a and later had no time to
 % update it properly.}
@@ -153,6 +162,9 @@
 % \changes{v2.2}{2018/12/25}{replaced \cs{tex_par:D} by \cs{par} to avoid
 % incompatibilities with \LaTeX2e's |list|-environment. Thanks to Karl Hagen
 % for reporting. See \url{ttps://github.com/patta42/lipsum/issues/12}.}
+% \changes{v2.3}{2021/03/03}{Remove dependency on an \pkg{xparse} internal
+%   macro.  \pkg{lipsum}'s new home at
+%   \url{https://github.com/PhelypeOleinik/lipsum}}
 %
 % \maketitle{\pkg{lipsum} is a \LaTeX{} package that produces dummy text
 % to be used in test documents or examples. The paragraphs are taken with
@@ -164,16 +176,16 @@
 %
 % \hspace{1em} Please, file bug reports, typos in the documentation or
 % feature requests as an issue on
-% \url{https://github.com/patta42/lipsum/issues}.}
+% \url{https://github.com/PhelypeOleinik/lipsum/issues}.}
 % \begin{documentation}
 %
 % \section{Quick usage overview}
-% To load the package specify 
+% To load the package specify
 % \begin{verbatim}
 %     \usepackage{lipsum}
 % \end{verbatim}
 % in the preamble of your document. This package provides several
-% macros. \DescribeMacro{\lipsum}The most important one is 
+% macros. \DescribeMacro{\lipsum}The most important one is
 % \cs{lipsum}. This macro typesets the \emph{Lorem ipsum}
 % paragraphs. It has two optional arguments. The first one allows to specify the range
 % of the  paragraphs. For example, \verb|\lipsum[4-57]| typesets the paragraphs 4 to
@@ -187,7 +199,7 @@
 %
 % \section{Foreword to Version 2.0}\label{sec:foreword2.0}
 % Version 2.0 of \pkg{lipsum} is a complete (well, nearly complete)  rewrite
-% of the code in \pkg{expl3} 
+% of the code in \pkg{expl3}
 % syntax. I have never used \pkg{expl3} before and thus the code might be too
 % complicated, might use wrong or badly chosen data types or weird function
 % names. I am happy to receive comments on this.
@@ -198,7 +210,7 @@
 % documents is not a big issue here. The changes are:
 % \begin{itemize}
 % \item The package option \opt{nopar} now uses a \cs{space} as terminator,
-% instead of \cs{relax}. 
+% instead of \cs{relax}.
 % \item The commands \cs{UnpackLipsum} and \cs{UnpackLipsum*} are no longer
 % available. The effect of \cs{UnpackLipsum} now is default for
 % \cs{unpacklipsum} (or \cs{unpacklipsum*}, depending on the package
@@ -213,8 +225,8 @@
 %
 % \begin{document}
 %   \renewcommand\foo{\color{.!75!red}}
-%   { \lipsumexp } 
-% 
+%   { \lipsumexp }
+%
 %   \newcounter{mycnt}\setcounter{mycnt}{1}
 %   \renewcommand\foo{%
 %     (\themycnt)\stepcounter{mycnt}}
@@ -232,15 +244,15 @@
 % \section{Foreword to version 2.2}
 % As of version 2.2, \pkg{lipsum} provides a simple interface to define other
 % texts to be used as output of the \cs{lipsum}-family of commands. This was
-% heavily inspired by an issue raised by 
+% heavily inspired by an issue raised by
 % \emph{svenper} on
 % github\footnote{\url{https://github.com/patta42/lipsum/issues/13}}. However,
 % the implementation of this interface might not match the needs of everyone
 % who wants to provide a dummy text in another language. Comments and
-% suggestions on this are very welcome.   
+% suggestions on this are very welcome.
+%
+% Please note that the documentation still only refers to the \lips-text.
 %
-% Please note that the documentation still only refers to the \lips-text. 
-% 
 % \section{Usage}
 % \pkg{lipsum} was intended to quickly provide a way to fill a page or two to
 % analyze the page
@@ -258,7 +270,7 @@
 % \item[\opt{nopar}:] Instead of \cs{par}, \cs{space} is used to
 % separate the paragraphs.
 % \end{description}
-% 
+%
 % \subsection{User Commands}
 % \DescribeMacro{\lipsum}\DescribeMacro{\lipsum*}
 % \begin{quote}
@@ -276,7 +288,7 @@
 % below). \cs{lipsum} terminates every paragraph depending on the package
 % option (using \cs{par} is the default). \cs{lipsum*} does the same, but
 % uses a different termination (default is to use a blank space) for each
-% paragraph. \emph{As a simplified rule of thumb, \cs{lipsum} prints the 
+% paragraph. \emph{As a simplified rule of thumb, \cs{lipsum} prints the
 % paragraphs as multiple paragraphs, \cs{lipsum*} prints them as a single
 % paragraph}.
 %
@@ -286,7 +298,7 @@
 % |\lipsum*[9-12]|, which will output the paragraphs nine to
 % twelve. \pkg{lipsum} provides 150 paragraphs of \lips\, thus |150| is the
 % maximum that should be specified.
-% 
+%
 % \subsection{Outputting Sentences instead of Paragraphs}
 % Starting with \pkg{lipsum} v2.0, \cs{lipsum} and \cs{lipsum*} allow to
 % output sentences of the \lips\ dummy text instead of paragraphs. To retrieve
@@ -318,7 +330,7 @@
 %   sentences since paragraph \#104 consists only of 10 sentences. For the
 %   same reason, |\lipsum[104][11-20]| will output nothing.
 % \item If you need a lot of sentences, consider the \opt{space} option and
-%   |\lipsum[1-150]|. This should be faster. 
+%   |\lipsum[1-150]|. This should be faster.
 % \end{itemize}
 %
 % \section{Advanced or Developer Macros}
@@ -333,7 +345,7 @@
 %
 % \DescribeMacro{\SetLipsumDefault} In order to change the default range of
 % paragraphs that is used by \cs{lipsum} and friends, specify
-% |\SetLipsumDefault{8}| or |\SetLipsumDefault{123-145}|.  
+% |\SetLipsumDefault{8}| or |\SetLipsumDefault{123-145}|.
 %
 % \DescribeMacro{\LipsumPar} To get a single paragraph of the \lips\ dummy
 % text, use |\LipsumPar{8}| (for the eighth paragraph). This is similar to
@@ -397,8 +409,8 @@
 % lists of sentences (also indicated by the labelled arrows in the middle). }
 % \label{fig:tokens}
 %   \end{multicols}
-% 
-% 
+%
+%
 % \end{widefigure}
 % \DescribeMacro{\SetLipsumParListStart}\DescribeMacro{\SetLipsumParListStart*}
 % \DescribeMacro{\SetLipsumParListEnd}\DescribeMacro{\SetLipsumParListEnd*}
@@ -407,13 +419,13 @@
 % \pkg{lipsum} allows to specify all of the tokens in the list indicated
 % above except for the item-specific inner and outer \meta{items} (shown as
 % \meta{item_N_,_s-outer/inner}, \meta{item_N_,_e-outer/inner} above), which
-% remain to be implemented. 
+% remain to be implemented.
 %
 % The macros that enable setting these tokens are all available in a normal
-% and in a starred version, they apply to \cs{lipsum} and \cs{unpacklipsum} or 
-% \cs{lipsum*} and \cs{unpacklipsum*}, respectively. 
+% and in a starred version, they apply to \cs{lipsum} and \cs{unpacklipsum} or
+% \cs{lipsum*} and \cs{unpacklipsum*}, respectively.
+%
 %
-% 
 % The macro \cs{SetLipsumParListStart}\Arg{tokens} and its starred variant
 % insert \meta{tokens} at the very beginning of the list of paragraphs
 % (\meta{list_s} in Figure~\ref{fig:tokens}). \cs{SetLipsumSentenceListStart}
@@ -451,12 +463,12 @@
 % commands that allow to set a pair of \meta{tokens} to surround every item:
 % \begin{macrolist}
 % \item \cs{SetLipsumParListItemSurrounders}\Arg{start}\Arg{end}\DescribeMacro{\SetLipsumParListItemSurrounders}
-% \item \cs{SetLipsumParListItemSurrounders*}\Arg{start}\Arg{end}\DescribeMacro{\SetLipsumParListItemSurrounders*} 
+% \item \cs{SetLipsumParListItemSurrounders*}\Arg{start}\Arg{end}\DescribeMacro{\SetLipsumParListItemSurrounders*}
 % \item \cs{SetLipsumSentenceListItemSurrounders}\Arg{start}\Arg{end}\DescribeMacro{\SetLipsumSentenceListItemSurrounders}
 % \item \DescribeMacro{\SetLipsumSentenceListItemSurrounders*} \cs{SetLipsumSentenceListItemSurrounders*}\Arg{start}\Arg{end}
-%   
+%
 % \end{macrolist}
-% 
+%
 % \DescribeMacro{\SetLipsumParListItemSeparator}
 % \DescribeMacro{\SetLipsumParListItemSeparator*}
 % \DescribeMacro{\SetLipsumSentenceListItemSeparator}
@@ -478,7 +490,7 @@
 % \begin{widefigure}
 % \begin{exploutputbox}
 %   \begin{verbatim}
-% 
+%
 % \SetLipsumSentenceListSurrounders{\begin{itemize}}{\end{itemize}}
 % \SetLipsumSentenceListItemStart{\item}
 % \lipsum[10][1-2]
@@ -503,7 +515,7 @@
 % \cs{LipsumRestoreParList} (for lists of paragraphs),
 % \DescribeMacro{\LipsumRestoreSentenceList} \cs{LipsumRestoreSentenceList} (for lists of
 % sentences) and \DescribeMacro{\LipsumRestoreAll} \cs{LipsumRestoreAll} for
-% both lists.   
+% both lists.
 % \begin{widefigure}
 % \begin{exploutputbox}
 %   \begin{verbatim}
@@ -572,7 +584,7 @@
 %   \mdfsubtitle{Output}
 % \lipsum[1][1]
 % \MakePercentComment\SetLipsumText{cicero}\MakePercentIgnore
-% \selectlanguage{latin} 
+% \selectlanguage{latin}
 % \hspace*{1em}\lipsum[1]
 % \end{exploutputbox}
 % \MakePercentComment\SetLipsumText{lipsum}\MakePercentIgnore
@@ -607,7 +619,7 @@
 % \begin{verbatim}
 % \ProvidesPackage{mydummytext}
 % \RequirePackage{lipsum}
-% \SetLipsumText{mydummytext} 
+% \SetLipsumText{mydummytext}
 % \end{verbatim}
 % To make the text accesible via a command \cs{mydummytext}, simply use
 % \cs{let} to copy the definition of \cs{lipsum}:
@@ -655,36 +667,25 @@
 % can either be a range as specified above, or a token list containing a
 % range. Thus, the argument has to be expanded before it is analyzed. This use
 % case is not available in \pkg{xparse} (at least not in the release
-% 2018-10-17). Thus, we have to touch \pkg{xparse}'s internal and generate
-% such a variant. We copy it to a \pkg{lipsum} internal variant to avoid name
-% clashes with future versions of \pkg{xparse}.
-% \begin{function}{\__lipsum_split_argument_expanded:nne
-%   ,\__xparse_split_argument:nne}
+% 2018-10-17). We copy it to a \pkg{lipsum} internal variant to be able to
+% generate a variant.
+% \begin{function}{\@@_split_argument_expanded:nnn
+%   ,\@@_split_argument_expanded:nne}
 %   \begin{syntax}
-%     \cs{__lipsum_split_argument_expanded:nne}\Arg{number}\Arg{token}\Arg{argument}
+%     \cs{@@_split_argument_expanded:nne}\Arg{number}\Arg{token}\Arg{argument}
 %   \end{syntax}
 % \begin{arguments}
 %   \item See documentation for \cs{SplitArgument} in
 %     \pkg{xparse}
-%   \item See documentation for \cs{SplitArgument} in
-%     \pkg{xparse}
 %   \item The argument fed to the function, which is expanded
-%   in this case 
+%   in this case.
 % \end{arguments}
 %    \begin{macrocode}
-\cs_generate_variant:Nn \__xparse_split_argument:nnn {nne}
-\cs_new_eq:NN
-  \__lipsum_split_argument_expanded:nne
-  \__xparse_split_argument:nne
+\cs_new_eq:NN \@@_split_argument_expanded:nnn \SplitArgument
+\cs_generate_variant:Nn \@@_split_argument_expanded:nnn { nne }
 %    \end{macrocode}
 % \end{function}
-% \begin{function}{str_if_eq:VnTF}
-%   Allows to compare a string value and a string:
-%    \begin{macrocode}
-\cs_generate_variant:Nn \str_if_eq:nnTF {VnTF}
-%    \end{macrocode}
-% \end{function}
-% 
+%
 % \subsection{Messages}
 % Starting from \pkg{lipsum}2.0, some commands from previous versions are
 % considered deprecated and issue a warning when used. This is the
@@ -699,48 +700,48 @@
   \string#1~might~not~be~available~in~a~
   future~version~of~lipsum.sty.}
 %    \end{macrocode}
-% 
+%
 % \subsection{Variables}
-% \begin{variable}{\g_lipsum_paragraph_seq}
+% \begin{variable}{\g_@@_paragraph_seq}
 % The sequence that stores all the paragraphs.
 %    \begin{macrocode}
-\seq_new:N\g_lipsum_paragraph_seq
+\seq_new:N\g_@@_paragraph_seq
 %    \end{macrocode}
 % \end{variable}
 % \begin{variable}{\g_lipsum_default_range_tl}
 % The default range for lipsum paragraphs.
 %    \begin{macrocode}
-\tl_new:N \g_lipsum_default_range_tl % 
+\tl_new:N \g_lipsum_default_range_tl %
 %    \end{macrocode}
 % \end{variable}
-% \begin{variable}{\l__lipsum_pars_tl}
+% \begin{variable}{\l_@@_pars_tl}
 % This variables is used to store the token list containing the selected paragraphs.
 %    \begin{macrocode}
-\tl_new:N \l__lipsum_pars_tl
+\tl_new:N \l_@@_pars_tl
 %    \end{macrocode}
 % \end{variable}
-% \begin{variable}{\l__lipsum_sentences_tl}
+% \begin{variable}{\l_@@_sentences_tl}
 % This variables is used to store the token list containing the selected sentences.
 %    \begin{macrocode}
-\tl_new:N \l__lipsum_sentences_tl
+\tl_new:N \l_@@_sentences_tl
 %    \end{macrocode}
 % \end{variable}
-% \begin{variable}{ 
-%   \l__lipsum_sentences_seq
+% \begin{variable}{
+%   \l_@@_sentences_seq
 % }
-% In this sequence, the sentence list is stored.  
+% In this sequence, the sentence list is stored.
 %    \begin{macrocode}
-\seq_new:N \l__lipsum_sentences_seq
+\seq_new:N \l_@@_sentences_seq
 %    \end{macrocode}
 % \end{variable}
 % \begin{variable}{\l_@@_par_list_start_nostar_tl,
 % \l_@@_par_list_end_nostar_tl, \l_@@_sentence_list_start_nostar_tl,
 % \l_@@_sentence_list_end_nostar_tl, \l_@@_par_list_start_star_tl,
 % \l_@@_par_list_end_star_tl, \l_@@_sentence_star_list_start_tl,
-% \l_@@_sentence_star_list_end_tl} 
+% \l_@@_sentence_star_list_end_tl}
 % Next are the variables used to store the tokens between the list items for
-% lists of paragraph and lists of sentences. 
-% 
+% lists of paragraph and lists of sentences.
+%
 %    \begin{macrocode}
 \tl_new:N \l_@@_par_list_start_nostar_tl
 \tl_new:N \l_@@_par_list_end_nostar_tl
@@ -772,7 +773,7 @@
 % \l_@@_par_list_itemend_nostar_tl, \l_@@_sentence_list_itemstart_nostar_tl,
 % \l_@@_sentence_list_itemend_nostar_tl, \l_@@_par_list_itemstart_star_tl,
 % \l_@@_par_list_itemend_star_tl, \l_@@_sentence_list_itemstart_star_tl,
-% \l_@@_sentence_list_itemend_star_tl} 
+% \l_@@_sentence_list_itemend_star_tl}
 % The variables that surround each single item of a paragraph or sentence list.
 %    \begin{macrocode}
 \tl_new:N \l_@@_par_list_itemstart_nostar_tl
@@ -787,7 +788,7 @@
 
 %    \end{macrocode}
 % \end{variable}
-% \begin{variable}{\l_@@_par_list_start_tl, 
+% \begin{variable}{\l_@@_par_list_start_tl,
 % \l_@@_par_list_end_tl,
 % \l_@@_sentence_list_start_tl,
 % \l_@@_sentence_list_end_tl,
@@ -813,7 +814,7 @@
 \tl_new:N\l_@@_sentence_list_itemstart_tl
 \tl_new:N\l_@@_sentence_list_itemend_tl
 %    \end{macrocode}
-% 
+%
 % \end{variable}
 % \begin{variable}{\g_@@_text_str}
 %   Holds the current text loaded for the output of \cs{lipsum} and
@@ -822,7 +823,7 @@
 \str_new:N\g_@@_text_str
 %    \end{macrocode}
 % \end{variable}
-% 
+%
 % \subsection{Developer interface}
 % \begin{function}{\lipsum_store_as_temp_ints:nn}
 %   \begin{syntax}
@@ -853,7 +854,7 @@
 %   \lipsum_get_terminated_par:n}
 % These two commands are used to retrieve paragraph \meta{number} from the
 % \lips\ dummy text. \cs{lipsum_get_terminated_par:n} additionally adds
-% \cs{par}. 
+% \cs{par}.
 %
 %   \begin{syntax}
 %     \cs{lipsum_get_non_terminated_par:n} \Arg{number}\\
@@ -865,33 +866,33 @@
 % paragraphs were stored in \cs{lipsum@i}, \cs{lipsum@ii}, \ldots.
 %    \begin{macrocode}
 \cs_new:Npn \lipsum_get_non_terminated_par:n #1{
-  \seq_item:Nn \g_lipsum_paragraph_seq{#1}
+  \seq_item:Nn \g_@@_paragraph_seq{#1}
 }
 
 \cs_new:Npn \lipsum_get_terminated_par:n #1 {
    \lipsum_get_non_terminated_par:n{#1}\par
 }
-     
+
 %    \end{macrocode}
 % \end{function}
 % \begin{function}{\lipsum_add_to_tokenlist:n}
 % Adds a paragraph \meta{item} to the list of paragraphs
 % (\cs{l_@@_pars_tl}) and surrounds it by
 % the user-defined \meta{tokens}
-% . 
+% .
 %  \begin{syntax}
 %     \cs{lipsum_add_to_tokenlist:n}\Arg{number}
 %  \end{syntax}
 %    \begin{macrocode}
 \cs_new:Npn \lipsum_add_to_tokenlist:n #1 {
   \tl_put_right:NV
-    \l__lipsum_pars_tl 
-    \l_@@_par_list_itemstart_tl 
-  \tl_put_right:Nn \l__lipsum_pars_tl  {
+    \l_@@_pars_tl
+    \l_@@_par_list_itemstart_tl
+  \tl_put_right:Nn \l_@@_pars_tl  {
     \lipsum_get_non_terminated_par:n{#1}
   }
   \tl_put_right:NV
-    \l__lipsum_pars_tl
+    \l_@@_pars_tl
     \l_@@_par_list_itemend_tl
 }
 \cs_generate_variant:Nn
@@ -903,7 +904,7 @@
 %     \cs{lipsum_range_to_tokenlist:VV}\Arg{number_1}\Arg{number_2}
 %   \end{syntax}
 %   Adds the paragraphs specified by \meta{number_1} to \meta{number_2}
-%   to the token list \cs{l_@@_pars_tl}. 
+%   to the token list \cs{l_@@_pars_tl}.
 %    \begin{macrocode}
 \cs_new:Npn \lipsum_range_to_tokenlist:nn #1#2 {
   \tl_clear:N \l_@@_pars_tl
@@ -921,7 +922,7 @@
             \l_@@_pars_tl
             \l_@@_par_list_itemseparator_tl
         }
-      \lipsum_add_to_tokenlist:V {\l_tmpa_int}  
+      \lipsum_add_to_tokenlist:V {\l_tmpa_int}
       \int_incr:N\l_tmpa_int
     }
   \tl_put_right:NV
@@ -929,8 +930,8 @@
     \l_@@_par_list_end_tl
 }
 \cs_generate_variant:Nn
-  \lipsum_range_to_tokenlist:nn { VV }     
-%      
+  \lipsum_range_to_tokenlist:nn { VV }
+%
 %    \end{macrocode}
 % \end{function}
 % \begin{function}{\@@_expanded_paragraphs_terminated_with_space:}
@@ -947,9 +948,9 @@
 %   \end{syntax}
 % Puts the sentences specified by \meta{sentence range} from the paragraphs
 % specified by \meta{paragraph range} on the token list
-% \cs{l_@@_sentences_tl} and surrounds the \meta{tokens} set by the user. 
+% \cs{l_@@_sentences_tl} and surrounds the \meta{tokens} set by the user.
 %    \begin{macrocode}
-% 
+%
 \cs_new:Npn \lipsum_sentences_to_tokenlist:nnn #1#2#3{
 %    \end{macrocode}
 % Now, we only need to put the sentences within \meta{sentence range} into
@@ -957,8 +958,8 @@
 % the token list.
 %    \begin{macrocode}
 
-  \tl_clear:N \l__lipsum_sentences_tl
-   
+  \tl_clear:N \l_@@_sentences_tl
+
 %    \end{macrocode}
 % Using a regexp turned out to be rather slow for large \meta{paragraph
 % range}s. Thus, I use a loop similar to the one used by
@@ -969,7 +970,7 @@
 %    \begin{macrocode}
   \int_compare:nT {#2 >= #1}
   {
-      \__lipsum_put_sentence_on_tokenlist:nnnw
+      \@@_put_sentence_on_tokenlist:nnnw
       {#1}
       {#2}
       {1}
@@ -1024,8 +1025,8 @@
             \use_none_delimit_by_q_stop:w
           }
           { % Not yet list end
-            \int_compare:nNnTF{#3} > {#2} 
-              { % Counter > End: Leave loop 
+            \int_compare:nNnTF{#3} > {#2}
+              { % Counter > End: Leave loop
                 \use_none_delimit_by_q_stop:w
               }
               { % Counter <= End: Proceed
@@ -1037,7 +1038,7 @@
                           \l_@@_sentences_tl
                           \l_@@_sentence_list_itemseparator_tl
                       } % End Counter < Start true
-                    % Put item on list  
+                    % Put item on list
                     \tl_put_right:NV
                       \l_@@_sentences_tl
                       \l_@@_sentence_list_itemstart_tl
@@ -1048,7 +1049,7 @@
                       \l_@@_sentences_tl
                       \l_@@_sentence_list_itemend_tl
                   } % End Counter >= Start: Put item on list
-                % Call loop again  
+                % Call loop again
                 \exp_args:Nnnf
                   \@@_put_sentence_on_tokenlist:nnnw
                   {#1}
@@ -1116,7 +1117,7 @@
 %   \begin{syntax}
 %      \cs{@@_set_surrounding_tokens_nostar:}
 %    \end{syntax}
-%    
+%
 % As \cs{@@_set_surrounding_tokens_star:}, but for calls of the non-starred
 % version of \cs{lipsum} and \cs{unpacklipsum}.
 %    \begin{macrocode}
@@ -1177,14 +1178,14 @@
       \l_@@_par_list_start_tl{}
     \tl_set:No
       \l_@@_par_list_end_tl{}
-  }  
+  }
 %    \end{macrocode}
 % \end{function}
 % \subsection{User- and developer-level commands}\label{sec:code:commands}
 % \begin{macro}{\NewLipsumPar}
 %  Developer-Level macro to add a paragraph to the dummy text used by
 %  \cs{lipsum} and related commands. To specify a new dummy text, see
-%  section~\ref{sec:other-texts}. 
+%  section~\ref{sec:other-texts}.
 %  \begin{syntax}
 %    \cs{NewLipsumPar}\Arg{content}
 %  \end{syntax}
@@ -1197,7 +1198,7 @@
 %    \begin{macrocode}
 
 \NewDocumentCommand\NewLipsumPar{m}{
-  \seq_gput_right:Nn{\g_lipsum_paragraph_seq}{#1}
+  \seq_gput_right:Nn{\g_@@_paragraph_seq}{#1}
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1231,7 +1232,7 @@
 %
 % \begin{arguments}
 %   \item \meta{tokens} to be inserted at the beginning of the
-%     paragraph or sentence list. 
+%     paragraph or sentence list.
 % \end{arguments}
 %
 %    \begin{macrocode}
@@ -1285,7 +1286,7 @@
     \tl_set:No\l_@@_sentence_list_end_star_tl{#2}
   }
   {
-    \tl_set:No\l_@@_sentence_list_end_nostar_tl{#2} 
+    \tl_set:No\l_@@_sentence_list_end_nostar_tl{#2}
   }
 }
 %    \end{macrocode}
@@ -1407,11 +1408,11 @@
         \l_@@_sentence_list_itemend_nostar_tl{#2}
     }
 }
-%    \end{macrocode} 
+%    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\SetLipsumParListItemSurrounders,
 % \SetLipsumParListItemSurrounders*, \SetLipsumSentenceListItemSurrounders,
-% \SetLipsumSentenceListItemSurrounders*} 
+% \SetLipsumSentenceListItemSurrounders*}
 % Short-hands for setting the \meta{token}s surrounding a single list \meta{item}.
 % \begin{syntax}
 %   \cs{SetLipsumParListItemSurrounders}\Arg{start}\Arg{end}\\
@@ -1459,12 +1460,12 @@
 % \end{syntax}
 % \begin{arguments}
 %   \item \meta{tokens} to be inserted between two \meta{item}s of a paragraph
-%   or sentence list. 
+%   or sentence list.
 % \end{arguments}
 %    \begin{macrocode}
 \NewDocumentCommand\SetLipsumParListItemSeparator{s+m}{
   \IfBooleanTF{#1}
-    {  
+    {
       \tl_set:No
         \l_@@_par_list_itemseparator_star_tl{#2}
     }
@@ -1485,7 +1486,7 @@
     }
 }
 %    \end{macrocode}
-% 
+%
 % \end{macro}
 % \begin{macro}{\SetLipsumProtect}
 % \begin{syntax}
@@ -1504,7 +1505,7 @@
 % \begin{macro}{\SetLipsumDefault, \setlipsumdefault}
 % Command to change the default range used by \cs{lipsum} and friends. Note
 % that the use of \cs{setlipsumdefault} is considered deprecated starting from
-% \pkg{lipsum}2.0. 
+% \pkg{lipsum}2.0.
 % \begin{syntax}
 %   \cs{SetLipsumDefault}\Arg{range}
 % \end{syntax}
@@ -1530,7 +1531,7 @@
 %    \end{macrocode}
 % \end{macro}
 % The following macros are considered to be user-level commands and thus all
-% lower-case. 
+% lower-case.
 % \begin{macro}{\lipsum, \lipsum*}
 % \begin{syntax}
 %   \cs{lipsum}\oarg{paragraph range}\oarg{sentence range}
@@ -1575,7 +1576,7 @@
       {
         \lipsum_range_to_tokenlist:VV
           { \l_tmpa_int }{ \l_tmpb_int }
-        \tl_use:N \l__lipsum_pars_tl
+        \tl_use:N \l_@@_pars_tl
       }
       {
         \@@_ensure_parsable_output:
@@ -1584,12 +1585,12 @@
         \lipsum_store_as_temp_ints:nn #3
         \cs_gset_nopar:Nx
           \@@_expanded_paragraphs_terminated_with_space:
-          {\tl_use:N\l__lipsum_pars_tl}
+          {\tl_use:N\l_@@_pars_tl}
         \lipsum_sentences_to_tokenlist:VVf
           { \l_tmpa_int }
           { \l_tmpb_int }
-          \__lipsum_expanded_paragraphs_terminated_with_space:
-        \tl_use:N \l__lipsum_sentences_tl  
+          \@@_expanded_paragraphs_terminated_with_space:
+        \tl_use:N \l_@@_sentences_tl
       }
     \group_end:
   }
@@ -1597,13 +1598,13 @@
 % \end{macro}
 % \begin{macro}{\lipsumexp}
 % The following macros store their results in the macro \cs{lipsumexp}. I
-% create it first using \pkg{xparss} before it is overwritten. Don't know if
+% create it first using \pkg{xparse} before it is overwritten. Don't know if
 % this makes sense.
 %    \begin{macrocode}
 \NewDocumentCommand\lipsumexp{}{}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\unpacklipsum, \unpacklipsum*}
 % These two commands do the same as \cs{lipsum} and \cs{lipsum*}, but instead
 % of typesetting the paragraphs or sentences, they store the expanded content
@@ -1611,7 +1612,7 @@
 % \opt{space} or by using the \cs{SetLipsum...List} commands, the
 % corresponding \meta{tokens} between the single items of the list are
 % expandable, they are expanded. If they arenot expandable, they are---of
-% course---not. 
+% course---not.
 %   \begin{syntax}
 %     \cs{unpacklipsum}\oarg{paragraph range}\oarg{sentence range}\\
 %     \cs{unpacklipsum*}\oarg{paragraph range}\oarg{sentence range}\\
@@ -1619,18 +1620,18 @@
 %     \cs{lipsumexp}
 %   \end{syntax}
 %    \begin{macrocode}
-\cs_new:Nn \__lipsum_expanded: {}
+\cs_new:Nn \@@_expanded: {}
 \NewDocumentCommand
   \unpacklipsum
   {
     s
-    >{\__lipsum_split_argument_expanded:nne{1}{-}}
+    >{\@@_split_argument_expanded:nne{1}{-}}
       O{\g_lipsum_default_range_tl}
-    >{\__lipsum_split_argument_expanded:nne{1}{-}}
+    >{\@@_split_argument_expanded:nne{1}{-}}
       o
   }
   {
-   
+
     \group_begin:
       \lipsum_store_as_temp_ints:nn #2
       \IfBooleanTF {#1}
@@ -1645,9 +1646,9 @@
         \lipsum_range_to_tokenlist:VV
           { \l_tmpa_int } { \l_tmpb_int }
         \cs_gset:Nx
-          \__lipsum_expanded: {\tl_use:N\l__lipsum_pars_tl}
+          \@@_expanded: {\tl_use:N\l_@@_pars_tl}
         \cs_gset_eq:NN
-          \lipsumexp \__lipsum_expanded:
+          \lipsumexp \@@_expanded:
       }
       {
         \@@_ensure_parsable_output:
@@ -1655,7 +1656,7 @@
           { \l_tmpa_int } { \l_tmpb_int }
         \cs_gset_nopar:Nx
           \@@_expanded_paragraphs_terminated_with_space:
-          { \tl_use:N\l__lipsum_pars_tl }
+          { \tl_use:N\l_@@_pars_tl }
         \lipsum_store_as_temp_ints:nn #3
         \lipsum_sentences_to_tokenlist:VVf
           { \l_tmpa_int }
@@ -1663,11 +1664,11 @@
           \@@_expanded_paragraphs_terminated_with_space:
         \cs_gset:Nx
           \@@_expanded:
-          { \tl_use:N\l__lipsum_sentences_tl }
+          { \tl_use:N\l_@@_sentences_tl }
         \cs_gset_eq:NN
-          \lipsumexp \__lipsum_expanded:
+          \lipsumexp \@@_expanded:
       }
-    \group_end: 
+    \group_end:
   }
 %    \end{macrocode}
 % \end{macro}
@@ -1692,19 +1693,19 @@
 % Used to select and load the text output by \cs{lipsum} and friends. See the
 % section on loading and defining new outputs for \cs{lipsum}
 % (section~\ref{sec:other-texts}). It first checks whether the requested text
-% is already loaded, and if not, it clears \cs{g_lipsum_paragraph_seq} and
+% is already loaded, and if not, it clears \cs{g_@@_paragraph_seq} and
 % loads the corresponding lipsum text definition file.
 %    \begin{macrocode}
 \NewDocumentCommand\SetLipsumText{m}{%
   \IfLipsumText{#1}{}{
-    \seq_clear:N\g_lipsum_paragraph_seq
+    \seq_gclear:N\g_@@_paragraph_seq
     \file_input:n{#1.ltd}
-    \str_set:Nn\g_lipsum_text_str{#1}
+    \str_gset:Nn\g_@@_text_str{#1}
   }
 }
 
 %    \end{macrocode}
-% 
+%
 % \end{macro}
 % \subsection{Package options and defaults}
 %    \begin{macrocode}
@@ -3451,14 +3452,14 @@
 % \newpage
 % \subsection{The text of Cicero's speech}
 %    \begin{macrocode}
-%<*cicero> 
+%<*cicero>
 %    \end{macrocode}
 %    \begin{macrocode}
 
 %%
 %% This text was provided by github-user
 %% svenper. See https://github.com/patta42/lipsum/issues/13
-%% 
+%%
 
 \NewLipsumPar{Non eram nescius, Brute, cum, quae summis ingeniis exquisitaque
   doctrina philosophi Graeco sermone tractavissent, ea Latinis litteris
-- 
cgit v1.2.3

