poemscol (3aug13)

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

3 files changed, 142 insertions, 90 deletions

diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
index 66226e564aa..200a8290603 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 82a4c0b03ae..fe2953bd6cc 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/03/24 v2.62 poemscol file] 
+%<package>   [2013/08/20 v2.64 poemscol file] 
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -33,7 +33,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{6224}
+% \CheckSum{6228}
 %
 % \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
@@ -197,6 +197,10 @@
 % 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.}
+% \changes{v2.63}{2013/06/01}{Revisions to manual.}
+% \changes{v2.64}{2013/08/02}{Bug fix: remove extra white space in 
+% custom endnotes for prose sections when notes are in single paragraph mode. Fix 
+% appearance of page number in endnote sections.}
 %
 % \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
 % \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip}
@@ -228,11 +232,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.62} \def\filedate{24 May 2013} \def\docdate{24
-% Mark 2013} \title{Typesetting Poetry Collections with
+% \def\fileversion{2.64} \def\filedate{2 August 2013} \def\docdate{2
+% August2013} \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{May 24, 2013} \maketitle
+% \\ \texttt{burt@brandeis.edu}} \date{June 20, 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
@@ -292,7 +296,7 @@
 % 
 % Using \LaTeX\ to typeset critical editions offers more advantages
 % than simply the ability to automate tedious and easy to fumble
-% tasks.  Most modern \TeX\ compilers have the ability to produce
+% tasks.  Modern \TeX\ compilers have the ability to produce
 % output in Adobe pdf format.  Adobe pdf output can be used as camera
 % ready copy, saving your publisher time and expense, and perhaps
 % making a marginally economic critical edition a bit easier to bring
@@ -306,7 +310,7 @@
 % Editions made in the formats of proprietary software such as
 % QuarkXPress\copyright\ or InDesign\copyright\ will become not only obsolete
 % but unreadable if those programs pass from use.  Since your \LaTeX\
-% sources for your edition are in ASCII, they provide a permanent
+% sources for your edition are in ASCII, or perhaps Unicode, they provide a permanent
 % record of your local intentions at every point in your edition,
 % whether or not those who wish to consult your files have access to a
 % \LaTeX\ compiler, or indeed whether or not they can read \LaTeX\
@@ -332,7 +336,8 @@
 % sections such as the author's introduction or prose poetry, and it
 % can also handle inset prose passages in the midst of verse.
 % \textsf{poemscol} is not, however, designed for typesetting large
-% scale prose works.  For critical editions of prose works, several
+% scale prose works, although very possibly it could be tweaked to 
+% work.  For critical editions of prose works, several
 % other packages are available, including the \texttt{EDMAC} format, a
 % \TeX\ format analogous to but distinct from \LaTeX, by John
 % Lavagnino and Dominik Wujastyk, or \textsf{ledmac}, a port of
@@ -510,7 +515,8 @@
 % Multiple line titles, titles of subsections of poems, titles of
 % sequences of poems, and titles of the elements of a sequence of
 % poems are all special cases, with special commands, which will be
-% dealt with below.
+% dealt with below. You can also create new varieties of title. For instructions 
+% on how to do this, see section \ref{customizing titles} below, page \pageref{customizing titles}.
 % 
 % \DescribeMacro{\poemsubtitle} Subtitles of poems should be issued as 
 % the arguments to the |\poemsubtitle{}| macro.
@@ -544,7 +550,10 @@
 % argument. You can set the length of |\versewidth| to the proper 
 % amount using |\settowidth| as follows:
 % \DescribeMacro{\versewidth}
-% |\settowidth{\versewidth}{Text of line to use for centering}|.
+% |\settowidth{\versewidth}{Text of line to use for centering}|. To use |\versewidth|
+% to center the poem on a sample line, enter the |poem| environment this way:
+% |\begin{poem}[\versewidth]|.
+% 
 % \DescribeMacro{\centertitles}
 % If you center the poem on a sample 
 % line, you probably also want to center the title of the poem too, 
@@ -604,7 +613,7 @@
 % If you wish also to mark all cases where there is NOT a stanza break 
 % at the bottom of the page, issue the command |\nostanzaatbottom{}|, 
 % using as the argument whatever you wish to mark such cases. The 
-% default is |\relax|.
+% default is |\relax| (which is to say, ``don't do anything'').
 % 
 % \DescribeMacro{\verseline} |\verseline| should mark the end of every
 % line, except the last line of every stanza (which should be marked
@@ -700,7 +709,7 @@
 % automatically anyway).  |\verseindent| indents the line a bit less
 % than the run over portion of long ``bent'' lines are indented, so 
 % that the two cases can be visually distinguished. By default, the 
-% length of |\verseindent| is 2em. To change it, say to 3em, issue 
+% length of |\verseindent| is 2 em. To change it, say to 3 em, issue 
 % |\renewcommand{\verseindent}{\hspace{3em}}|
 %  
 % 
@@ -853,7 +862,7 @@
 % a section of a poetic sequence, a slash follows the title, followed
 % by the page number.  If you wish to give \emph{all} your entries a
 % different look altogether, modify the |\c@ntentsinfo| macro below
-% (see section \ref{poemtitlecode}, page \pageref{poemtitlecode}.  To
+% (see section \ref{poemtitlecode}, page \pageref{poemtitlecode}).  To
 % change the appearance of a \emph{particular} kind of entry (for all
 % sequences of poems, for instance), go to the definition of the title
 % of that kind of entry (e.g. |\sequencetitle|) below, find the line
@@ -898,7 +907,7 @@
 % start a new one.  You should issue |\makepoemcontents| just
 % \emph{after} issuing |\putpoemcontents|.
 % 
-% \subsection{~Entries for notes sections and the index}
+% \subsection{~Contents entries for notes sections and the index}
 % \DescribeMacro{\putpoemindex}
 % Remember that if you are making an index of titles and first lines
 % you may need to run your file through \LaTeX\ after running
@@ -1045,7 +1054,8 @@
 % for multi-line titles of volumes gathered into the collection.  (Use
 % these last commands if you want to specify how a long title is
 % broken up both in the text and in the table of contents.
-% \textsf{poemscol} will break up long titles on its own anyway, but
+% \textsf{poemscol} will break up long titles on its own anyway
+% if you don't specify how to break them up, but
 % you might not be happy with how it breaks up the lines.)
 % |\volumesubtitle{}| is for setting the subtitle to a volume.
 % |\volumesectiontitle{}| is for setting the title of a section of a
@@ -1069,7 +1079,12 @@
 % \section{Recording textual notes} \subsection{~Setup for sections for
 % textual notes, emendations, and explanatory notes.}
 % \DescribeMacro{\makeemendations} \DescribeMacro{\maketextnotes}
-% \DescribeMacro{\makeexplanatorynotes} If you issue these commands,
+% \DescribeMacro{\makeexplanatorynotes} 
+% To collect emendations, issue |\makeemendations| in your preamble. 
+% To collect textual collations, issue |\maketextnotes| in your
+% preamble.  To collect explanatory notes, issue
+% |\makeexplanatorynotes| in your preamble.
+% If you issue these commands,
 % \textsf{poemscol} puts all of the emendations, textual collations,
 % and explanatory notes in the backmatter of your volume.
 % \textsf{poemscol} opens external files for emendations, textual
@@ -1077,12 +1092,7 @@
 % .enx respectively), and reads them back in at the place you specify
 % with |\puttextnotes|, |\putexplanatory|, or |\putemendations|, or at
 % the end (if you use the |\finish| command).
-%  
-% To collect emendations, issue |\makeemendations| in your preamble. 
-% To collect textual collations, issue |\maketextnotes| in your
-% preamble.  To collect explanatory notes, issue
-% |\makeexplanatorynotes| in your preamble.  These commands set up the
-% external files, send to them the commands for typesetting the
+%  These commands  also send to the external files the commands for typesetting the
 % title of each section (e.g. Explanatory Notes) and for modifying the
 % running headers of the notes sections to xx--yy format (e.g.
 % ``Explanatory Notes to pp.~55--7'').
@@ -1102,6 +1112,7 @@
 % information about the variants and copy text of the poem), but only
 % opens entries in the emendations or explanatory notes sections if
 % you actually have emendations or explanatory notes on that poem.
+%
 % The notes for each poem are set in a block paragraph, with a new
 % paragraph for every |\poemtitle| command, and the line counter for
 % the notes is reset to 1 with every |\begin{poem}|.  (For long poems
@@ -1109,22 +1120,24 @@
 % canto names or numbers, setting the poem title in some other way,
 % perhaps with |\volumetitle| described above.)
 % 
+% \begin{sloppypar}
 % \DescribeMacro{\iftextnotessinglepar} 
 % \DescribeMacro{\ifemendationssingplepar}
 % \DescribeMacro{\ifexplanationssinglepar}
-% By default, notes are grouped in block paragraphs for each poem, which, for 
-% collections of relatively short poems makes sense. You may, 
-% however, particularly if you are annotating long poems, wish each 
-% note to appear in its own paragraph. To do this, you need to set 
+% You may, 
+% particularly if you are annotating long poems, wish each 
+% note to appear in its own paragraph rather than in a block paragraph 
+% with the other notes to that poem. To do this, you need to set 
 % the relevant boolean. Issue |\textnotessinglepartrue| 
-% |\emendationssingplepartrue| or |explanationssinglepartrue| to do 
-% this.
+% |\emendationssingplepartrue| or |\explanationssinglepartrue| to givve
+% each such note a separate paragraph.
+% \end{sloppypar}
 %
 % \DescribeMacro{\iftextnotestwocol} 
 % \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|.
+% By default, notes are set in single columns. To set them in two column mode, 
+% set the relevant booleans to true, e.g. |\textnotestwocoltrue|.
 %
 % \DescribeMacro{\putpagenumberinnotesfalse}
 % \DescribeMacro{\puttitleinnotesfalse}
@@ -1204,9 +1217,8 @@
 % you will have to run your file through \LaTeX\ twice, once to define
 % the labels, and once to set the text.\end{sloppypar}
 % 
-% One advantage of using an optional argument to specify line ranges 
-% in notes is that nested or overlapping lemmas, or lemmas that 
-% include stanza breaks, do not pose any difficulties. 
+% Overlapping lemmas, or lemmas that 
+% include stanza breaks, do not pose any difficulties for |poemscol|. 
 % 
 % |\emendation{}| and |\explanatory{}| are used exactly as |\textnote{}| 
 % is. Issue the emendation or the explanatory note as the argument to 
@@ -1256,9 +1268,8 @@
 % \textsf{poemscol} does not provide for a separate backmatter section
 % for accidentals, but it would be trivial to construct one, using 
 % |\definenewnotetype|, described in section \ref{definingnewnotes} 
-% below. Be sure to delete the 
-% existing definition of |\accidental| from poemscol.sty before doing 
-% this.
+% below.  Use |\definenewnotetype| to create a command called 
+% |\newaccidental|, then issue| \let\accidental=\newaccidental|.
 % 
 % If you wish to exclude accidentals from your printed output, but to
 % mark them in your source files, so that your published collation
@@ -1323,7 +1334,7 @@
 % for typescript variants, but it would be trivial to construct one,
 % again using |\definenewnotetype|. To do this, you would also have to 
 % copy all of the emendations, explanatory notes, and textual notes 
-% which have a |\tsentry| in their arguments, and construct
+% which have a |\tsentry| in their arguments, and add
 % |\tsvariant{}| commands in those places. For information about 
 % |\definenewnotetype| see section \ref{definingnewnotes}.
 %
@@ -1340,9 +1351,9 @@
 % one paragraph per note form, rather than in block paragraphs).  
 % \textsf{poemscol} will only open an entry for a poem in the
 % ``mynotes'' section if there actually is a ``mynote'' on that poem.
