From c75fbb3cd27c0c61bb4d93cedf51f4794edfa12d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 8 Jan 2018 22:19:00 +0000 Subject: poemscol (8jan18) git-svn-id: svn://tug.org/texlive/trunk@46251 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/poemscol/poemscol.sty | 46 ++++++++++++++++++----- 1 file changed, 36 insertions(+), 10 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 6cfc4fceb8a..f2a9ebde7ea 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/12/20 v2.95 poemscol file] + [2018/01/05 v2.97 poemscol file] @@ -310,8 +310,8 @@ \fancyhfoffset[RO,LE]{\headoffsetlength} \fancyhead[RO]{{\small\textrm{\thepage}}} \fancyhead[LE]{{\small\textrm{\thepage}}} -\fancyhead[CO]{\hfil{\small{\em \leftheadervalue ~ \myversemarks}}\hfil} -\fancyhead[CE]{\hfil{\small{\em \volumeheadervalue ~ \myversemarks}}\hfil} +\fancyhead[CO]{\hfil{\small{\em \volumeheadervalue ~\myversemarks}}\hfil} +\fancyhead[CE]{\hfil{\small{\em \leftheadervalue~\myversemarks}}\hfil} \fancyfoot[CE]{{\small \botmark}\hfil} \fancyfoot[CO]{\hfil{\small \botmark}} \renewcommand{\headrulewidth}{0pt} @@ -897,7 +897,7 @@ \fi } \newif\ifcentertitleson -\newcommand{\centertitles}{\centertitlesontrue} +\newcommand{\centertitles}{\centertitlesontrue\centerepigraphsontrue} \makeatletter \newcommand{\set@p@emtitle}[6]{\setlength{\titleentryoverrun}{#6}% {#2}% @@ -1438,10 +1438,12 @@ } \newcommand{\JHpoemsubtitle}[2]{\JHsequencesectionsubtitle{#1}{#2} } -\newcommand{\JHdedication}[2]{\nopagebreak\afterpoemtitleskip\begin{epigraphquote}% +\newcommand{\JHdedication}[2]{\nopagebreak\afterpoemtitleskip\testforcenterepigraph% +\begin{epigraphquote}% \emph{#1}\JHlabel{#2}\end{epigraphquote}% \sources{\label{#2}}\afterpoemtitleskip\nopagebreak} -\newcommand{\JHepigraph}[2]{\nopagebreak\afterpoemtitleskip\begin{epigraphquote}% +\newcommand{\JHepigraph}[2]{\nopagebreak\afterpoemtitleskip\testforcenterepigraph% +\begin{epigraphquote}% \emph{#1}\JHlabel{#2}\end{epigraphquote}% \sources{\label{#2}}\afterpoemtitleskip\nopagebreak} \newcommand{\backmattersectiontitle}[1]{% @@ -1480,12 +1482,34 @@ \newcommand{\margrefspecial}[1]{% \marginpar{\scriptsize {\the\margrefmarker~p.~\pageref{#1}}} } -\newcommand{\epigraph}[1]{\nopagebreak\afterpoemtitleskip\begin{epigraphquote} - \emph{#1}\end{epigraphquote}\afterpoemtitleskip\nopagebreak} +\newif\ifcenterepigraphson +\centerepigraphsonfalse +\newlength{\centerepigraphindentation} +\setlength{\centerepigraphindentation}{6em} +\newlength{\normalepigraphindentation} +\setlength{\normalepigraphindentation}{1.5em} +\newcommand{\centerepigraphquote}{% +\setlength{\epigraphquoteleftmargin}{\centerepigraphindentation} +\setlength{\epigraphquoterightmargin}{\centerepigraphindentation} +} +\newcommand{\normalepigraphquote}{% +\setlength{\epigraphquoteleftmargin}{\normalepigraphindentation} +\setlength{\epigraphquoterightmargin}{\normalepigraphindentation} +} +\newcommand{\testforcenterepigraph}{\ifcenterepigraphson% +\centerepigraphquote +\else +\normalepigraphquote +\fi} +\newcommand{\epigraph}[1]{\nopagebreak\afterpoemtitleskip\testforcenterepigraph% +\begin{epigraphquote}% + \emph{#1}\end{epigraphquote}\afterpoemtitleskip\nopagebreak} \newcommand{\headnote}[1]{\epigraph{#1}} -\newcommand{\attribution}[1]{\nopagebreak\afterpoemtitleskip\begin{epigraphquote} +\newcommand{\attribution}[1]{\nopagebreak\afterpoemtitleskip\testforcenterepigraph% +\begin{epigraphquote}% {\small\emph{#1}}\end{epigraphquote}\afterpoemtitleskip\nopagebreak} -\newcommand{\poemdedication}[1]{\nopagebreak\afterpoemtitleskip\begin{epigraphquote} +\newcommand{\poemdedication}[1]{\nopagebreak\afterpoemtitleskip\testforcenterepigraph% +\begin{epigraphquote}% \emph{#1}\end{epigraphquote}\afterpoemtitleskip\nopagebreak} \providecommand{\dedication}[1]{\poemdedication{#1}} \newcommand{\volumededication}[1]{\par\bigskip\begin{volumetitlepagequote} @@ -1494,6 +1518,8 @@ \emph{#1}\end{volumetitlepagequote}} \newcommand{\volumeattribution}[1]{\par\smallskip\begin{volumetitlepagequote} {\small \emph{#1}}\end{volumetitlepagequote}} + \newenvironment{epigraphenvironment}{\nopagebreak\afterpoemtitleskip\testforcenterepigraph% +\begin{epigraphquote}\em}{\end{epigraphquote}\afterpoemtitleskip\nopagebreak} \newlength{\dateindent}% \setlength{\dateindent}{\leftmargin}% \newcommand{\variabledateindent}{% -- cgit v1.2.3