summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/poetry
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-12-15 03:00:40 +0000
committerNorbert Preining <norbert@preining.info>2019-12-15 03:00:40 +0000
commit6a10e5334a233fe321991967f0d9dfd930303a46 (patch)
tree8cefd5aaed1203e74693312b5ff76e03b3423d42 /macros/latex/contrib/poetry
parent2c20697e8a5301b61c59d752fd1cfa7499724eec (diff)
CTAN sync 201912150300
Diffstat (limited to 'macros/latex/contrib/poetry')
-rw-r--r--macros/latex/contrib/poetry/CHANGES3
-rw-r--r--macros/latex/contrib/poetry/poetry.dtx8
-rw-r--r--macros/latex/contrib/poetry/poetry.pdfbin261991 -> 261766 bytes
3 files changed, 8 insertions, 3 deletions
diff --git a/macros/latex/contrib/poetry/CHANGES b/macros/latex/contrib/poetry/CHANGES
index 578def1a4e..5f7cbed13e 100644
--- a/macros/latex/contrib/poetry/CHANGES
+++ b/macros/latex/contrib/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/macros/latex/contrib/poetry/poetry.dtx b/macros/latex/contrib/poetry/poetry.dtx
index 774c2842ba..170317ee4d 100644
--- a/macros/latex/contrib/poetry/poetry.dtx
+++ b/macros/latex/contrib/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/macros/latex/contrib/poetry/poetry.pdf b/macros/latex/contrib/poetry/poetry.pdf
index 2fbe72dd41..1160de155a 100644
--- a/macros/latex/contrib/poetry/poetry.pdf
+++ b/macros/latex/contrib/poetry/poetry.pdf
Binary files differ