1 files changed, 70 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
index d82159be6e7..eb9a66bafe1 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}
-   [2013/02/06 v2.61 poemscol file]
+   [2013/03/24 v2.62 poemscol file]
 
 
 
@@ -137,6 +137,12 @@
 \advance\leftmargin\runoverindentvalue}
 \item[]}
 {\endlist}
+\newenvironment{quotedverse}{%
+\let\\=\@centercr%
+\list{}{\itemsep\z@ \itemindent 0pt\listparindent \itemindent
+          \rightmargin 0sp\leftmargin 0sp\advance\leftmargin
+          \runoverindentvalue}\item[]}
+{\endlist}
 
 \newcounter{verselinenumber}
 \newcounter{printlineindex}
@@ -580,6 +586,36 @@
 \lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0}
 \literalcontents{  \relax}}
 
+\newcommand{\setendnotessectiontitledefaults}[6]{%
+#2%
+#3 \begin{titleentryenvironment}%
+{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+\end{titleentryenvironment}%
+#5%
+\label{#6}
+}
+\newcommand{\setendnotessectiontitle}[2]{
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink\begin{center}}{\backmatterheaderfont}
+{\relax}{\end{center}\lefthyphenmin=2\backmatterafterheadersink}{#2}}
+\newcommand{\contentsendnotesdefaults}[4]{\ifpoemcontentson
+\immediate\write\poemcontents{\string\begin\string{contentsentryenvironment\string}}%
+\literalcontents{#2{#3#1}}%
+  \ifputpagenumberincontents
+\immediate\write\poemcontents{\string\contentsleaders}%
+\immediate\write\poemcontents{\string\pageref
+\string{#4\string}}%
+  \else
+  \literalcontents{\relax}%
+  \fi
+\immediate\write\poemcontents{\string\end\string{contentsentryenvironment\string}}%
+\immediate\write\poemcontents{\string\par}%
+\fi
+}
+\newcommand{\contentsendnotesindent}{\contentsindentone}
+\newcommand{\contentsendnotesfont}{\contentspoemtitlefont}
+\newcommand{\contentsendnotestitle}[2]{%
+\contentsendnotesdefaults{#1}{\contentsendnotesindent}{\contentsendnotesfont}{#2}%
+}
 \newtoks{\pmclnotesname}
 \pmclnotesname={TEXTUAL NOTES}
 \newcommand{\changenotesname}[1]{\pmclnotesname={#1}}
@@ -605,10 +641,8 @@
 \fancyhead[CE]{{\small{\em \the\notesheadername~\mymarks}}}
 \fancyfoot[C]{}
 \mark{3}
-\backmattersink
-\begin{center}{\normalfont \backmatterheaderfont \the\pmclnotesname}\end{center}
-\label{textualnotes}
-\lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0
+\setendnotessectiontitle{\the\pmclnotesname}{textualnotes}
+\tolerance=500\language=0
 \normalfont \backmattertextfont
 \iftextnotestwocol
 \begin{multicols}{2}
@@ -617,6 +651,7 @@
 }
 }
 
+
 \newtoks{\emendationsname}
 \emendationsname={EMENDATIONS}
 \newcommand{\changeemendationsname}[1]{\emendationsname={#1}}
@@ -642,11 +677,8 @@
 \fancyhead[CE]{{\small{\em \the\emendationsheadername~\mymarks}}}
 \fancyfoot{}
 \mark{3}
-\backmattersink
-\begin{center}{\normalfont \backmatterheaderfont
-\the\emendationsname}\end{center}
-\label{emendationnotes}
-\lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0
+\setendnotessectiontitle{\the\emendationsname}{emendationnotes}
+\tolerance=500\language=0
 \normalfont \backmattertextfont
 \ifemendationstwocol
 \begin{multicols}{2}
@@ -679,11 +711,8 @@
 \fancyhead[CE]{{\small{\em \the\explanationsheadername~\mymarks}}}
 \fancyfoot{}
 \mark{3}
-\backmattersink
-\begin{center}{\normalfont \backmatterheaderfont
-\the\explanationsname}\end{center}
-\label{explanatorynotes}
-\lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0
+\setendnotessectiontitle{\the\explanationsname}{explanatorynotes}
+\tolerance=500\language=0
 \normalfont \backmattertextfont
 \ifexplanationstwocol
 \begin{multicols}{2}
@@ -692,6 +721,7 @@
 }
 }
 
+
 \newcommand{\@pagemarktotextnotes}[1]{%
 \immediate\write\textnotes{\string\setcounterfrompageref\string{notepageholdertitle\string}%
 \string{#1\string}\string\unskip}%
@@ -1352,6 +1382,13 @@
 \newcommand{\JHepigraph}[2]{\nopagebreak\afterpoemtitleskip\begin{epigraphquote}%
 \emph{#1}\JHlabel{#2}\end{epigraphquote}%
 \sources{\label{#2}}\afterpoemtitleskip\nopagebreak}
+\newcommand{\backmattersectiontitle}[1]{%
+\set@p@emtitle{#1}{\poemtitlepenalty}{\volumetitlefont}%
+{\relax}{\backmattersink}{\z@}%
+\c@ntentsinfo{#1}{contentsindentone}{\contentspoemtitlefont}%
+{\contentsindenttwoamount}%
+\t@xtnotesinfo{#1}
+}
 \newcounter{margrefnumber}
 \setcounter{margrefnumber}{1}
 \newtoks{\margrefmarker}
@@ -1625,11 +1662,7 @@
 \mark{3}
 \backmattersink}
 \immediate\write\csname #1s\endcsname{
-\string\begin\string{center\string}
-\string{\string\normalfont \string\backmatterheaderfont\ #4\string}
-\string\end\string{center\string}}
-\immediate\write\csname #1s\endcsname{
-\string\label\string{#1notes\string}}
+\string\setendnotessectiontitle\string{#4\string}\string{#1notes\string}}
 \csname literal#1\endcsname{\lefthyphenmin=2\backmatterafterheadersink
 \tolerance=500\language=0
 \normalfont \backmattertextfont}
@@ -1637,7 +1670,10 @@
 \csname
 literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
 \expandafter\newcommand\csname first#1\endcsname{
-\immediate\write\expandafter\csname #1s\endcsname{\titletoothernotes}}
+\immediate\write\expandafter\csname #1s\endcsname{\titletoothernotes}
+\immediate\write\csname #1s\endcsname{\string\if#1ssinglepar}
+\immediate\write\csname #1s\endcsname{\string\par}
+\immediate\write\csname #1s\endcsname{\string\fi}}
 \expandafter\newcommand\csname #1\endcsname[2][0]{%
 \setlemmarange{##1}%
 \csname ifno#1yet\endcsname%
@@ -1698,10 +1734,7 @@ literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
 \immediate\expandafter\closeout\csname #1s\endcsname
 \expandafter\input \jobname.#2
 \ifpoemcontentson
-  \immediate\write\poemcontents{\string\contentspoemtitlefont\ #5}
-  \immediate\write\poemcontents{\string~ \string\contentsleaders
-  \string~\ \string\pageref{#1notes} \string\par}
-  \immediate\write\poemcontents{\string\par \string\smallskip}
+ \contentsendnotestitle{#5}{#1notes}
 \fi
   }
 \expandafter\newcommand\csname margref#1\endcsname{%
@@ -2633,15 +2666,7 @@ wherever such spaces are lost in pagination.
    \hyphenationforsmall
    \immediate\closeout\emendations
    \input \jobname.emd
-   \ifpoemcontentson
-       \ifemendationson
-\immediate\write\poemcontents{\string\contentspoemtitlefont\ \the\emendationscontentsname}
-\immediate\write
-  \poemcontents{\string~ \string\contentsleaders  \string~\
-  \string\pageref{emendationnotes} \string\par}
-\immediate\write\poemcontents{\string\par \string\smallskip}
-       \fi
-\fi
+\contentsendnotestitle{\the\emendationscontentsname}{emendationnotes}
 \else
  \relax
 \fi}
@@ -2654,14 +2679,10 @@ wherever such spaces are lost in pagination.
    \hyphenationforsmall
    \immediate\closeout\explanations
    \input \jobname.enx
-   \ifpoemcontentson
-       \ifexplanon
-\immediate\write\poemcontents{\string\contentspoemtitlefont\ \the\explanationscontentsname}
-\immediate\write
-  \poemcontents{\string~ \string\contentsleaders  \string~\
-  \string\pageref{explanatorynotes} \string\par}
-\immediate\write\poemcontents{\string\par \string\smallskip}
-       \fi
+\ifpoemcontentson
+ \ifexplanon
+\contentsendnotestitle{\the\explanationscontentsname}{explanatorynotes}
+  \fi
 \fi
 \else
  \relax
@@ -2675,15 +2696,7 @@ wherever such spaces are lost in pagination.
    \hyphenationforsmall
    \immediate\closeout\textnotes
    \input \jobname.ent
-   \ifpoemcontentson
-       \iftextnoteson
-\immediate\write\poemcontents{\string\contentspoemtitlefont\ \the\textnotescontentsname}
-\immediate\write
-  \poemcontents{\string~ \string\contentsleaders  \string~\
-  \string\pageref{textualnotes} \string\par}
-\immediate\write\poemcontents{\string\par \string\smallskip}
-       \fi
-\fi
+\contentsendnotestitle{\the\textnotescontentsname}{textualnotes}
 \else
  \relax
 \fi}
@@ -2777,8 +2790,12 @@ wherever such spaces are lost in pagination.
                 \let\item\pmclidxitem}
                {\end{multicols}\clearpage}
 \makeatother
-\newenvironment{epigraphquote}{\list{}{\rightmargin 1.5em%
-                                       \leftmargin  1.5em%
+\newlength{\epigraphquoteleftmargin}
+\newlength{\epigraphquoterightmargin}
+\setlength{\epigraphquoteleftmargin}{1.5em}
+\setlength{\epigraphquoterightmargin}{1.5em}
+\newenvironment{epigraphquote}{\list{}{\rightmargin\epigraphquoterightmargin%
+                                       \leftmargin\epigraphquoteleftmargin%
                                        \topsep 0pt%
                                        \partopsep 0pt%
                                        \listparindent 0pt%