poemscol (8sep19)

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

3 files changed, 1684 insertions, 432 deletions

diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
index 1342e632a7a..d36f8e74cb9 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 3119270c03e..a829066e7bf 100644
--- a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
+++ b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
@@ -23,11 +23,12 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
 %<package>\ProvidesPackage{poemscol}
-%<package>   [2019/08/18 v3.02 poemscol file] 
+%<package>   [2019/09/08 v3.11 poemscol file] 
 %
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{makeidx,multicol,keyval,ifthen}
+\setlength\IndexMin{100pt}
 \EnableCrossrefs         
 \CodelineIndex
 \RecordChanges
@@ -37,7 +38,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{8587}
+% \CheckSum{9869}
 %
 % \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
@@ -241,7 +242,19 @@
 % \changes{v3}{2019/08/03}{With centered verse you can align the title, epigraphs,
 % attibutions, and so on with the left margin of the verse block.}
 % \changes{v3.01}{2019/08/04}{Corrections to manual}
-% \changes{v3.02}{2019/08/18}{Corrections to manual. Hierarchy of indented lines. Minor bug fix.}
+% \changes{v3.04}{2019/08/18}{Appendix sections. New contents entries.}
+% \changes{v3.08}{2019/09/03}{Indentations of species of titles in text can be independenttly changed without changing the 
+% definition of the title. Appendix and Foreword section titles can be indented differently from notes section titles. }
+% \changes{v3.081}{2019/09/05}{Fixed centertitles bug for subsections}
+% \changes{v3.09}{2019/09/06}{New schemes for titles. Titles can be placed 
+% according the indentation schemes introduced in version 3.08, at the left text margin, at
+% the left verse margin, centered over the longest line of a verse block at the left verse margin, 
+% at the left margin of a verse block centered on the longest line, and centered over a verse 
+% block centered over the longest line.}
+% \changes{v3.1}{2019/09/08}{New commands shortpoemepigraph, shortpoemdedication, 
+% shortpoemattribution, JHshortepigraph, JHshortdedication. These 
+% commands are controlled by the same booleans that control placement 
+% of titles.}
 % \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
 % \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip}
 % \DoNotIndex{\newcommand, \section, \subsection, \subsubsection,
@@ -274,15 +287,15 @@
 % \textsc, \unskip} 
 % \setcounter{IndexColumns}{2} 
 % \MakeShortVerb{|}
-% \def\fileversion{3.02} 
-% \def\filedate{18 August 2019} 
-% \def\docdate{18 August 2019}
+% \def\fileversion{3.11} 
+% \def\filedate{8 September 2019} 
+% \def\docdate{8 September 2019}
 %  \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{18 August 2019} 
+% \date{8 September 2019} 
 % \maketitle
 % \begin{abstract} \textsf{poemscol} provides commands for \LaTeX\ for
 % setting collections of poetry.  It is especially suited for setting
@@ -602,6 +615,14 @@
 % retrofit files that use the old version of this command. You can 
 % see the details at section \ref{definingnewnotes}, page 
 % \pageref{definingnewnotes}.
+% 
+%\begin{sloppy}
+% Version 3 introduced the boolean |\ifleftaligntitles|, for aligning the title with
+% the left edge of a verse block centered on the longest line. Version 3.1 introduces
+% new title placement schemes, including one which
+% centers the title on the longest line of a verse block at the left margin. This made
+% the meaning of |\ifleftaligntitles| ambiguous. So I have changed that boolean to 
+% |\iftitlesatleftmarginofcenteredblock.|\end{sloppy}
 %
 % \section{Marking up individual poems}
 % First, a word about the command names. The command names may seem 
@@ -662,29 +683,91 @@
 % either |\setlength| or |\renewcommand| (depending upon what you are
 % changing).  
 %
-% \subsubsection{Customization of titles}
-% \DescribeMacro{\centertitles} By default, titles place at or near (depending on the kind
-% of title) the left margin. To center all titles, issue |\centertitles|. (Centering titles might be 
-% especially useful if you are setting poems so that the longest line 
-% of the verse block is centered on the page. For instructions about 
-% how to center the verse block in this way, see section \ref{centeringtextblock} 
-% on page \pageref{centeringtextblock}.) If you have multi-line
-% titles, |\centertitles| will center each line.  |\centertitles| also moves in epigraphs, headnotes,
+% \subsubsection{Customization of titles}\begin{sloppy}
+% There are a number of places where a title might be set.  I have
+% defined for this purpose five ``title placement schemes.'' For each 
+% one there is a boolean which turns on the choice, and a ``scheme'' 
+% command which switches that boolean on and switches off the 
+% booleans for the other schemes.  They are
+% \begin{itemize} 
+%\item Aligned with the left print margin, or
+% indented from it according to the scheme of title indentations. The 
+% hierarchy of indentations for various kinds of title is described 
+% below at section \ref{customtitleindentations}, 
+% page \pageref{customtitleindentations}
+% I will call the boolean that describes this
+% situation |\ifnormaltitleindentation| because it was the default for
+% \textsf{poemscol}. You invoke this title scheme with the command 
+% |\normaltitleindentationscheme|
+% 
+% \item Aligned with the left margin of a left-aligned verse block.
+% The verse block is normally inset from the left print margin by the length
+% |\leftmargini |.  I will call the boolean that describes this
+% title placement |\iftitlesatleftversemargin|. You invoke this title 
+% scheme with the command |\titlesatleftversemarginscheme|
+% 
+% \item Centered over the longest line of a left-aligned verse block.
+% I will call the boolean that describes this title placement
+% |\iftitlescenteredonleftverseblock|. The corresponding command is 
+% |\titlescenteredonleftverseblockscheme|.
+% 
+% \item Aligned with the left margin of a verse block centered on the
+% page on the longest line. This will be associated with the boolean 
+% |\iftitlesatleftmarginofcenteredblock|. (In version 3.0 this boolean
+% was called |\ifleftaligntitles|. I have removed that boolean 
+% because its meaning is ambiguous now.) The command to invoke this 
+% title scheme is |\titlesatleftmarginofcenteredblockscheme|.
+% 
+% 
+% \item Titles centered over a centered verse block.  I call this
+% |\ifcentertitleson|. The corresponding command is 
+% |\centertitlesscheme| I have retained the command |\centertitles| 
+% from earlier versions of \textsf{poemscol} for compatibility.\end{itemize}\end{sloppy}
+%
+% \DescribeMacro{\centertitlesscheme} This scheme will center the 
+% titles even if you do not center the verse block on the longest 
+% line. For instructions about 
+% how to center the verse block on the longest line, see section \ref{centeringtextblock} 
+% on page \pageref{centeringtextblock}. For each poem you will have 
+% to set the length of the length variable |\versewidth| to the 
+% width of the longest line. To do this, use |\settowidth| as 
+% follows:\\ |\settowidth{\versewidth}{text of longest line}|.\\ Then 
+% use the optional argument to |\begin{poem}| as follows:\\ 
+% |\begin{poem}[\versewidth].|\\
+%  |\centertitlescheme| also moves in epigraphs, headnotes,
 % attributions, and dedications towards the center. Since an epigraph or a headnote may be 
 % a prose paragraph, or a passage of verse, it would be unwise to set them in a centering
 % environment, so |\centertitles| just moves them towards the center. To adjust the placement
 % of epigraphs and similar things, see section \ref{centerepigraphs}, page \pageref{centerepigraphs}.
+
+%
+% \DescribeMacro{\titlescenteredonleftverseblockscheme} 
+
+%Using this
+% scheme will require you to make known the width of the longest line
+% of the poem being set and the width of the title.  You will need to
+% use the |\settowidth| command to set the length of |\versewidth| and
+% |\titlewidth|. For example: 
+% |\settowidth{\titlewidth}{poem title}|.  Normally
+% you should not use the optional argument to |\begin{poem}| with this
+% title scheme.  But you may have already marked up all your poems
+% such a way as to leave open the choice of centering them.  You can
+% turn off centering, without erasing all of the optional arguments, by
+% issuing |\textcenteringturnedonfalse|.  You can turn on centering the
+% text block again by issuing |\textcenteringturnedontrue|.
 %
 %\begin{sloppypar}
-% \DescribeMacro{\leftaligntitles} Rather than centering the title over 
+% \DescribeMacro{\titlesatleftmarginofcenteredblockscheme} 
+
+%Rather than centering the title over 
 % a centered block of verse, one might prefer to align the title with 
-% the left margin of the centered verse block. To do this, issue 
-% |\leftaligntitlestrue| to set the boolean |\ifleftaligntitles|. The length |\versewidth|
+% the left margin of the centered verse block. That is the use of this scheme The length |\versewidth|
 % is used both to center the verse block and to place the title at the verse block's left margin.
 % You will need to use |\settowidth| to set the length of |\versewidth| before
 % issuing |\poemtitle| or the other title-making commands (such as |\sequencesectiontitle|).  
 % Issue |\settowidth{\versewidth}{Text to be used for centering}| just 
-% before you issue the |\poemtitle| or |\epigraph| command.  For how to use |\settowidth| to center the
+% before you issue the |\poemtitle| or |\epigraph| command. 
+% For how to use |\settowidth| to center the
 % verse block or to align titles, epigraphs, and so forth with the left margin of the
 % verse block, see section \ref{centeringtextblock}, page \pageref{centeringtextblock}.
 %
@@ -697,7 +780,10 @@
 % dedications, and other pre-texts of poems. (It will not affect the 
 % dedications and attributions on volume title pages, which are set 
 % using the |\volumededication|, |\volumeepigraph|, and 
-% |\volumeattribution| commands.) 
+% |\volumeattribution| commands.) A new group of commands, 
+% |\shortpoemepigraph|, |\shortpoemdedication|, |\shortpoemattribution|, 
+% |\JHshortepigraph| and |\JHshortdedication| will appear at the places 
+% controlled by the new ``title schemes'' listed above.
 % \end{sloppypar}
 %
 % \begin{sloppypar}
