From 33fcbd8a69b5d145e18aee4ae16adc6fde04960e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Jun 2020 21:02:51 +0000 Subject: poemscol (12jun20) git-svn-id: svn://tug.org/texlive/trunk@55528 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/poemscol/poemscol.sty | 165 ++++++++++++++++------ 1 file changed, 122 insertions(+), 43 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 abd1d9d9967..895a3b53780 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} - [2020/06/02 v3.14159 poemscol file] + [2020/06/12 v3.141592 poemscol file] %|\prosexyznote| %% @@ -1833,6 +1833,8 @@ \setlength{\JHmarginparwidth}{\marginparwidth} \newlength{\JHmarginparsepmin} \setlength{\JHmarginparsepmin}{\marginparsepmin} +\newlength{\JHtitlemarginparsep}% +\setlength{\JHtitlemarginparsep}{\JHmarginparsep}% \newif{\ifJHmarkstoleft} \JHmarkstolefttrue \newif{\ifJHmarkstoright} @@ -1966,10 +1968,10 @@ \newcommand{\JHrighttitlemarginpar}[1]{% \pmclbsphack\strut\vadjust{% \rlap{\kern-\parindent% -\kern\textwidth\kern\JHmarginparsep% at right -\ifcentertitleson -\kern-.5\JHtextwidth\kern\marginparsepmin -\fi +\kern\textwidth\kern\JHtitlemarginparsep% at right +\ifcentertitleson% +\kern-.5\JHtextwidth\kern\marginparsepmin% +\fi% \setbox0=\vtop to 0pt{% added \begin{minipage}[t]{\JHmarginparwidth}% added #1% @@ -1977,15 +1979,14 @@ \vss}% \vtop to 0pt{\kern\JHmarginparvshift% default should be 0pt \kern-\dp\strutbox \kern-\ht0 \box0 \vss}}}\pmclesphack}% - \newcommand{\JHlefttitlemarginpar}[1]{% \pmclbsphack\strut\vadjust{% changed \rlap{\kern-\parindent% -\kern -\JHmarginparsep \kern -\JHmarginparwidth% at left -\ifcentertitleson -\kern-.5\JHtextwidth\kern\marginparsepmin -\fi -\setbox0=\vtop to 0pt{ +\kern -\JHtitlemarginparsep \kern -\JHmarginparwidth% at left +\ifcentertitleson% +\kern-.5\JHtextwidth\kern\marginparsepmin% +\fi% +\setbox0=\vtop to 0pt{% \begin{minipage}[t]{\JHmarginparwidth}% added #1% \end{minipage}% @@ -1994,42 +1995,42 @@ \kern-\dp\strutbox \kern-\ht0 \box0 \vss}}}\pmclesphack}% changed \newcommand{\JHswitchtitlemarginpar}{\@dblarg{\@JHswitchtitlemarginpar}} \long\def\@JHswitchtitlemarginpar[#1]#2{\@bsphack\strut\vadjust{% added -\checkoddpage - \ifJHmarginparswitch - \ifJHreversemarginpar - \ifoddpage - \oddpagefalse - \else - \oddpagetrue - \fi - \fi - \else - \oddpagetrue - \ifJHreversemarginpar - \oddpagefalse - \fi - \fi - \rlap{\kern-\parindent - \if@twocolumn +\checkoddpage% + \ifJHmarginparswitch% + \ifJHreversemarginpar% + \ifoddpage% + \oddpagefalse% + \else% + \oddpagetrue% + \fi% + \fi% + \else% + \oddpagetrue% + \ifJHreversemarginpar% + \oddpagefalse% + \fi% + \fi% + \rlap{\kern-\parindent% + \if@twocolumn% \if@firstcolumn % put at left - \kern -\JHmarginparsep \kern -\marginparwidth % at left - \kern-.5\JHtextwidth\kern\marginparsepmin + \kern -\JHtitlemarginparsep \kern -\marginparwidth % at left + \kern-.5\JHtextwidth\kern\marginparsepmin% \else % put at right - \kern \columnwidth \kern \JHmarginparsep % at right - \fi - \else + \kern \columnwidth \kern \JHtitlemarginparsep % at right + \fi% + \else% \ifoddpage % put at right - \kern \textwidth \kern \JHmarginparsep % at right - \ifcentertitleson - \kern-.5\JHtextwidth\kern\marginparsepmin - \fi + \kern \textwidth \kern \JHtitlemarginparsep % at right + \ifcentertitleson% + \kern-.5\JHtextwidth\kern\marginparsepmin% + \fi% \else % put at left - \kern -\JHmarginparsep \kern -\marginparwidth % at left - \ifcentertitleson - \kern-.5\JHtextwidth\kern\marginparsepmin - \fi - \fi - \fi + \kern -\JHtitlemarginparsep \kern -\marginparwidth % at left + \ifcentertitleson% + \kern-.5\JHtextwidth\kern\marginparsepmin% + \fi% + \fi% + \fi% \setbox0=\vtop to 0pt{% added \begin{minipage}[t]{\marginparwidth}% added \ifoddpage #2\else #1\fi% @@ -2037,6 +2038,7 @@ \vss}% added \vtop to 0pt{\kern\JHmarginparvshift % default should be 0pt \kern-\dp\strutbox \kern-\ht0 \box0 \vss}}}\@esphack}% added + % \newcommand{\set@margp@emtitle}[7]{\setlength{\titleentryoverrun}{#6}% {#2}% {#3 \begin{titleentryenvironment}% @@ -2213,6 +2215,83 @@ \newcommand{\margrefspecial}[1]{% \marginpar{\scriptsize {\the\margrefmarker~p.~\pageref{#1}}} } +\newif\iftitlefootnotesatpoemend% +\titlefootnotesatpoemendfalse% +\newif\iftitlefootnotesplain% +\titlefootnotesplaintrue% +\newif\iftitlefootnoteslayered% +\titlefootnoteslayeredfalse% +\newcommand{\maketitlefootnoteslayered}{% +\DeclareNewFootnote[plain]{H}% +\titlefootnoteslayeredtrue% +\titlefootnotesplainfalse% +\titlefootnotesatpoemendfalse% +} +\newcommand{\maketitlefootnotesatpoemend}{ +\titlefootnoteslayeredfalse% +\titlefootnotesplainfalse% +\titlefootnotesatpoemendtrue% +} +\newcommand{\maketitlefootnotesplain}{ +\titlefootnoteslayeredfalse% +\titlefootnotesplaintrue% +\titlefootnotesatpoemendfalse% +} +\newcommand{\placetitlefootnote}[1]{\iftitlefootnoteslayered% +\footnoteH{#1}% +\fi% +\iftitlefootnotesatpoemend% +\footnotemark% +\immediate\write\poemendnotes{\string\makeatletter}% +\immediate\write\poemendnotes{\string\footnotemark\string[\the\c@footnote \string]}% +\immediate\write\poemendnotes{\string\makeatother}% +\literalpoemendnote{#1}% +\fi% +\iftitlefootnotesplain% +\footnote{#1}% +\fi% +} +\newcommand{\footnotepoemtitle}[2]{% +\set@p@emtitle{#1\placetitlefootnote{#2}}{\poemtitlepenalty}{\poemtitlefont}% +{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}% +\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}% +{\contentspoemtitleindentamount}% +\t@xtnotesinfo{#1}% +} +\newcommand{\footnotepoemtitlefirstline}[2]{% +\firstlinesettings% +\set@p@emtitle{#1\placetitlefootnote{#2}}{\multilinetitlepenalty}{\poemtitlefont}% +{\poemtitleindent}{\nobreak\par\nobreak}{\z@}% +\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}% +{\contentspoemtitleindentamount}% +\t@xtnotesinfo{#1}% +\restoresinglelinesettings% +} +\newcommand{\footnotepoemtitlemiddleline}[2]{% +\middlelinesettings% +\set@p@emtitle{#1\placetitlefootnote{#2}}{\par\nobreak}{\poemtitlefont}% +{\poemtitlesecondlineindent}{\nobreak\par\nobreak}{\z@}% +\c@ntentsinfo{#1}{\contentspoemtitlesecondlineindent}{\contentspoemtitlefont}% +{\contentspoemtitlesecondlineindentamount}% +\t@xtnotesinfo{#1}% +\restoresinglelinesettings% +} +\newcommand{\footnotepoemtitlelastline}[2]{% +\lastlinesettings% +\set@p@emtitle{#1\placetitlefootnote{#2}}{\par\nobreak}{\poemtitlefont}% +{\poemtitlesecondlineindent}{\nobreak\par\afterpoemtitleskip\nobreak}{\z@}% +\c@ntentsinfo{#1}{\contentspoemtitlesecondlineindent}{\contentspoemtitlefont}% +{\contentspoemtitlesecondlineindentamount}% +\t@xtnotesinfo{#1}% +\restoresinglelinesettings% +} +\newcommand{\footnotesplitpoemtitle}[3]{% +\set@p@emtitle{#1\placetitlefootnote{#2} #3}{\poemtitlepenalty}{\poemtitlefont}% +{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}% +\c@ntentsinfo{#1 #3}{\contentspoemtitleindent}{\contentspoemtitlefont}% +{\contentspoemtitleindentamount}% +\t@xtnotesinfo{#1 #3}% +} \newif\ifcenterepigraphson \centerepigraphsonfalse \newlength{\centerepigraphindentation} -- cgit v1.2.3