poemscol (25oct17)

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

3 files changed, 104 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
index c404a391816..b8bda654a19 100644
--- a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
+++ b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
diff --git a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
index 798f7b4e6c6..f133408565c 100644
--- a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
+++ b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
@@ -19,7 +19,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
 %<package>\ProvidesPackage{poemscol}
-%<package>   [2017/9/03 v2.85 poemscol file] 
+%<package>   [2017/10/23 v2.87 poemscol file] 
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -33,7 +33,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{8012}
+% \CheckSum{8070}
 %
 % \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
@@ -221,6 +221,7 @@
 % Subtitles center when centertitles is issued. Epigraphs and attributions move 
 % in when centertitles is issued. New boolean to adjust placement of marginal 
 % reference markers in jhtextnote and related commands.}
+% \changes{v2.87}{2017/10/23}{Notes to appear at the end of individual poems.}
 % \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
 % \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip}
 % \DoNotIndex{\newcommand, \section, \subsection, \subsubsection,
@@ -253,15 +254,15 @@
 % \textsc, \unskip} 
 % \setcounter{IndexColumns}{2} 
 % \MakeShortVerb{|}
-% \def\fileversion{2.85} 
-% \def\filedate{3 September 2017} 
-% \def\docdate{3 September 2017}
+% \def\fileversion{2.87} 
+% \def\filedate{23 October 2017} 
+% \def\docdate{23 October 2017}
 %  \title{Typesetting Poetry Collections with
 % \textsf{poemscol}\thanks{This document corresponds to
 % \textsf{poemscol}~\fileversion, dated \filedate.}} 
 % \author{John Burt
 % \\ \texttt{burt@brandeis.edu}} 
-% \date{3 September 2017} 
+% \date{23 October 2017} 
 % \maketitle
 % \begin{abstract} \textsf{poemscol} provides macros for \LaTeX\ for
 % setting collections of poetry.  It is especially suited for setting
@@ -636,7 +637,7 @@
 % the optional second argument to |\begin{poem}| which would cause the text 
 % block to be centered on the longest line. You can turn off centering, without 
 % erasing all of the second arguments, by issuing |\textcenteringturnonfalse|. 
-% You can turn on centering the text block again by issuing 
+% You can turn on centring the text block again by issuing 
 % |\textcenteringturnedontrue|.
 %
 % \textsf{poemscol} turns off automatic hyphenation in poetry
@@ -742,7 +743,7 @@
 % Setting |\marginparsep| to zero lines the verse line numbers up with the page
 % numbers, and puts both at the margin.  If you move the verse line numbers by
 % changing |\marginparsep|, you can move the page numbers to keep them aligned
-% by changing |\headoffsetlength|.  
+% by changing |\headoffsetlength| to the same value.  
 %\end{sloppypar}
 % 
 % The line numbers should print on the baseline. You can adjust them 
@@ -1630,7 +1631,23 @@
 % |\resetlemmacounters| enable your footnote to handle line ranges in 
 % the lemma.) If a |\mynote| refers to a range of lines, you can issue 
 % the same kinds of optional argument that are used with |\textnote|.
-% 
+%
+% \section{Note at the end of poems}
+% \DescribeMacro{\poemendnote}
+% \DescribeMacro{\makepoemendnotes}
+% \DescribeMacro{\putpoemendnotes}
+% You may wish, rather than using endnotes or footnotes, simply to print your
+% notes at the end of each poem.  To do this, issue |\makepoemendnotes| just
+% after |\begin{poem}|.  Issue |\poemendnote| where you wish to make a note,
+% using the same conventions you use for |\textnote|.  Where you want to output
+% the notes, issue |\putpoemendnotes|. These notes can have mult-line lemmas, 
+% just like textual notes.
+%
+%
+% \DescribeMacro{\ifpoemendnotessinglepar} 
+% By default, each poem end note is given its own paragraph. To concatenate 
+% them into a single paragraph, issue |\poemendnotessingleparfalse|.
+%
 % \section{Pulling it all together} 
 % \DescribeMacro{\testforauxonfirstrun} If you don't want to listen to
 % \LaTeX\ complain about missing references during your first run,