-% Note that the |\if| sthat refer to the section are plural
+% Note that every  |\if| that refers to a section is plural
 % (|\ifmynoteson|, |\ifmynotestwocol|, |\ifmynotessinglepar|) and 
-% that the |\if| that refers to a singular note
+% that every |\if| that refers to a singular note
 % is singular (|\ifnomynoteyet|).  \item The name for the output
 % channel for writing the notes to the appropriate external file.
 % This name will always be plural.  \item The name for the ``literal''
@@ -1350,7 +1361,7 @@
 % |\literaltextnote{}| does on the textnotes file), and for the note
 % command that sends the actual textual note (line number and all) to
 % the section (e.g. |\mynote{}|), also the command to write notes in
-% line-numbered prose (e.g. |\prosemynote{}|) or prose numbered by
+% line-numbered prose (e.g. |\prosemynote{}{}|) or prose numbered by
 % paragraph and sentence (e.g. |\pmmynote{}|).  These commands will
 % always be singular.  \item The name of the |\put| command (e.g.
 % |\putmynotes|) which closes the external file for the notes section,
@@ -1637,7 +1648,7 @@
 % 
 % \begin{sloppypar}
 % \DescribeMacro{\poemsectiontitle} 
-% |\poemsectiontitle{}| and  (|\poemsubsectiontitle{}|, as their 
+% |\poemsectiontitle{}| and  |\poemsubsectiontitle{}|, as their 
 % names imply, are for the titles of sections or subsections of poems
 % that have them.  |\poemfirstsectiontitle| is for the first section
 % of a poem with many sections.  (It differs from |\poemsectiontitle|
@@ -1759,17 +1770,19 @@
 % \end{itemize}
 % 	
 % 	
-% \subsection{~Customizing titles} \textsf{poemscol} provides a large
+% \subsection{~Customizing titles} \label{customizing titles} \textsf{poemscol} provides a large
 % number of ways of setting titles, but conceivably you may wish to
 % define your own.  Here is a template for designing a new kind of
 % title.  Suppose you wish to create a kind of title called
 % |\mytitle{}|.  It would take one argument, which would be the title
-% itself.  The macro should in turn call three macros,
+% itself.  The macro defining the |\mytitle| command should call three macros,
 % |\set@p@emtitle|, to set the title in the main text and make the
 % label for use by the contents and notes sections, |\c@ntentsinfo| to
 % set the title in the table of contents, and |\t@xtnotesinfo|, which
-% sets the title in the notes sections.  (You should enclose the whole
-% thing between |\makeatletter| and |\makeatother|.)  |\set@p@emtitle|
+% sets the title in the notes sections.  (You should enclose the whole thing
+% between |\makeatletter| and |\makeatother|.) 
+
+% |\set@p@emtitle|
 % takes six arguments, which are, in order, (1) the title (which, if
 % you are calling this command inside of the definition of |\mytitle|
 % should just be |#1|), (2) commands to be issued before setting the
@@ -1779,14 +1792,38 @@
 % (|\relax| for |\poemtitle|, or |\titleindent| for
 % |\sequencesectiontitle|), (5) commands to be issued after the
 % title is set (such as |\afterpoemtitleskip|) and (6) the amount 
-% overrun lines in the title should be indented.  |\c@ntentsinfo| takes
+% overrun lines in the title should be indented.  
+
+%|\c@ntentsinfo| takes
 % four arguments, which are, in order, (1) the title, (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|).  |\t@xtnotesinfo|
-% takes one argument, the title. By default, \textsf{poemscol} 
+% |\contentsindenttwoamount|). 
+
+%  |\t@xtnotesinfo|
+% takes one argument, the title. 
+
+%  So, for example, to create a new kind of title called |\mytitle| which looks
+% just like |\poemtitle|, issue
+% \begin{verbatim}
+% \makeatletter
+% \newcommand{\mytitle}[1]{%
+% \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
+% {\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+% \c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
+% {\contentsindenttwoamount}%
+% \t@xtnotesinfo{#1}%
+% }
+% \makeatother
+% \end{verbatim}
+%
+% (The |\z@| which is the sixth argument to |\set@p@emtitle| above is
+% a constant set to zero. You will also notice that I became completely hysterical
+% on the subject of preventing a page break after a poem title.)
+
+% By default, \textsf{poemscol} 
 % does not indent the overrun portion of titles relative to the first 
 % line of the title, but if that first line is indented will set the 
 % overrun portions to be indented the same amount. Overrun portions 
@@ -1816,7 +1853,7 @@
 % takes two arguments: first, the title of the poem, second, the label
 % used by the |\label| command on the page of the notes section to
 % which the title refers.  So, you would issue the poem title command
-% this way: |\poemtitle{Los desvelados}{EP_LosDesvelados_AC}|.  Up to
+% this way: |\JHpoemtitle{Los desvelados}{EP_LosDesvelados_AC}|.  Up to
 % version 2.49 of \textsf{poemscol} you had to be sure to define the
 % label in the notes sections by issuing
 % |\sources{\label{EP_LosDesvelados_AC}}|.  This is no longer
@@ -1825,13 +1862,13 @@
 % p.~\pageref{JHpoemtitle} for how to construct similar commands for
 % sequences, sequence sections, and so on.
 % 
-% \begin{sloppypar}
 % The following related commands are defined already 
-% |\JHsequencetitle|, |\JHsequencefirstsectiontitle|, 
-% |\JHsequencesectiontitle|, |\JHsequencesubsectiontitle|,  
-% |\JHpoemsectiontitle|,   |\JHpoemfirstsectiontitle|, 
-% |\JHpoemsubtitle|,  |\JHepigraph|, |\JHprosesectiontitle|, and 
-% |\JHdedication|.\end{sloppypar}
+% \begin{itemize}
+% \item |\JHsequencetitle|, \item |\JHsequencefirstsectiontitle|, 
+% \item |\JHsequencesectiontitle|, \item |\JHsequencesubsectiontitle|,  
+% \item |\JHpoemsectiontitle|,   \item |\JHpoemfirstsectiontitle|, 
+% \item |\JHpoemsubtitle|,  \item |\JHepigraph|,\item  |\JHprosesectiontitle|, and 
+% \item |\JHdedication|.\end{itemize}
 % 
 % If you are using |\JHpoemtitle| and its siblings, you need to be
 % sure to add \textsf{mparhack} to your package list.  You can prevent
@@ -1890,7 +1927,7 @@
 %
 % \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 
+% in a verse play quotes a poem). \DescribeMacro{\quotedverse} The 
 % |quotedverse| environment is desiged for this contingency.
 % 	
 % \subsection{~Visual formatting}
@@ -2175,7 +2212,7 @@
 % \begin{verbatim}
 % \prosetextnote[a way of driving away the spleen] {Call me Ishmael}
 % {Call me Ishmael \ldots\ a way of driving away the spleen] text of
-% textual note} \end{verbatim}, and on 
+% textual note} \end{verbatim} On the
 % last line of the passage to which the note refers you would 
 % issue: \\ |\proselinelabel{a way of driving away the spleen}|.
 %
@@ -2972,12 +3009,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}
+ \newenvironment{quotedverse}{%
+ \let\\=\@centercr%  
+ \list{}{\itemsep\z@ \itemindent -\runoverindentvalue\listparindent \itemindent 
+           \rightmargin 0sp\leftmargin 0sp\advance\leftmargin 
+           \runoverindentvalue}\item[]}
+ {\endlist}
 % rfoverse (flushes runover to right) (Just a placeholder now.)
 % \newif\ifrfv
 % \rfvfalse