@@ -1027,7 +1113,7 @@
 % multiple times. But you can also use an optional argument to |\verseindent|, with
 % the number indicating how many levels of indentation to add to this line,  like so
 % |\verseindent[3]| for the third level of indentation, (with each level being one |\verseindent| 
-% deep. If you use this option, don't put any white space between the end of the 
+% deep). If you use this option, don't put any white space between the end of the 
 % |\verseindent| command and the beginning of the poetic text, otherwise
 % poemscol will add about 10pt of unwanted extra white space. (The only real 
 % consequence of forgetting about this will be that |\verseindent[1]| will be about
@@ -1356,6 +1442,22 @@
 % can find all of the values in the contents indentation hierarchy at section 
 % \ref{contents indentation hierarchy}, page \pageref{contents indentation hierarchy}.
 %
+% \DescribeMacro{\pmclcontentsentry} There is a simple way of adding a new contents
+% entry using the command |\pmclcontentsentry|. The command creates an entry on the model
+% of the entry for the textual notes section. It takes three arguments. The first is the title of 
+% the section. The second is the indentation of the entry (typically |\contentsindentone|
+% |\contentsindenttwo|, or |\contentsindentthree|, but any length will do). The third is the page number.
+% You can suppress the page number by setting the boolean |\putpagenumbersincontentsfalse|.
+%
+% A more general way to add a entry in the table
+% of contents is to use the command |\pmclecontentsentrydefaults|. This command takes
+% four arguments: (1) The title  (2) the indentation (3) the font size (e.g. |\contentendnotesfont| for the
+% same font size used in contents entries for the endnotes sections) and (4) the page number. Here
+% also you can suppress the page number by setting the boolean |\putpagenumbersincontentsfalse|.
+%
+% \DescribeMacro{\setlength} To change the amount various kinds of title are indented in the Table
+% of Contents, see below at section \ref{contentsindentations}, page \pageref{contentsindentations}.
+%
 % \DescribeMacro{\renewcommand}
 % You can also make global changes to the appearance of a particular kind of contents entry. To
 % change the appearance of a kind of entry (for all sections of 
@@ -1400,7 +1502,7 @@
 % \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}
 % {\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
 % {\titleindentamount}
-% \c@ntentsinfo{#1}{\contentsindenthree}{\contentspoemtitlefont}
+% \c@ntentsinfo{#1}{\poemsectiontitleindent}{\contentspoemtitlefont}
 % {\contentsindentfouramount}
 % \t@xtnotesinfo{#1}} 
 % \makeatother
@@ -1641,7 +1743,7 @@
 % this problem.  The first way is to change all of the paragraphs of the notes to
 % normal indentation, which you can do by issuing
 % |\literaltextnote{\setlength{\parindent}{\noteindentation}}| just after issuing |\maketextnotes| . 
-% You can change the amoubt of indentation by changing the value of the 
+% You can change the amount of indentation by changing the value of the 
 % length |\noteindentation| (the default value is 1 em).
 % You should remember to issue similar 
 % commands for emendations, explanatory notes, and whatever kinds of notes you 
@@ -2211,6 +2313,41 @@
 % the lines to read those files in and add entries for them in the
 % table of contents.
 %
+% \section{Forewords, Appendices, Contents Entries}
+%
+% \DescribeMacro{\makeappendix} To make a an Appendix, or any other inserted
+% prose section, use |\makeappendix|. |\makeappendix| takes one argument, the title.
+% The new section will open on a recto page, and its first page will be in the empty page style.
+% The title of the section will appear on the page in the style of the textual notes section.
+% The title of the section will appear in the running header of subsequent pages.
+% An entry for the new section, with the page number,
+%  will be added to the table of contents. The entry will
+% be formatted the way the entries for textual notes and explanatory notes are formatted. 
+%
+% \DescribeMacro{\appendixtitle} If you wish to add an Appendix which you don't 
+% want to start on a new page but do want
+% to have a contents entry for, use |\appendixtitle| instead of |\makeappendix|.
+%
+% \DescribeMacro{\makesubappendix} |\makesubappendix| behaves exactly as |makeappendix| does,
+% except the contents entry will be indented by the length |\subappendixtitleindentamount|.
+%
+% \DescribeMacro{\subappendixtitle} If you wish to add an Subappendix which you don't 
+% want to start on a new page but do want
+% to have a contents entry for, use |\subappendixtitle| instead of |\makesubappendix|.
+%
+% \DescribeMacro{\appendixincontents} If you wish to suppress contents entries for 
+% appendices, issue the boolean |\appendixincontentsfalse|. Contents entries for 
+% appendices or subappendices will be suppressed so long as that boolean is set to false.
+%
+% \DescribeMacro{\pmclcontentsentry} \label{pmclcontentsentry} If you want to add a 
+% line to the table of contents that
+% will follow the formatting of other entries in the contents, issue |\pmclcontentsentry|. 
+% |\pmclcontentsentry| takes three arguments. The first is the title you wish to put in the contents.
+% The second is the length of the indentation to appear in the contents (usually |\contentsindentone|, 
+% |\contentsindenttwo|, or |\contentsindentthree|, but you can use any arbitrary length).
+% The third argument is the page number. The argument could be a |\pageref| rather than a number.
+% if you define the |\label| for that |\pageref| somewhere else in your file.
+%
 % 
 % \section{Special cases}
 % \subsection{~Epigraphs, attributions etc.} \label{centerepigraphs}
@@ -2220,17 +2357,37 @@
 % their arguments as epigraphs, headnotes, attributions, or
 % dedications for poems or poetic sequences. \goodbreak
 %
-% \DescribeEnv{epigraphenvironment}
 % If your epigraph or headnote is a prose passage of more than one paragraph, or a verse
-% passage of more than one stanza, use the |epigraphenvironment| environment
-% rather than the |\epigraph| command. If you use the standard \LaTeX\ |verse|
+% passage of more than one stanza, the |\epigraph| command will work 
+% properly. If you use the standard \LaTeX\ |verse|
 % environment within an epigraph, you may wish to add a |\smallskip| between 
 % stanzas. (To my eye that environment does not leave enough white space between
 % stanzas.) Alternatively, you can use the special |pmclverse| environment 
 % within the |epigraphenvironment| environment. (You can even use
 % the |poem| environment within the |epigraphenvironment| environment, but if
 % you mark up the epigraph with things like |\verseline| and |\end{stanza}| you may wind
-% up with marginal line numbers.)
+% up with marginal line numbers.) Because |\centerepigraphs| merely 
+% draws in the margins on both sides, short passages may not appear 
+% centered very well, unless you fool around with |\versewidth| to 
+% find a satisfactory value. 
+%
+% \DescribeMacro{\shortpoemepigraph} The commands 
+% |\shortpoemepigraph| |\shortpoemdedication| and 
+% |\shortpoemattribution| These will all place their texts in 
+% accordance with the title placement scheme you select in your 
+% preamble. 
+% |\normaltitleindentationscheme| will place them near the left text 
+% margin.
+% |\titlesatleftversemarginscheme| will place them at the left verse 
+% margin.
+% |\titlescenteredonleftverseblockscheme| will center them over the 
+% longest line of a left-flushed verse block. 
+% |\centertitlesscheme| will center them.
+% |\titlesatleftmarginofcenteredblockscheme| will place them at the 
+% left margin of a centered verse block. I have also included 
+% |\JHshortepigraph| and |\JHshortdedication|, which set marginal 
+% marks pointing to where notes on the epigraph or dedication in the textual notes section may be 
+% found, in the manner of |\JHpoemtitle|.
 %
 % \DescribeMacro{\centertitles}
 % Issuing |\centertitles| moves the margins in on both sides by the length 
@@ -2248,10 +2405,11 @@
 % |\volumeattribution|. These commands are unaffected by |\centertitles|.
 %
 % \begin{sloppypar}
-% \DescribeMacro{\leftaligntitles} Rather than centering the title over 
+% \DescribeMacro{\titlesatleftmarginofcenteredblock} Rather than centering the title over 
 % a centered block of verse, one might prefer to align the title with 
 % the left margin of the verse block. To do this, issue 
-% |\leftaligntitlestrue| to set the boolean |\ifleftaligntitles|. You 
+% |\titlesatleftmarginofcenteredblocktrue| to set the boolean |\iftitlesatleftmarginofcenteredblock|.
+% You 
 % may also wish to align epigraphs, dedications, attributions, or 
 % headnotes with the left margin of the verse block (even if you 
 % center the titles). To do this, issue |\leftalignepigraphstrue| to 
@@ -2740,7 +2898,111 @@
 % commands.  The lines will be broken in the table of contents and in
 % the body of the text in the same way, but will be run in in the
 % notes sections.
+%
+% \subsection{~Customizing indentations in titles in the text body}\label{customtitleindentations}
+% Titles of poems, subtitles, titles of sequences, sections of sequences (and subsections and so on), 
+% appear in the text with a hierarchy of indentations. If you want to change anything
+% about these indentations, you don't need to modify the various title-setting commands, but only to 
+% change the length of the relevant indentation command. I
+% have given the indentations for each class of title a defined length, which you can change
+% by changing the definition of the indentation command. (e.g. 
+% |\renewcommand{\poemtitleindent}{\hspace{3em}}.)| For many of these 
+% indentations you can also simply change the applicable length (e.g. 
+% |\setlength{\\sequencesubtitleindentmount}{\titleindenttwoamount}|. )
+%
+%  The ``amount'' part in the command
+% is important. |\poemtitleindentamount| is a length. On the other 
+% hand, |\sequencesectiontitleindentindent| is a command, defined
+% defined as\\
+%  |\hspace{\sequencesectiontitleindenttitleindentamount}|. \\
+% The table lists all the commands for these 
+% indentations. In the table ``Extra Lines'' refers to the indentation for the second and third lines
+% (and so on) of multi-line titles. If you wish to change the 
+% indentation of any of the titles whose default length is listed as 
+% 0 in the table below, you must use the |\renewcommand| method. (I 
+% found that setting the length of one of the indentations to 0pt 
+% added a few points of white space I could not figure out how to get 
+% rid of, so by default those commands are defined not by using a 
+% length but by, for example, |\newcommand{\poemtitleindent}{\relax}|.)
+%
+%\begin{table}[t]
+%\caption{Indentations in Titles}
+%\bigskip
+%{\scriptsize
+%\begin{tabular}{l l l}
+%\hline
+%Entity Title & Indentation  & Default Length\\
+%\hline
+%Volume & |\volumetitleindentamount| & |0pt| \\
+%Extra Lines & |\volumetitlesecondlineindentamount| & |0pt| \\
+%Volume Subtitle & |\volumesubtitleindentamount| & |\titleindentamount| (1pc)\\ 
+%Extra  Lines & |\volumesubtitlesecondlineindentamount| & |\titleindentamount| \\ 
+%Volume Section & |\volumesectiontitleindentamount| & |0pt| \\ 
+%Extra  Lines & |\volumesectiontitlesecondlineindentamount| & |0pt|  \\ 
+%Poem & |\poemtitleindentamount| & |0pt| \\
+%Extra Lines & |\poemtitlesecondlineindentamount| & |0pt| \\
+%Poem Subtitle & |\poemsubtitleindentamount| & |\titleindentamount| \\ 
+%Poem Section & |\poemsectiontitleindentamount| & |\titleindentamount| \\
+%Poem Subsection & |\poemsubsectiontitleindentamount| & |2 *\titleindentamount| \\
+%Extra Lines  & |\poemsectiontitlesecondlineindentamount| & |\titleindentamount| \\
+%Sequence & |\sequencetitleindentamount| & |0pt| \\
+%Extra Lines  & |\sequencetitlesecondlineindentamount| & |0pt| \\
+%Sequence Subtitle & |\sequencesubtitleindent | & |\titleindentamount| \\ 
+%Extra Lines & |\sequencesubtitlesecondlineindentamount| & |\titleindentamount| \\ 
+%Sequence Section & |\sequencesectiontitleindentamount| & |\titleindentamount| \\
+%Extra Lines & |\sequencesectiontitlesecondlineindentamount| & |\titleindentamount| \\
+%Sequence Section Subtitle & |\sequencesectionsubtitleindentamount| & |\titleindenttwoamount| \\
+%Extra Lines & |\sequencesectionsubtitlesecondlineindentamount| &  |\titleindenttwoamount| \\
+%Sequence Subsection & |\sequencesubsectiontitleindentamount| &   |\titleindenttwoamount| \\
+%Sequence Subsubsection & |\sequencesubsubsectiontitleindentamount| &  |\titleindentathreeamount| \\
+%Appendix & |\appendixtitleindentamount| & |0pt| \\
+%SubAppendix & |\subappendixtitleindentamount| & |\titleindentamount| \\
+%Foreword & |\forewordtitleindentamount| & |0pt| \\
+%Notes Sections & |\notestitleindentamount| & |0pt| 
+%\end{tabular}}
+%\end{table}
+%
+% \subsection{~Customizing indentations in titles in the Contents}\label{contentsindentations}
+% There is also a hierarchy of indentations for titles in the Table of Contents. Again,
+% to change the indentations in the Contents, you don't need to redefine the title-setting
+% commands, only to change the value of the relevant length. The table shows the hierarchy
+% of indentations in the Table of Contents:
 %	
+%\begin{table}[t]
+%\caption{Indentations in Contents}
+%\bigskip
+%{\scriptsize
+%\begin{tabular}{l l l}
+%\hline
+%Entity Title & Indentation  & Default Length\\
+%\hline
+%Volume & |\contentsvolumetitleindentamount| & |0pt| \\
+%Extra Lines & |\contentsvolumetitlesecondlineindentamount| & |0pt| \\
+%Volume Subtitle & |\contentsvolumesubtitleindentamount| & |\contentsindentoneamount| (24pt)\\ 
+%Extra Lines & |\contentsvolumesubtitlesecondlineindentamount| & |\contentsindentoneamount| \\ 
+%Volume Section & |\contentsvolumesectiontitleindentamount| & |0pt| \\ 
+%Extra Lines & |\contentsvolumesectiontitlesecondlineindentamount| & |0pt|  \\ 
+%Poem & |\contentspoemtitleindentamount| & |\contentsindentoneamount| \\
+%Extra Lines & |\contentspoemtitlesecondlineindentamount| & |\contentsindentoneamount| \\
+%Poem Subtitle & |\contentspoemsubtitleindentindentamount| & |\contentsindenttwoamount| \\ 
+%Poem Section & |\contentspoemsectiontitleindentamount| & |\contentsindenttwoamount| \\
+%Extra Lines & |\poemsectiontitlesecondlineindentamount| & |\contentsindenttwoamount| \\
+%Sequence & |\contentssequencetitleindentamount| & |\contentsindentoneamount|\ \\
+%Extra Lines & |\contentssequencetitlesecondlineindentamount| & |\contentsindentoneamount| \\
+%Sequence Subtitle & |\contentssequencesubtitleindenamountt | & |\contentsindentotwoamount| \\ 
+%Extra Lines  & |\contentssequencesubtitlesecondlineindentamount| & |\contentsindenttwoamount| \\ 
+%Sequence Section & |\contentssequencesectiontitleindentamount| & |\contentsindenttwoamount| \\
+%Extra Lines & |\contentssequencesectiontitlesecondlineindentamount| & |\contentsindenttwoamount| \\
+%Sequence Section Subtitle & |\contentssequencesectionsubtitleindentamount| & |\contentsindentthreeamount| \\
+%Extra Lines & |\contentssequencesectionsubtitlesecondlineindentamount| & |\contentsindenthtreeamount| \\
+%Sequence Subsection & |\contentssequencesubsectiontitleindentamount| &  |\contentsindentthreeamount| \\
+%Sequence Subsubsection & |\contentssequencesubsubsectiontitleindentamount| & |\contentsindentfouramount| \\
+%Appendix or Foreword & |\contentsappendixtitleindentamount| & |0pt| \\
+%Notes Sections & |\contentsnotestitleindentamount| & |0pt|  
+%
+%\end{tabular}}
+%\end{table}
+%
 % \subsection{~Visual formatting}
 % \DescribeMacro{\longpage}
 % \DescribeMacro{\shortpage}
@@ -4037,22 +4299,109 @@
 %    A hierarchy of indentations for sequence section titles and 
 % subsection titles.
 %    \begin{macrocode}
-\newdimen\titleindentamount \titleindentamount=1pc
-\newdimen\titleindenttwoamount \titleindenttwoamount=2pc
-\newdimen\titleindentthreeamount \titleindentthreeamount=3pc
+\newlength{\titleindentamount}
+\setlength{\titleindentamount}{1pc}
+%\newdimen\titleindentamount \titleindentamount=1pc
+%\newdimen\titleindenttwoamount \titleindenttwoamount=2pc
+\newlength{\titleindenttwoamount}
+\setlength{\titleindenttwoamount}{2pc}
+\newlength{\titleindentthreeamount}
+\setlength{\titleindentthreeamount}{3pc}
+%\newdimen\titleindentthreeamount \titleindentthreeamount=3pc
 \newcommand{\titleindent}{\hspace{\titleindentamount}}
-\setlength{\parindent}{\titleindentamount}
-%    \end{macrocode}
-%    White space after poem titles, after poems, and after sequence 
-% titles. \label{skiplist}
-%    \begin{macrocode}
-\newcommand{\afterpoemtitleskip}{\smallskip}
-\newcommand{\afterpoemskip}{\bigskip}
-\newcommand{\aftersequencetitleskip}{\medskip}
-%    \end{macrocode}
-%    A little extra white space between stanzas.
-%    \begin{macrocode}
-\newcommand{\stanzaskip}{\medskip}
+\setlength{\parindent}{1pc}
+\newlength{\volumetitleindentamount}
+\setlength{\volumetitleindentamount}{0pt}
+%\newcommand{\volumetitleindent}{\hspace{\volumetitleindentamount}}
+\newcommand{\volumetitleindent}{\relax}
+\newlength{\volumetitlesecondlineindentamount}
+\setlength{\volumetitlesecondlineindentamount}{0pt}
+%\newcommand{\volumetitlesecondlineindent}{\hspace{\volumetitlesecondlineindentamount}}
+\newcommand{\volumetitlesecondlineindent}{\relax}
+% \titleindentamount=1pc
+\newlength{\volumesubtitleindentamount}
+\setlength{\volumesubtitleindentamount}{\titleindentamount}
+\newcommand{\volumesubtitleindent}{\hspace{\volumesubtitleindentamount}}
+\newlength{\volumesubtitlesecondlineindentamount}
+\setlength{\volumesubtitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\volumesubtitlesecondlineindent}{\hspace{\volumesubtitlesecondlineindentamount}}
+\newlength{\volumesectiontitleindentamount}
+\setlength{\volumesectiontitleindentamount}{0pt}
+% \newcommand{\volumesectiontitleindent}{\hspace{\volumesectiontitleindentamount}}
+\newcommand{\volumesectiontitleindent}{\relax}
+\newlength{\volumesectiontitlesecondlineindentamount}
+\setlength{\volumesectiontitlesecondlineindentamount}{0pt}
+% \newcommand{\volumesectiontitlesecondlineindent}{\hspace{\volumesectiontitlesecondlineindentamount}}
+\newcommand{\volumesectiontitlesecondlineindent}{\relax}
+\newlength{\poemtitleindentamount}
+\setlength{\poemtitleindentamount}{0pt}
+% \newcommand{\poemtitleindent}{\hspace{\poemtitleindentamount}}
+\newcommand{\poemtitleindent}{\relax}
+\newlength{\poemtitlesecondlineindentamount}
+\setlength{\poemtitlesecondlineindentamount}{0pt}
+% \newcommand{\poemtitlesecondlineindent}{\hspace{\poemtitlesecondlineindentamount}}
+\newcommand{\poemtitlesecondlineindent}{\relax}
+\newlength{\poemsubtitleindentamount}
+\setlength{\poemsubtitleindentamount}{\titleindentamount}
+\newcommand{\poemsubtitleindent}{\hspace{\poemsubtitleindentamount}}
+\newlength{\poemsectiontitleindentamount}
+\setlength{\poemsectiontitleindentamount}{\titleindentamount}
+\newcommand{\poemsectiontitleindent}{\hspace{\poemsectiontitleindentamount}}
+\newlength{\poemsectiontitlesecondlineindentamount}
+\setlength{\poemsectiontitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\poemsectiontitlesecondlineindent}{\hspace{\poemsectiontitlesecondlineindentamount}}
+\newlength{\poemsubsectiontitleindentamount}
+\setlength{\poemsubsectiontitleindentamount}{\titleindenttwoamount}
+\newcommand{\poemsubsectiontitleindent}{\hspace{\poemsectiontitleindentamount}}
+\newlength{\sequencetitleindentamount}
+\setlength{\sequencetitleindentamount}{0pt}
+% \newcommand{\sequencetitleindent}{\hspace{\sequencetitleindentamount}}
+\newcommand{\sequencetitleindent}{\relax}
+\newlength{\sequencetitlesecondlineindentamount}
+\setlength{\sequencetitlesecondlineindentamount}{0pt}
+% \newcommand{\sequencetitlesecondlineindent}{\hspace{\sequencetitlesecondlineindentamount}}
+\newcommand{\sequencetitlesecondlineindent}{\hspace{\relax}}
+\newlength{\sequencesubtitleindentamount}
+\setlength{\sequencesubtitleindentamount}{\titleindentamount}
+\newcommand{\sequencesubtitleindent}{\hspace{\sequencesubtitleindentamount}}
+\newlength{\sequencesubtitlesecondlineindentamount}
+\setlength{\sequencesubtitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\sequencesubtitlesecondlineindent}{\hspace{\sequencesubtitlesecondlineindentamount}}
+\newlength{\sequencesectiontitleindentamount}
+\setlength{\sequencesectiontitleindentamount}{\titleindentamount}
+\newcommand{\sequencesectiontitleindent}{\hspace{\sequencesectiontitleindentamount}}
+\newlength{\sequencesectiontitlesecondlineindentamount}
+\setlength{\sequencesectiontitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\sequencesectiontitlesecondlineindent}{\hspace{\sequencesectiontitlesecondlineindentamount}}
+\newlength{\sequencesectionsubtitleindentamount}
+\setlength{\sequencesectionsubtitleindentamount}{\titleindenttwoamount}
+\newcommand{\sequencesectionsubtitleindent}{\hspace{\sequencesectionsubtitleindentamount}}
+\newlength{\sequencesectionsubtitlesecondlineindentamount}
+\setlength{\sequencesectionsubtitlesecondlineindentamount}{\titleindenttwoamount}
+\newcommand{\sequencesectionsubtitlesecondlineindent}{\hspace{\sequencesectionsubtitlesecondlineindentamount}}
+\newlength{\sequencesubsectiontitleindentamount}
+\setlength{\sequencesubsectiontitleindentamount}{\titleindenttwoamount}
+\newcommand{\sequencesubsectiontitleindent}{\hspace{\sequencesubsectiontitleindentamount}}
+\newlength{\sequencesubsubsectiontitleindentamount}
+\setlength{\sequencesubsubsectiontitleindentamount}{\titleindentthreeamount}
+\newcommand{\sequencesubsubsectiontitleindent}{\hspace{\sequencesubsubsectiontitleindentamount}}
+\newlength{\appendixtitleindentamount}
+\setlength{\appendixtitleindentamount}{0pt}
+% \newcommand{\appendixtitleindent}{\hspace{\appendixtitleindentamount}}
+\newcommand{\appendixtitleindent}{\relax}
+\newlength{\subappendixtitleindentamount}
+\setlength{\subappendixtitleindentamount}{0pt}
+% \newcommand{\subappendixtitleindent}{\hspace{\subappendixtitleindentamount}}
+\newcommand{\subappendixtitleindent}{\relax}
+\newlength{\forewordtitleindentamount}
+\setlength{\forewordtitleindentamount}{0pt}
+% \newcommand{\forewordtitleindent}{\hspace{\forewordtitleindentamount}}
+\newcommand{\forewordtitleindent}{\relax}
+\newlength{\notestitleindentamount} 
+\setlength{\notestitleindentamount}{0pt}
+% \newcommand{\notestitleindent}{\hspace{\notestitleindentamount}}
+\newcommand{\notestitleindent}{\relax}
+
 %    \end{macrocode}
 %    A hierarchy of indentations for the table of contents: \label{contents indentation hierarchy}
 %    \begin{macrocode}
@@ -4070,6 +4419,97 @@
 \newdimen\contentsindentfiveamount \contentsindentfiveamount=80pt
 \newcommand{\contentsindentfive}{\hspace{\contentsindentfiveamount}}
 %    \end{macrocode}
+%    A hierarchy of indentations for sequence section titles and 
+% subsection titles in the table of contents.
+%    \begin{macrocode}
+\newlength{\contentsvolumetitleindentamount}
+\setlength{\contentsvolumetitleindentamount}{0pt}
+%\newcommand{\contentsvolumetitleindent}{\hspace{\contentsvolumetitleindentamount}}
+\newcommand{\contentsvolumetitleindent}{\relax}
+\newlength{\contentsvolumetitlesecondlineindentamount}
+\setlength{\contentsvolumetitlesecondlineindentamount}{0pt}
+%\newcommand{\contentsvolumetitlesecondlineindent}{\hspace{\contentsvolumetitlesecondlineindentamount}}
+\newcommand{\contentsvolumetitlesecondlineindent}{\relax}
+\newlength{\contentsvolumesubtitleindentamount}
+\setlength{\contentsvolumesubtitleindentamount}{\titleindentamount}
+\newcommand{\contentsvolumesubtitleindent}{\hspace{\contentsvolumesubtitleindentamount}}
+\newlength{\contentsvolumesubtitlesecondlineindentamount}
+\setlength{\contentsvolumesubtitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\contentsvolumesubtitlesecondlineindent}{\hspace{\contentsvolumesubtitlesecondlineindentamount}}
+\newlength{\contentsvolumesectiontitleindentamount}
+\setlength{\contentsvolumesectiontitleindentamount}{0pt}
+\newcommand{\contentsvolumesectiontitleindent}{\hspace{\contentsvolumesectiontitleindentamount}}
+%\newcommand{\contentsvolumesectiontitleindent}{\relax}
+\newlength{\contentsvolumesectiontitlesecondlineindentamount}
+\setlength{\contentsvolumesectiontitlesecondlineindentamount}{0pt}
+\newcommand{\contentsvolumesectiontitlesecondlineindent}{\hspace{\contentsvolumesectiontitlesecondlineindentamount}}
+\newlength{\contentspoemtitleindentamount}
+\setlength{\contentspoemtitleindentamount}{\contentsindentoneamount}
+%\setlength{\contentspoemtitleindentamount}{0pt}
+\newcommand{\contentspoemtitleindent}{\hspace{\contentspoemtitleindentamount}}
+%\newcommand{\contentspoemtitleindent}{\relax}
+\newlength{\contentspoemtitlesecondlineindentamount}
+\setlength{\contentspoemtitlesecondlineindentamount}{\contentspoemtitleindentamount}
+\newcommand{\contentspoemtitlesecondlineindent}{\hspace{\contentspoemtitlesecondlineindentamount}}
+%\newcommand{\contentspoemtitlesecondlineindent}{\relax}
+\newlength{\contentspoemsubtitleindentamount}
+\setlength{\contentspoemsubtitleindentamount}{\contentspoemsubtitleindentamount}
+\newcommand{\contentspoemsubtitleindent}{\hspace{\contentspoemsubtitleindentamount}}
+\newlength{\contentspoemsectiontitleindentamount}
+\setlength{\contentspoemsectiontitleindentamount}{\contentsindenttwoamount}
+\newcommand{\contentspoemsectiontitleindent}{\hspace{\contentspoemsectiontitleindentamount}}
+\newlength{\contentspoemsectiontitlesecondlineindentamount}
+\setlength{\contentspoemsectiontitlesecondlineindentamount}{\contentspoemsectiontitleindentamount}
+\newcommand{\contentspoemsectiontitlesecondlineindent}{\hspace{\contentspoemsectiontitlesecondlineindentamount}}
+\newlength{\contentspoemsubsectiontitleindentamount}
+\setlength{\contentspoemsubsectiontitleindentamount}{\contentsindentthreeamount}
+\newcommand{\contentspoemsubsectiontitleindent}{\hspace{\contentsindentthreeamount}}
+\newlength{\contentssequencetitleindentamount}
+\setlength{\contentssequencetitleindentamount}{0pt}
+ \newcommand{\contentssequencetitleindent}{\hspace{\contentssequencetitleindentamount}}
+%\newcommand{\contentssequencetitleindent}{\relax}
+\newlength{\contentssequencetitlesecondlineindentamount}
+\setlength{\contentssequencetitlesecondlineindentamount}{0pt}
+ \newcommand{\contentssequencetitlesecondlineindent}{\hspace{\contentssequencetitlesecondlineindentamount}}
+%\newcommand{\contentssequencetitlesecondlineindent}{\hspace{\relax}}
+\newlength{\contentssequencesubtitleindentamount}
+\setlength{\contentssequencesubtitleindentamount}{\contentsindentoneamount}
+\newcommand{\contentssequencesubtitleindent}{\hspace{\contentssequencesubtitleindentamount}}
+\newlength{\contentssequencesubtitlesecondlineindentamount}
+\setlength{\contentssequencesubtitlesecondlineindentamount}{\contentsindentoneamount}
+\newcommand{\contentssequencesubtitlesecondlineindent}{\hspace{\contentssequencesubtitlesecondlineindentamount}}
+\newlength{\contentssequencesectiontitleindentamount}
+\setlength{\contentssequencesectiontitleindentamount}{\contentsindentoneamount}
+\newcommand{\contentssequencesectiontitleindent}{\hspace{\contentssequencesectiontitleindentamount}}
+\newlength{\contentssequencesectiontitlesecondlineindentamount}
+\setlength{\contentssequencesectiontitlesecondlineindentamount}{\contentsindentoneamount}
+\newcommand{\contentssequencesectiontitlesecondlineindent}{\hspace{\contentssequencesectiontitlesecondlineindentamount}}
+\newlength{\contentssequencesectionsubtitleindentamount}
+\setlength{\contentssequencesectionsubtitleindentamount}{\contentsindenttwoamount}
+\newcommand{\contentssequencesectionsubtitleindent}{\hspace{\contentssequencesectionsubtitleindentamount}}
+\newlength{\contentssequencesectionsubtitlesecondlineindentamount}
+\setlength{\contentssequencesectionsubtitlesecondlineindentamount}{\contentsindenttwoamount}
+\newcommand{\contentssequencesectionsubtitlesecondlineindent}{\hspace{\contentssequencesectionsubtitlesecondlineindentamount}}
+\newlength{\contentssequencesubsectiontitleindentamount}
+\setlength{\contentssequencesubsectiontitleindentamount}{\contentsindentoneamount}
+\newcommand{\contentssequencesubsectiontitleindent}{\hspace{\contentssequencesubsectiontitleindentamount}}
+\newlength{\contentssequencesubsubsectiontitleindentamount}
+\setlength{\contentssequencesubsubsectiontitleindentamount}{\contentsindentthreeamount}
+\newcommand{\contentssequencesubsubsectiontitleindent}{\hspace{\contentssequencesubsubsectiontitleindentamount}}
+
+
+%    \end{macrocode}
+%    White space after poem titles, after poems, and after sequence 
+% titles. \label{skiplist}
+%    \begin{macrocode}
+\newcommand{\afterpoemtitleskip}{\smallskip}
+\newcommand{\afterpoemskip}{\bigskip}
+\newcommand{\aftersequencetitleskip}{\medskip}
+%    \end{macrocode}
+%    A little extra white space between stanzas.
+%    \begin{macrocode}
+\newcommand{\stanzaskip}{\medskip}
+%    \end{macrocode}
 %    Penalties to encourage page breaks before poem titles, before 
 % multi-line poem titles, and before sequence titles.
 %    \begin{macrocode}
@@ -4078,7 +4518,60 @@
 \newcommand{\sequencetitlepenalty}{\penalty-3000}
 \newcommand{\multilinesequencepenalty}{\penalty-3500}
 %    \end{macrocode}
+% \subsection{~Title Schemes} Ways of controlling the placement of titles.
+%    \begin{macrocode}
+\newlength{\titlewidth}
+\newif\iftitlescenteredonleftverseblock
+\newif\iftitlesatleftmarginofcenteredblock
+\newif\iftitlesatleftversemargin
+\newif\ifnormaltitleindentation
+%
+\newcommand{\normaltitleindentationscheme}{%
+\normaltitleindentationtrue%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesonfalse%
+}
+\newcommand{\titlesatleftversemarginscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemargintrue%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesonfalse%
+}
+\newcommand{\titlescenteredonleftverseblockscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblocktrue%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesonfalse%
+}
+\newcommand{\titlesatleftmarginofcenteredblockscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblocktrue%
+\centertitlesonfalse%
+}
+\newcommand{\centertitlesscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesontrue%
+\centerepigraphsontrue%
+}
+\newlength{\lefttitleaddition}
+\setlength{\lefttitleaddition}{0pt}
+\newcommand{\l@ftc@ntertitleblock}{\rightmargin        \z@%%
+\setlength{\lefttitleaddition}{\versewidth}%
+\addtolength{\lefttitleaddition}{-\titlewidth}%
+\addtolength{\lefttitleaddition}{-0.5\lefttitleaddition}%
+\setlength{\lefttitlemargin}{\lefttitleaddition}%
+}
 
+%    \end{macrocode}   
 % \subsection{~Verse} The verse environment here is taken from \LaTeX, 
 % slightly modified to indent run over lines more. The idea is to 
 % distinguish the automatic indentation of run over lines from the 
@@ -4586,13 +5079,32 @@
 \partopsep\z@%
 \itemsep\z@ \itemindent -\titleentryoverrun%
 \listparindent \itemindent %
-\ifleftaligntitles
-\left@ligntitleblock
-\rightmargin 1sp\leftmargin \lefttitlemargin%
+\iftitlesatleftmarginofcenteredblock%
+\left@ligntitleblock%
+\rightmargin \z@\leftmargin \lefttitlemargin%
+\else%
+\iftitlescenteredonleftverseblock
+\l@ftc@ntertitleblock
+\rightmargin \z@\leftmargin \lefttitlemargin
 \else
-\rightmargin 1sp\leftmargin 1sp%
-\fi
-\advance\leftmargin \titleentryoverrun}\item[]}{\endlist}		  
+\rightmargin \z@\leftmargin \z@%
+\fi\fi%
+\advance\leftmargin \titleentryoverrun}\item[]}{\endlist}
+% older version:
+%\newenvironment{titleentryenvironment}{%
+%\language=255%no hyphenation in poem titles
+%\let\\=\@centercr%  
+%\list{}{\topsep\z@%
+%\partopsep\z@%
+%\itemsep\z@ \itemindent -\titleentryoverrun%
+%\listparindent \itemindent %
+%\ifleftaligntitles
+%\left@ligntitleblock
+%\rightmargin 1sp\leftmargin \lefttitlemargin%
+%\else
+%\rightmargin 1sp\leftmargin 1sp%
+%\fi
+%\advance\leftmargin \titleentryoverrun}\item[]}{\endlist}		  
 %    \end{macrocode}
 %    \end{macro}
 % The poem environment.  The little trick about setting the language