@@ -6841,6 +6858,48 @@ r@#2\endcsname{}{}\@nil
 \newcommand{\biblechapter}{\pmpara}
 %    \end{macrocode}
 %    \end{macro}
+%
+% \subsection{~Notes at the foot of individual poems} 
+%
+%    \begin{macro}{\poemendnote}
+%    \begin{macrocode}
+\newif\ifpoemendnoteson
+\poemendnotesontrue
+\newif\ifpoemendnotessinglepar
+\poemendnotessinglepartrue
+\newcommand{\makepoemendnotes}{
+  \global\verselinenumberstrue
+  \newwrite\poemendnotes
+  \immediate\openout\poemendnotes=\jobname.pnd
+  \literalpoemendnote{\bigskip}
+ }
+\newcommand{\poemendnote}[2][0]{%
+\ifpoemendnoteson
+    \setlemmarange{#1}%
+    \immediate\write\poemendnotes{\checknoteheaders}
+    \literalpoemendnote{#2}%
+    \ifpoemendnotessinglepar%
+    \literalpoemendnote{\par}%
+    \fi%
+    \fi 
+\resetlemmacounters
+}
+\newcommand{\literalpoemendnote}[1]{%
+     \begingroup
+        \def\next{#1}%
+        \newlinechar='40
+        \immediate\write\poemendnotes{\expandafter\strip\meaning\next}%
+     \endgroup
+ }
+\newcommand{\putpoemendnotes}{
+\ifpoemendnoteson
+   \immediate\closeout\poemendnotes
+   \input \jobname.pnd
+\else
+ \relax
+\fi}
+%    \end{macrocode}
+%    \end{macro}
 %    \subsection{~Embarrassing kludges} Because the dirty trick 
 % mentioned above writes out textnotes as a ribbon one word wide, 
 % quoted poetry in the notes sections will leave a blank line at the 
diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
index e3d66b3e943..72d6de8fb4b 100644
--- a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
+++ b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]
 \ProvidesPackage{poemscol}
-   [2017/9/03 v2.85 poemscol file]
+   [2017/10/23 v2.87 poemscol file]
 
 
 
@@ -2322,6 +2322,41 @@ r@#2\endcsname{}{}\@nil
 }
 \newcommand{\bibleverse}{\pmsentence}
 \newcommand{\biblechapter}{\pmpara}
+\newif\ifpoemendnoteson
+\poemendnotesontrue
+\newif\ifpoemendnotessinglepar
+\poemendnotessinglepartrue
+\newcommand{\makepoemendnotes}{
+  \global\verselinenumberstrue
+  \newwrite\poemendnotes
+  \immediate\openout\poemendnotes=\jobname.pnd
+  \literalpoemendnote{\bigskip}
+ }
+\newcommand{\poemendnote}[2][0]{%
+\ifpoemendnoteson
+    \setlemmarange{#1}%
+    \immediate\write\poemendnotes{\checknoteheaders}
+    \literalpoemendnote{#2}%
+    \ifpoemendnotessinglepar%
+    \literalpoemendnote{\par}%
+    \fi%
+    \fi
+\resetlemmacounters
+}
+\newcommand{\literalpoemendnote}[1]{%
+     \begingroup
+        \def\next{#1}%
+        \newlinechar='40
+        \immediate\write\poemendnotes{\expandafter\strip\meaning\next}%
+     \endgroup
+ }
+\newcommand{\putpoemendnotes}{
+\ifpoemendnoteson
+   \immediate\closeout\poemendnotes
+   \input \jobname.pnd
+\else
+ \relax
+\fi}
 \newcommand{\quotedversecorrectiontextnote}[1][0pt]
 {\iftextnoteson%
 \immediate\write\textnotes{\string\noindent\string\kern-#1}%