@@ -3802,7 +3839,7 @@
 % different in different books. 
 % If you want to change that page 
 % number (say, to page 3) without messing with this file, issue 
-% |\literalcontents{\setcounter{page}{3}| just after you issue 
+% |\literalcontents{\setcounter{page}{3}}| just after you issue 
 % |\makepoemcontents| Alternatively, you can issue |\makepoemcontents{}| with its
 % optional argument, putting the page number in the argument.
 %    \begin{macrocode}
@@ -3836,22 +3873,25 @@
 
 % Next, the textual collations:
 % \begin{macro}{\maketextnotes} Like the |\makecontents| macro, 
-% |\maketextnotes| opens an external file with the extension .ent. It 
+% |\maketextnotes| opens an external file using |\jobname|, this time with the extension .ent. It 
 % makes sure that line numbering is on (since it makes no sense to make 
 % notes without numbering the lines, particularly since the 
 % |\textnote{}| macro uses the line number). And it makes sure that the 
 % 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
+% contents. 
+%
+% First, a few commands for use by all of the endnotes 
+% sections. |\setendnotessectiontitledefaults| sets the title of the endnotes section
+% at the top of the first page of that species of note, and 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
+% (|\relax| to put the title where |\poemtitle| puts it, or |\titleindent| to put it where
+% |\sequencesectiontitle| puts it), (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.
@@ -4043,7 +4083,7 @@
 
 %    \end{macrocode}
 % \end{macro}
-
+%
 % Auxiliary commands for note and title sections
 %    \begin{macrocode}
 %    
@@ -5344,9 +5384,11 @@
 % for those notes as well.
 %    \begin{macrocode}
 \newcommand{\titletoothernotes}{\string\par
+\ifputpagenumberinnotes%
 \string\argpageref\string{\@compoundlabelscratch\string}%
 \string\setcounterfrompageref\string{notepageholdertitle\string}%
 \string{\@compoundlabelscratch\string}%
+\fi%
 \string\textbf\string{\ \the\fulltitleholder\string}}%
 %    \end{macrocode}
 %    \end{macro}
@@ -5494,11 +5536,12 @@ literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
 % \csname literal#1\endcsname{\setlength}{\parindent}{2}}% problem here
 % 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\csname #1s\endcsname{\string\if#1ssinglepar}
-\immediate\write\csname #1s\endcsname{\string\par}
-\immediate\write\csname #1s\endcsname{\string\fi}}
+\expandafter\newcommand\csname first#1\endcsname{%
+\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}%
@@ -5515,7 +5558,7 @@ literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
 \resetlemmacounters%
 }
 % prose  version
