From f7eebe5d798ebeb8717724b7f331e7d8894c2abf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 Sep 2019 21:02:37 +0000 Subject: poemscol (8sep19) git-svn-id: svn://tug.org/texlive/trunk@52056 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/poemscol/poemscol.sty | 850 +++++++++++++++++----- 1 file changed, 653 insertions(+), 197 deletions(-) (limited to 'Master/texmf-dist/tex/latex') 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 -- cgit v1.2.3