X-Git-Url: https://git.distorted.org.uk/~mdw/mdwtools/blobdiff_plain/86f6a31e4b41acb71ba37f3838a9ce75f7743330..5e7ed76b22826581dc50bb74fcb4d8d283dba105:/poetry.dtx

diff --git a/poetry.dtx b/poetry.dtx
index cfd0282..eb52f52 100644
--- a/poetry.dtx
+++ b/poetry.dtx
@@ -13,20 +13,19 @@
 %% poetry package -- sophisticated typesetting of poetry
 %% Copyright (c) 1996 Mark Wooding
 %%
-%% This package is not finished, let alone properly tested.  It is being
-%% released in the hope that others can contribute ideas and suggestions
-%% that the author (who is not an expert on poetry) may have missed.
+%% This program is free software; you can redistribute it and/or modify
+%% it under the terms of the GNU General Public License as published by
+%% the Free Software Foundation; either version 2 of the License, or
+%% (at your option) any later version.
 %%
-%% I hope that someone finds this package useful.  However, if it goes
-%% wrong, that's your problem.  I may try and fix it, although the author
-%% does not guarantee that this is the case.
+%% This program is distributed in the hope that it will be useful,
+%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%% GNU General Public License for more details.
 %%
-%% This pre-release version may be distributed under the terms of the GNU
-%% General Public Licence, as published by the Free Software Foundation;
-%% either version 2 of the Licence, or (at your option) any later version.
-%% However, since this is not finished, and I'd like others to benefit
-%% from the finished version, the author BEGS and PLEADS you not to spread
-%% this pre-release too much.
+%% You should have received a copy of the GNU General Public License
+%% along with this program; if not, write to the Free Software
+%% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %%
 % \end{meta-comment}
 %
@@ -36,7 +35,7 @@
 %<+package>                [1996/05/28 1.00 Poetry typesetting]
 % \end{meta-comment}
 %
-% ^^A \CheckSum{579}
+% \CheckSum{593}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -128,7 +127,7 @@
 % You can use the |\title| command to typeset a title for your poem.  The
 % title is inserted right there and then, so watch out.  It's conventional
 % to put the title at the top of the poem, although this is art we're talking
-% about, so who knows?  Just say \syntax{"\title{"<title>"}"}.
+% about, so who knows?  Just say \syntax{"\\title{"<title>"}"}.
 %
 % \DescribeMacro{\author}
 % Similarly, the author of a poem can be credited with the |\author| command.
@@ -164,7 +163,7 @@
 % are described below (if you're not interested in this sort of thing, skip
 % to the next section).
 %
-% \begin{description} \def\makelabel#1{\hskip\labelsep\cmd{#1}\hfil}
+% \begin{description} \setdescriptionlabel{\ttfamily\string#1}
 % \item [stanza] is a \LaTeX\ counter which contains the current stanza
 %       number.
 % \item [\thestanza] typesets the value of the |stanza| counter in normal
@@ -183,8 +182,8 @@
 %       are given.
 % \item [\stanzaspace] is called with no arguments.  It should somehow
 %       separate the previous stanza (if any) from the new one.  Look at the
-%	counter value to find out whether this is the first stanza, if it
-%	matters (e.g., you're drawing little rows of stars or something).
+%       counter value to find out whether this is the first stanza, if it
+%       matters (e.g., you're drawing little rows of stars or something).
 % \item [\stanzatitle] is given one argument: a `combined' title.  It should
 %       typeset the title as a line in LR mode.  Again, it's too late to
 %       play with fonts now.
@@ -360,7 +359,7 @@
 \newif\ifpoem@long
 %    \end{macrocode}
 %
-% Lastly, a skip register.  This is the glue on the left hand side of a 
+% Lastly, a skip register.  This is the glue on the left hand side of a
 % poem.  It should be |\@centering| to center the poem horizontally, or
 % something rigid and nonzero to left-align.
 %
@@ -468,7 +467,7 @@
 % a \<skip> by a \<number> kills off the stretch.
 %
 %    \begin{macrocode}
-\def\@maybe@unskip{\hskip-\@ne\lastskip\relax}
+\def\@maybe@unskip{\ifhmode\hskip\m@ne\lastskip\relax\fi}
 %    \end{macrocode}
 %
 % \end{macro}
@@ -556,7 +555,7 @@
 %
 % \begin{environment}{xpoem}
 %
-% The \env{xpoem} environment is where the nastiness really starts. 
+% The \env{xpoem} environment is where the nastiness really starts.
 % Actually, the early bit is simple enough.
 %
 % This environment has a funny name, so that users and style designers can