-\expandafter\newcommand\csname prose#1\endcsname[3][0]{%                                               %	
+\expandafter\newcommand\csname prose#1\endcsname[3][0]{%	
 \unskip\proselinelabel{##2}%
 \setproselemmarange{##2}{##1}%
 \csname ifno#1yet\endcsname%
@@ -5526,6 +5569,7 @@ literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
 \csname literal#1\endcsname{##3}%
 \csname if#1ssinglepar\endcsname%
 \csname literal#1\endcsname{\par}%
+\unskip%
 \fi%
 \resetlemmacounters\unskip%
 }
diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
index eb9a66bafe1..0686ae5934f 100644
--- a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
+++ b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
@@ -22,7 +22,12 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]
 \ProvidesPackage{poemscol}
-   [2013/03/24 v2.62 poemscol file]
+   [2013/08/20 v2.64 poemscol file]
+
+
+
+
+
 
 
 
@@ -137,12 +142,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}
+ \newenvironment{quotedverse}{%
+ \let\\=\@centercr%
+ \list{}{\itemsep\z@ \itemindent -\runoverindentvalue\listparindent \itemindent
+           \rightmargin 0sp\leftmargin 0sp\advance\leftmargin
+           \runoverindentvalue}\item[]}
+ {\endlist}
 
 \newcounter{verselinenumber}
 \newcounter{printlineindex}
