From c36ac7b086b2cb672ea6226c28b6890c342d4908 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 2 Jun 2020 21:14:04 +0000 Subject: poemscol (2jun20) git-svn-id: svn://tug.org/texlive/trunk@55389 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/poemscol/poemscol.sty | 35 ++++++++++++++++------- 1 file changed, 24 insertions(+), 11 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 63730c3b4c0..abd1d9d9967 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/10/29 v3.141 poemscol file] + [2020/06/02 v3.14159 poemscol file] %|\prosexyznote| %% @@ -1829,6 +1829,10 @@ \setlength{\JHmarginparsep}{0pt} \newlength{\JHmarginparvshift} \setlength{\JHmarginparvshift}{0pt} +\newlength{\JHmarginparwidth} +\setlength{\JHmarginparwidth}{\marginparwidth} +\newlength{\JHmarginparsepmin} +\setlength{\JHmarginparsepmin}{\marginparsepmin} \newif{\ifJHmarkstoleft} \JHmarkstolefttrue \newif{\ifJHmarkstoright} @@ -1884,7 +1888,7 @@ \rlap{\kern-\parindent% \kern\JHtextwidth\kern\JHmarginparsep% at right \setbox0=\vtop to 0pt{% added -\begin{minipage}[t]{\marginparwidth}% added +\begin{minipage}[t]{\JHmarginparwidth}% added #1% \end{minipage}% \vss}% @@ -1893,9 +1897,9 @@ \newcommand{\JHleftmarginpar}[1]{% \pmclbsphack\strut\vadjust{% changed \rlap{\kern-\parindent% -\kern -\JHmarginparsep \kern -\marginparwidth% at left +\kern -\JHmarginparsep \kern -\JHmarginparwidth% at left \setbox0=\vtop to 0pt{ -\begin{minipage}[t]{\marginparwidth}% added +\begin{minipage}[t]{\JHmarginparwidth}% added #1% \end{minipage}% \vss}% changed @@ -1941,7 +1945,7 @@ \rlap{\kern-\parindent \if@twocolumn \if@firstcolumn % put at left - \kern -\JHmarginparsep \kern -\marginparwidth % at left + \kern -\JHmarginparsep \kern -\JHmarginparwidth % at left \else % put at right \kern \columnwidth \kern \JHmarginparsep % at right \fi @@ -1949,11 +1953,11 @@ \ifoddpage % put at right \kern \textwidth \kern \JHmarginparsep % at right \else % put at left - \kern -\JHmarginparsep \kern -\marginparwidth % at left + \kern -\JHmarginparsep \kern -\JHmarginparwidth % at left \fi \fi \setbox0=\vtop to 0pt{% added - \begin{minipage}[t]{\marginparwidth}% added + \begin{minipage}[t]{\JHmarginparwidth}% added \ifoddpage #2\else #1\fi% \end{minipage}% \vss}% added @@ -1962,22 +1966,27 @@ \newcommand{\JHrighttitlemarginpar}[1]{% \pmclbsphack\strut\vadjust{% \rlap{\kern-\parindent% -\kern\JHtextwidth\kern\JHmarginparsep% at right +\kern\textwidth\kern\JHmarginparsep% at right +\ifcentertitleson \kern-.5\JHtextwidth\kern\marginparsepmin +\fi \setbox0=\vtop to 0pt{% added -\begin{minipage}[t]{\marginparwidth}% added +\begin{minipage}[t]{\JHmarginparwidth}% added #1% \end{minipage}% \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 -\marginparwidth% at left +\kern -\JHmarginparsep \kern -\JHmarginparwidth% at left +\ifcentertitleson \kern-.5\JHtextwidth\kern\marginparsepmin +\fi \setbox0=\vtop to 0pt{ -\begin{minipage}[t]{\marginparwidth}% added +\begin{minipage}[t]{\JHmarginparwidth}% added #1% \end{minipage}% \vss}% changed @@ -2011,10 +2020,14 @@ \else \ifoddpage % put at right \kern \textwidth \kern \JHmarginparsep % 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 \setbox0=\vtop to 0pt{% added -- cgit v1.2.3