summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/plain/plipsum
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-05-09 22:52:03 +0000
committerKarl Berry <karl@freefriends.org>2013-05-09 22:52:03 +0000
commit75b2113b57c777aaac8bf52968a2accf10c4a2c7 (patch)
tree8656cae5e32b6c0e710a55e9aedef570e16ad8ab /Master/texmf-dist/tex/plain/plipsum
parent4e4c128479aaf71fbcea7350a046b57c8f74fcfd (diff)
plipsum (9may13)
git-svn-id: svn://tug.org/texlive/trunk@30353 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/plain/plipsum')
-rw-r--r--Master/texmf-dist/tex/plain/plipsum/plipsum.tex54
1 files changed, 32 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/plain/plipsum/plipsum.tex b/Master/texmf-dist/tex/plain/plipsum/plipsum.tex
index 17ed20da1ac..df93c2b1ce0 100644
--- a/Master/texmf-dist/tex/plain/plipsum/plipsum.tex
+++ b/Master/texmf-dist/tex/plain/plipsum/plipsum.tex
@@ -3,12 +3,14 @@
%% The original source file was: plipsum.nw.
%% Copyright (C) 2013 by Sergio Spina
\def\PLversion{4}
-\def\PLrevision{2}
-\def\PLrevisiondate{2013/05/06}
+\def\PLrevision{3}
+\def\PLrevisiondate{2013/05/08}
\chardef\beforeplipsumatcatcode=\the\catcode`@
\catcode`@=11
-{\newlinechar`|\message{|P-lipsum version
-\PLversion.\PLrevision\space-- revision \PLrevisiondate|}}
+\def\@message#1{{\newlinechar`\^^J\message{#1}}}
+\def\@errmessage#1{{\newlinechar`\^^J\errmessage{#1}}}
+\@message{^^JP-lipsum version
+\PLversion.\PLrevision\space-- revision \PLrevisiondate^^J}
\newcount\c@parnumber \c@parnumber=0
\def\create@par{\advance\c@parnumber by1
\expandafter\def\csname plips@\romannumeral\the\c@parnumber\endcsname}
@@ -328,12 +330,11 @@ occultissimarum. Conclusum est enim contra Cyrenaicos satis acute, nihil ad Epic
\create@par{Simus igitur contenti his. Nam ante Aristippus, et ille melius.\@par}
\create@par{Tria genera bonorum; Quare attende, quaeso. Quid adiuvas? Quis negat?\@par}
\create@par{Tria genera bonorum; Proclivi currit oratio. Sed nimis multa. Quid de Pythagora?\@par}
-{\newlinechar`|\message{|P-lipsum: created
-\number\c@parnumber\space paragraphs.|}}
+\@message{^^JP-lipsum: created
+\number\c@parnumber\space paragraphs.^^J}
\newhelp\optparams@error{%
Valid optional parameters are 's', 'short', 'm', 'medium', 'l', 'long'.}
-\newhelp\paramexcess@error{%
-The best possible value is \the\c@parnumber.}
+\newhelp\paramexcess@error{The best possible value is 100}
\newif\iflong
\newif\ifmedium
\newif\ifshort
@@ -360,23 +361,30 @@ The best possible value is \the\c@parnumber.}
\ifx\param@ne\@short@\shorttrue\mediumfalse\longfalse
\else
\errhelp\optparams@error
-{\newlinechar`|\errmessage{|P-lipsum: !! ERROR !!
-Wrong optional parameter.}}
+\@errmessage{^^JP-lipsum: !! ERROR !!
+Wrong optional parameter.^^J}
\fi\fi\fi\fi\fi\fi
\no@opt@par{#2}}
\newif\ifhyphen
\def\no@opt@par#1{\scan#1-;\end
\ifhyphen\noopt@parA#1\end\else\noopt@parB#1\end\fi}
\def\scan#1-#2\end{\ifx;#2\hyphenfalse\else\hyphentrue\fi}
-\countdef\c@plipsumAone=253
-\countdef\c@plipsumAtwo=251
+\newcount\c@plipsumAone
+\newcount\c@plipsumAtwo
+\newcount\c@max
+\c@max\c@parnumber
+\divide\c@max by3\relax
\def\noopt@parA#1-#2\end{{%
\global\c@plipsumAone=#1\relax
\global\c@plipsumAtwo=#2\relax
-\ifnum\c@plipsumAone>\c@parnumber
-\warnmsg{first}\fi
-\ifnum\c@plipsumAtwo>\c@parnumber
-\warnmsg{second}\fi
+\ifnum\c@plipsumAone>\c@max
+\errhelp\paramexcess@error
+\@errmessage{^^JP-lipsum: ERROR at line \the\inputlineno. The
+first parameter of \string\lipsum\space is too big.^^J}\fi
+\ifnum\c@plipsumAtwo>\c@max
+\errhelp\paramexcess@error
+\@errmessage{^^JP-lipsum: ERROR at line \the\inputlineno. The
+second parameter of \string\lipsum\space is too big.^^J}\fi
\ifmedium
\advance\c@plipsumAone by100\relax
\advance\c@plipsumAtwo by100\relax
@@ -389,12 +397,14 @@ Wrong optional parameter.}}
\c@plipsumAtwo=\count@\fi
\types@t}}
\def\noopt@parB#1\end{%
-\ifnum#1>\c@parnumber
-\warnmsg{}\fi
-\count253=#1\relax
-\ifmedium\advance\count253 by100\relax\else
-\ifshort\advance\count253 by200\relax\fi\fi
-\csname plips@\romannumeral\count253\endcsname}
+\c@plipsumAone#1
+\ifnum\c@plipsumAone>\c@max
+\errhelp\paramexcess@error
+\@errmessage{^^JP-lipsum: ERROR at line \the\inputlineno. The
+parameter of \string\lipsum\space is too big.^^J}\fi
+\ifmedium\advance\c@plipsumAone by100\relax
+\else\ifshort\advance\c@plipsumAone by200\relax\fi\fi
+\csname plips@\romannumeral\c@plipsumAone\endcsname}
\def\types@t{\let\next\relax
\ifnum\c@plipsumAone>\c@plipsumAtwo\else
\csname plips@\romannumeral\the\c@plipsumAone\endcsname