poetry (10nov19)

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

4 files changed, 16 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/poetry/CHANGES b/Master/texmf-dist/doc/latex/poetry/CHANGES
index 42cc519f2e5..578def1a4ef 100644
--- a/Master/texmf-dist/doc/latex/poetry/CHANGES
+++ b/Master/texmf-dist/doc/latex/poetry/CHANGES
@@ -1,3 +1,8 @@
+9 Nov 1203 (9 Nov 2019):  Protected the index commands so
+that the package works with classes that don't include
+indices.  Also removed two spurious "{"s.  Thanks to David
+Carlisle for pointing out the issues to me.  Version 2.1.
+
 2 May 1203 (2 May 2019):  Added ability to arbitrarily label
 both the left and right sides of the line.  Version 2.0.
 
diff --git a/Master/texmf-dist/doc/latex/poetry/poetry.pdf b/Master/texmf-dist/doc/latex/poetry/poetry.pdf
index f22f9cee847..2fbe72dd41b 100644
--- a/Master/texmf-dist/doc/latex/poetry/poetry.pdf
+++ b/Master/texmf-dist/doc/latex/poetry/poetry.pdf
diff --git a/Master/texmf-dist/source/latex/poetry/poetry.dtx b/Master/texmf-dist/source/latex/poetry/poetry.dtx
index de710f32393..774c2842ba5 100644
--- a/Master/texmf-dist/source/latex/poetry/poetry.dtx
+++ b/Master/texmf-dist/source/latex/poetry/poetry.dtx
@@ -22,7 +22,7 @@
 
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{poetry}[2019/05/02 v2.0 support for typesetting poetry]
+%<package>\ProvidesPackage{poetry}[2019/05/02 v2.1 support for typesetting poetry]
 %<*driver>
 \documentclass{ltxdoc}
 
@@ -77,7 +77,7 @@
 %</driver>
 % \fi
 %
-% \title{The |poetry| Package, v2.0}
+% \title{The |poetry| Package, v2.1}
 % \author{Donald P.\ Goodman III}
 % \date{\today}
 %
@@ -1314,7 +1314,6 @@
 % \label{sect:implem}
 %
 %    \begin{macrocode}
-\ProvidesPackage{poetry}%
 \RequirePackage{modulus}%
 \newcounter{poemline}%
 \newcount\poemlineno%
@@ -1336,8 +1335,8 @@
 \newcounter{poemrtlinenumsevery}\setcounter{poemrtlinenumsevery}{1}%
 \newcount\poem@rt@linenumsevery\poem@rt@linenumsevery=\value{poemrtlinenumsevery}%
 \newlength{\poemindent}\setlength{\poemindent}{0pt}%
-\newlength{\poemtopskip}{\setlength{\poemtopskip}{1em}%
-\newlength{\poembotskip}{\setlength{\poembotskip}{1em}%
+\newlength{\poemtopskip}\setlength{\poemtopskip}{1em}%
+\newlength{\poembotskip}\setlength{\poembotskip}{1em}%
 \newdimen\poem@topskip\newdimen\poem@botskip%
 \newdimen\poem@defleftskip\poem@defleftskip=\the\poemindent%
 \newdimen\poem@maxlinewd%
@@ -1716,6 +1715,7 @@
 % |imakeidx| package for this, so as not to interfere with
 % any existing indices.
 %    \begin{macrocode}
+\ifx\theindex\@undefined\else%
 \RequirePackage{imakeidx}
 \makeindex[intoc,columns=1,name={\jobname-iofl},title={\poemioflname}]
 \def\poemioflname{Index of First Lines}%
@@ -1729,6 +1729,7 @@
 \def\printiofl{%
 	\printindex[\jobname-iofl]%
 }%
+\fi%
 %    \end{macrocode}
 % \listofpoems
 % \PrintIndex
diff --git a/Master/texmf-dist/tex/latex/poetry/poetry.sty b/Master/texmf-dist/tex/latex/poetry/poetry.sty
index 4dfbabeee65..550b41f20f7 100644
--- a/Master/texmf-dist/tex/latex/poetry/poetry.sty
+++ b/Master/texmf-dist/tex/latex/poetry/poetry.sty
@@ -26,9 +26,8 @@
 %% derived files poetry.sty and poetry.pdf.
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{poetry}[2019/05/02 v2.0 support for typesetting poetry]
+\ProvidesPackage{poetry}[2019/05/02 v2.1 support for typesetting poetry]
 
-\ProvidesPackage{poetry}%
 \RequirePackage{modulus}%
 \newcounter{poemline}%
 \newcount\poemlineno%
@@ -50,8 +49,8 @@
 \newcounter{poemrtlinenumsevery}\setcounter{poemrtlinenumsevery}{1}%
 \newcount\poem@rt@linenumsevery\poem@rt@linenumsevery=\value{poemrtlinenumsevery}%
 \newlength{\poemindent}\setlength{\poemindent}{0pt}%
-\newlength{\poemtopskip}{\setlength{\poemtopskip}{1em}%
-\newlength{\poembotskip}{\setlength{\poembotskip}{1em}%
+\newlength{\poemtopskip}\setlength{\poemtopskip}{1em}%
+\newlength{\poembotskip}\setlength{\poembotskip}{1em}%
 \newdimen\poem@topskip\newdimen\poem@botskip%
 \newdimen\poem@defleftskip\poem@defleftskip=\the\poemindent%
 \newdimen\poem@maxlinewd%
@@ -388,6 +387,7 @@
 \else%
 \def\phantomsection{\relax}%
 \fi%
+\ifx\theindex\@undefined\else%
 \RequirePackage{imakeidx}
 \makeindex[intoc,columns=1,name={\jobname-iofl},title={\poemioflname}]
 \def\poemioflname{Index of First Lines}%
@@ -401,6 +401,7 @@
 \def\printiofl{%
 \printindex[\jobname-iofl]%
 }%
+\fi%
 \endinput
 %%
 %% End of file `poetry.sty'.