poetry (14dec19)

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

4 files changed, 11 insertions, 4 deletions

diff --git a/Master/texmf-dist/doc/latex/poetry/CHANGES b/Master/texmf-dist/doc/latex/poetry/CHANGES
index 578def1a4ef..5f7cbed13ec 100644
--- a/Master/texmf-dist/doc/latex/poetry/CHANGES
+++ b/Master/texmf-dist/doc/latex/poetry/CHANGES
@@ -1,3 +1,6 @@
+12 Dec 1203 (14 Dec 2019):  Protected the poemline counter
+definition to avoid a clash with memoir.  Version 2.2.
+
 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
diff --git a/Master/texmf-dist/doc/latex/poetry/poetry.pdf b/Master/texmf-dist/doc/latex/poetry/poetry.pdf
index 2fbe72dd41b..1160de155aa 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 774c2842ba5..170317ee4df 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.1 support for typesetting poetry]
+%<package>\ProvidesPackage{poetry}[2019/05/02 v2.2 support for typesetting poetry]
 %<*driver>
 \documentclass{ltxdoc}
 
@@ -77,7 +77,7 @@
 %</driver>
 % \fi
 %
-% \title{The |poetry| Package, v2.1}
+% \title{The |poetry| Package, v2.2}
 % \author{Donald P.\ Goodman III}
 % \date{\today}
 %
@@ -1315,7 +1315,9 @@
 %
 %    \begin{macrocode}
 \RequirePackage{modulus}%
-\newcounter{poemline}%
+\@ifundefined{c@poemline}{%
+	\newcounter{poemline}%
+}{}
 \newcount\poemlineno%
 \newcounter{poemrtline}%
 \newcount\poemrtlineno%
diff --git a/Master/texmf-dist/tex/latex/poetry/poetry.sty b/Master/texmf-dist/tex/latex/poetry/poetry.sty
index 550b41f20f7..01c2be7fc14 100644
--- a/Master/texmf-dist/tex/latex/poetry/poetry.sty
+++ b/Master/texmf-dist/tex/latex/poetry/poetry.sty
@@ -26,10 +26,12 @@
 %% derived files poetry.sty and poetry.pdf.
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{poetry}[2019/05/02 v2.1 support for typesetting poetry]
+\ProvidesPackage{poetry}[2019/05/02 v2.2 support for typesetting poetry]
 
 \RequirePackage{modulus}%
+\@ifundefined{c@poemline}{%
 \newcounter{poemline}%
+}{}
 \newcount\poemlineno%
 \newcounter{poemrtline}%
 \newcount\poemrtlineno%