@@ -5197,16 +5709,16 @@
 \newcommand{\setendnotessectiontitledefaults}[6]{%
 #2%
 #3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{\ifcentertitleson\begin{center}#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}}
+\newcommand{\setendnotessectiontitle}[2]{%
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\notestitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{#2}}
 % Generic command for sending info about endnotes sections to table 
 % of contents
 \newcommand{\contentsendnotesdefaults}[4]{\ifpoemcontentson
@@ -5378,7 +5890,103 @@
 \newcommand{\@poemtitletotextnotes}[1]{\literaltextnote{\textbf{#1}}}
 %    \end{macrocode}
 %    
+% \subsection{~Appendices, Forewords, Contents Entries}
+%    \begin{macro}{\makeappendix}
+%    \begin{macrocode}
+\newif\ifappendixincontents
+\appendixincontentstrue
+\newif\ifforewordincontents
+\forewordincontentstrue
+%
+\newcommand{\appendixdividerpage}[1]{\flushbottom{\par\clearpage
+  {\pagestyle{volumetitlestyle}\cleardoublepage}
+\thispagestyle{volumetitlestyle}}
+\fancyhead{}
+\fancyfoot{}
+\fancyhead[RO,LE]{\small\textrm{\thepage}}
+\fancyhead[CO]{\small{\em #1}}
+\fancyhead[CE]{#1}
+\fancyfoot[C]{}}
+%
+\newcommand{\appendixtitle}[1]{
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\appendixtitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{appdx#1}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\setlength{\parindent}{\noteindentation}
+\ifappendixincontents\contentsendnotestitle{#1}{appdx#1}\fi
+}
+%
+\newcommand{\makeappendix}[1]{%
+\appendixdividerpage{#1}
+\appendixtitle{#1}
+}
+%
+\newcommand{\contentsendnotessubtitle}[2]{
+\contentsendnotesdefaults{#1}{\contentsindenttwo}{\contentsendnotesfont}{#2}
+}
+%
+\newcommand{\subappendixtitle}[1]{%
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\subappendixtitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{appdx#1}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\setlength{\parindent}{\noteindentation}
+\ifappendixincontents\contentsendnotessubtitle{#1}{appdx#1}\fi
+}
+%
+\newcommand{\makesubappendix}[1]{%
+\appendixdividerpage{#1}
+\subappendixtitle{#1}
+}
+\newcommand{\foreworddividerpage}[1]{\flushbottom{\par\clearpage
+  {\pagestyle{volumetitlestyle}\cleardoublepage}
+\thispagestyle{volumetitlestyle}}
+\fancyhead{}
+\fancyfoot{}
+\fancyhead[RO,LE]{\small\textrm{\thepage}}
+\fancyhead[CO]{\small{\em #1}}
+\fancyhead[CE]{#1}
+\fancyfoot[C]{}}
+%
+\newcommand{\forewordtitle}[1]{
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\forewordtitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{foreword#1}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\setlength{\parindent}{\noteindentation}
+\ifforewordincontents\contentsendnotestitle{#1}{foreword#1}\fi
+}
+%
+\newcommand{\makeforeword}[1]{%
+\foreworddividerpage{#1}
+\forewordtitle{#1}
+}
 
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\pmclcontentsentry}
+%    \begin{macrocode}
+\newcommand{\pmclcontentsentrydefaults}[4]{
+\ifpoemcontentson
+\immediate\write\poemcontents{\string\begin\string{contentsentryenvironment\string}}%
+\literalcontents{#2{#3#1}}%
+  \ifputpagenumberincontents
+\immediate\write\poemcontents{\string\contentsleaders}%
+\literalcontents{#4}
+  \else
+  \literalcontents{\relax}%
+  \fi
+\immediate\write\poemcontents{\string\end\string{contentsentryenvironment\string}}%
+\immediate\write\poemcontents{\string\par}%
+\fi
+}
+%
+\newcommand{\pmclcontentsentry}[3]{%
+\pmclcontentsentrydefaults{#1}{#2}{\contentsendnotesfont}{#3}%
+}
+%    \end{macrocode}
+%    \end{macro}
 % \subsection{~Book, volume, and volume section titles}
 %    \begin{macro}{\wholebooktitle}
 %    \begin{macro}{\booksection}
@@ -5394,13 +6002,13 @@
 %    \begin{macrocode}
 \newcommand{\volumetitle}[1]{%
   \set@p@emtitle{#1}{\volumetitlesink\par}{\volumetitlefont}
-  {\relax}{\nobreak\par\nobreak}{\z@}
+  {\volumetitleindent}{\nobreak\par\nobreak}{\z@}
   \putpagenumberincontentsfalse
   \putpagenumberinnotesfalse
-  \literalcontents{\goodbreak}
-  \c@ntentsinfo{#1}{\relax}{\contentsvolumefont}
-  {\contentsindentoneamount}
-  \literalcontents{\vspace{5pt}\par\nobreak}
+  \literalcontents{\par\goodbreak\bigskip}
+  \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+  {\\contentsvolumetitleindentamount}
+ \literalcontents{\par\goodbreak\medskip}
   \literaltextnote{\notesvolumetitlepenalty\bigskip\goodbreak\par}
   \t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
   \putpagenumberincontentstrue
@@ -5415,12 +6023,13 @@
 \newcommand{\volumetitlefirstline}[1]{\firstlinesettings%
   \set@p@emtitle{#1}{\volumetitlesink\par}
   {\volumetitlefont}
-  {\relax}{\nobreak\par\nobreak}{\z@}
+  {\volumetitleindent}{\nobreak\par\nobreak}{\z@}
   \putpagenumberincontentsfalse
   \putpagenumberinnotesfalse
-  \c@ntentsinfo{#1}{\relax}{\contentsvolumefont}
-  {\contentsindentoneamount}
-%  \literalcontents{\vspace{5pt}\par\nobreak}
+\literalcontents{\par\goodbreak\bigskip}
+  \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+  {\contentsvolumetitleindentamount}
+  \literalcontents{\medskip\par\nobreak}
 %  \literaltextnote{\notesvolumetitlepenalty\bigskip\par}
   \t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
   \putpagenumberincontentstrue
@@ -5428,31 +6037,57 @@
 \newcommand{\volumetitlemiddleline}[1]{\middlelinesettings%
   \set@p@emtitle{#1}{\relax}
   {\volumetitlefont}
-  {\relax}{\nobreak\par\nobreak}{\z@}
+  {\volumetitlesecondlineindent}{\nobreak\par\nobreak}{\z@}
   \putpagenumberincontentsfalse
   \putpagenumberinnotesfalse
-  \c@ntentsinfo{#1}{\contentsindentone}{\contentsvolumefont}
-  {\contentsindenttwoamount}
+  \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+  {\contentsvolumetitleindentamount}
+    \literalcontents{\medskip\par\nobreak}
   \t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
   \putpagenumberincontentstrue
   \putpagenumberinnotestrue}
 \newcommand{\volumetitlelastline}[1]{\lastlinesettings%
   \set@p@emtitle{#1}{\relax}
   {\volumetitlefont}
-  {\relax}{\nobreak\par\nobreak}{\z@}
+  {\volumetitlesecondlineindent}{\nobreak\par\nobreak}{\z@}
   \putpagenumberincontentsfalse
   \putpagenumberinnotesfalse
-  \c@ntentsinfo{#1}{\contentsindentone}{\contentsvolumefont}
-  {\contentsindenttwoamount}
-  \literalcontents{\vspace{5pt}\par\nobreak}
+  \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+  {\contentsvolumetitleindentamount}
+   \literalcontents{\medskip\par\nobreak}
   \t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
   \putpagenumberincontentstrue
   \putpagenumberinnotestrue}
 \newcommand{\volumesubtitle}[1]{{\volumesubtitlefont 
-\volumetitleshift #1 \par}
+\volumetitleshift \volumesubtitleindent #1 \par}
+  \ifpoemcontentson
+    \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\medskip\nobreak}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
+     \immediate\write\textnotes{\string\par \string\backmattertextfont} 
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesubtitlefirstline}[1]{{\firstlinesettings\volumesubtitlefont 
+\volumetitleshift \volumesubtitlesecondlineindent #1 \par}
+  \ifpoemcontentson
+    \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\nobreak}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
+     \immediate\write\textnotes{\string\par \string\backmattertextfont} 
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesubtitlemiddleline}[1]{{\middlelinesettings\volumesubtitlefont 
+%\volumetitleshift 
+\volumesubtitlesecondlineindent #1 \par}
   \ifpoemcontentson
-    \literalcontents{{\contentsvolumesubtitlefont 
-#1\vspace{3pt}\par\nobreak}}
+    \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent 
+#1\par\nobreak}}
   \fi
   \iftextnoteson\iftextnotesatend
      \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
@@ -5460,12 +6095,80 @@
      \immediate\write\textnotes{\string\nobreak}
   \fi\fi
 }
-\newcommand{\volumesectiontitle}[1]
-{\clearpage\thispagestyle{volumefirststyle}
-\begin{center} {\volumesubtitlefont\textbf{#1}}
-\end{center} \bigskip\bigskip
+\newcommand{\volumesubtitlelastline}[1]{{\lastlinesettings\volumesubtitlefont 
+%\volumetitleshift 
+\volumesubtitlesecondlineindent #1 \par}
+  \ifpoemcontentson
+    \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\medskip\nobreak}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
+     \immediate\write\textnotes{\string\par \string\backmattertextfont} 
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesectiontitle}[1]{\clearpage\thispagestyle{volumefirststyle}
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center} 
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}} 
+\fi\bigskip\bigskip
+  \ifpoemcontentson
+  \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+  \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\notesvolumetitlepenalty}
+     \immediate\write\textnotes{\string\par \string\begin{bf}}
+     \immediate\write\textnotes{#1 \string\end{bf}}
+     \immediate\write\textnotes{\string\par}
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesectiontitlefirstline}[1]{\firstlinesettings\clearpage\thispagestyle{volumefirststyle}
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center} 
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}\par} 
+\fi% \bigskip\bigskip
+  \ifpoemcontentson
+  \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+  \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\notesvolumetitlepenalty}
+     \immediate\write\textnotes{\string\par \string\begin{bf}}
+     \immediate\write\textnotes{#1 \string\end{bf}}
+     \immediate\write\textnotes{\string\par}
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesectiontitlemiddleline}[1]{\middlelinesettings
+%\clearpage\thispagestyle{volumefirststyle}
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center} 
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}\par} 
+\fi% \bigskip\bigskip
   \ifpoemcontentson
-  \literalcontents{\goodbreak{\contentsvolumesubtitlefont #1\par\nobreak}}
+  \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+  \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\notesvolumetitlepenalty}
+     \immediate\write\textnotes{\string\par \string\begin{bf}}
+     \immediate\write\textnotes{#1 \string\end{bf}}
+     \immediate\write\textnotes{\string\par}
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesectiontitlelastline}[1]{\lastlinesettings
+%\clearpage\thispagestyle{volumefirststyle}
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center} 
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}} 
+\fi\bigskip\bigskip
+  \ifpoemcontentson
+  \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+  \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
   \fi
   \iftextnoteson\iftextnotesatend
      \immediate\write\textnotes{\string\notesvolumetitlepenalty}
@@ -5561,15 +6264,28 @@
 \newif\ifcentertitleson
 \newcommand{\centertitles}{\centertitlesontrue\centerepigraphsontrue}
 \makeatletter
-\newcommand{\set@p@emtitle}[6]{\setlength{\titleentryoverrun}{#6}%
+\newcommand{\set@p@emtitle}[6]{\iftitlesatleftversemargin% 
+{\begin{pmclverse}\addtolength{\leftmargin}{-\leftmargini}{#2 #3 #4 #1 #5} \end{pmclverse}}%
+\else%
+\setlength{\titleentryoverrun}{#6}%
 {#2}%
 {#3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{{\ifnormaltitleindentation #4 #1%
+\else \ifcentertitleson \begin{center} #1 \end{center} \else #1\fi\fi}}%
 \end{titleentryenvironment}}%
 {#5}%
 \m@kep@emlabel
 \m@ken@teholder{#1}%
-\setlength{\titleentryoverrun}{\z@}}
+\setlength{\titleentryoverrun}{\z@}\fi}
+%\newcommand{\set@p@emtitle}[6]{\setlength{\titleentryoverrun}{#6}%
+%{#2}%
+%{#3 \begin{titleentryenvironment}%
+%{\ifcentertitleson\begin{center}#1\end{center}\else #4 #1\fi}%
+%\end{titleentryenvironment}}%
+%{#5}%
+%\m@kep@emlabel
+%\m@ken@teholder{#1}%
+%\setlength{\titleentryoverrun}{\z@}}
 %
 \newcommand{\setcontentsleaders}[1]{%
    \def\contentsleaders{#1\nobreak%
@@ -5619,23 +6335,23 @@
 %
 \newcommand{\poemtitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemtitlenocontents}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemtitlebaretitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 }
 \newcommand{\poemtitleonlycontents}[1]{%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
 }
 \newcommand{\poemtitleonlynotes}[1]{%
 \m@kep@emlabel
@@ -5644,9 +6360,9 @@
 }
 \newcommand{\poemtitlenonotes}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -5693,9 +6409,9 @@
 \newcommand{\poemtitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\multilinetitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+{\poemtitleindent}{\nobreak\par\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
@@ -5707,18 +6423,18 @@
 \newcommand{\poemtitlemiddleline}[1]{%
 \middlelinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemtitlesecondlineindent}{\nobreak\par\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemtitlesecondlineindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
 \newcommand{\poemtitlelastline}[1]{%
 \lastlinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}%
-{\relax}{\nobreak\par\afterpoemtitleskip\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemtitlesecondlineindent}{\nobreak\par\afterpoemtitleskip\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemtitlesecondlineindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
@@ -5735,37 +6451,37 @@
 %    \begin{macrocode}
 \newcommand{\poemsectiontitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
 {\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemsectiontitlefirstline}[1]{%
 \firstlinesettings
 \set@p@emtitle{#1}{\multilinetitlepenalty}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak}{\poemsectiontitleindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
 \newcommand{\poemsectiontitlemiddleline}[1]{%
 \middlelinesettings
 \set@p@emtitle{#1}{\relax}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}%
-{\contentsindentfouramount}%
+{\poemsectiontitlesecondlineindent}{\nobreak\par\nobreak}{\poemsectiontitlesecondlineindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitlesecondlineindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
 \newcommand{\poemsectiontitlelastline}[1]{%
 \lastlinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\afterpoemtitleskip\nobreak}%
-{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}%
-{\contentsindentfouramount}%
+{\poemsectiontitlesecondlineindent}{\nobreak\par\afterpoemtitleskip\nobreak}%
+{\poemsectiontitlesecondlineindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitlesecondlineindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
@@ -5784,16 +6500,16 @@
   \sequencesubsectiontitlenocontents{#1}}%
 \newcommand{\poemfirstsectiontitle}[1]{%
 \set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%                                                        
 }
 \newcommand{\poemfirstsectiontitlebaretitle}[1]{%
 \set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}}
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindentamount}}
 \newcommand{\poemsectiontitlebaretitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
 {\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
@@ -5801,16 +6517,16 @@
 }
 \newcommand{\poemsubsectiontitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindenttwoamount}%
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}%
-{\contentsindentfouramount}%
+{\poemsubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsubsectiontitleindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsubsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsubsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemtitlenotitle}[1]{%
 \m@kep@emlabel
 \m@ken@teholder{#1}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
 {\contentsindenttwoamount}%
 \t@xtnotesinfo{#1}%
 }
@@ -5830,10 +6546,10 @@
 %    \begin{macrocode}
 \newcommand{\sequencetitle}[1]{
 \set@p@emtitle{#1}{\sequencetitlepenalty}{\sequencetitlefont}
-{\relax}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}
+{\sequencetitleindent}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}
 \putpagenumberincontentsfalse
-\c@ntentsinfo{#1}{\contentsindentone}{\contentssequencetitlefont}
-{\contentsindenttwoamount}
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentssequencetitlefont}
+{\contentssequencetitleindentamount}
 \putpagenumberincontentstrue
 \t@xtnotesinfo{#1}
 }
@@ -5849,30 +6565,61 @@
 \newcommand{\sequencetitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\multilinesequencepenalty}{\sequencetitlefont}
-{\relax}{\nobreak\par\nobreak}{\z@}
-\c@ntentsinfo{#1}{\contentsindentone}{\contentssequencetitlefont}
-{\contentsindenttwoamount}
+{\sequencetitleindent}{\nobreak\par\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentssequencetitlefont}
+{\contentssequencetitleindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencetitlemiddleline}[1]{
 \middlelinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
-{\relax}{\nobreak\par\nobreak}{\z@}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentssequencetitlefont}
-{\contentsindentthreeamount}
+{\sequencetitleindent}{\nobreak\par\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencetitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencetitlesecondlineindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencetitlelastline}[1]{
 \lastlinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
-{\relax}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+{\sequencetitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencetitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencetitlesecondlineindent}
+\t@xtnotesinfo{#1}
+\restoresinglelinesettings
+}
+\newcommand{\sequencesubtitle}[1]{
+\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencesubtitleindent}{\contentssequencetitlefont}
+{\contentssequencesubtitleindentamount}
+\t@xtnotesinfo{#1}
+}
+\newcommand{\sequencesubtitlefirstline}[1]{\firstlinesettings
+\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
 \c@ntentsinfo{#1}{\contentsindenttwo}{\contentssequencetitlefont}
 {\contentsindentthreeamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
+\newcommand{\sequencesubtitlemiddleline}[1]{\middlelinesettings
+\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitlesecondlineindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencesubtitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencesubtitlesecondlineindentamount}
+\t@xtnotesinfo{#1}
+\restoresinglelinesettings
+}
+\newcommand{\sequencesubtitlelastline}[1]{\lastlinesettings
+\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitlesecondlineindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencesubtitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencesubtitlesecondlineindentamount}
+\t@xtnotesinfo{#1}
+\restoresinglelinesettings
+}
 %    \end{macrocode}
 %    \end{macro}
 %    \end{macro}
@@ -5883,10 +6630,10 @@
 %    \begin{macrocode}
 \newcommand{\sequencesectiontitle}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 %    \end{macrocode}
@@ -5897,10 +6644,10 @@
 %    \begin{macrocode}
 \newcommand{\sequencefirstsectiontitle}[1]{
 \set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 %    \end{macrocode}
@@ -5911,17 +6658,17 @@
 %    \begin{macrocode}
 \newcommand{\sequencetitlenonotes}[1]{
 \set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
-{\relax}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentssequencetitlefont}
-{\contentsindentthreeamount}
+{\sequencetitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\sequencetitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentssequencetitlefont}
+{\contentssequencetitleindentamount}
 %\t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesectiontitlenonotes}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
 %\t@xtnotesinfo{#1}
 }
 %    \end{macrocode}
@@ -5931,27 +6678,27 @@
 \newcommand{\sequencesectiontitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\multilinetitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak}{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindent}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesectiontitlemiddleline}[1]{
 \middlelinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak}{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitlesecondlineindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesectiontitlelastline}[1]{
 \lastlinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}
-{\titleindent}{\nobreak\par\afterpoemtitleskip\nobreak}{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesectiontitleindent}{\nobreak\par\afterpoemtitleskip\nobreak}{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitlesecondlineindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
@@ -5965,15 +6712,15 @@
 %    \begin{macrocode}
 \newcommand{\sequencefirstsectiontitlenocontents}[2]{
 \set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
 %\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesectiontitlenocontents}[2]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
 %\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
 \t@xtnotesinfo{#1}
 }
@@ -5984,10 +6731,10 @@
 \newcommand{\sequencefirstsectiontitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
@@ -5999,10 +6746,10 @@
 
 \newcommand{\sequencefirstsectiontitlenonotes}[1]{
 \set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
 %\t@xtnotesinfo{#1}
 }
 %    \end{macrocode}
@@ -6014,9 +6761,25 @@
 %   \nobreak\par\nobreak\afterpoemtitleskip\nobreak
 % }
 \newcommand{\sequencesectionsubtitle}[1]{\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
-{\subsectiontitlefont}{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\titleindentamount}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+}
+\newcommand{\sequencesectionsubtitlefirstline}[1]{\firstlinesettings
+\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+\restoresinglelinesettings
+}
+\newcommand{\sequencesectionsubtitlemiddleline}[1]{\middlelinesettings
+\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+\restoresinglelinesettings
 }
-\newcommand{\poemsubtitle}[1]{\sequencesectionsubtitle{#1}
+\newcommand{\sequencesectionsubtitlelastline}[1]{\lastlinesettings
+\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+\restoresinglelinesettings
+}
+\newcommand{\poemsubtitle}[1]{\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\poemsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\titleindentamount}
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -6053,31 +6816,31 @@
 %    \begin{macrocode}
 \newcommand{\sequencesubsectiontitle}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesubsectiontitlenocontents}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
 %\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}{\contentsindentfouramount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencefirstsubsectiontitle}[1]
 {\set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencefirstsubsectiontitlenocontents}[1]
 {\set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
 %\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
 %{\contentsindentfouramount}
 \t@xtnotesinfo{#1}
@@ -6085,52 +6848,52 @@
 \newcommand{\sequencesubsectiontitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\multilinetitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak}{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak}{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesubsectiontitlemiddleline}[1]{
 \middlelinesettings
 \set@p@emtitle{#1}{\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak}{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}
-{\contentsindentfiveamount}
+{\sequencesubsectiontitlesecondlineindent}{\nobreak\par\nobreak}{\sequencesubsectiontitlesecondlineindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitlesecondlineindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesubsectiontitlelastline}[1]{
 \lastlinesettings
 \set@p@emtitle{#1}{\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}
-{\contentsindentfiveamount}
+{\sequencesubsectiontitleindent}{\nobreak\par\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitlesecondlineindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesubsubsectiontitle}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent\titleindent}
+{\sequencesubsubsectiontitleindent}
 {\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentthreeamount}
-\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}
-{\contentsindentfiveamount}
+{\sequencesubsubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsubsectiontitleindentmount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesubsubsectiontitlenocontents}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentthreeamount}
+{\sequencesubsubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsubsectiontitleindentamount}
 %\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}
 %{\contentsindentfiveamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencefirstsubsubsectiontitlenocontents}[1]{
 \set@p@emtitle{#1}{\nobreak\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentthreeamount}
+{\sequencesubsubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsubsectiontitleindentamount}
 %\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}{\contentsindentfiveamount}
 \t@xtnotesinfo{#1}
 }
@@ -6139,9 +6902,9 @@
 \newcommand{\sequencefirstsubsectiontitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak}{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak}{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindent}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
@@ -6184,7 +6947,7 @@
 
 \newcommand{\setmargpoemtitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}%
+{\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}%
 \c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
 {\contentsindenttwoamount}%
 \t@xtnotesinfo{#1}%
@@ -6208,19 +6971,19 @@
 % }
 \newcommand{\JHpoemtitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 {\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentspoemtitlefont}%
+{\contentssequencetitleindentamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}%                  
 }
 \newcommand{\JHprosesectiontitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 {\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentspoemtitlefont}%
+{\contentssequencetitleindentamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}%                  
 }  
@@ -6234,7 +6997,7 @@
 %    \begin{macrocode}
 \newcommand{\JHsequencetitle}[2]{%
 \set@margp@emtitle{#1}{\sequencetitlepenalty}{\sequencetitlefont}%
-{\relax}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}%
+{\sequencetitleindent}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}%
 {\JHlabel{#2}}%
 \putpagenumberincontentsfalse%
 \c@ntentsinfo{#1}{\contentsindentone}{\contentssequencetitlefont}%
@@ -6245,37 +7008,37 @@
 }
 \newcommand{\JHsequencesectiontitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\sequencesectiontitleindentamount}{\JHlabel{#2}}%
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}%
 {\contentsindentthreeamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}%                   
 }
 \newcommand{\JHsequencefirstsectiontitle}[2]{%
 \set@margp@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
 {\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}%
+{\contentssequencesectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}% 
 }
 \newcommand{\JHpoemsectiontitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindentamount}{\JHlabel{#2}}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}% 
 }
 \newcommand{\JHpoemfirstsectiontitle}[2]{%
 \set@margp@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\\poemsectiontitleindentamount}{\JHlabel{#2}}%
+\c@ntentsinfo{#1}{\contentsi\poemsectiontitleindent}{\contentspoemtitlefont}%
+{\contents\poemsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%                                                        
 \sources{\label{#2}}% 
 }
@@ -6366,7 +7129,7 @@
 % \begin{verbatim}
 % \newcommand{\sequencetitle}[1]{
 % \set@p@emtitle{#1}{\sequencetitlepenalty}{\sequencetitlefont}
-% {\relax}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}
+% {\sequencetitleindent}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}
 % \putpagenumberincontentsfalse
 % \c@ntentsinfo{#1}{\contentsindentone}{\contentssequencetitlefont}
 % {\contentsindenttwoamount}
@@ -6390,7 +7153,9 @@
 % \end{verbatim}
 % \subsection{~Epigraphs, headnotes, attributions, dedications}
 % Notice that epigraphs to volumes are handled differently from 
-% epigraphs to poems.
+% epigraphs to poems. Notice also the ``short'' commands, which
+% are placed on the page according to the same booleans
+% that control how titles are placed.
 %    \begin{macro}{\epigraph}
 %    \begin{macro}{\headnote}
 %    \begin{macro}{\attribution}
@@ -6437,6 +7202,37 @@
  {\small \emph{#1}}\end{volumetitlepagequote}}
  \newenvironment{epigraphenvironment}{\nopagebreak\afterpoemtitleskip\testforcenterepigraph%
 \begin{epigraphquote}\em}{\end{epigraphquote}\afterpoemtitleskip\nopagebreak}
+\newcommand{\set@short@pigraph}[1]{\iftitlesatleftversemargin% 
+{\begin{pmclverse}\addtolength{\leftmargin}{-\leftmargini}{\nobreak \emph{#1} \afterpoemtitleskip} \end{pmclverse}}%
+\else%\iftitlesatleftversemargin
+{\nobreak}%
+\begin{titleentryenvironment}%
+\ifnormaltitleindentation
+\hspace{\normalepigraphindentation}\emph{#1}%
+\else % for the \ifnormaltitleindentation
+\ifcenterepigraphson 
+\begin{center} \emph{#1}\end{center} 
+\else \emph{#1}\fi % for ifcenterepigraphson
+\fi %\ifnormaltitleindentation
+\end{titleentryenvironment}
+{\afterpoemtitleskip}%
+\fi}% for the \iftitlesatleftversemargin	
+\newcommand{\shortpoemepigraph}[1]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{#1}
+}
+\newcommand{\shortpoemdedication}[1]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{#1}
+}
+\newcommand{\shortpoemattribution}[1]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{{\small #1}}
+}
+\newcommand{\JHshortepigraph}[2]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{#1}\marginpar{{\scriptsize{\the\margrefmarker~p.~\pageref{#2}}}}
+\sources{\label{#2}}
+}
+\newcommand{\JHshortdedication}[2]{\JHshortepigraph{#1}{#2}}
+	
+
 \newlength{\dateindent}%
 \setlength{\dateindent}{\leftmargin}%
 \newcommand{\variabledateindent}{%
@@ -8188,7 +8984,7 @@ r@#2\endcsname{}{}\@nil
 \makeatletter
 \newcommand{\versopoemtitle}[1]{%
 \versoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 \c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
 {\contentsindenttwoamount}%
 }
@@ -8196,7 +8992,7 @@ r@#2\endcsname{}{}\@nil
 \setlength{\titleentryoverrun}{#6}%
 {#2}%
 {#3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{\ifcentertitleson\begin{center}#1\end{center}\else #4 #1\fi}%
 \end{titleentryenvironment}}%
 {#5}%
 \m@kep@emlabel
@@ -8235,7 +9031,7 @@ r@#2\endcsname{}{}\@nil
 }%
 \newcommand{\versopoemtitlenocontents}[1]{%
 \versoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 }
 \newcommand{\versotitleinnotescheck}{\ifparalleltexts\let\titletoothernotes=\versotitletoothernotes\fi}
 \makeatother
@@ -8246,7 +9042,7 @@ r@#2\endcsname{}{}\@nil
 \makeatletter
 \newcommand{\rectopoemtitle}[1]{%
 \rectoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 \c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
 {\contentsindenttwoamount}%
 }
@@ -8254,7 +9050,7 @@ r@#2\endcsname{}{}\@nil
 \setlength{\titleentryoverrun}{#6}%
 {#2}%
 {#3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{\ifcentertitleson\begin{center}#1\end{center}\else #4 #1\fi}%
 \end{titleentryenvironment}}%
 {#5}%
 \m@kep@emlabel
@@ -8293,7 +9089,7 @@ r@#2\endcsname{}{}\@nil
 }%
 \newcommand{\rectopoemtitlenocontents}[1]{%
 \rectoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 %\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
 %{\contentsindenttwoamount}%
 %\t@xtnotesinfo{#1}%
diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
index 15617f71408..f34210affbe 100644
--- a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
+++ b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
@@ -22,7 +22,10 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]
 \ProvidesPackage{poemscol}
-   [2019/08/18 v3.02 poemscol file]
+   [2019/09/08 v3.11 poemscol file]
+
+
+
  %|\prosexyznote|
 
 %%
@@ -120,15 +123,93 @@
 \variablestanzaamount}\item[]}
 {\endlist\inindentedversefalse\setlength{\variablestanzaamount}{\indentedstanzaamount}}
 \setlength{\columnsep}{15pt}
-\newdimen\titleindentamount \titleindentamount=1pc
-\newdimen\titleindenttwoamount \titleindenttwoamount=2pc
-\newdimen\titleindentthreeamount \titleindentthreeamount=3pc
+\newlength{\titleindentamount}
+\setlength{\titleindentamount}{1pc}
+\newlength{\titleindenttwoamount}
+\setlength{\titleindenttwoamount}{2pc}
+\newlength{\titleindentthreeamount}
+\setlength{\titleindentthreeamount}{3pc}
 \newcommand{\titleindent}{\hspace{\titleindentamount}}
-\setlength{\parindent}{\titleindentamount}
-\newcommand{\afterpoemtitleskip}{\smallskip}
-\newcommand{\afterpoemskip}{\bigskip}
-\newcommand{\aftersequencetitleskip}{\medskip}
-\newcommand{\stanzaskip}{\medskip}
+\setlength{\parindent}{1pc}
+\newlength{\volumetitleindentamount}
+\setlength{\volumetitleindentamount}{0pt}
+\newcommand{\volumetitleindent}{\relax}
+\newlength{\volumetitlesecondlineindentamount}
+\setlength{\volumetitlesecondlineindentamount}{0pt}
+\newcommand{\volumetitlesecondlineindent}{\relax}
+\newlength{\volumesubtitleindentamount}
+\setlength{\volumesubtitleindentamount}{\titleindentamount}
+\newcommand{\volumesubtitleindent}{\hspace{\volumesubtitleindentamount}}
+\newlength{\volumesubtitlesecondlineindentamount}
+\setlength{\volumesubtitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\volumesubtitlesecondlineindent}{\hspace{\volumesubtitlesecondlineindentamount}}
+\newlength{\volumesectiontitleindentamount}
+\setlength{\volumesectiontitleindentamount}{0pt}
+\newcommand{\volumesectiontitleindent}{\relax}
+\newlength{\volumesectiontitlesecondlineindentamount}
+\setlength{\volumesectiontitlesecondlineindentamount}{0pt}
+\newcommand{\volumesectiontitlesecondlineindent}{\relax}
+\newlength{\poemtitleindentamount}
+\setlength{\poemtitleindentamount}{0pt}
+\newcommand{\poemtitleindent}{\relax}
+\newlength{\poemtitlesecondlineindentamount}
+\setlength{\poemtitlesecondlineindentamount}{0pt}
+\newcommand{\poemtitlesecondlineindent}{\relax}
+\newlength{\poemsubtitleindentamount}
+\setlength{\poemsubtitleindentamount}{\titleindentamount}
+\newcommand{\poemsubtitleindent}{\hspace{\poemsubtitleindentamount}}
+\newlength{\poemsectiontitleindentamount}
+\setlength{\poemsectiontitleindentamount}{\titleindentamount}
+\newcommand{\poemsectiontitleindent}{\hspace{\poemsectiontitleindentamount}}
+\newlength{\poemsectiontitlesecondlineindentamount}
+\setlength{\poemsectiontitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\poemsectiontitlesecondlineindent}{\hspace{\poemsectiontitlesecondlineindentamount}}
+\newlength{\poemsubsectiontitleindentamount}
+\setlength{\poemsubsectiontitleindentamount}{\titleindenttwoamount}
+\newcommand{\poemsubsectiontitleindent}{\hspace{\poemsectiontitleindentamount}}
+\newlength{\sequencetitleindentamount}
+\setlength{\sequencetitleindentamount}{0pt}
+\newcommand{\sequencetitleindent}{\relax}
+\newlength{\sequencetitlesecondlineindentamount}
+\setlength{\sequencetitlesecondlineindentamount}{0pt}
+\newcommand{\sequencetitlesecondlineindent}{\hspace{\relax}}
+\newlength{\sequencesubtitleindentamount}
+\setlength{\sequencesubtitleindentamount}{\titleindentamount}
+\newcommand{\sequencesubtitleindent}{\hspace{\sequencesubtitleindentamount}}
+\newlength{\sequencesubtitlesecondlineindentamount}
+\setlength{\sequencesubtitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\sequencesubtitlesecondlineindent}{\hspace{\sequencesubtitlesecondlineindentamount}}
+\newlength{\sequencesectiontitleindentamount}
+\setlength{\sequencesectiontitleindentamount}{\titleindentamount}
+\newcommand{\sequencesectiontitleindent}{\hspace{\sequencesectiontitleindentamount}}
+\newlength{\sequencesectiontitlesecondlineindentamount}
+\setlength{\sequencesectiontitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\sequencesectiontitlesecondlineindent}{\hspace{\sequencesectiontitlesecondlineindentamount}}
+\newlength{\sequencesectionsubtitleindentamount}
+\setlength{\sequencesectionsubtitleindentamount}{\titleindenttwoamount}
+\newcommand{\sequencesectionsubtitleindent}{\hspace{\sequencesectionsubtitleindentamount}}
+\newlength{\sequencesectionsubtitlesecondlineindentamount}
+\setlength{\sequencesectionsubtitlesecondlineindentamount}{\titleindenttwoamount}
+\newcommand{\sequencesectionsubtitlesecondlineindent}{\hspace{\sequencesectionsubtitlesecondlineindentamount}}
+\newlength{\sequencesubsectiontitleindentamount}
+\setlength{\sequencesubsectiontitleindentamount}{\titleindenttwoamount}
+\newcommand{\sequencesubsectiontitleindent}{\hspace{\sequencesubsectiontitleindentamount}}
+\newlength{\sequencesubsubsectiontitleindentamount}
+\setlength{\sequencesubsubsectiontitleindentamount}{\titleindentthreeamount}
+\newcommand{\sequencesubsubsectiontitleindent}{\hspace{\sequencesubsubsectiontitleindentamount}}
+\newlength{\appendixtitleindentamount}
+\setlength{\appendixtitleindentamount}{0pt}
+\newcommand{\appendixtitleindent}{\relax}
+\newlength{\subappendixtitleindentamount}
+\setlength{\subappendixtitleindentamount}{0pt}
+\newcommand{\subappendixtitleindent}{\relax}
+\newlength{\forewordtitleindentamount}
+\setlength{\forewordtitleindentamount}{0pt}
+\newcommand{\forewordtitleindent}{\relax}
+\newlength{\notestitleindentamount}
+\setlength{\notestitleindentamount}{0pt}
+\newcommand{\notestitleindent}{\relax}
+
 \newdimen\volumetitleshiftamount \volumetitleshiftamount=1pc
 \newcommand{\volumetitleshift}{\hbox{\hspace{\volumetitleshiftamount}}}
 \newdimen\voladditionalamount \voladditionalamount=2pc
@@ -142,10 +223,130 @@
 \newcommand{\contentsindentfour}{\hspace{\contentsindentfouramount}}
 \newdimen\contentsindentfiveamount \contentsindentfiveamount=80pt
 \newcommand{\contentsindentfive}{\hspace{\contentsindentfiveamount}}
+\newlength{\contentsvolumetitleindentamount}
+\setlength{\contentsvolumetitleindentamount}{0pt}
+\newcommand{\contentsvolumetitleindent}{\relax}
+\newlength{\contentsvolumetitlesecondlineindentamount}
+\setlength{\contentsvolumetitlesecondlineindentamount}{0pt}
+\newcommand{\contentsvolumetitlesecondlineindent}{\relax}
+\newlength{\contentsvolumesubtitleindentamount}
+\setlength{\contentsvolumesubtitleindentamount}{\titleindentamount}
+\newcommand{\contentsvolumesubtitleindent}{\hspace{\contentsvolumesubtitleindentamount}}
+\newlength{\contentsvolumesubtitlesecondlineindentamount}
+\setlength{\contentsvolumesubtitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\contentsvolumesubtitlesecondlineindent}{\hspace{\contentsvolumesubtitlesecondlineindentamount}}
+\newlength{\contentsvolumesectiontitleindentamount}
+\setlength{\contentsvolumesectiontitleindentamount}{0pt}
+\newcommand{\contentsvolumesectiontitleindent}{\hspace{\contentsvolumesectiontitleindentamount}}
+\newlength{\contentsvolumesectiontitlesecondlineindentamount}
+\setlength{\contentsvolumesectiontitlesecondlineindentamount}{0pt}
+\newcommand{\contentsvolumesectiontitlesecondlineindent}{\hspace{\contentsvolumesectiontitlesecondlineindentamount}}
+\newlength{\contentspoemtitleindentamount}
+\setlength{\contentspoemtitleindentamount}{\contentsindentoneamount}
+\newcommand{\contentspoemtitleindent}{\hspace{\contentspoemtitleindentamount}}
+\newlength{\contentspoemtitlesecondlineindentamount}
+\setlength{\contentspoemtitlesecondlineindentamount}{\contentspoemtitleindentamount}
+\newcommand{\contentspoemtitlesecondlineindent}{\hspace{\contentspoemtitlesecondlineindentamount}}
+\newlength{\contentspoemsubtitleindentamount}
+\setlength{\contentspoemsubtitleindentamount}{\contentspoemsubtitleindentamount}
+\newcommand{\contentspoemsubtitleindent}{\hspace{\contentspoemsubtitleindentamount}}
+\newlength{\contentspoemsectiontitleindentamount}
+\setlength{\contentspoemsectiontitleindentamount}{\contentsindenttwoamount}
+\newcommand{\contentspoemsectiontitleindent}{\hspace{\contentspoemsectiontitleindentamount}}
+\newlength{\contentspoemsectiontitlesecondlineindentamount}
+\setlength{\contentspoemsectiontitlesecondlineindentamount}{\contentspoemsectiontitleindentamount}
+\newcommand{\contentspoemsectiontitlesecondlineindent}{\hspace{\contentspoemsectiontitlesecondlineindentamount}}
+\newlength{\contentspoemsubsectiontitleindentamount}
+\setlength{\contentspoemsubsectiontitleindentamount}{\contentsindentthreeamount}
+\newcommand{\contentspoemsubsectiontitleindent}{\hspace{\contentsindentthreeamount}}
+\newlength{\contentssequencetitleindentamount}
+\setlength{\contentssequencetitleindentamount}{0pt}
+ \newcommand{\contentssequencetitleindent}{\hspace{\contentssequencetitleindentamount}}
+\newlength{\contentssequencetitlesecondlineindentamount}
+\setlength{\contentssequencetitlesecondlineindentamount}{0pt}
+ \newcommand{\contentssequencetitlesecondlineindent}{\hspace{\contentssequencetitlesecondlineindentamount}}
+\newlength{\contentssequencesubtitleindentamount}
+\setlength{\contentssequencesubtitleindentamount}{\contentsindentoneamount}
+\newcommand{\contentssequencesubtitleindent}{\hspace{\contentssequencesubtitleindentamount}}
+\newlength{\contentssequencesubtitlesecondlineindentamount}
+\setlength{\contentssequencesubtitlesecondlineindentamount}{\contentsindentoneamount}
+\newcommand{\contentssequencesubtitlesecondlineindent}{\hspace{\contentssequencesubtitlesecondlineindentamount}}
+\newlength{\contentssequencesectiontitleindentamount}
+\setlength{\contentssequencesectiontitleindentamount}{\contentsindentoneamount}
+\newcommand{\contentssequencesectiontitleindent}{\hspace{\contentssequencesectiontitleindentamount}}
+\newlength{\contentssequencesectiontitlesecondlineindentamount}
+\setlength{\contentssequencesectiontitlesecondlineindentamount}{\contentsindentoneamount}
+\newcommand{\contentssequencesectiontitlesecondlineindent}{\hspace{\contentssequencesectiontitlesecondlineindentamount}}
+\newlength{\contentssequencesectionsubtitleindentamount}
+\setlength{\contentssequencesectionsubtitleindentamount}{\contentsindenttwoamount}
+\newcommand{\contentssequencesectionsubtitleindent}{\hspace{\contentssequencesectionsubtitleindentamount}}
+\newlength{\contentssequencesectionsubtitlesecondlineindentamount}
+\setlength{\contentssequencesectionsubtitlesecondlineindentamount}{\contentsindenttwoamount}
+\newcommand{\contentssequencesectionsubtitlesecondlineindent}{\hspace{\contentssequencesectionsubtitlesecondlineindentamount}}
+\newlength{\contentssequencesubsectiontitleindentamount}
+\setlength{\contentssequencesubsectiontitleindentamount}{\contentsindentoneamount}
+\newcommand{\contentssequencesubsectiontitleindent}{\hspace{\contentssequencesubsectiontitleindentamount}}
+\newlength{\contentssequencesubsubsectiontitleindentamount}
+\setlength{\contentssequencesubsubsectiontitleindentamount}{\contentsindentthreeamount}
+\newcommand{\contentssequencesubsubsectiontitleindent}{\hspace{\contentssequencesubsubsectiontitleindentamount}}
+
+\newcommand{\afterpoemtitleskip}{\smallskip}
+\newcommand{\afterpoemskip}{\bigskip}
+\newcommand{\aftersequencetitleskip}{\medskip}
+\newcommand{\stanzaskip}{\medskip}
 \newcommand{\poemtitlepenalty}{\penalty-1000}
 \newcommand{\multilinetitlepenalty}{\penalty-3000}
 \newcommand{\sequencetitlepenalty}{\penalty-3000}
 \newcommand{\multilinesequencepenalty}{\penalty-3500}
+\newlength{\titlewidth}
+\newif\iftitlescenteredonleftverseblock
+\newif\iftitlesatleftmarginofcenteredblock
+\newif\iftitlesatleftversemargin
+\newif\ifnormaltitleindentation
+\newcommand{\normaltitleindentationscheme}{%
+\normaltitleindentationtrue%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesonfalse%
+}
+\newcommand{\titlesatleftversemarginscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemargintrue%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesonfalse%
+}
+\newcommand{\titlescenteredonleftverseblockscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblocktrue%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesonfalse%
+}
+\newcommand{\titlesatleftmarginofcenteredblockscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblocktrue%
+\centertitlesonfalse%
+}
+\newcommand{\centertitlesscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesontrue%
+\centerepigraphsontrue%
+}
+\newlength{\lefttitleaddition}
+\setlength{\lefttitleaddition}{0pt}
+\newcommand{\l@ftc@ntertitleblock}{\rightmargin        \z@%%
+\setlength{\lefttitleaddition}{\versewidth}%
+\addtolength{\lefttitleaddition}{-\titlewidth}%
+\addtolength{\lefttitleaddition}{-0.5\lefttitleaddition}%
+\setlength{\lefttitlemargin}{\lefttitleaddition}%
+}
 
 \def\makeatletter{\catcode`\@=11}
 \def\makeatother{\catcode`\@=12 }
@@ -400,13 +601,17 @@
 \partopsep\z@%
 \itemsep\z@ \itemindent -\titleentryoverrun%
 \listparindent \itemindent %
-\ifleftaligntitles
-\left@ligntitleblock
-\rightmargin 1sp\leftmargin \lefttitlemargin%
+\iftitlesatleftmarginofcenteredblock%
+\left@ligntitleblock%
+\rightmargin \z@\leftmargin \lefttitlemargin%
+\else%
+\iftitlescenteredonleftverseblock
+\l@ftc@ntertitleblock
+\rightmargin \z@\leftmargin \lefttitlemargin
 \else
-\rightmargin 1sp\leftmargin 1sp%
-\fi
-\advance\leftmargin \titleentryoverrun}\item[]}{\endlist} 
+\rightmargin \z@\leftmargin \z@%
+\fi\fi%
+\advance\leftmargin \titleentryoverrun}\item[]}{\endlist}
 \newlength{\versewidth}
 \setlength{\versewidth}{\linewidth}% default length for \versewidth
 \newenvironment{poem}[1][\linewidth]
@@ -668,14 +873,14 @@
 \newcommand{\setendnotessectiontitledefaults}[6]{%
 #2%
 #3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{\ifcentertitleson\begin{center}#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{\setendnotessectiontitle}[2]{%
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\notestitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{#2}}
 \newcommand{\contentsendnotesdefaults}[4]{\ifpoemcontentson
 \immediate\write\poemcontents{\string\begin\string{contentsentryenvironment\string}}%
 \literalcontents{#2{#3#1}}%
@@ -814,20 +1019,98 @@
 \immediate\write\textnotes{\string\par\string\argpageref\string{#1\string}\string\unskip}%
 \@pagemarktotextnotes{#1}}
 \newcommand{\@poemtitletotextnotes}[1]{\literaltextnote{\textbf{#1}}}
+\newif\ifappendixincontents
+\appendixincontentstrue
+\newif\ifforewordincontents
+\forewordincontentstrue
+\newcommand{\appendixdividerpage}[1]{\flushbottom{\par\clearpage
+  {\pagestyle{volumetitlestyle}\cleardoublepage}
+\thispagestyle{volumetitlestyle}}
+\fancyhead{}
+\fancyfoot{}
+\fancyhead[RO,LE]{\small\textrm{\thepage}}
+\fancyhead[CO]{\small{\em #1}}
+\fancyhead[CE]{#1}
+\fancyfoot[C]{}}
+\newcommand{\appendixtitle}[1]{
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\appendixtitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{appdx#1}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\setlength{\parindent}{\noteindentation}
+\ifappendixincontents\contentsendnotestitle{#1}{appdx#1}\fi
+}
+\newcommand{\makeappendix}[1]{%
+\appendixdividerpage{#1}
+\appendixtitle{#1}
+}
+\newcommand{\contentsendnotessubtitle}[2]{
+\contentsendnotesdefaults{#1}{\contentsindenttwo}{\contentsendnotesfont}{#2}
+}
+\newcommand{\subappendixtitle}[1]{%
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\subappendixtitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{appdx#1}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\setlength{\parindent}{\noteindentation}
+\ifappendixincontents\contentsendnotessubtitle{#1}{appdx#1}\fi
+}
+\newcommand{\makesubappendix}[1]{%
+\appendixdividerpage{#1}
+\subappendixtitle{#1}
+}
+\newcommand{\foreworddividerpage}[1]{\flushbottom{\par\clearpage
+  {\pagestyle{volumetitlestyle}\cleardoublepage}
+\thispagestyle{volumetitlestyle}}
+\fancyhead{}
+\fancyfoot{}
+\fancyhead[RO,LE]{\small\textrm{\thepage}}
+\fancyhead[CO]{\small{\em #1}}
+\fancyhead[CE]{#1}
+\fancyfoot[C]{}}
+\newcommand{\forewordtitle}[1]{
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\forewordtitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{foreword#1}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\setlength{\parindent}{\noteindentation}
+\ifforewordincontents\contentsendnotestitle{#1}{foreword#1}\fi
+}
+\newcommand{\makeforeword}[1]{%
+\foreworddividerpage{#1}
+\forewordtitle{#1}
+}
 
+\newcommand{\pmclcontentsentrydefaults}[4]{
+\ifpoemcontentson
+\immediate\write\poemcontents{\string\begin\string{contentsentryenvironment\string}}%
+\literalcontents{#2{#3#1}}%
+  \ifputpagenumberincontents
+\immediate\write\poemcontents{\string\contentsleaders}%
+\literalcontents{#4}
+  \else
+  \literalcontents{\relax}%
+  \fi
+\immediate\write\poemcontents{\string\end\string{contentsentryenvironment\string}}%
+\immediate\write\poemcontents{\string\par}%
+\fi
+}
+\newcommand{\pmclcontentsentry}[3]{%
+\pmclcontentsentrydefaults{#1}{#2}{\contentsendnotesfont}{#3}%
+}
 \newcommand{\wholebooktitle}[1]{{\Huge\begin{center}
 \hbox{#1}\end{center}}
 }
 \newcommand{\booksection}[1]{\volumesection{#1}}
 \newcommand{\volumetitle}[1]{%
   \set@p@emtitle{#1}{\volumetitlesink\par}{\volumetitlefont}
-  {\relax}{\nobreak\par\nobreak}{\z@}
+  {\volumetitleindent}{\nobreak\par\nobreak}{\z@}
   \putpagenumberincontentsfalse
   \putpagenumberinnotesfalse
-  \literalcontents{\goodbreak}
-  \c@ntentsinfo{#1}{\relax}{\contentsvolumefont}
-  {\contentsindentoneamount}
-  \literalcontents{\vspace{5pt}\par\nobreak}
+  \literalcontents{\par\goodbreak\bigskip}
+  \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+  {\\contentsvolumetitleindentamount}
+ \literalcontents{\par\goodbreak\medskip}
   \literaltextnote{\notesvolumetitlepenalty\bigskip\goodbreak\par}
   \t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
   \putpagenumberincontentstrue
@@ -835,42 +1118,69 @@
 \newcommand{\volumetitlefirstline}[1]{\firstlinesettings%
   \set@p@emtitle{#1}{\volumetitlesink\par}
   {\volumetitlefont}
-  {\relax}{\nobreak\par\nobreak}{\z@}
+  {\volumetitleindent}{\nobreak\par\nobreak}{\z@}
   \putpagenumberincontentsfalse
   \putpagenumberinnotesfalse
-  \c@ntentsinfo{#1}{\relax}{\contentsvolumefont}
-  {\contentsindentoneamount}
+\literalcontents{\par\goodbreak\bigskip}
+  \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+  {\contentsvolumetitleindentamount}
+  \literalcontents{\medskip\par\nobreak}
   \t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
   \putpagenumberincontentstrue
   \putpagenumberinnotestrue}
 \newcommand{\volumetitlemiddleline}[1]{\middlelinesettings%
   \set@p@emtitle{#1}{\relax}
   {\volumetitlefont}
-  {\relax}{\nobreak\par\nobreak}{\z@}
+  {\volumetitlesecondlineindent}{\nobreak\par\nobreak}{\z@}
   \putpagenumberincontentsfalse
   \putpagenumberinnotesfalse
-  \c@ntentsinfo{#1}{\contentsindentone}{\contentsvolumefont}
-  {\contentsindenttwoamount}
+  \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+  {\contentsvolumetitleindentamount}
+    \literalcontents{\medskip\par\nobreak}
   \t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
   \putpagenumberincontentstrue
   \putpagenumberinnotestrue}
 \newcommand{\volumetitlelastline}[1]{\lastlinesettings%
   \set@p@emtitle{#1}{\relax}
   {\volumetitlefont}
-  {\relax}{\nobreak\par\nobreak}{\z@}
+  {\volumetitlesecondlineindent}{\nobreak\par\nobreak}{\z@}
   \putpagenumberincontentsfalse
   \putpagenumberinnotesfalse
-  \c@ntentsinfo{#1}{\contentsindentone}{\contentsvolumefont}
-  {\contentsindenttwoamount}
-  \literalcontents{\vspace{5pt}\par\nobreak}
+  \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+  {\contentsvolumetitleindentamount}
+   \literalcontents{\medskip\par\nobreak}
   \t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
   \putpagenumberincontentstrue
   \putpagenumberinnotestrue}
 \newcommand{\volumesubtitle}[1]{{\volumesubtitlefont
-\volumetitleshift #1 \par}
+\volumetitleshift \volumesubtitleindent #1 \par}
+  \ifpoemcontentson
+    \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\medskip\nobreak}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
+     \immediate\write\textnotes{\string\par \string\backmattertextfont}
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesubtitlefirstline}[1]{{\firstlinesettings\volumesubtitlefont
+\volumetitleshift \volumesubtitlesecondlineindent #1 \par}
+  \ifpoemcontentson
+    \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\nobreak}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
+     \immediate\write\textnotes{\string\par \string\backmattertextfont}
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesubtitlemiddleline}[1]{{\middlelinesettings\volumesubtitlefont
+\volumesubtitlesecondlineindent #1 \par}
   \ifpoemcontentson
-    \literalcontents{{\contentsvolumesubtitlefont
-#1\vspace{3pt}\par\nobreak}}
+    \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\nobreak}}
   \fi
   \iftextnoteson\iftextnotesatend
      \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
@@ -878,12 +1188,77 @@
      \immediate\write\textnotes{\string\nobreak}
   \fi\fi
 }
-\newcommand{\volumesectiontitle}[1]
-{\clearpage\thispagestyle{volumefirststyle}
-\begin{center} {\volumesubtitlefont\textbf{#1}}
-\end{center} \bigskip\bigskip
+\newcommand{\volumesubtitlelastline}[1]{{\lastlinesettings\volumesubtitlefont
+\volumesubtitlesecondlineindent #1 \par}
+  \ifpoemcontentson
+    \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\medskip\nobreak}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
+     \immediate\write\textnotes{\string\par \string\backmattertextfont}
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesectiontitle}[1]{\clearpage\thispagestyle{volumefirststyle}
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center}
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}}
+\fi\bigskip\bigskip
+  \ifpoemcontentson
+  \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+  \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\notesvolumetitlepenalty}
+     \immediate\write\textnotes{\string\par \string\begin{bf}}
+     \immediate\write\textnotes{#1 \string\end{bf}}
+     \immediate\write\textnotes{\string\par}
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesectiontitlefirstline}[1]{\firstlinesettings\clearpage\thispagestyle{volumefirststyle}
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center}
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}\par}
+\fi% \bigskip\bigskip
+  \ifpoemcontentson
+  \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+  \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\notesvolumetitlepenalty}
+     \immediate\write\textnotes{\string\par \string\begin{bf}}
+     \immediate\write\textnotes{#1 \string\end{bf}}
+     \immediate\write\textnotes{\string\par}
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesectiontitlemiddleline}[1]{\middlelinesettings
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center}
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}\par}
+\fi% \bigskip\bigskip
   \ifpoemcontentson
-  \literalcontents{\goodbreak{\contentsvolumesubtitlefont #1\par\nobreak}}
+  \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+  \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
+  \fi
+  \iftextnoteson\iftextnotesatend
+     \immediate\write\textnotes{\string\notesvolumetitlepenalty}
+     \immediate\write\textnotes{\string\par \string\begin{bf}}
+     \immediate\write\textnotes{#1 \string\end{bf}}
+     \immediate\write\textnotes{\string\par}
+     \immediate\write\textnotes{\string\nobreak}
+  \fi\fi
+}
+\newcommand{\volumesectiontitlelastline}[1]{\lastlinesettings
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center}
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}}
+\fi\bigskip\bigskip
+  \ifpoemcontentson
+  \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+  \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
   \fi
   \iftextnoteson\iftextnotesatend
      \immediate\write\textnotes{\string\notesvolumetitlepenalty}
@@ -934,15 +1309,19 @@
 \newif\ifcentertitleson
 \newcommand{\centertitles}{\centertitlesontrue\centerepigraphsontrue}
 \makeatletter
-\newcommand{\set@p@emtitle}[6]{\setlength{\titleentryoverrun}{#6}%
+\newcommand{\set@p@emtitle}[6]{\iftitlesatleftversemargin%
+{\begin{pmclverse}\addtolength{\leftmargin}{-\leftmargini}{#2 #3 #4 #1 #5} \end{pmclverse}}%
+\else%
+\setlength{\titleentryoverrun}{#6}%
 {#2}%
 {#3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{{\ifnormaltitleindentation #4 #1%
+\else \ifcentertitleson \begin{center} #1 \end{center} \else #1\fi\fi}}%
 \end{titleentryenvironment}}%
 {#5}%
 \m@kep@emlabel
 \m@ken@teholder{#1}%
-\setlength{\titleentryoverrun}{\z@}}
+\setlength{\titleentryoverrun}{\z@}\fi}
 \newcommand{\setcontentsleaders}[1]{%
    \def\contentsleaders{#1\nobreak%
 }}
@@ -988,23 +1367,23 @@
 }
 \newcommand{\poemtitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemtitlenocontents}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemtitlebaretitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 }
 \newcommand{\poemtitleonlycontents}[1]{%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
 }
 \newcommand{\poemtitleonlynotes}[1]{%
 \m@kep@emlabel
@@ -1013,9 +1392,9 @@
 }
 \newcommand{\poemtitlenonotes}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
 }
 \newcommand{\poemtitleitalic}[2]{%
 \poemtitle{#1}}
@@ -1044,9 +1423,9 @@
 \newcommand{\poemtitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\multilinetitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+{\poemtitleindent}{\nobreak\par\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
@@ -1054,54 +1433,54 @@
 \newcommand{\poemtitlemiddleline}[1]{%
 \middlelinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemtitlesecondlineindent}{\nobreak\par\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemtitlesecondlineindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
 \newcommand{\poemtitlelastline}[1]{%
 \lastlinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}%
-{\relax}{\nobreak\par\afterpoemtitleskip\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemtitlesecondlineindent}{\nobreak\par\afterpoemtitleskip\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemtitlesecondlineindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
 \newcommand{\poemsectiontitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
 {\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemsectiontitlefirstline}[1]{%
 \firstlinesettings
 \set@p@emtitle{#1}{\multilinetitlepenalty}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak}{\poemsectiontitleindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
 \newcommand{\poemsectiontitlemiddleline}[1]{%
 \middlelinesettings
 \set@p@emtitle{#1}{\relax}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}%
-{\contentsindentfouramount}%
+{\poemsectiontitlesecondlineindent}{\nobreak\par\nobreak}{\poemsectiontitlesecondlineindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitlesecondlineindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
 \newcommand{\poemsectiontitlelastline}[1]{%
 \lastlinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\afterpoemtitleskip\nobreak}%
-{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}%
-{\contentsindentfouramount}%
+{\poemsectiontitlesecondlineindent}{\nobreak\par\afterpoemtitleskip\nobreak}%
+{\poemsectiontitlesecondlineindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitlesecondlineindentamount}%
 \t@xtnotesinfo{#1}%
 \restoresinglelinesettings
 }
@@ -1109,16 +1488,16 @@
   \sequencesubsectiontitlenocontents{#1}}%
 \newcommand{\poemfirstsectiontitle}[1]{%
 \set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemfirstsectiontitlebaretitle}[1]{%
 \set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}}
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindentamount}}
 \newcommand{\poemsectiontitlebaretitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
 {\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
@@ -1126,16 +1505,16 @@
 }
 \newcommand{\poemsubsectiontitle}[1]{%
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindenttwoamount}%
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}%
-{\contentsindentfouramount}%
+{\poemsubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsubsectiontitleindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsubsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsubsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemtitlenotitle}[1]{%
 \m@kep@emlabel
 \m@ken@teholder{#1}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
 {\contentsindenttwoamount}%
 \t@xtnotesinfo{#1}%
 }
@@ -1143,10 +1522,10 @@
 \poemtitlenotitle{1}}
 \newcommand{\sequencetitle}[1]{
 \set@p@emtitle{#1}{\sequencetitlepenalty}{\sequencetitlefont}
-{\relax}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}
+{\sequencetitleindent}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}
 \putpagenumberincontentsfalse
-\c@ntentsinfo{#1}{\contentsindentone}{\contentssequencetitlefont}
-{\contentsindenttwoamount}
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentssequencetitlefont}
+{\contentssequencetitleindentamount}
 \putpagenumberincontentstrue
 \t@xtnotesinfo{#1}
 }
@@ -1154,106 +1533,137 @@
 \newcommand{\sequencetitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\multilinesequencepenalty}{\sequencetitlefont}
-{\relax}{\nobreak\par\nobreak}{\z@}
-\c@ntentsinfo{#1}{\contentsindentone}{\contentssequencetitlefont}
-{\contentsindenttwoamount}
+{\sequencetitleindent}{\nobreak\par\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentssequencetitlefont}
+{\contentssequencetitleindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencetitlemiddleline}[1]{
 \middlelinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
-{\relax}{\nobreak\par\nobreak}{\z@}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentssequencetitlefont}
-{\contentsindentthreeamount}
+{\sequencetitleindent}{\nobreak\par\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencetitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencetitlesecondlineindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencetitlelastline}[1]{
 \lastlinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
-{\relax}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+{\sequencetitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencetitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencetitlesecondlineindent}
+\t@xtnotesinfo{#1}
+\restoresinglelinesettings
+}
+\newcommand{\sequencesubtitle}[1]{
+\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencesubtitleindent}{\contentssequencetitlefont}
+{\contentssequencesubtitleindentamount}
+\t@xtnotesinfo{#1}
+}
+\newcommand{\sequencesubtitlefirstline}[1]{\firstlinesettings
+\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
 \c@ntentsinfo{#1}{\contentsindenttwo}{\contentssequencetitlefont}
 {\contentsindentthreeamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
+\newcommand{\sequencesubtitlemiddleline}[1]{\middlelinesettings
+\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitlesecondlineindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencesubtitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencesubtitlesecondlineindentamount}
+\t@xtnotesinfo{#1}
+\restoresinglelinesettings
+}
+\newcommand{\sequencesubtitlelastline}[1]{\lastlinesettings
+\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitlesecondlineindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencesubtitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencesubtitlesecondlineindentamount}
+\t@xtnotesinfo{#1}
+\restoresinglelinesettings
+}
 \newcommand{\sequencesectiontitle}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 
 \newcommand{\sequencefirstsectiontitle}[1]{
 \set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencetitlenonotes}[1]{
 \set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
-{\relax}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentssequencetitlefont}
-{\contentsindentthreeamount}
+{\sequencetitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\sequencetitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentssequencetitlefont}
+{\contentssequencetitleindentamount}
 }
 \newcommand{\sequencesectiontitlenonotes}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
 }
 \newcommand{\sequencesectiontitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\multilinetitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak}{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindent}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesectiontitlemiddleline}[1]{
 \middlelinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak}{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitlesecondlineindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesectiontitlelastline}[1]{
 \lastlinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}
-{\titleindent}{\nobreak\par\afterpoemtitleskip\nobreak}{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesectiontitleindent}{\nobreak\par\afterpoemtitleskip\nobreak}{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitlesecondlineindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencefirstsectiontitlenocontents}[2]{
 \set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesectiontitlenocontents}[2]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencefirstsectiontitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
@@ -1265,16 +1675,32 @@
 
 \newcommand{\sequencefirstsectiontitlenonotes}[1]{
 \set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
 }
 
 \newcommand{\sequencesectionsubtitle}[1]{\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
-{\subsectiontitlefont}{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\titleindentamount}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+}
+\newcommand{\sequencesectionsubtitlefirstline}[1]{\firstlinesettings
+\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+\restoresinglelinesettings
 }
-\newcommand{\poemsubtitle}[1]{\sequencesectionsubtitle{#1}
+\newcommand{\sequencesectionsubtitlemiddleline}[1]{\middlelinesettings
+\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+\restoresinglelinesettings
+}
+\newcommand{\sequencesectionsubtitlelastline}[1]{\lastlinesettings
+\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+\restoresinglelinesettings
+}
+\newcommand{\poemsubtitle}[1]{\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\poemsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\titleindentamount}
 }
 \newcommand{\sequencesectiontitleitalicnonotes}[2]
 {\sequencesectiontitlenonotes{#1}
@@ -1291,88 +1717,88 @@
 
 \newcommand{\sequencesubsectiontitle}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesubsectiontitlenocontents}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencefirstsubsectiontitle}[1]
 {\set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencefirstsubsectiontitlenocontents}[1]
 {\set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesubsectiontitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\multilinetitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak}{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak}{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesubsectiontitlemiddleline}[1]{
 \middlelinesettings
 \set@p@emtitle{#1}{\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak}{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}
-{\contentsindentfiveamount}
+{\sequencesubsectiontitlesecondlineindent}{\nobreak\par\nobreak}{\sequencesubsectiontitlesecondlineindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitlesecondlineindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesubsectiontitlelastline}[1]{
 \lastlinesettings
 \set@p@emtitle{#1}{\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}
-{\contentsindentfiveamount}
+{\sequencesubsectiontitleindent}{\nobreak\par\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitlesecondlineindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesubsubsectiontitle}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent\titleindent}
+{\sequencesubsubsectiontitleindent}
 {\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentthreeamount}
-\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}
-{\contentsindentfiveamount}
+{\sequencesubsubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsubsectiontitleindentmount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesubsubsectiontitlenocontents}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentthreeamount}
+{\sequencesubsubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsubsectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencefirstsubsubsectiontitlenocontents}[1]{
 \set@p@emtitle{#1}{\nobreak\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentthreeamount}
+{\sequencesubsubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsubsectiontitleindentamount}
 \t@xtnotesinfo{#1}
 }
 
 \newcommand{\sequencefirstsubsectiontitlefirstline}[1]{
 \firstlinesettings
 \set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak}{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak}{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindent}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
@@ -1401,7 +1827,7 @@
 
 \newcommand{\setmargpoemtitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}%
+{\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}%
 \c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
 {\contentsindenttwoamount}%
 \t@xtnotesinfo{#1}%
@@ -1409,19 +1835,19 @@
 }
 \newcommand{\JHpoemtitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 {\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentspoemtitlefont}%
+{\contentssequencetitleindentamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}%
 }
 \newcommand{\JHprosesectiontitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 {\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentspoemtitlefont}%
+{\contentssequencetitleindentamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}%
 }
@@ -1429,7 +1855,7 @@
 \marginpar{{\scriptsize{\the\margrefmarker~p.~\pageref{#1}}}}}
 \newcommand{\JHsequencetitle}[2]{%
 \set@margp@emtitle{#1}{\sequencetitlepenalty}{\sequencetitlefont}%
-{\relax}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}%
+{\sequencetitleindent}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}%
 {\JHlabel{#2}}%
 \putpagenumberincontentsfalse%
 \c@ntentsinfo{#1}{\contentsindentone}{\contentssequencetitlefont}%
@@ -1440,37 +1866,37 @@
 }
 \newcommand{\JHsequencesectiontitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\sequencesectiontitleindentamount}{\JHlabel{#2}}%
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}%
 {\contentsindentthreeamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}%
 }
 \newcommand{\JHsequencefirstsectiontitle}[2]{%
 \set@margp@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
 {\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}%
+{\contentssequencesectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}%
 }
 \newcommand{\JHpoemsectiontitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindentamount}{\JHlabel{#2}}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}%
 }
 \newcommand{\JHpoemfirstsectiontitle}[2]{%
 \set@margp@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\\poemsectiontitleindentamount}{\JHlabel{#2}}%
+\c@ntentsinfo{#1}{\contentsi\poemsectiontitleindent}{\contentspoemtitlefont}%
+{\contents\poemsectiontitleindentamount}%
 \t@xtnotesinfo{#1}%
 \sources{\label{#2}}%
 }
@@ -1564,6 +1990,36 @@
  {\small \emph{#1}}\end{volumetitlepagequote}}
  \newenvironment{epigraphenvironment}{\nopagebreak\afterpoemtitleskip\testforcenterepigraph%
 \begin{epigraphquote}\em}{\end{epigraphquote}\afterpoemtitleskip\nopagebreak}
+\newcommand{\set@short@pigraph}[1]{\iftitlesatleftversemargin%
+{\begin{pmclverse}\addtolength{\leftmargin}{-\leftmargini}{\nobreak \emph{#1} \afterpoemtitleskip} \end{pmclverse}}%
+\else%\iftitlesatleftversemargin
+{\nobreak}%
+\begin{titleentryenvironment}%
+\ifnormaltitleindentation
+\hspace{\normalepigraphindentation}\emph{#1}%
+\else % for the \ifnormaltitleindentation
+\ifcenterepigraphson
+\begin{center} \emph{#1}\end{center}
+\else \emph{#1}\fi % for ifcenterepigraphson
+\fi %\ifnormaltitleindentation
+\end{titleentryenvironment}
+{\afterpoemtitleskip}%
+\fi}% for the \iftitlesatleftversemargin 
+\newcommand{\shortpoemepigraph}[1]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{#1}
+}
+\newcommand{\shortpoemdedication}[1]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{#1}
+}
+\newcommand{\shortpoemattribution}[1]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{{\small #1}}
+}
+\newcommand{\JHshortepigraph}[2]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{#1}\marginpar{{\scriptsize{\the\margrefmarker~p.~\pageref{#2}}}}
+\sources{\label{#2}}
+}
+\newcommand{\JHshortdedication}[2]{\JHshortepigraph{#1}{#2}}
+
 \newlength{\dateindent}%
 \setlength{\dateindent}{\leftmargin}%
 \newcommand{\variabledateindent}{%
@@ -2773,7 +3229,7 @@ r@#2\endcsname{}{}\@nil
 \makeatletter
 \newcommand{\versopoemtitle}[1]{%
 \versoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 \c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
 {\contentsindenttwoamount}%
 }
@@ -2781,7 +3237,7 @@ r@#2\endcsname{}{}\@nil
 \setlength{\titleentryoverrun}{#6}%
 {#2}%
 {#3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{\ifcentertitleson\begin{center}#1\end{center}\else #4 #1\fi}%
 \end{titleentryenvironment}}%
 {#5}%
 \m@kep@emlabel
@@ -2820,14 +3276,14 @@ r@#2\endcsname{}{}\@nil
 }%
 \newcommand{\versopoemtitlenocontents}[1]{%
 \versoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 }
 \newcommand{\versotitleinnotescheck}{\ifparalleltexts\let\titletoothernotes=\versotitletoothernotes\fi}
 \makeatother
 \makeatletter
 \newcommand{\rectopoemtitle}[1]{%
 \rectoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 \c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
 {\contentsindenttwoamount}%
 }
@@ -2835,7 +3291,7 @@ r@#2\endcsname{}{}\@nil
 \setlength{\titleentryoverrun}{#6}%
 {#2}%
 {#3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{\ifcentertitleson\begin{center}#1\end{center}\else #4 #1\fi}%
 \end{titleentryenvironment}}%
 {#5}%
 \m@kep@emlabel
@@ -2874,7 +3330,7 @@ r@#2\endcsname{}{}\@nil
 }%
 \newcommand{\rectopoemtitlenocontents}[1]{%
 \rectoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 }
 \newcommand{\rectotitleinnotescheck}{\ifparalleltexts\let\titletoothernotes=\rectotitletoothernotes\fi}
 \makeatother