poemscol (19sep19)

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

3 files changed, 134 insertions, 79 deletions

diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
index 4b9df36cbdc..9a353d345c0 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 c0bde4dce21..a5ccbb380e7 100644
--- a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
+++ b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
@@ -23,7 +23,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
 %<package>\ProvidesPackage{poemscol}
-%<package>   [2019/09/09 v3.12 poemscol file] 
+%<package>   [2019/09/15 v3.13 poemscol file] 
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -38,7 +38,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{9868}
+% \CheckSum{9913}
 %
 % \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
@@ -240,7 +240,7 @@
 % \changes{v2.98}{2018/01/11}{Corrections to manual.}
 % \changes{v2.99}{2019/08/02}{Hierarchy of indented stanzas}
 % \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.}
+% attributions, and so on with the left margin of the verse block.}
 % \changes{v3.01}{2019/08/04}{Corrections to manual}
 % \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 
@@ -256,6 +256,7 @@
 % commands are controlled by the same booleans that control placement 
 % of titles.}
 % \changes{v3.12}{2019/09/05}{Bug fix. Fix command clash with titlesec Manual revision}
+% \changes{v3.13}{2019/09/15}{Fixed subtitles in emendations and explanations, Fixed bug in sequencesectiontitlefirstline, changed sequence hierarchy of indentations, subsubsections of sequences no longer appear in contents}
 % \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
 % \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip}
 % \DoNotIndex{\newcommand, \section, \subsection, \subsubsection,
@@ -288,15 +289,15 @@
 % \textsc, \unskip} 
 % \setcounter{IndexColumns}{2} 
 % \MakeShortVerb{|}
-% \def\fileversion{3.12} 
-% \def\filedate{9 September 2019} 
-% \def\docdate{9 September 2019}
+% \def\fileversion{3.13} 
+% \def\filedate{15 September 2019} 
+% \def\docdate{15 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{9 September 2019} 
+% \date{15 September 2019} 
 % \maketitle
 % \begin{abstract} \textsf{poemscol} provides commands for \LaTeX\ for
 % setting collections of poetry.  It is especially suited for setting
@@ -728,12 +729,19 @@
 % 
 % \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{sloppypar}
-%
+% |\centertitlesscheme|. I have retained the command |\centertitles| 
+% from earlier versions of \textsf{poemscol} for compatibility.  This
+% scheme can also be used to center the titles (and epigraphs, headnotes
+% and other top matter) over a non-centered verseblock too, if you 
+% don't use the optional argument to |\begin{poem}| describe in the next 
+% section, or if you turn off centering of the verse block by issuing the
+% boolean |\textcenteringturnedonfalse|.
+%\end{itemize}\end{sloppypar}
+%
+% \subsubsection{Using title placement schemes: verse width and title width}
 % \begin{sloppypar}
 %  |\centertitlesscheme|, |\titlescenteredonleftverseblockscheme|, and \\
-% |titlesatleftmarginofcenteredblockscheme| require additional information
+% |\titlesatleftmarginofcenteredblockscheme| require additional information
 % about each poem. Here are some details about the uses of these schemes.\end{sloppypar}
 %
 % \DescribeMacro{\centertitlesscheme} For each poem you wish to center you will have 
@@ -793,7 +801,7 @@
 %\begin{sloppypar}
 %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. That is the use of this scheme The length |\versewidth|
+% the left margin of the centered verse block. 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|).  
@@ -2439,21 +2447,31 @@
 % their arguments as epigraphs, headnotes, attributions, or
 % dedications for poems or poetic sequences. \goodbreak
 %
-% If your epigraph or headnote is a prose passage of more than one paragraph, or a verse
+% If your epigraph or headnote is a prose passage of more than one line, or 
+% of more than one paragraph, or a verse
 % passage of more than one stanza, the |\epigraph| command will work 
-% properly. If you use the standard \LaTeX\ |verse|
+% properly, which is to say it will draw the margins in towards the center,
+% rather than centering the epigraph line by line.  
+%
+% 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
+% 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.) Because |\centerepigraphs| merely 
+% up with marginal line numbers, so mark line breaks with |\\| and stanza breaks
+% with a blank line, as in the standard |verse| environment.)
+%
+% 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. 
+% find a satisfactory value. |\shortpoemepigraph| and similar commands, described
+% below, are better for single line epigraphs.
 %
