diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/poemscol/poemscol.pdf | bin | 704303 -> 708776 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/poemscol/poemscol.dtx | 220 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/poemscol/poemscol.sty | 11 |
3 files changed, 161 insertions, 70 deletions
diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf Binary files differindex d36f8e74cb9..4b9df36cbdc 100644 --- a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf +++ b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf diff --git a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx index a829066e7bf..c0bde4dce21 100644 --- a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx +++ b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx @@ -23,7 +23,7 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01] %<package>\ProvidesPackage{poemscol} -%<package> [2019/09/08 v3.11 poemscol file] +%<package> [2019/09/09 v3.12 poemscol file] % %<*driver> \documentclass{ltxdoc} @@ -38,7 +38,7 @@ %</driver> % \fi % -% \CheckSum{9869} +% \CheckSum{9868} % % \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 @@ -255,6 +255,7 @@ % shortpoemattribution, JHshortepigraph, JHshortdedication. These % commands are controlled by the same booleans that control placement % of titles.} +% \changes{v3.12}{2019/09/05}{Bug fix. Fix command clash with titlesec Manual revision} % \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother} % \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip} % \DoNotIndex{\newcommand, \section, \subsection, \subsubsection, @@ -287,15 +288,15 @@ % \textsc, \unskip} % \setcounter{IndexColumns}{2} % \MakeShortVerb{|} -% \def\fileversion{3.11} -% \def\filedate{8 September 2019} -% \def\docdate{8 September 2019} +% \def\fileversion{3.12} +% \def\filedate{9 September 2019} +% \def\docdate{9 September 2019} % \title{Typesetting Poetry Collections with % \textsf{poemscol}\thanks{This document corresponds to % \textsf{poemscol}~\fileversion, dated \filedate.}} % \author{John Burt % \\ \texttt{burt@brandeis.edu}} -% \date{8 September 2019} +% \date{9 September 2019} % \maketitle % \begin{abstract} \textsf{poemscol} provides commands for \LaTeX\ for % setting collections of poetry. It is especially suited for setting @@ -616,13 +617,13 @@ % see the details at section \ref{definingnewnotes}, page % \pageref{definingnewnotes}. % -%\begin{sloppy} +%\begin{sloppypar} % Version 3 introduced the boolean |\ifleftaligntitles|, for aligning the title with % the left edge of a verse block centered on the longest line. Version 3.1 introduces % new title placement schemes, including one which % centers the title on the longest line of a verse block at the left margin. This made % the meaning of |\ifleftaligntitles| ambiguous. So I have changed that boolean to -% |\iftitlesatleftmarginofcenteredblock.|\end{sloppy} +% |\iftitlesatleftmarginofcenteredblock.|\end{sloppypar} % % \section{Marking up individual poems} % First, a word about the command names. The command names may seem @@ -681,20 +682,24 @@ % change all these values in your preamble by changing the value of % the parameters for the relevant commands, listed below in the implementation section, using % either |\setlength| or |\renewcommand| (depending upon what you are -% changing). +% changing). Some common values you might change are described in section +% \ref{titlecustomization}. % -% \subsubsection{Customization of titles}\begin{sloppy} +% \subsubsection{Title placement schemes} +% \begin{sloppypar} % There are a number of places where a title might be set. I have % defined for this purpose five ``title placement schemes.'' For each % one there is a boolean which turns on the choice, and a ``scheme'' % command which switches that boolean on and switches off the % booleans for the other schemes. They are +% % \begin{itemize} %\item Aligned with the left print margin, or -% indented from it according to the scheme of title indentations. The +% indented from it according to the scheme of title indentations (whether it is +% the title to a poem, to a section, to a subsection, or so on). The % hierarchy of indentations for various kinds of title is described % below at section \ref{customtitleindentations}, -% page \pageref{customtitleindentations} +% page \pageref{customtitleindentations}. % I will call the boolean that describes this % situation |\ifnormaltitleindentation| because it was the default for % \textsf{poemscol}. You invoke this title scheme with the command @@ -702,63 +707,90 @@ % % \item Aligned with the left margin of a left-aligned verse block. % The verse block is normally inset from the left print margin by the length -% |\leftmargini |. I will call the boolean that describes this -% title placement |\iftitlesatleftversemargin|. You invoke this title -% scheme with the command |\titlesatleftversemarginscheme| +% |\leftmargini | (the default distance between the left margin of +% a list environment --- I defined titles as lists --- and the surrounding text). +% I will call the boolean that describes +% title placement at the left verse margin |\iftitlesatleftversemargin|. You invoke this title +% scheme with the command |\titlesatleftversemarginscheme|. % % \item Centered over the longest line of a left-aligned verse block. % I will call the boolean that describes this title placement % |\iftitlescenteredonleftverseblock|. The corresponding command is -% |\titlescenteredonleftverseblockscheme|. +% |\titlescenteredonleftverseblockscheme|. % % \item Aligned with the left margin of a verse block centered on the % page on the longest line. This will be associated with the boolean % |\iftitlesatleftmarginofcenteredblock|. (In version 3.0 this boolean % was called |\ifleftaligntitles|. I have removed that boolean % because its meaning is ambiguous now.) The command to invoke this -% title scheme is |\titlesatleftmarginofcenteredblockscheme|. +% title scheme is |\titlesatleftmarginofcenteredblockscheme|. % % % \item Titles centered over a centered verse block. I call this % |\ifcentertitleson|. The corresponding command is % |\centertitlesscheme| I have retained the command |\centertitles| -% from earlier versions of \textsf{poemscol} for compatibility.\end{itemize}\end{sloppy} +% from earlier versions of \textsf{poemscol} for compatibility. %\end{itemize}\end{sloppypar} % -% \DescribeMacro{\centertitlesscheme} This scheme will center the -% titles even if you do not center the verse block on the longest -% line. For instructions about -% how to center the verse block on the longest line, see section \ref{centeringtextblock} -% on page \pageref{centeringtextblock}. For each poem you will have +% \begin{sloppypar} +% |\centertitlesscheme|, |\titlescenteredonleftverseblockscheme|, and \\ +% |titlesatleftmarginofcenteredblockscheme| require additional information +% about each poem. Here are some details about the uses of these schemes.\end{sloppypar} +% +% \DescribeMacro{\centertitlesscheme} For each poem you wish to center you will have % to set the length of the length variable |\versewidth| to the % width of the longest line. To do this, use |\settowidth| as -% follows:\\ |\settowidth{\versewidth}{text of longest line}|.\\ Then -% use the optional argument to |\begin{poem}| as follows:\\ -% |\begin{poem}[\versewidth].|\\ -% |\centertitlescheme| also moves in epigraphs, headnotes, +% follows:\\ |\settowidth{\versewidth}{text of longest line}|.\\ +% |\centertitlesscheme| will center the +% titles even if you do not center the verse block on the longest +% line. +% To center the verseblock use the optional argument to |\begin{poem}| as follows:\\ +% |\begin{poem}[\versewidth].| \\ (For further instructions about +% how to center the verse block on the longest line, see section \ref{centeringtextblock} +% on page \pageref{centeringtextblock}.) +% +% |\centertitlesscheme| also moves in epigraphs, headnotes, % attributions, and dedications towards the center. Since an epigraph or a headnote may be % a prose paragraph, or a passage of verse, it would be unwise to set them in a centering -% environment, so |\centertitles| just moves them towards the center. To adjust the placement +% environment, so |\centertitles| just moves the margins of epigraphs and headnotes in +% towards the center. To adjust the placement % of epigraphs and similar things, see section \ref{centerepigraphs}, page \pageref{centerepigraphs}. - +% Single line epigraphs, attributions, and dedications, however, +% will be centered if |\centertitlesscheme| +% is in effect. There are special commands for single line epigraphs, attributions, or dedications. +% To set these, issue +% |\shortpoemepigraph|, |\shortpoemdedication|, or |\shortpoemattribution|. % % \DescribeMacro{\titlescenteredonleftverseblockscheme} - -%Using this +% +% Using |\titlescenteredonleftverseblockscheme| % scheme will require you to make known the width of the longest line -% of the poem being set and the width of the title. You will need to +% of the poem being set \emph{and} the width of the title. You will need to % use the |\settowidth| command to set the length of |\versewidth| and -% |\titlewidth|. For example: -% |\settowidth{\titlewidth}{poem title}|. Normally +% |\poemtitlewidth|. For example: \begin{quotation} +% \noindent |\settowidth{\poemtitlewidth}{poem title}| \\ +% |\settowidth{\versewidth}{text of longest line}|. \end{quotation} +% Normally % you should not use the optional argument to |\begin{poem}| with this % title scheme. But you may have already marked up all your poems % such a way as to leave open the choice of centering them. You can -% turn off centering, without erasing all of the optional arguments, by +% turn off centering of the verse block, without erasing all of the optional arguments, by % issuing |\textcenteringturnedonfalse|. You can turn on centering the -% text block again by issuing |\textcenteringturnedontrue|. +% text block again by issuing |\textcenteringturnedontrue|. +% +% \begin{sloppypar} +% In this scheme, |\shortpoemepigraph|, |\shortdedication|, and |\shortattribution| will +% not center their arguments on the line, but set them flush with the beginning of the title. +% \end{sloppypar} +% +% If you don't set the length of |\poemtitlewidth| this scheme will simply set the +% left margin of the title over the center of the poem. (This may be an effect you want.) +% +% Note: this scheme will only yield proper results if the title is shorter than +% the longest line is. +% % -%\begin{sloppypar} % \DescribeMacro{\titlesatleftmarginofcenteredblockscheme} - +%\begin{sloppypar} %Rather than centering the title over % a centered block of verse, one might prefer to align the title with % the left margin of the centered verse block. That is the use of this scheme The length |\versewidth| @@ -767,10 +799,36 @@ % issuing |\poemtitle| or the other title-making commands (such as |\sequencesectiontitle|). % Issue |\settowidth{\versewidth}{Text to be used for centering}| just % before you issue the |\poemtitle| or |\epigraph| command. -% For how to use |\settowidth| to center the +% In addition, you must center to verse block by using the optional argument |\versewidth| +% to |\begin{poem}|, for example: |\begin{poem}[\versewidth]| +% +% For more about how to use |\settowidth| to center the % verse block or to align titles, epigraphs, and so forth with the left margin of the % verse block, see section \ref{centeringtextblock}, page \pageref{centeringtextblock}. % +% Consult the table to see when you should issue |\settowidth| and when you should +% use the optional argument to |\begin{poem}|. +%\begin{table}[h] +%\caption{Placement in Title Schemes} +%\bigskip +%{\scriptsize +%\begin{tabular}{l l l} +%\hline +%Scheme & Lengths to Set & Argument to |\begin{poem}|\\ +%\hline +%|\normalindentationtitlescheme| & None & None\\ +%|\titlesatversemarginscheme| & None & None\\ +%|\titlescenteredonleftverseblockscheme| & |\poemtitlewidth| |\versewidth| & None\\ +%|\titlesatleftmarginofcenteredblockscheme| & |\versewidth| & |\begin{poem}[\versewidth]| \\ +%|\centertitlesscheme| & |\versewidth| & |\begin{poem}[\versewidth]| \\ +%\end{tabular} +%} +%\end{table} +% \end{sloppypar} +% +%\subsubsection{Customization of titles}\label{titlecustomization} +% +%\begin{sloppypar} % \DescribeMacro{\leftalignepigraphs} You % may also wish to align epigraphs, dedications, attributions, or % headnotes with the left margin of the verse block (even if you @@ -783,7 +841,8 @@ % |\volumeattribution| commands.) A new group of commands, % |\shortpoemepigraph|, |\shortpoemdedication|, |\shortpoemattribution|, % |\JHshortepigraph| and |\JHshortdedication| will appear at the places -% controlled by the new ``title schemes'' listed above. +% controlled by the new ``title schemes'' listed above. These commands will not +% obey |\leftalignepigraphs|. % \end{sloppypar} % % \begin{sloppypar} @@ -849,7 +908,11 @@ % |\titleindent|. A subsection is indented two. And so on.) % |\titleindent| is also used internally in the commands for multiple % line titles. Instructions about changing the value of |\titleindent| -% can be found in section \ref{changingfontsandleading}. +% can be found in section \ref{changingfontsandleading}. Each kind of title, +% for poems, sections of poems, sequences, and so forth, has its own default +% indentation both in the text and in the table of contents. You can see a list of these +% default values, and instructions about how to change them, at \ref{customtitleindentations}, +% page \pageref{customtitleindentations}. % % \subsubsection{Subtitles and special titles} % \DescribeMacro{\poemsubtitle} Subtitles of poems should be issued as @@ -927,15 +990,21 @@ % |\marginparsep|). The default % value of |\marginparsepmin| is 2 em. % -% \begin{sloppy} +% \begin{sloppypar} % \DescribeMacro{\centertitles} +% \DescribeMacro{\ifcenterepigraphson} % 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|. If you decide against centering the title, +% which you can do by issuing |\centertitles|. +% (|\centertitles| invokes the title centeringscheme.) If you decide against centering the title, % you can either just remove or comment out the |\centertitles| command, or % switch a boolean by issuing |\centertitlesonfalse|. By default, |\centertitles| % also moves epigraphs, dedications, headnotes, and attributions toward the center. -% To prevent this, issue |\centerepigraphsonfalse|.\end{sloppy} +% To prevent this, issue |\centerepigraphsonfalse|. This boolean applies to the +% regular |\epigraph|, |\headnote| and |\dedication| commands, not to the +%single-line |\shortpoemepigraph|, |\shortpoemdedication| and |\shortpoemattribution| commands, +%whose places are defined by the title scheme that is in force when they are issued. +%\end{sloppypar} % % \DescribeMacro{\iftextcenteringturnedon} Suppose you have marked up many poems with % the optional second argument to |\begin{poem}|, which would cause the text @@ -950,7 +1019,8 @@ % to adjust its horizontal placement, 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. +% |\versemarginadjust| to 28pts will put the verse block at the left margin, aligned +% with the page number. % % \subsubsection{Hyphenation is off in the poem environment} % \textsf{poemscol} turns off automatic hyphenation in poetry @@ -1017,7 +1087,7 @@ % If you wish to change the symbol used to mark cases in which a % break falls on a page turn, issue the command |\stanzaatbottom|, % using as the argument whatever you wish to use to mark such cases. -% The default is *, which is suitable for a published volume. If you +% The default is |\stanzaatbottom{*}|, which is suitable for a published volume. If you % are preparing a typescript for submission, you may wish to set % |\stanzaatbottom| to ``stanza break.'' % @@ -1121,7 +1191,7 @@ % % \begin{sloppypar} % \DescribeMacro{indentedverse} \label{indentedverse} You might want to indent whole stanzas, -% or perhaps extended passages of verse, relative to the rest of the poem (you might +% or perhaps extended passages of verse, relative to the rest of the poem (you might, % for instance, want to indent refrains systematically). This would be tedious to % do using |\verseindent|. Put stretches of % verse you wish to indent in the |indentedverse| environment. Whatever is @@ -1172,7 +1242,9 @@ % spaces, marked with |~| in your source. But \textsf{poemscol} will % complain if you do this, and rightly so, since the result is likely % to be ugly. It would probably be wiser to adjust the lengths |\leftmargin| -% and |\rightmargin|, allowing all of the line to be a little bit longer. +% and |\rightmargin| in the definition of the |pmclverse| environment, +% allowing all of the lines to be a little bit longer. The |pmclverse| environment +% is defined below, at section \ref{versedefine}, page \pageref{versedefine}. % % \DescribeMacro{\runoverindent} To change the indentation for the run % over portion of verse lines globally, issue the amount of @@ -1421,7 +1493,7 @@ % the right margin, and insert leading dots up to the number. % The argument to |\setcontentsleaders| can be whatever you wish % to use to separate the title from the page number, such as a colon, -% a hard space (|~|), or even |\hfil| to flush the page number to the left margin. +% a hard space (|~|), or even |\hfil| to flush the page number to the right margin. % % \DescribeMacro{\contentspoemtitlefont} % You can change the font sizes that are used to set particular classes of title @@ -1446,12 +1518,16 @@ % entry using the command |\pmclcontentsentry|. The command creates an entry on the model % of the entry for the textual notes section. It takes three arguments. The first is the title of % the section. The second is the indentation of the entry (typically |\contentsindentone| -% |\contentsindenttwo|, or |\contentsindentthree|, but any length will do). The third is the page number. +% |\contentsindenttwo|, or |\contentsindentthree|, but any indentation command will do). +% The third is the page number. +% Remember that |\contentsindentone| is a command, not a length. The length of +% the indentation is |\contentsindentoneamount|. +% The command is defined as |\hspace{contentsindentoneamount}|. % You can suppress the page number by setting the boolean |\putpagenumbersincontentsfalse|. % % A more general way to add a entry in the table % of contents is to use the command |\pmclecontentsentrydefaults|. This command takes -% four arguments: (1) The title (2) the indentation (3) the font size (e.g. |\contentendnotesfont| for the +% four arguments: (1) The title (2) the indentation command (3) the font size (e.g. |\contentendnotesfont| for the % same font size used in contents entries for the endnotes sections) and (4) the page number. Here % also you can suppress the page number by setting the boolean |\putpagenumbersincontentsfalse|. % @@ -1893,13 +1969,13 @@ % concludes the line to which it is a comment. These commands also can % take optional arguments to specify line ranges. % -% \begin{sloppy} +% \begin{sloppypar} % \DescribeMacro{\accidental} |\accidental| behaves exactly like % |\textnote|. Accidentals % are included by default, but if you issue |\global\includeaccidentalstrue| % in your preamble, you will remind yourself of that fact. % If you wish to distinguish between accidentals and -% substantives, using |\accidental| provides a way of doing so.\end{sloppy} +% substantives, using |\accidental| provides a way of doing so.\end{sloppypar} % % If you wish to exclude accidentals from your printed output, but to % mark them in your source files, so that your published collation in the @@ -2077,7 +2153,7 @@ % ``MYNOTES''). \item The title of the notes section as you wish % it to appear in the table of contents (e.g.\ ``Mynotes''). \end{enumerate} % -% \sloppypar So, for instance,\begin{verbatim} +% \begin{sloppypar} So, for instance,\begin{verbatim} % \definenewnotetype{xyznote}{xyz}{Xyznotes to}{XYZNOTES}{Xyznotes} % \end{verbatim} % creates the booleans |\ifxyznoteson|, |\ifnoxyznoteyet|, and @@ -2087,7 +2163,7 @@ % to use it explicitly, |\firstxyznote|) the output channel xyznotes, % the external file |\jobname.xyz|, an entry in the contents for % ``Xyznotes'', and an endnotes section with a running header of the -% form ``Xyznotes to pp.~xx--yy'' and a title XYZNOTES. +% form ``Xyznotes to pp.~xx--yy'' and a title XYZNOTES. \end{sloppypar} % % |\xyznote| % takes the same arguments that |\textnote| does (which is to say, @@ -2339,6 +2415,12 @@ % appendices, issue the boolean |\appendixincontentsfalse|. Contents entries for % appendices or subappendices will be suppressed so long as that boolean is set to false. % +% +% \DescribeMacro{\makeforeword} |\makeforeword| and |\forewordtitle| behave basically the way +% |\makeappendix| and |\appendixtitle|. I provided separate commands because it occurred to +% me that one might want to treat front matter and back matter sections differently in the +% table of contents, so I have allowed for different indentations for their contents entries. +% % \DescribeMacro{\pmclcontentsentry} \label{pmclcontentsentry} If you want to add a % line to the table of contents that % will follow the formatting of other entries in the contents, issue |\pmclcontentsentry|. @@ -2373,7 +2455,7 @@ % % \DescribeMacro{\shortpoemepigraph} The commands % |\shortpoemepigraph| |\shortpoemdedication| and -% |\shortpoemattribution| These will all place their texts in +% |\shortpoemattribution| will all place their texts in % accordance with the title placement scheme you select in your % preamble. % |\normaltitleindentationscheme| will place them near the left text @@ -2384,7 +2466,12 @@ % longest line of a left-flushed verse block. % |\centertitlesscheme| will center them. % |\titlesatleftmarginofcenteredblockscheme| will place them at the -% left margin of a centered verse block. I have also included +% left margin of a centered verse block. A short epigraph set using the +% normal |\epigraph| command may not appear centered, because |\epigraph| does not +% center the text line by line, but centers the paragraph block by drawing in the margins. +% If your epigraph is short, perhaps a single line, only |\shortpoemepigraph| will give +% it a centered appearance on the page if the |\centertitles| scheme is being used or +% if the boolean |\centerepigraphson| is in effect. I have also included % |\JHshortepigraph| and |\JHshortdedication|, which set marginal % marks pointing to where notes on the epigraph or dedication in the textual notes section may be % found, in the manner of |\JHpoemtitle|. @@ -2405,20 +2492,27 @@ % |\volumeattribution|. These commands are unaffected by |\centertitles|. % % \begin{sloppypar} -% \DescribeMacro{\titlesatleftmarginofcenteredblock} Rather than centering the title over +% \DescribeMacro{\titlesatleftmarginofcenteredblock} +% +% Rather than centering the title over % a centered block of verse, one might prefer to align the title with % the left margin of the verse block. To do this, issue % |\titlesatleftmarginofcenteredblocktrue| to set the boolean |\iftitlesatleftmarginofcenteredblock|. +% This command has been made obsolete by the introduction of ``title indentation schemes,'' but +% it still works so long as you issue it after you have set the title indentation scheme. +% % You % may also wish to align epigraphs, dedications, attributions, or % headnotes with the left margin of the verse block (even if you % center the titles). To do this, issue |\leftalignepigraphstrue| to -% set the boolean |\ifleftalignepigraphs|. Remember that for this to +% set the boolean |\ifleftalignepigraphs|. This will align |\epigraph| and its congeners, +% but not the newer commands |\shortpoemepigraph| and its congeners, +% who obey the prevailing title indentation scheme. Remember that for |\leftalignepigraphstrue| to % work, you will need to use the |\settowidth| command. Issue % |\settowidth{\versewidth}{Text to be used for centering.}| just % before you issue the |\poemtitle| command. % |\leftalignepigraphstrue| will also align attributions, -% dedications, and other pre-texts of poems. (It will not affect the +% dedications, and other pre-texts of poems. (It will not affect the % dedications and attributions on volume title pages, which are set % using the |\volumededication|, |\volumeepigraph|, and % |\volumeattribution| commands.)\end{sloppypar} @@ -4520,7 +4614,7 @@ % \end{macrocode} % \subsection{~Title Schemes} Ways of controlling the placement of titles. % \begin{macrocode} -\newlength{\titlewidth} +\newlength{\poemtitlewidth} \newif\iftitlescenteredonleftverseblock \newif\iftitlesatleftmarginofcenteredblock \newif\iftitlesatleftversemargin @@ -4566,7 +4660,7 @@ \setlength{\lefttitleaddition}{0pt} \newcommand{\l@ftc@ntertitleblock}{\rightmargin \z@%% \setlength{\lefttitleaddition}{\versewidth}% -\addtolength{\lefttitleaddition}{-\titlewidth}% +\addtolength{\lefttitleaddition}{-\poemtitlewidth}% \addtolength{\lefttitleaddition}{-0.5\lefttitleaddition}% \setlength{\lefttitlemargin}{\lefttitleaddition}% } @@ -6007,7 +6101,7 @@ \putpagenumberinnotesfalse \literalcontents{\par\goodbreak\bigskip} \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont} - {\\contentsvolumetitleindentamount} + {\contentsvolumetitleindentamount} \literalcontents{\par\goodbreak\medskip} \literaltextnote{\notesvolumetitlepenalty\bigskip\goodbreak\par} \t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak} diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty index f34210affbe..7500545fca1 100644 --- a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty +++ b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty @@ -22,10 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{poemscol} - [2019/09/08 v3.11 poemscol file] - - - + [2019/09/09 v3.12 poemscol file] %|\prosexyznote| %% @@ -298,7 +295,7 @@ \newcommand{\multilinetitlepenalty}{\penalty-3000} \newcommand{\sequencetitlepenalty}{\penalty-3000} \newcommand{\multilinesequencepenalty}{\penalty-3500} -\newlength{\titlewidth} +\newlength{\poemtitlewidth} \newif\iftitlescenteredonleftverseblock \newif\iftitlesatleftmarginofcenteredblock \newif\iftitlesatleftversemargin @@ -343,7 +340,7 @@ \setlength{\lefttitleaddition}{0pt} \newcommand{\l@ftc@ntertitleblock}{\rightmargin \z@%% \setlength{\lefttitleaddition}{\versewidth}% -\addtolength{\lefttitleaddition}{-\titlewidth}% +\addtolength{\lefttitleaddition}{-\poemtitlewidth}% \addtolength{\lefttitleaddition}{-0.5\lefttitleaddition}% \setlength{\lefttitlemargin}{\lefttitleaddition}% } @@ -1109,7 +1106,7 @@ \putpagenumberinnotesfalse \literalcontents{\par\goodbreak\bigskip} \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont} - {\\contentsvolumetitleindentamount} + {\contentsvolumetitleindentamount} \literalcontents{\par\goodbreak\medskip} \literaltextnote{\notesvolumetitlepenalty\bigskip\goodbreak\par} \t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak} |