@@ -721,7 +726,6 @@
 }
 }
 
-
 \newcommand{\@pagemarktotextnotes}[1]{%
 \immediate\write\textnotes{\string\setcounterfrompageref\string{notepageholdertitle\string}%
 \string{#1\string}\string\unskip}%
@@ -1568,9 +1572,11 @@
  \fi
 }
 \newcommand{\titletoothernotes}{\string\par
+\ifputpagenumberinnotes%
 \string\argpageref\string{\@compoundlabelscratch\string}%
 \string\setcounterfrompageref\string{notepageholdertitle\string}%
 \string{\@compoundlabelscratch\string}%
+\fi%
 \string\textbf\string{\ \the\fulltitleholder\string}}%
 \newif\ifemendationssinglepar
 \newcommand{\emendation}[2][0]{
@@ -1669,11 +1675,12 @@
 \immediate\write\csname #1s\endcsname{\string\if#1stwocol}
 \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\csname #1s\endcsname{\string\if#1ssinglepar}
-\immediate\write\csname #1s\endcsname{\string\par}
-\immediate\write\csname #1s\endcsname{\string\fi}}
+\expandafter\newcommand\csname first#1\endcsname{%
+\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%
@@ -1688,7 +1695,7 @@ literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
 \fi%
 \resetlemmacounters%
 }
-\expandafter\newcommand\csname prose#1\endcsname[3][0]{%                                               %
+\expandafter\newcommand\csname prose#1\endcsname[3][0]{%
 \unskip\proselinelabel{##2}%
 \setproselemmarange{##2}{##1}%
 \csname ifno#1yet\endcsname%
@@ -1699,6 +1706,7 @@ literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
 \csname literal#1\endcsname{##3}%
 \csname if#1ssinglepar\endcsname%
 \csname literal#1\endcsname{\par}%
+\unskip%
 \fi%
 \resetlemmacounters\unskip%
 }