-% \DescribeMacro{\shortpoemepigraph} The commands 
+% \DescribeMacro{\shortpoemepigraph} 
+% \DescribeMacro{shortpoemdedication} 
+% \DescribeMacro{shortpoemattribution}  \begin{sloppypar} The commands 
 % |\shortpoemepigraph| |\shortpoemdedication| and 
 % |\shortpoemattribution|  will all place their texts in 
 % accordance with the title placement scheme you select in your 
@@ -2474,7 +2492,7 @@
 % if the boolean |\centerepigraphson| is in effect. 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|.
+% found, in the manner of |\JHpoemtitle|.\end{sloppypar}
 %
 % \DescribeMacro{\centertitles}
 % Issuing |\centertitles| moves the margins in on both sides by the length 
@@ -4559,36 +4577,36 @@
 \setlength{\contentspoemsubsectiontitleindentamount}{\contentsindentthreeamount}
 \newcommand{\contentspoemsubsectiontitleindent}{\hspace{\contentsindentthreeamount}}
 \newlength{\contentssequencetitleindentamount}
-\setlength{\contentssequencetitleindentamount}{0pt}
+\setlength{\contentssequencetitleindentamount}{\contentsindentoneamount} %313
  \newcommand{\contentssequencetitleindent}{\hspace{\contentssequencetitleindentamount}}
 %\newcommand{\contentssequencetitleindent}{\relax}
 \newlength{\contentssequencetitlesecondlineindentamount}
-\setlength{\contentssequencetitlesecondlineindentamount}{0pt}
+\setlength{\contentssequencetitlesecondlineindentamount}{\contentsindentoneamount} %313
  \newcommand{\contentssequencetitlesecondlineindent}{\hspace{\contentssequencetitlesecondlineindentamount}}
 %\newcommand{\contentssequencetitlesecondlineindent}{\hspace{\relax}}
 \newlength{\contentssequencesubtitleindentamount}
-\setlength{\contentssequencesubtitleindentamount}{\contentsindentoneamount}
+\setlength{\contentssequencesubtitleindentamount}{\contentsindenttwoamount} %313
 \newcommand{\contentssequencesubtitleindent}{\hspace{\contentssequencesubtitleindentamount}}
 \newlength{\contentssequencesubtitlesecondlineindentamount}
-\setlength{\contentssequencesubtitlesecondlineindentamount}{\contentsindentoneamount}
+\setlength{\contentssequencesubtitlesecondlineindentamount}{\contentsindenttwoamount} %313
 \newcommand{\contentssequencesubtitlesecondlineindent}{\hspace{\contentssequencesubtitlesecondlineindentamount}}
 \newlength{\contentssequencesectiontitleindentamount}
-\setlength{\contentssequencesectiontitleindentamount}{\contentsindentoneamount}
+\setlength{\contentssequencesectiontitleindentamount}{\contentsindenttwoamount} %313
 \newcommand{\contentssequencesectiontitleindent}{\hspace{\contentssequencesectiontitleindentamount}}
 \newlength{\contentssequencesectiontitlesecondlineindentamount}
-\setlength{\contentssequencesectiontitlesecondlineindentamount}{\contentsindentoneamount}
+\setlength{\contentssequencesectiontitlesecondlineindentamount}{\contentsindenttwoamount} %313
 \newcommand{\contentssequencesectiontitlesecondlineindent}{\hspace{\contentssequencesectiontitlesecondlineindentamount}}
 \newlength{\contentssequencesectionsubtitleindentamount}
-\setlength{\contentssequencesectionsubtitleindentamount}{\contentsindenttwoamount}
+\setlength{\contentssequencesectionsubtitleindentamount}{\contentsindentthreeamount} %313
 \newcommand{\contentssequencesectionsubtitleindent}{\hspace{\contentssequencesectionsubtitleindentamount}}
 \newlength{\contentssequencesectionsubtitlesecondlineindentamount}
