From 1e31c251270941078ff4874d90758f122a4a51ed Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 19 Sep 2019 20:44:41 +0000 Subject: poemscol (19sep19) git-svn-id: svn://tug.org/texlive/trunk@52127 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/poemscol/poemscol.sty | 73 +++++++++++++---------- 1 file changed, 43 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist/tex/latex/poemscol') 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}}% -- cgit v1.2.3