texlive[45197] Master/texmf-dist: poemscol (2sep17)
commits+karl at tug.org
commits+karl at tug.org
Sat Sep 2 23:43:00 CEST 2017
Revision: 45197
http://tug.org/svn/texlive?view=revision&revision=45197
Author: karl
Date: 2017-09-02 23:43:00 +0200 (Sat, 02 Sep 2017)
Log Message:
-----------
poemscol (2sep17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
trunk/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
trunk/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
Modified: trunk/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/poemscol/poemscol.dtx 2017-09-02 21:42:48 UTC (rev 45196)
+++ trunk/Master/texmf-dist/source/latex/poemscol/poemscol.dtx 2017-09-02 21:43:00 UTC (rev 45197)
@@ -19,7 +19,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
%<package>\ProvidesPackage{poemscol}
-%<package> [2017/8/25 v2.8 poemscol file]
+%<package> [2017/9/03 v2.85 poemscol file]
%
%<*driver>
\documentclass{ltxdoc}
@@ -33,7 +33,7 @@
%</driver>
% \fi
%
-% \CheckSum{7768}
+% \CheckSum{8012}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -208,9 +208,19 @@
% \changes{v2.72}{2015/6/25}{Improvements to parallel texts. Generic note types for parallel texts.
% corrections to manual.}
% \changes{v2.8}{2017/8/25}{Changes in default values about where line numbers
-% are placed. verselinenumberstoleft are related command no longer change
+% are placed. verselinenumberstoleft and related commands no longer change
% marginparsep. Endnote sections may have normal or hanging paragraphs.
% Endnotes may have multiple paragraphs.}
+% \changes{v2.81}{2017/8/30}{Versemarginadjust to
+% adjust margins of the verse block. Line numbers automatically move closer to
+% the text when the text block is centered on the longest line. New boolean to
+% force line numbers to the margins when the text block is centered. New commands to
+% control the distance of line numbers from margins of centered text block. New default
+% values for marginparwidth and marginparsep.}
+% \changes{v2.85}{2017/9/03}{Boolean to turn centering of verse block on and off.
+% Subtitles center when centertitles is issued. Epigraphs and attributions move
+% in when centertitles is issued. New boolean to adjust placement of marginal
+% reference markers in jhtextnote and related commands.}
% \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
% \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip}
% \DoNotIndex{\newcommand, \section, \subsection, \subsubsection,
@@ -243,15 +253,15 @@
% \textsc, \unskip}
% \setcounter{IndexColumns}{2}
% \MakeShortVerb{|}
-% \def\fileversion{2.8}
-% \def\filedate{25 August 2017}
-% \def\docdate{25 August 2017}
+% \def\fileversion{2.85}
+% \def\filedate{3 September 2017}
+% \def\docdate{3 September 2017}
% \title{Typesetting Poetry Collections with
% \textsf{poemscol}\thanks{This document corresponds to
% \textsf{poemscol}~\fileversion, dated \filedate.}}
% \author{John Burt
% \\ \texttt{burt at brandeis.edu}}
-% \date{25 August 2017}
+% \date{3 September 2017}
% \maketitle
% \begin{abstract} \textsf{poemscol} provides macros for \LaTeX\ for
% setting collections of poetry. It is especially suited for setting
@@ -607,12 +617,28 @@
% |\settowidth{\versewidth}{Text of line to use for centering}|. To use |\versewidth|
% to center the poem on a sample line, enter the |poem| environment this way:
% |\begin{poem}[\versewidth]|.
+%
+% If you center the verse on the page using this option, you probably also want
+% to move the line numbers in, so as to be closer to the line.
+% \textsf{poemscol} will do this by default. If you wish to leave the line
+% numbers at the margin, set the boolean |\linenumberscenteredwithverse| to
+% false. For centered verse, the distance between the line numbers and the
+% verse can be set by setting the length of |\marginparsepmin| (not
+% |\marginparsep|). The default
+% value of |\marginparsepmin| is 2em.
%
% \DescribeMacro{\centertitles}
% If you center the poem on a sample
% line, you probably also want to center the title of the poem too,
% which you can do by issuing |\centertitles|.
-%
+%
+% \DescribeMacro{iftextcenteringturnedon} Suppose you have marked up poems with
+% the optional second argument to |\begin{poem}| which would cause the text
+% block to be centered on the longest line. You can turn off centering, without
+% erasing all of the second arguments, by issuing |\textcenteringturnonfalse|.
+% You can turn on centering the text block again by issuing
+% |\textcenteringturnedontrue|.
+%
% \textsf{poemscol} turns off automatic hyphenation in poetry
% environments. The idea here is that every hyphen in the printed
% poem is authorial, obviating the need for you to compile a
@@ -690,31 +716,34 @@
% numbering off, issue |\global\verselinenumbersfalse|. To turn it
% back on, issue |\makeverselinenumbers|.
%
+% \begin{sloppypar}
% \DescribeMacro{\verselinenumberstoright}
% \DescribeMacro{\verselinenumberstoleft}
% \DescribeMacro{\verselinenumbersswitch}
% \DescribeMacro{\verselinenumbersgutter}
% \DescribeMacro{\verselinenumbersouter}
-% To put all of the line numbers to the left, issue
-% |\verselinenumberstoleft| in your preamble.
-% |\verselinenumberstoright| puts the line numbers in the right
-% margin. (These two commands use non-floating marginal note macros
-% derived from the \textsf{memoir} class, |\pmclleftsidepar| and
-% |\pmclrightsidepar|, respectively.) If you wish them to appear in
-% the outer margins, issue |\verselinenumbersouter| in your preamble.
-% If you want the line numbers to appear in the inner margins, issue
-% |\verselinenumbersgutter| in your preamble. (These two commands use
-% |\pmclsidepar|, derived from |\sidepar| from the \textsf{memoir}
-% class, but modified by Dan Leucking.) You can adjust the distance
-% between the marginal line number and the text with
-% |\setlength{\marginparsep}{}|.The default value for |\marginparsep|
-% is 0pt, and the default value for the width of the box in which
-% the line numbers are set, |\marginparwidth|, is 0 pt. These values line the
-% verse line numbers up with the page numbers. If you move the verse line
-% numbers by changing |\marginparsep|, you can move the page numbers to keep
-% them aligned by changing |\headoffsetlength|. If you set |\marginparsep| to
-% 18pts (the default value up to version 2.72 of \textsf{poemscol}), set
-% |\headoffsetlength| to 28pts.
+% To put all of the line numbers to the left, issue |\verselinenumberstoleft| in
+% your preamble. |\verselinenumberstoright| puts the line numbers in the right
+% margin. (These two commands use non-floating marginal note macros derived
+% from the \textsf{memoir} class, |\pmclleftsidepar| and |\pmclrightsidepar|,
+% respectively.) If you wish them to appear in the outer margins, issue
+% |\verselinenumbersouter| in your preamble. If you want the line numbers to
+% appear in the inner margins, issue |\verselinenumbersgutter| in your preamble.
+% (These two commands use |\pmclsidepar|, derived from |\sidepar| from the
+% \textsf{memoir} class, but modified by Dan Leucking.) You can adjust the
+% distance between the marginal line number and the text with
+% |\setlength{\marginparsep}{}|. The default value for |\marginparsep| is 18pt,
+% and the default value for the width of the box in which the line numbers are
+% set, |\marginparwidth|, is 18 pt. If you are setting with the line numbers to
+% the right, |\marginparwidth| can be as small as you wish, although your log
+% file will be full of complaints if you make it too small. But if you are
+% setting with the line numbers to the left, if |\marginparwidth| is narrower
+% than the width of the line number, the line number will be moved down a line.
+% Setting |\marginparsep| to zero lines the verse line numbers up with the page
+% numbers, and puts both at the margin. If you move the verse line numbers by
+% changing |\marginparsep|, you can move the page numbers to keep them aligned
+% by changing |\headoffsetlength|.
+%\end{sloppypar}
%
% The line numbers should print on the baseline. You can adjust them
% to move them up or down by changing the value of a length called
@@ -721,6 +750,10 @@
% |\pmclsideparvshift|. The default value is
% |\setlength{\pmclsideparvshift}{0ex}|.
%
+% You can adjust the placement of the verse block by changing the value of the
+% length |\versemarginadjust|. For most commonly used type sizes, setting
+% |\versemarginadjust| to 28pts will put the verse block at the left margin.
+%
% \subsection{~Special line markup}
% \DescribeMacro{\linebend} \textsf{poemscol} automatically runs over
% long lines, indenting the run over portion on the next physical
@@ -1186,10 +1219,10 @@
% in books or cantos, it would be wise to use |\poemtitle| for the
% canto names or numbers, setting the poem title in some other way,
% perhaps with |\volumetitle| described above.)
-%
+%
% By default, there is one paragraph per poem, with a hanging indent to give
% prominence to the page number.
-%
+%
% \begin{sloppypar}
% \DescribeMacro{\iftextnotessinglepar}
% \DescribeMacro{\ifemendationssingplepar}
@@ -1199,9 +1232,9 @@
% note to appear in its own paragraph rather than in a block paragraph
% with the other notes to that poem. To do this, you need to set
% the relevant boolean. Issue |\textnotessinglepartrue|
-% |\emendationssingplepartrue| or |\explanationssinglepartrue| to givve
-% each such note a separate paragraph. By default, these notes will have a
-% hanging indent, to give prominence to the line number
+% |\emendationssingplepartrue| or |\explanationssinglepartrue| to give
+% each such note a separate paragraph.By default, these notes will have a
+% hanging indent, to give prominence to the line number.
% \end{sloppypar}
%
% You may have notes with multiple paragraphs. The default settings for all of
@@ -1223,7 +1256,6 @@
% 1em. You can change this by changing the value of the length
% |\noteindentation|.
%
-%
% \DescribeMacro{\iftextnotestwocol}
% \DescribeMacro{\ifemendationstwocol}
% \DescribeMacro{\ifexplanationstwocol}
@@ -2008,7 +2040,7 @@
% set a marginal note with a page reference to that label. Issue
% |\margreftextnote| \emph{before} issuing the |\verseline| or
% |\end{stanza}| that closes the line to which it refers. (The textual
-% note itself can be an ordinary |\textnote|, and should be place, as
+% note itself can be an ordinary |\textnote|, and should be placed, as
% usual, \emph{after} the |\verseline| or |\end{stanza}|.
%
% |\margreftextnote| generates its own label, so there is no need to
@@ -2020,7 +2052,12 @@
% whole family of markers to be controlled by the same settings. You
% use the settings that control the behavior of |\marginpar| (e.g.
% |\mparswitch| and |\reversemarginpar|) to control the behavior of
-% these marks.
+% these marks.
+%
+% By default these marginal references are placed in the right margin. If you
+% are centering the verse block on the longest line, the marginal references
+% will move in closer to the line. If you would prefer to keep the marginal
+% references in the margin, set the boolean |\margrefstomargin| true.
%
% \begin{sloppypar}
% If you define a new endnote type using |\definenewnotetype|,
@@ -2152,7 +2189,7 @@
% You have to give geometry the values that suit you. I include the
% values I used in my own book, just to give you a starting place.
% The default values for marginparsep and
-% marginparwidth are different now (18pt and 10pt respectively). With
+% marginparwidth are different now (18pt and 18pt respectively). With
% that warning, here is a list of the values I used:
%
% \bigskip
@@ -2383,8 +2420,8 @@
% placeholder now, used only for setting the value of |\marginparsep|
% to something better for prose. (|\marginparsep| sets how far the
% line numbers are from the text block.) |\verselinenumberstoleft|,
-% |\verselinenumberstoright|, and |\verselinenumbersswitch| each
-% set |\marginparsep| to zero. By default these values all
+% |\verselinenumberstoright|, and |\verselinenumbersswitch| each pick
+% convenient values for |\marginparsep|. By default these values all
% line up on the page, but if you change any of them, you may have to
% use reset |\marginparsep| to some value you will have to find by
% trial and error, since they each use |\marginparsep| in slightly
@@ -2394,6 +2431,7 @@
% |\verselinenumberstoleft| or whatever else you intend to use. Adjust
% |\headoffsetlength| to make the page numbers line up with the line numbers.
%
+%
% \DescribeMacro{\pmsentence} Each sentence must begin with
% |\pmsentence|. |\pmsentence| increments the sentence counter,
% optionally puts the sentence number in the running text, and
@@ -3306,6 +3344,27 @@
% \rightmargin 1sp\leftmargin 1sp\advance\leftmargin
% \runoverindentvalue}\item[]}
% {\endlist}
+\newif\iflinenumberscenteredwithverse
+\linenumberscenteredwithversetrue
+%
+\newlength{\marginparsepmin}
+\setlength{\marginparsepmin}{2em}
+%
+\newlength{\versemarginadjust}
+\setlength{\versemarginadjust}{0pt}
+%
+\newif\iftextcenteringturnedon
+\textcenteringturnedontrue
+%
+\newcommand{\v at riablemarginpar}{\setlength{\marginparsep}{-\leftmargin}%
+\addtolength{\marginparsep}{\marginparsepmin}}
+%
+\newcommand{\c at nterverseblock}[1]{\rightmargin \z@%
+ \setlength{\leftmargin}{\linewidth}%
+ \addtolength{\leftmargin}{-#1}%
+ \addtolength{\leftmargin}{-0.5\leftmargin}%
+ \iflinenumberscenteredwithverse\v at riablemarginpar\fi}
+%
\newenvironment{pmclverse}[1][\linewidth]{%
\let\\=\@centercr%
\list{}{\itemsep\z@
@@ -3312,16 +3371,96 @@
\itemindent -\runoverindentvalue
\listparindent \itemindent
\ifdim #1 < \linewidth
- \rightmargin \z@
- \setlength{\leftmargin}{\linewidth}%
- \addtolength{\leftmargin}{-#1}%
- \addtolength{\leftmargin}{-0.5\leftmargin}%
+ \iftextcenteringturnedon
+ \c at 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
+% \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}%
+% \iflinenumberscenteredwithverse
+% \setlength{\marginparsep}{-\leftmargin+\marginparsepmin}
+% \fi
+% \else
+% \rightmargin \leftmargin
+% \addtolength{\leftmargin}{-\versemarginadjust}
+% \fi
+% \advance\leftmargin\runoverindentvalue}
+% \item[]}
+% {\endlist\setlength{\marginparsep}{0pt}} % from email
+
+% \newenvironment{pmclverse}[1][\linewidth]{%
+% \let\\=\@centercr%
+% \list{}{\itemsep\z@
+% \itemindent -\runoverindentvalue
+% \listparindent \itemindent
+% \iftextcenteringturnedon
+% \ifdim #1 < \linewidth
+% \rightmargin \z@
+% \setlength{\leftmargin}{\linewidth}%
+% \addtolength{\leftmargin}{-#1}%
+% \addtolength{\leftmargin}{-0.5\leftmargin}%
+% \iflinenumberscenteredwithverse\setlength{\marginparsep}{-\leftmargin+\marginparsepmin}\fi
+% \else
+% \rightmargin \leftmargin
+% \addtolength{\leftmargin}{-\versemarginadjust}
+% \fi % linewidth
+% \else
+% \rightmargin \leftmargin
+% \addtolength{\leftmargin}{-\versemarginadjust}
+%
+% \fi% textcentering
+% \advance\leftmargin\runoverindentvalue}
+% \item[]}
+% {\endlist\setlength{\marginparsep}{0pt}}% % draft
+
+% \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}%
+% \else
+% \rightmargin \leftmargin
+% \addtolength{\leftmargin}{-\versemarginadjust}
+% \fi
+% \advance\leftmargin\runoverindentvalue}
+% \item[]}
+% {\endlist} % first version from 2.81
+% \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}%
+% \else
+% \rightmargin \leftmargin
+% \fi
+% \advance\leftmargin\runoverindentvalue}
+% \item[]}
+% {\endlist}% from 2.72
\newif\ifinquotedverse
\newenvironment{quotedverse}{%
\inquotedversetrue
@@ -3478,8 +3617,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}
@@ -3490,13 +3629,13 @@
\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}
\renewcommand{\footrulewidth}{0pt}
-}
+}
% \end{macrocode}
% \end{macro}
@@ -3706,7 +3845,7 @@
% \end{macro}
% \subsection{~Marginal line numbers, verse lines, line cross
% references, etc.}\label{marginalgeometry} The default is that the
-% line numbers are on the right side, and that the |\marginparsep| is
+% line numbers are on the left side, and that the |\marginparsep| is
% 18pt. If you use |\pmclleftsidepar| the placement of the number is
% controlled by |\marginparsep| and |\marginparwidth|. You should
% experiment with different values until you find a set that suits
@@ -3714,10 +3853,10 @@
% numbers is on the right should be the negative of the value if it is
% on the left. First, some lengths and ifs:
% \begin{macrocode}
- \setlength{\marginparsep}{0pt}
- \setlength{\marginparwidth}{0pt}
+ \setlength{\marginparsep}{18pt}
+ \setlength{\marginparwidth}{18pt}
\newif\ifnumbersswitch \numbersswitchfalse
-\newif\ifnumbersright \numbersrighttrue
+\newif\ifnumbersright \numbersrightfalse
% \end{macrocode}
% Next, code for |\pmclsidepar|, taken from the memoir class, by
% Peter Wilson. Modified by Dan Luecking.
@@ -3901,12 +4040,12 @@
% \begin{macro}{\verselinenumberstoright}
% \begin{macrocode}
\newcommand{\verselinenumberstoleft}{%
-% \setlength{\marginparsep}{18pt}%
-% \setlength{\marginparwidth}{10pt}%
+% \setlength{\marginparsep}{18pt}%
+% \setlength{\marginparwidth}{10pt}%
\numbersswitchfalse\numbersrightfalse}
\newcommand{\verselinenumberstoright}{%
-% \setlength{\marginparsep}{18pt}%
-% \setlength{\marginparwidth}{10pt}%
+% \setlength{\marginparsep}{18pt}%
+% \setlength{\marginparwidth}{10pt}%
\numbersswitchfalse\numbersrighttrue}
% \end{macrocode}
% \end{macro}
@@ -3917,8 +4056,8 @@
% \begin{macrocode}
\newcommand{\verselinenumbersswitch}{%
\strictpagechecktrue%
-% \setlength{\marginparsep}{18pt}%
-% \setlength{\marginparwidth}{10pt}%
+% \setlength{\marginparsep}{18pt}%
+% \setlength{\marginparwidth}{10pt}%
\numbersswitchtrue\numbersrightfalse\pmclsideparswitchtrue}
\newif\ifnumbersgutter \numbersgutterfalse%
\newcommand{\verselinenumbersgutter}{\verselinenumbersswitch%
@@ -4614,15 +4753,7 @@
\m at kep@emlabel
\m at ken@teholder{#1}%
\setlength{\titleentryoverrun}{\z@}}
-
-% \newcommand{\set at p@emtitle}[6]{\setlength{\titleentryoverrun}{#6}%
-% {#2}%
-% {#3 \begin{titleentryenvironment}{#4 #1}\end{titleentryenvironment}}%
-% {#5}%
-% \m at kep@emlabel
-% \m at ken@teholder{#1}%
-% \setlength{\titleentryoverrun}{\z@}}
-
+%
\newcommand{\setcontentsleaders}[1]{%
\def\contentsleaders{#1\nobreak%
}}
@@ -5037,8 +5168,11 @@
% \begin{macro}{\sequencesectionsubtitle}
% \begin{macro}{\poemsubtitle}
% \begin{macrocode}
-\newcommand{\sequencesectionsubtitle}[1]{{\subsectiontitlefont \hbox{\titleindent #1}}
- \nobreak\par\nobreak\afterpoemtitleskip\nobreak
+% \newcommand{\sequencesectionsubtitle}[1]{{\subsectiontitlefont \hbox{\titleindent #1}}
+% \nobreak\par\nobreak\afterpoemtitleskip\nobreak
+% }
+\newcommand{\sequencesectionsubtitle}[1]{\set at p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\titleindentamount}
}
\newcommand{\poemsubtitle}[1]{\sequencesectionsubtitle{#1}
}
@@ -5196,6 +5330,16 @@
% |\setmargpoemtitle| with the second argument passed to |\JHlabel|,
% which actually makes the marginal mark.
% \begin{macrocode}
+\newcommand{\set at 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 at kep@emlabel%
+\m at ken@teholder{#1}%
+\setlength{\titleentryoverrun}{\z@}}
+
\newcommand{\setmargpoemtitle}[2]{%
\set at margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}%
@@ -5204,14 +5348,14 @@
\t at xtnotesinfo{#1}%
\sources{\label{#2}}%
}
-\newcommand{\set at margp@emtitle}[7]{\setlength{\titleentryoverrun}{#6}%
-{#2}%
-{#3 \begin{titleentryenvironment}%
-{#4 #1 #7}\end{titleentryenvironment}}%
-{#5}%
-\m at kep@emlabel%
-\m at ken@teholder{#1}%
-\setlength{\titleentryoverrun}{\z@}}
+%\newcommand{\set at margp@emtitle}[7]{\setlength{\titleentryoverrun}{#6}%
+%{#2}%
+%{#3 \begin{titleentryenvironment}%
+%{#4 #1 #7}\end{titleentryenvironment}}%
+%{#5}%
+%\m at kep@emlabel%
+%\m at ken@teholder{#1}%
+%\setlength{\titleentryoverrun}{\z@}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\JHpoemtitle} Macros to set marginal line
@@ -5340,9 +5484,14 @@
\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{\setmargref}
+% {\marginpar{\scriptsize {\the\margrefmarker~p.~\pageref{margref\themargrefnumber}}}
+% }
\newcommand{\margreftextnote}{%
\iftextnoteson\addtocounter{margrefnumber}{1}%
\immediate\write\textnotes{\makemargreflabel}%
Modified: trunk/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/poemscol/poemscol.sty 2017-09-02 21:42:48 UTC (rev 45196)
+++ trunk/Master/texmf-dist/tex/latex/poemscol/poemscol.sty 2017-09-02 21:43:00 UTC (rev 45197)
@@ -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,6 +130,21 @@
\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 at riablemarginpar}{\setlength{\marginparsep}{-\leftmargin}%
+\addtolength{\marginparsep}{\marginparsepmin}}
+\newcommand{\c at nterverseblock}[1]{\rightmargin \z@%
+ \setlength{\leftmargin}{\linewidth}%
+ \addtolength{\leftmargin}{-#1}%
+ \addtolength{\leftmargin}{-0.5\leftmargin}%
+ \iflinenumberscenteredwithverse\v at riablemarginpar\fi}
\newenvironment{pmclverse}[1][\linewidth]{%
\let\\=\@centercr%
\list{}{\itemsep\z@
@@ -136,16 +151,20 @@
\itemindent -\runoverindentvalue
\listparindent \itemindent
\ifdim #1 < \linewidth
- \rightmargin \z@
- \setlength{\leftmargin}{\linewidth}%
- \addtolength{\leftmargin}{-#1}%
- \addtolength{\leftmargin}{-0.5\leftmargin}%
+ \iftextcenteringturnedon
+ \c at 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 at kep@emlabel
\m at 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 at 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 at 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 at kep@emlabel%
+\m at ken@teholder{#1}%
+\setlength{\titleentryoverrun}{\z@}}
+
\newcommand{\setmargpoemtitle}[2]{%
\set at margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}%
@@ -1300,14 +1327,6 @@
\t at xtnotesinfo{#1}%
\sources{\label{#2}}%
}
-\newcommand{\set at margp@emtitle}[7]{\setlength{\titleentryoverrun}{#6}%
-{#2}%
-{#3 \begin{titleentryenvironment}%
-{#4 #1 #7}\end{titleentryenvironment}}%
-{#5}%
-\m at kep@emlabel%
-\m at ken@teholder{#1}%
-\setlength{\titleentryoverrun}{\z@}}
\newcommand{\JHpoemtitle}[2]{%
\set at 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}%
More information about the tex-live-commits
mailing list