-\setlength{\contentssequencesectionsubtitlesecondlineindentamount}{\contentsindenttwoamount}
+\setlength{\contentssequencesectionsubtitlesecondlineindentamount}{\contentsindentthreeamount}%313
 \newcommand{\contentssequencesectionsubtitlesecondlineindent}{\hspace{\contentssequencesectionsubtitlesecondlineindentamount}}
 \newlength{\contentssequencesubsectiontitleindentamount}
-\setlength{\contentssequencesubsectiontitleindentamount}{\contentsindentoneamount}
+\setlength{\contentssequencesubsectiontitleindentamount}{\contentsindentthreeamount}
 \newcommand{\contentssequencesubsectiontitleindent}{\hspace{\contentssequencesubsectiontitleindentamount}}
 \newlength{\contentssequencesubsubsectiontitleindentamount}
-\setlength{\contentssequencesubsubsectiontitleindentamount}{\contentsindentthreeamount}
+\setlength{\contentssequencesubsubsectiontitleindentamount}{\contentsindentfouramount}
 \newcommand{\contentssequencesubsubsectiontitleindent}{\hspace{\contentssequencesubsubsectiontitleindentamount}}
 
 
@@ -6381,6 +6399,20 @@
 %\m@ken@teholder{#1}%
 %\setlength{\titleentryoverrun}{\z@}}
 %
