poetry (11sep18)

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

6 files changed, 32 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/latex/poetry/CHANGES b/Master/texmf-dist/doc/latex/poetry/CHANGES
index a1d5a4cd072..dc373bf1cdd 100644
--- a/Master/texmf-dist/doc/latex/poetry/CHANGES
+++ b/Master/texmf-dist/doc/latex/poetry/CHANGES
@@ -1 +1,5 @@
+X Sept 1202 (10 Sept 2018):  Removed *requirement* for
+hyperref by inserting a fake definition for \phantomsection,
+which is the only hyperref command used.
+
 17 June 1201 (19 June 2017):  Version 1.0, initial release.
diff --git a/Master/texmf-dist/doc/latex/poetry/README b/Master/texmf-dist/doc/latex/poetry/README
index 2e78708316a..4f3a5bf9621 100644
--- a/Master/texmf-dist/doc/latex/poetry/README
+++ b/Master/texmf-dist/doc/latex/poetry/README
@@ -1,12 +1,12 @@
 +AMDG
 
-This document is copyright 2017 by Donald P. Goodman, and is
+This document is copyright 2018 by Donald P. Goodman, and is
 released publicly under the LaTeX Project Public License.  The
 distribution and modification of this work is constrained by the
 conditions of that license.  See
 	http://www.latex-project.org/lppl.txt
 for the text of the license.  This document is released
-under version 1.3 of that license, and this work may be distributed
+under version 1.3c of that license, and this work may be distributed
 or modified under the terms of that license or, at your option, any
 later version.
 
diff --git a/Master/texmf-dist/doc/latex/poetry/poetry.pdf b/Master/texmf-dist/doc/latex/poetry/poetry.pdf
index 5880eb99759..a52b934d5e3 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 0d552e87d98..49ad9a81308 100644
--- a/Master/texmf-dist/source/latex/poetry/poetry.dtx
+++ b/Master/texmf-dist/source/latex/poetry/poetry.dtx
@@ -1,13 +1,13 @@
 % \iffalse
 % +AMDG
 %
-% This document is copyright 2017 by Donald P. Goodman, and is
+% This document is copyright 2018 by Donald P. Goodman, and is
 % released publicly under the LaTeX Project Public License.  The
 % distribution and modification of this work is constrained by the
 % conditions of that license.  See
 % 	http://www.latex-project.org/lppl.txt
 % for the text of the license.  This document is released
-% under version 1.3 of that license, and this work may be distributed
+% under version 1.3c of that license, and this work may be distributed
 % or modified under the terms of that license or, at your option, any
 % later version.
 % 
@@ -22,7 +22,7 @@
 
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{poetry}[2017/06/19 v1.0 support for typesetting poetry]
+%<package>\ProvidesPackage{poetry}[2018/09/10 v1.1 support for typesetting poetry]
 %<*driver>
 \documentclass{ltxdoc}
 
@@ -30,6 +30,7 @@
 \usepackage{xellipsis}
 \usepackage{parcolumns}
 \usepackage{array}
+\usepackage{xcolor}
 \usepackage{lettrine}
 	\setcounter{DefaultLines}{3}
 	\setlength{\DefaultFindent}{2pt}
@@ -38,8 +39,8 @@
 \usepackage{poetry}
 \usepackage{spverbatim}
 \usepackage[typeone]{dozenal}
-\usepackage[colorlinks]{hyperref}
 \usepackage{makeidx}
+\usepackage[colorlinks]{hyperref}
 \EnableCrossrefs
 \PageIndex
 \CodelineNumbered
@@ -76,7 +77,7 @@
 %</driver>
 % \fi
 %
-% \title{The |poetry| Package, v1.0}
+% \title{The |poetry| Package, v1.1}
 % \author{Donald P.\ Goodman III}
 % \date{\today}
 %
@@ -670,11 +671,12 @@
 % \def\poemlinenumstyle{}
 %
 % Labels can be placed on any line of poetry, and refer back
-% to that line.  Hyperlinks will work properly, if you're
-% using |hyperref| to produce them.  For example, ``line
+% to that line.  Make references with the usual \LaTeX\
+% |\ref| and |\label| commands; for example, ``line
 % \ref{ln:ex}'' refers to line 4 of the quotation from
-% \textit{Hamlet} we gave you earlier.  Make such references
-% with the usual \LaTeX\ |\ref| and |\label| commands.
+% \textit{Hamlet} we gave you earlier.  If you've loaded
+% |hyperref|, these will correctly turn into hyperlinks, as
+% well.
 %
 % \section{Document Structure}
 % \label{sect:structure}
@@ -1509,6 +1511,14 @@
 }%
 \def\l@poemgroup{\poemgrouplopformat}%
 %    \end{macrocode}
+% Do some magic to ensure that the package works even if
+% |hyperref| isn't loaded.
+%    \begin{macrocode}
+	\ifcsname phantomsection\endcsname%
+	\else%
+		\def\phantomsection{\relax}%
+	\fi%
+%    \end{macrocode}
 % Now let's set up the index of first lines.  We use the
 % |imakeidx| package for this, so as not to interfere with
 % any existing indices.
diff --git a/Master/texmf-dist/source/latex/poetry/poetry.ins b/Master/texmf-dist/source/latex/poetry/poetry.ins
index d6808258f2f..1ed29aa55c2 100644
--- a/Master/texmf-dist/source/latex/poetry/poetry.ins
+++ b/Master/texmf-dist/source/latex/poetry/poetry.ins
@@ -3,13 +3,13 @@
 % Apostle, and the Immaculate Heart of Mary, for their
 % prayers, and to the Sacred Heart of Jesus, for His mercy.
 %
-% This document is copyright 2017 by Donald P. Goodman, and is
+% This document is copyright 2018 by Donald P. Goodman, and is
 % released publicly under the LaTeX Project Public License.  The
 % distribution and modification of this work is constrained by the
 % conditions of that license.  See
 % 	http://www.latex-project.org/lppl.txt
 % for the text of the license.  This document is released
-% under version 1.3 of that license, and this work may be distributed
+% under version 1.3c of that license, and this work may be distributed
 % or modified under the terms of that license or, at your option, any
 % later version.
 % 
diff --git a/Master/texmf-dist/tex/latex/poetry/poetry.sty b/Master/texmf-dist/tex/latex/poetry/poetry.sty
index e0a0751a6e1..5f4c7b03c51 100644
--- a/Master/texmf-dist/tex/latex/poetry/poetry.sty
+++ b/Master/texmf-dist/tex/latex/poetry/poetry.sty
@@ -26,7 +26,7 @@
 %% derived files poetry.sty and poetry.pdf.
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{poetry}[2017/06/19 v1.0 support for typesetting poetry]
+\ProvidesPackage{poetry}[2018/09/10 v1.1 support for typesetting poetry]
 
 \ProvidesPackage{poetry}%
 \newcounter{poemline}%
@@ -351,6 +351,10 @@
 \fi%
 }%
 \def\l@poemgroup{\poemgrouplopformat}%
+\ifcsname phantomsection\endcsname%
+\else%
+\def\phantomsection{\relax}%
+\fi%
 \RequirePackage{imakeidx}
 \makeindex[intoc,columns=1,name={\jobname-iofl},title={\poemioflname}]
 \def\poemioflname{Index of First Lines}%