summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2013-05-27 01:44:40 +0000
committerNorbert Preining <preining@logic.at>2013-05-27 01:44:40 +0000
commitc044e50ef0f17da73341e8a04a9180f043126a54 (patch)
treedba6d604015e9de45524689e75fd6506a149b5d7 /Master/texmf-dist
parentb651954f7ba70b34a0a9e73c374da6ed725fe796 (diff)
poemscol update 5/27
git-svn-id: svn://tug.org/texlive/trunk@30706 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/poemscol/poemscol.pdfbin553949 -> 557915 bytes
-rw-r--r--Master/texmf-dist/doc/latex/poemscol/poemscolcheatsheet.pdfbin0 -> 54837 bytes
-rw-r--r--Master/texmf-dist/source/latex/poemscol/poemscol.dtx239
-rw-r--r--Master/texmf-dist/tex/latex/poemscol/poemscol.sty123
4 files changed, 237 insertions, 125 deletions
diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
index c64a916ba90..66226e564aa 100644
--- a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
+++ b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscolcheatsheet.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscolcheatsheet.pdf
new file mode 100644
index 00000000000..d59c0419631
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/poemscol/poemscolcheatsheet.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
index 23de514959b..82a4c0b03ae 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> [2013/02/06 v2.61 poemscol file]
+%<package> [2013/03/24 v2.62 poemscol file]
%
%<*driver>
\documentclass{ltxdoc}
@@ -33,7 +33,7 @@
%</driver>
% \fi
%
-% \CheckSum{6235}
+% \CheckSum{6224}
%
% \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
@@ -165,7 +165,7 @@
% sequence sections. Fixed errors in manual. }
% \changes{v2.50}{2006/05/13}{Added marginal reference commands for
% poem sections, poem subtitles, epigraphs, and dedications. These
-% commands no longer require an addition label command to set the
+% commands no longer require an additional label command to set the
% label to which they refer. Added commands to make marginal
% references to the pages in notes sections where comments on
% individual lines may be found, for textual notes, explanatory notes,
@@ -192,7 +192,12 @@
% be centered on the page.} \changes{v2.61}{2013/02/06}{Added a
% boolean to switch notes to one note per paragraph form. Boolean to
% switch off poem titles in notes. Two column formatting for notes sections.}
-%
+% \changes{v2.62}{2013/05/22}{You can adjust the margins of
+% epigraphs, dedications, and similar things. Made the appearance of
+% entries in the table of contents for endnotes sections
+% customizable. Fixed a bug which caused user-defined
+% endnotes to put extra white space in prose passages.}
+%
% \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
% \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip}
% \DoNotIndex{\newcommand, \section, \subsection, \subsubsection,
@@ -223,11 +228,11 @@
% \DoNotIndex{\closeout,\em,\emph,\expandafter,\Huge,\it,\jobname,\kern,\newif,
% \newwrite,\p@,\pageref,\renewenvironment,\rm,\scriptsize,\string,
% \textsc, \unskip} \setcounter{IndexColumns}{2} \MakeShortVerb{|}
-% \def\fileversion{2.61} \def\filedate{6 February 2013} \def\docdate{6
-% February 2013} \title{Typesetting Poetry Collections with
+% \def\fileversion{2.62} \def\filedate{24 May 2013} \def\docdate{24
+% Mark 2013} \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{February 6, 2013} \maketitle
+% \\ \texttt{burt@brandeis.edu}} \date{May 24, 2013} \maketitle
% \begin{abstract} \textsf{poemscol} provides macros for \LaTeX\ for
% setting collections of poetry. It is especially suited for setting
% collections of poetry in which several volumes are combined, such as
@@ -1119,15 +1124,23 @@
% \DescribeMacro{\ifemendationstwocol}
% \DescribeMacro{\ifexplanationstwocol}
% By default, notes set in single columns. To set them in two column mode,
-%set these booleans to true, e.g. |\textnotessinglepartrue|.
+% set these booleans to true, e.g. |\textnotessinglepartrue|.
%
-%\DescribeMacro{\putpagenumberinnotesfalse}
-%\DescribeMacro{\puttitleinnotesfalse}
-%You may not wish to have the poem's page number and title appear in
-%the notes. To turn off the appearance of the page number in the
-%notes, issue |\putpagenumberinnotesfalse|. You may also not wish to
-%put the poem's title in the notes. To turn off the appearance of the
-%poem's title in the notes, issue |\puttitleinnotesfalse|.
+% \DescribeMacro{\putpagenumberinnotesfalse}
+% \DescribeMacro{\puttitleinnotesfalse}
+% You may not wish to have the poem's page number and title appear in
+% the notes. To turn off the appearance of the page number in the
+% notes, issue |\putpagenumberinnotesfalse|. You may also not wish to
+% put the poem's title in the notes. To turn off the appearance of the
+% poem's title in the notes, issue |\puttitleinnotesfalse|.
+%
+% \DescribeMacro{\contentsendnotesindent}
+% \DescribeMacro{\contentsendnotesfont}
+% You can control the appearance of the entry for endnote sections in
+% the table of contents by changing the definition of
+% |\contentsendnotesindent| (set by default to |\contentsindentone|)
+% or |\contentsendnotesfont| (set by default to
+% |\contentspoemtitlefont|.
%
% \subsection{~Textual notes of various kinds}
% \DescribeMacro{\sources} To record information about the copy text,
@@ -1533,7 +1546,9 @@
% dedications. If you have dedications, epigraphs, or attributions on
% the divider pages of editions that combine several volumes of
% poetry, use |\volumededication{}|, |\volumeepigraph{}|, and
-% |\volumeattribution{}|.
+% |\volumeattribution{}|. You can adjust the left and right margins
+% of epigraphs by changing the values of |\epigraphquoteleftmargin|
+% or |\epigraphquoterightmargin|
%
% \subsection{~Inset prose quotations}
% \DescribeMacro{\saveverselinenumber}
@@ -1872,6 +1887,11 @@
%
% \DescribeMacro{\margrefexplanatory}|\margrefexplanatory| is a
% version of |\margreftextnote| for explanatory notes.
+%
+% \subsection{~Quoted Verse}
+% Sometimes you wish to quote verse within verse (as when a speaker
+% in a verse play quotes a poem. \DescribeMacro{\quotedverse} The
+% |quotedverse| environment is desiged for this contingency.
%
% \subsection{~Visual formatting}
% \DescribeMacro{\longpage}
@@ -1957,6 +1977,8 @@
% notesclubpoempenalty & -300 & \relax \\
% notessequenceclubpenalty & -1500 & \relax \\
% notesvolumetitlepenalty & -1500 & \relax \\
+% epigraphquoteleftmargin & 1.5em & for epigraphs, attributions, etc.\\
+% epigraphquoterightmargin & 1.5em & \relax \\
% \end{tabular}
%
% \subsection{~Page styles}
@@ -2950,6 +2972,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}
% rfoverse (flushes runover to right) (Just a placeholder now.)
% \newif\ifrfv
% \rfvfalse
@@ -3226,7 +3254,7 @@
% \end{macrocode}
% The next two environments are for contents entries and titles. The
% idea is to handle overrun titles the way overrun lines are handled
-% inverse. Contents entries indent the overrun slightly. Titles do
+% in verse. Contents entries indent the overrun slightly. Titles do
% not indent the overrun relative to the first line, but preserve the
% indentation of that line.
% \begin{macrocode}
@@ -3815,8 +3843,81 @@
% notes section is set with a flush bottom line, rather than with the
% ragged bottom line used for the verse sections. Also, it sets a
% label for sending the page number of the textual notes to the table of
+% contents. First, a few commands for use by all of the endnotes
+% sections. |\setendnotessectiontitledefaults| takes six arguments
+% which are, in order, (1) the title of the endnote section, (2)
+% commands to be issued before setting the
+% title (minimally, a penalty, such as |\poemtitlepenalty|), (3) the
+% font size in which the title is to be set in the text (such as
+% |\poemtitlefont| or |\large|), (4) any indentation of the title
+% (|\relax| for |\poemtitle|, or |\titleindent| for
+% |\sequencesectiontitle|), (5) commands to be issued after the
+% title is set (such as |\afterpoemtitleskip|) and (6) the label to
+% be used for this section, to be used to set the page number in the
+% table of contents.
+%
+% |\setendnotessectiontitle| is a simpler version of |\setendnotessectiontitledefaults|
+% with all the defaults filled in, leaving only two arguments, the
+% title of the section, and the label for use by the table of
% contents.
-% \begin{macrocode}
+%
+% |\contentsendnotesdefaults| sets the defaults for the table of
+% contents entries for endnotes sections. It takes four arguments
+% which are, in order, (1) the title of the endnote section, (2) the
+% indentation of the title in the table of contents (such as
+% |\contentsindentone|), (3), the font size in which the title
+% should be set (such as |\contentspoemtitlefont|) and (4) the amount
+% overrun lines in the table of contents should be indented (such as
+% |\contentsindenttwoamount|).
+%
+% |\contentsendnotesindent| sets the default indent for table of
+% contents entries for endnotes sections, and |\contentsendnotesfont|
+% sets the default font for the.
+%
+% |\contentsendnotestitle| is a simpler command for sending
+% information about endnote sections to the table of contents, taking
+% only two arguments, the title and the label used for page reference
+% purposes.
+% \begin{macrocode}
+% Generic command for titles of endnote sections
+\newcommand{\setendnotessectiontitledefaults}[6]{%
+#2%
+#3 \begin{titleentryenvironment}%
+{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+\end{titleentryenvironment}%
+#5%
+\label{#6}
+}
+% Simpler version with only two parameters, the title and the label
+% for page references
+\newcommand{\setendnotessectiontitle}[2]{
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink\begin{center}}{\backmatterheaderfont}
+{\relax}{\end{center}\lefthyphenmin=2\backmatterafterheadersink}{#2}}
+% Generic command for sending info about endnotes sections to table
+% of contents
+\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
+}
+% default styles for contents entries for endnotes sections
+\newcommand{\contentsendnotesindent}{\contentsindentone}
+\newcommand{\contentsendnotesfont}{\contentspoemtitlefont}
+% simpler command to set up contents entry with only tw parameters,
+% the title and the label for page references
+\newcommand{\contentsendnotestitle}[2]{%
+\contentsendnotesdefaults{#1}{\contentsendnotesindent}{\contentsendnotesfont}{#2}%
+}
+% tokens to use to change the names of the sections
\newtoks{\pmclnotesname}
\pmclnotesname={TEXTUAL NOTES}
\newcommand{\changenotesname}[1]{\pmclnotesname={#1}}
@@ -3826,8 +3927,10 @@
\newtoks{\textnotescontentsname}
\textnotescontentsname={Textual Notes}
\newcommand{\changetextnotescontentsname}[1]{\textnotescontentsname={#1}}
+% A boolean to change to two column notes.
\newif\iftextnotestwocol
\textnotestwocolfalse
+% Setup for textual notes
\newcommand{\maketextnotes}{\global\textnotesontrue
\global\verselinenumberstrue
\newwrite\textnotes
@@ -3842,10 +3945,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}
@@ -3853,12 +3954,14 @@
\setlength{\parindent}{-10pt}
}
}
+
% \end{macrocode}
% \end{macro}
% \begin{macro}{\makeemendations}
% Next, the emendations section:
% \begin{macrocode}
+% tokens for changing the names of these notes
\newtoks{\emendationsname}
\emendationsname={EMENDATIONS}
\newcommand{\changeemendationsname}[1]{\emendationsname={#1}}
@@ -3868,9 +3971,11 @@
\newtoks{\emendationscontentsname}
\emendationscontentsname={Emendations}
\newcommand{\changeemendationscontentsname}[1]{%
-\emendationscontentsname={#1}}
+\emendationscontentsname={#1}}
+% two column notes
\newif\ifemendationstwocol
\emendationstwocolfalse
+% Emendations section setup
\newcommand{\makeemendations}{\global\emendationsontrue
\newwrite\emendations
\global\verselinenumberstrue
@@ -3884,11 +3989,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}
@@ -3902,6 +4004,7 @@
% \begin{macro}{\makeexplanatorynotes}
% And the explanatory notes:
% \begin{macrocode}
+% Tokens to change names of these notes
\newtoks{\explanationsname}
\explanationsname={EXPLANATORY NOTES}
\newcommand{\changeexplanationsname}[1]{\explanationsname={#1}}
@@ -3912,8 +4015,10 @@
\explanationscontentsname={Explanatory Notes}
\newcommand{\changeexplanationscontentsname}[1]{%
\explanationscontentsname={#1}}
+% Two column notes
\newif\ifexplanationstwocol
\explanationstwocolfalse
+% Explanatory notes setup
\newcommand{\makeexplanatorynotes}{\global\explanontrue
\global\verselinenumberstrue
\newwrite\explanations
@@ -3926,11 +4031,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}
@@ -3938,6 +4040,7 @@
\setlength{\parindent}{-10pt}
}
}
+
% \end{macrocode}
% \end{macro}
@@ -4844,6 +4947,19 @@
\sources{\label{#2}}\afterpoemtitleskip\nopagebreak}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\backmattersectiontitle} Macros to set the titles of back matter sections
+% such as textual notes.
+%
+% \begin{macrocode}
+\newcommand{\backmattersectiontitle}[1]{%
+\set@p@emtitle{#1}{\poemtitlepenalty}{\volumetitlefont}%
+{\relax}{\backmattersink}{\z@}%
+\c@ntentsinfo{#1}{contentsindentone}{\contentspoemtitlefont}%
+{\contentsindenttwoamount}%
+\t@xtnotesinfo{#1}
+}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\margreftextnote} Macros to set marginal page
% references showing where in the apparatus a comment upon the
% marked line is to be found. |\margrefspecial{}| is for occasions
@@ -5366,12 +5482,7 @@
% then immediate write to send the title of the section to print at
% the top of the page
\immediate\write\csname #1s\endcsname{
-\string\begin\string{center\string}
-\string{\string\normalfont \string\backmatterheaderfont\ #4\string}
-\string\end\string{center\string}}
-% immediate write to set a label for the table of contents
-\immediate\write\csname #1s\endcsname{
-\string\label\string{#1notes\string}}
+\string\setendnotessectiontitle\string{#4\string}\string{#1notes\string}}
% literal write to turn hyphenation on, set the font for the note
% section, and turn on two column mode (if the boolean is set)
\csname literal#1\endcsname{\lefthyphenmin=2\backmatterafterheadersink
@@ -5384,7 +5495,10 @@ literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
% 6. set up a command to write the page and title of the poem for the first
% instance of this kind of note in a poem
\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}}
% 7. set up a command to write a note, complete with line numbers
\expandafter\newcommand\csname #1\endcsname[2][0]{%
\setlemmarange{##1}%
@@ -5454,10 +5568,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
}
% 10. command for making a marginal mark at a line, giving the page
@@ -6825,15 +6936,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}
@@ -6851,14 +6954,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
@@ -6877,15 +6976,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}
@@ -7020,8 +7111,12 @@ wherever such spaces are lost in pagination.
% \end{macro}
% Finally, some other miscellaneous environments.
% \begin{macrocode}
-\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%
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%