+%%% special version for subtitles
+\newcommand{\set@p@emsubtitle}[6]{\iftitlesatleftversemargin% 
+{\begin{pmclverse}\addtolength{\leftmargin}{-\leftmargini}{#2 #3 #4 #1 #5} \end{pmclverse}}%
+\else%
+\setlength{\titleentryoverrun}{#6}%
+{#2}%
+{#3 \begin{titleentryenvironment}%
+{{\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@}\fi}
 \newcommand{\setcontentsleaders}[1]{%
    \def\contentsleaders{#1\nobreak%
 }}
@@ -6440,7 +6472,7 @@
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemtitlebaretitle}[1]{%
-\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
+\set@p@emsubtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
 {\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 }
 \newcommand{\poemtitleonlycontents}[1]{%
@@ -6684,34 +6716,34 @@
 \restoresinglelinesettings
 }
 \newcommand{\sequencesubtitle}[1]{
-\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+\set@p@emsubtitle{#1}{\par\nobreak}{\sequencetitlefont}
 {\sequencesubtitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
 \c@ntentsinfo{#1}{\contentssequencesubtitleindent}{\contentssequencetitlefont}
 {\contentssequencesubtitleindentamount}
-\t@xtnotesinfo{#1}
+%\t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesubtitlefirstline}[1]{\firstlinesettings
-\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+\set@p@emsubtitle{#1}{\par\nobreak}{\sequencetitlefont}
 {\sequencesubtitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
 \c@ntentsinfo{#1}{\contentsindenttwo}{\contentssequencetitlefont}
 {\contentsindentthreeamount}
-\t@xtnotesinfo{#1}
+%\t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesubtitlemiddleline}[1]{\middlelinesettings
-\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+\set@p@emsubtitle{#1}{\par\nobreak}{\sequencetitlefont}
 {\sequencesubtitlesecondlineindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
 \c@ntentsinfo{#1}{\contentssequencesubtitlesecondlineindent}{\contentssequencetitlefont}
 {\contentssequencesubtitlesecondlineindentamount}
-\t@xtnotesinfo{#1}
+%\t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesubtitlelastline}[1]{\lastlinesettings
-\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+\set@p@emsubtitle{#1}{\par\nobreak}{\sequencetitlefont}
 {\sequencesubtitlesecondlineindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
 \c@ntentsinfo{#1}{\contentssequencesubtitlesecondlineindent}{\contentssequencetitlefont}
 {\contentssequencesubtitlesecondlineindentamount}
-\t@xtnotesinfo{#1}
+%\t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 %    \end{macrocode}
@@ -6774,7 +6806,7 @@
 \set@p@emtitle{#1}{\multilinetitlepenalty}{\poemtitlefont}
 {\sequencesectiontitleindent}{\nobreak\par\nobreak}{\sequencesectiontitleindentamount}
 \c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
-{\contentssequencesectiontitleindent}
+{\contentssequencesectiontitleindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
@@ -6854,25 +6886,25 @@
 % \newcommand{\sequencesectionsubtitle}[1]{{\subsectiontitlefont \hbox{\titleindent #1}}
 %   \nobreak\par\nobreak\afterpoemtitleskip\nobreak
 % }
-\newcommand{\sequencesectionsubtitle}[1]{\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+\newcommand{\sequencesectionsubtitle}[1]{\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
 {\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
 }
 \newcommand{\sequencesectionsubtitlefirstline}[1]{\firstlinesettings
-\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
 {\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesectionsubtitlemiddleline}[1]{\middlelinesettings
-\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
 {\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesectionsubtitlelastline}[1]{\lastlinesettings
-\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
 {\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
 \restoresinglelinesettings
 }
-\newcommand{\poemsubtitle}[1]{\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+\newcommand{\poemsubtitle}[1]{\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
 {\subsectiontitlefont}{\poemsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\titleindentamount}
 }
 %    \end{macrocode}
@@ -6969,11 +7001,11 @@
 }
 \newcommand{\sequencesubsubsectiontitle}[1]{
 \set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\sequencesubsubsectiontitleindent}
+{\sequencesubsubsectiontitleindent} 
 {\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
 {\sequencesubsubsectiontitleindentamount}
-\c@ntentsinfo{#1}{\contentssequencesubsubsectiontitleindent}{\contentspoemtitlefont}
-{\contentssequencesubsubsectiontitleindentmount}
+%\c@ntentsinfo{#1}{\contentssequencesubsubsectiontitleindent}{\contentspoemtitlefont}
+%{\contentssequencesubsectiontitleindentmount} % 313
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesubsubsectiontitlenocontents}[1]{
@@ -7038,7 +7070,17 @@
 \m@kep@emlabel%
 \m@ken@teholder{#1}%
 \setlength{\titleentryoverrun}{\z@}}
-
+%% subtitle version
+\newcommand{\set@margp@emsubtitle}[7]{\setlength{\titleentryoverrun}{#6}%
+{#2}%
+{#3 \begin{titleentryenvironment}%
+{\ifcentertitleson\begin{center}#4 #1 #7\end{center}\else #4 #1
+#7\fi}\end{titleentryenvironment}}%
+{#5}%
+%\m@kep@emlabel%
+%\m@ken@teholder{#1}%
+\setlength{\titleentryoverrun}{\z@}}
+% user version
 \newcommand{\setmargpoemtitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
 {\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}%
@@ -7137,7 +7179,7 @@
 \sources{\label{#2}}% 
 }
 \newcommand{\JHsequencesectionsubtitle}[2]{%
-\set@margp@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
+\set@margp@emsubtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
 {\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
 {\titleindentamount}{\JHlabel{#2}}%
 \sources{\label{#2}}% 
diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
index 7500545fca1..40a126fc701 100644
--- a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
+++ b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]
 \ProvidesPackage{poemscol}
-   [2019/09/09 v3.12 poemscol file]
+   [2019/09/15 v3.13 poemscol file]
  %|\prosexyznote|
 
 %%
@@ -257,34 +257,34 @@
 \setlength{\contentspoemsubsectiontitleindentamount}{\contentsindentthreeamount}
 \newcommand{\contentspoemsubsectiontitleindent}{\hspace{\contentsindentthreeamount}}
 \newlength{\contentssequencetitleindentamount}
-\setlength{\contentssequencetitleindentamount}{0pt}
+\setlength{\contentssequencetitleindentamount}{\contentsindentoneamount} %313
  \newcommand{\contentssequencetitleindent}{\hspace{\contentssequencetitleindentamount}}
 \newlength{\contentssequencetitlesecondlineindentamount}
-\setlength{\contentssequencetitlesecondlineindentamount}{0pt}
+\setlength{\contentssequencetitlesecondlineindentamount}{\contentsindentoneamount} %313
  \newcommand{\contentssequencetitlesecondlineindent}{\hspace{\contentssequencetitlesecondlineindentamount}}
 \newlength{\contentssequencesubtitleindentamount}
-\setlength{\contentssequencesubtitleindentamount}{\contentsindentoneamount}
+\setlength{\contentssequencesubtitleindentamount}{\contentsindenttwoamount} %313
 \newcommand{\contentssequencesubtitleindent}{\hspace{\contentssequencesubtitleindentamount}}
 \newlength{\contentssequencesubtitlesecondlineindentamount}
-\setlength{\contentssequencesubtitlesecondlineindentamount}{\contentsindentoneamount}
+\setlength{\contentssequencesubtitlesecondlineindentamount}{\contentsindenttwoamount} %313
 \newcommand{\contentssequencesubtitlesecondlineindent}{\hspace{\contentssequencesubtitlesecondlineindentamount}}
 \newlength{\contentssequencesectiontitleindentamount}
-\setlength{\contentssequencesectiontitleindentamount}{\contentsindentoneamount}
+\setlength{\contentssequencesectiontitleindentamount}{\contentsindenttwoamount} %313
 \newcommand{\contentssequencesectiontitleindent}{\hspace{\contentssequencesectiontitleindentamount}}
 \newlength{\contentssequencesectiontitlesecondlineindentamount}
-\setlength{\contentssequencesectiontitlesecondlineindentamount}{\contentsindentoneamount}
+\setlength{\contentssequencesectiontitlesecondlineindentamount}{\contentsindenttwoamount} %313
 \newcommand{\contentssequencesectiontitlesecondlineindent}{\hspace{\contentssequencesectiontitlesecondlineindentamount}}
 \newlength{\contentssequencesectionsubtitleindentamount}
-\setlength{\contentssequencesectionsubtitleindentamount}{\contentsindenttwoamount}
+\setlength{\contentssequencesectionsubtitleindentamount}{\contentsindentthreeamount} %313
 \newcommand{\contentssequencesectionsubtitleindent}{\hspace{\contentssequencesectionsubtitleindentamount}}
 \newlength{\contentssequencesectionsubtitlesecondlineindentamount}
-\setlength{\contentssequencesectionsubtitlesecondlineindentamount}{\contentsindenttwoamount}
+\setlength{\contentssequencesectionsubtitlesecondlineindentamount}{\contentsindentthreeamount}%313
 \newcommand{\contentssequencesectionsubtitlesecondlineindent}{\hspace{\contentssequencesectionsubtitlesecondlineindentamount}}
 \newlength{\contentssequencesubsectiontitleindentamount}
-\setlength{\contentssequencesubsectiontitleindentamount}{\contentsindentoneamount}
+\setlength{\contentssequencesubsectiontitleindentamount}{\contentsindentthreeamount}
 \newcommand{\contentssequencesubsectiontitleindent}{\hspace{\contentssequencesubsectiontitleindentamount}}
 \newlength{\contentssequencesubsubsectiontitleindentamount}
-\setlength{\contentssequencesubsubsectiontitleindentamount}{\contentsindentthreeamount}
+\setlength{\contentssequencesubsubsectiontitleindentamount}{\contentsindentfouramount}
 \newcommand{\contentssequencesubsubsectiontitleindent}{\hspace{\contentssequencesubsubsectiontitleindentamount}}
 
 \newcommand{\afterpoemtitleskip}{\smallskip}
@@ -1319,6 +1319,18 @@
 \m@kep@emlabel
 \m@ken@teholder{#1}%
 \setlength{\titleentryoverrun}{\z@}\fi}
+%%% special version for subtitles
+\newcommand{\set@p@emsubtitle}[6]{\iftitlesatleftversemargin%
+{\begin{pmclverse}\addtolength{\leftmargin}{-\leftmargini}{#2 #3 #4 #1 #5} \end{pmclverse}}%
+\else%
+\setlength{\titleentryoverrun}{#6}%
+{#2}%
+{#3 \begin{titleentryenvironment}%
+{{\ifnormaltitleindentation #4 #1%
+\else \ifcentertitleson \begin{center} #1 \end{center} \else #1\fi\fi}}%
+\end{titleentryenvironment}}%
+{#5}%
+\setlength{\titleentryoverrun}{\z@}\fi}
 \newcommand{\setcontentsleaders}[1]{%
    \def\contentsleaders{#1\nobreak%
 }}
@@ -1375,7 +1387,7 @@
 \t@xtnotesinfo{#1}%
 }
 \newcommand{\poemtitlebaretitle}[1]{%
-\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
+\set@p@emsubtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
 {\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
 }
 \newcommand{\poemtitleonlycontents}[1]{%
@@ -1555,34 +1567,30 @@
 \restoresinglelinesettings
 }
 \newcommand{\sequencesubtitle}[1]{
-\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
+\set@p@emsubtitle{#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}
+\set@p@emsubtitle{#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}
+\set@p@emsubtitle{#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}
+\set@p@emsubtitle{#1}{\par\nobreak}{\sequencetitlefont}
 {\sequencesubtitlesecondlineindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
 \c@ntentsinfo{#1}{\contentssequencesubtitlesecondlineindent}{\contentssequencetitlefont}
 {\contentssequencesubtitlesecondlineindentamount}
-\t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesectiontitle}[1]{
@@ -1620,7 +1628,7 @@
 \set@p@emtitle{#1}{\multilinetitlepenalty}{\poemtitlefont}
 {\sequencesectiontitleindent}{\nobreak\par\nobreak}{\sequencesectiontitleindentamount}
 \c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
-{\contentssequencesectiontitleindent}
+{\contentssequencesectiontitleindentamount}
 \t@xtnotesinfo{#1}
 \restoresinglelinesettings
 }
@@ -1678,25 +1686,25 @@
 {\contentssequencesectiontitleindentamount}
 }
 
-\newcommand{\sequencesectionsubtitle}[1]{\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+\newcommand{\sequencesectionsubtitle}[1]{\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
 {\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
 }
 \newcommand{\sequencesectionsubtitlefirstline}[1]{\firstlinesettings
-\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
 {\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesectionsubtitlemiddleline}[1]{\middlelinesettings
-\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
 {\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
 \restoresinglelinesettings
 }
 \newcommand{\sequencesectionsubtitlelastline}[1]{\lastlinesettings
-\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
 {\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
 \restoresinglelinesettings
 }
-\newcommand{\poemsubtitle}[1]{\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+\newcommand{\poemsubtitle}[1]{\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
 {\subsectiontitlefont}{\poemsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\titleindentamount}
 }
 \newcommand{\sequencesectiontitleitalicnonotes}[2]
@@ -1773,8 +1781,6 @@
 {\sequencesubsubsectiontitleindent}
 {\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
 {\sequencesubsubsectiontitleindentamount}
-\c@ntentsinfo{#1}{\contentssequencesubsubsectiontitleindent}{\contentspoemtitlefont}
-{\contentssequencesubsubsectiontitleindentmount}
 \t@xtnotesinfo{#1}
 }
 \newcommand{\sequencesubsubsectiontitlenocontents}[1]{
@@ -1821,7 +1827,14 @@
 \m@kep@emlabel%
 \m@ken@teholder{#1}%
 \setlength{\titleentryoverrun}{\z@}}
-
+%% subtitle version
+\newcommand{\set@margp@emsubtitle}[7]{\setlength{\titleentryoverrun}{#6}%
+{#2}%
+{#3 \begin{titleentryenvironment}%
+{\ifcentertitleson\begin{center}#4 #1 #7\end{center}\else #4 #1
+#7\fi}\end{titleentryenvironment}}%
+{#5}%
+\setlength{\titleentryoverrun}{\z@}}
 \newcommand{\setmargpoemtitle}[2]{%
 \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
 {\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}%
@@ -1898,7 +1911,7 @@
 \sources{\label{#2}}%
 }
 \newcommand{\JHsequencesectionsubtitle}[2]{%
-\set@margp@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
+\set@margp@emsubtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
 {\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
 {\titleindentamount}{\JHlabel{#2}}%
 \sources{\label{#2}}%