From eef0b81604ae423b3f37dac28840c4765d68c770 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 2 Sep 2017 21:43:00 +0000 Subject: poemscol (2sep17) git-svn-id: svn://tug.org/texlive/trunk@45197 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/poemscol/poemscol.sty | 75 +++++++++++++++-------- 1 file changed, 48 insertions(+), 27 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 313699c7aa1..e3d66b3e943 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} - [2017/8/25 v2.8 poemscol file] + [2017/9/03 v2.85 poemscol file] @@ -130,22 +130,41 @@ \newcommand{\runoverindent}[1]{\global\edef\runoverindentvalue{#1} } \runoverindent{6em} +\newif\iflinenumberscenteredwithverse +\linenumberscenteredwithversetrue +\newlength{\marginparsepmin} +\setlength{\marginparsepmin}{2em} +\newlength{\versemarginadjust} +\setlength{\versemarginadjust}{0pt} +\newif\iftextcenteringturnedon +\textcenteringturnedontrue +\newcommand{\v@riablemarginpar}{\setlength{\marginparsep}{-\leftmargin}% +\addtolength{\marginparsep}{\marginparsepmin}} +\newcommand{\c@nterverseblock}[1]{\rightmargin \z@% + \setlength{\leftmargin}{\linewidth}% + \addtolength{\leftmargin}{-#1}% + \addtolength{\leftmargin}{-0.5\leftmargin}% + \iflinenumberscenteredwithverse\v@riablemarginpar\fi} \newenvironment{pmclverse}[1][\linewidth]{% \let\\=\@centercr% \list{}{\itemsep\z@ \itemindent -\runoverindentvalue \listparindent \itemindent \ifdim #1 < \linewidth - \rightmargin \z@ - \setlength{\leftmargin}{\linewidth}% - \addtolength{\leftmargin}{-#1}% - \addtolength{\leftmargin}{-0.5\leftmargin}% + \iftextcenteringturnedon + \c@nterverseblock{#1}% + \else + \rightmargin \leftmargin + \addtolength{\leftmargin}{-\versemarginadjust}\fi \else - \rightmargin \leftmargin + \rightmargin \leftmargin + \addtolength{\leftmargin}{-\versemarginadjust} \fi \advance\leftmargin\runoverindentvalue} \item[]} -{\endlist} +{\endlist}% from 2.72 with additions + + \newif\ifinquotedverse \newenvironment{quotedverse}{% \inquotedversetrue @@ -247,8 +266,8 @@ \fancyhfoffset[RO,LE]{\headoffsetlength} \fancyhead[RO]{{\small\textrm{\thepage}}} \fancyhead[LE]{{\small\textrm{\thepage}}} -\fancyhead[CO]{\hfil{\small{\em \volumeheadervalue}}} -\fancyhead[CE]{{\small{\em \leftheadervalue}}\hfil} +\fancyhead[CO]{\hfil{\small{\em \volumeheadervalue}}\hfil} +\fancyhead[CE]{\hfil{\small{\em \leftheadervalue}}\hfil} \fancyfoot[CE]{{\small \botmark}\hfil} \fancyfoot[CO]{\hfil{\small \botmark}} \renewcommand{\headrulewidth}{0pt} @@ -259,8 +278,8 @@ \fancyhfoffset[RO,LE]{\headoffsetlength} \fancyhead[RO]{{\small\textrm{\thepage}}} \fancyhead[LE]{{\small\textrm{\thepage}}} -\fancyhead[CO]{\hfil{\small{\em \volumeheadervalue}}} -\fancyhead[CE]{{\small{\em \leftheadervalue}}\hfil} +\fancyhead[CO]{\hfil{\small{\em \volumeheadervalue}}\hfil} +\fancyhead[CE]{\hfil{\small{\em \leftheadervalue}}\hfil} \fancyfoot[CE]{{\small \botmark}\hfil} \fancyfoot[CO]{\hfil{\small \botmark}} \renewcommand{\headrulewidth}{0pt} @@ -362,10 +381,10 @@ }{\newpage\thispagestyle{volumetitlestyle}\cleardoublepage} \newenvironment{booksectionpage} {\par\newpage\thispagestyle{volumetitlestyle}}{\newpage} - \setlength{\marginparsep}{0pt} - \setlength{\marginparwidth}{0pt} + \setlength{\marginparsep}{18pt} + \setlength{\marginparwidth}{18pt} \newif\ifnumbersswitch \numbersswitchfalse -\newif\ifnumbersright \numbersrighttrue +\newif\ifnumbersright \numbersrightfalse \newcommand{\pmclsidepar}{\@dblarg{\@pmclsidepar}} \long\def\@pmclsidepar[#1]#2{\@bsphack\strut\vadjust{% added \checkoddpage @@ -868,8 +887,6 @@ \m@kep@emlabel \m@ken@teholder{#1}% \setlength{\titleentryoverrun}{\z@}} - - \newcommand{\setcontentsleaders}[1]{% \def\contentsleaders{#1\nobreak% }} @@ -1174,8 +1191,8 @@ {\contentsindentthreeamount} } -\newcommand{\sequencesectionsubtitle}[1]{{\subsectiontitlefont \hbox{\titleindent #1}} - \nobreak\par\nobreak\afterpoemtitleskip\nobreak +\newcommand{\sequencesectionsubtitle}[1]{\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip} +{\subsectiontitlefont}{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\titleindentamount} } \newcommand{\poemsubtitle}[1]{\sequencesectionsubtitle{#1} } @@ -1292,6 +1309,16 @@ \newcommand{\interjectiontitlemiddleline}[1]{ \sequencefirstsubsectionmiddleline{#1} } +\newcommand{\set@margp@emtitle}[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@}} + \newcommand{\setmargpoemtitle}[2]{% \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}% {\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}% @@ -1300,14 +1327,6 @@ \t@xtnotesinfo{#1}% \sources{\label{#2}}% } -\newcommand{\set@margp@emtitle}[7]{\setlength{\titleentryoverrun}{#6}% -{#2}% -{#3 \begin{titleentryenvironment}% -{#4 #1 #7}\end{titleentryenvironment}}% -{#5}% -\m@kep@emlabel% -\m@ken@teholder{#1}% -\setlength{\titleentryoverrun}{\z@}} \newcommand{\JHpoemtitle}[2]{% \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}% {\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}% @@ -1402,8 +1421,10 @@ \margrefmarker={\dag} \newcommand{\setmargrefmarker}[1]{\margrefmarker={#1}} \newcommand{\makemargreflabel}{\string\label\string{margref\themargrefnumber\string}} +\newif{\ifmargrefstomargin} +\margrefstomarginfalse \newcommand{\setmargref} -{\marginpar{\scriptsize {\the\margrefmarker~p.~\pageref{margref\themargrefnumber}}} +{\marginpar{\ifmargrefstomargin\hspace*{.5\leftmargin}\fi\scriptsize {\the\margrefmarker~p.~\pageref{margref\themargrefnumber}}} } \newcommand{\margreftextnote}{% \iftextnoteson\addtocounter{margrefnumber}{1}% -- cgit v1.2.3