From 9c6ec02a127bc4370b12e9740de4df7895c28f3a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Sep 2019 21:14:26 +0000 Subject: poemscol (29sep19) git-svn-id: svn://tug.org/texlive/trunk@52210 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/poemscol/poemscol.pdf | Bin 711468 -> 711514 bytes .../texmf-dist/source/latex/poemscol/poemscol.dtx | 33 +++++++++++---------- Master/texmf-dist/tex/latex/poemscol/poemscol.sty | 9 ++++-- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf index 9a353d345c0..ae971e19b98 100644 Binary files a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf and b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf differ diff --git a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx index a5ccbb380e7..bc64abcd693 100644 --- a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx +++ b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx @@ -23,7 +23,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1997/12/01] %\ProvidesPackage{poemscol} -% [2019/09/15 v3.13 poemscol file] +% [2019/09/27 v3.14 poemscol file] % %<*driver> \documentclass{ltxdoc} @@ -38,7 +38,7 @@ % % \fi % -% \CheckSum{9913} +% \CheckSum{9920} % % \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 @@ -257,6 +257,7 @@ % of titles.} % \changes{v3.12}{2019/09/05}{Bug fix. Fix command clash with titlesec Manual revision} % \changes{v3.13}{2019/09/15}{Fixed subtitles in emendations and explanations, Fixed bug in sequencesectiontitlefirstline, changed sequence hierarchy of indentations, subsubsections of sequences no longer appear in contents} +% \changes{v3.14}{2019/09/27}{Bug fix: ifpagenumberinnotesfalse, Manual revision} % \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother} % \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip} % \DoNotIndex{\newcommand, \section, \subsection, \subsubsection, @@ -289,15 +290,15 @@ % \textsc, \unskip} % \setcounter{IndexColumns}{2} % \MakeShortVerb{|} -% \def\fileversion{3.13} -% \def\filedate{15 September 2019} -% \def\docdate{15 September 2019} +% \def\fileversion{3.14} +% \def\filedate{27 September 2019} +% \def\docdate{27 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{15 September 2019} +% \date{27 September 2019} % \maketitle % \begin{abstract} \textsf{poemscol} provides commands for \LaTeX\ for % setting collections of poetry. It is especially suited for setting @@ -1857,7 +1858,10 @@ % the notes. To turn off the appearance of the page number in the % notes, issue |\putpagenumberinnotesfalse|. You may also not wish to % put the poem's title in the notes. To turn off the appearance of the -% poem's title in the notes, issue |\puttitleinnotesfalse|. +% poem's title in the notes, issue |\puttitleinnotesfalse|. \textsf{poemscol} assumes +% that the notes to a poem will begin with either the poem's title, or its page number, or both, +% so although you can set either boolean to ``false,'' don't set both of them to ``false." +% \textsf{poemscol} will let you do this, but the results will be strange. % % \goodbreak % \DescribeMacro{\contentsendnotesindent} @@ -3055,8 +3059,8 @@ %Extra Lines & |\poemtitlesecondlineindentamount| & |0pt| \\ %Poem Subtitle & |\poemsubtitleindentamount| & |\titleindentamount| \\ %Poem Section & |\poemsectiontitleindentamount| & |\titleindentamount| \\ -%Poem Subsection & |\poemsubsectiontitleindentamount| & |2 *\titleindentamount| \\ %Extra Lines & |\poemsectiontitlesecondlineindentamount| & |\titleindentamount| \\ +%Poem Subsection & |\poemsubsectiontitleindentamount| & | \titleindenttwoamount| \\ %Sequence & |\sequencetitleindentamount| & |0pt| \\ %Extra Lines & |\sequencetitlesecondlineindentamount| & |0pt| \\ %Sequence Subtitle & |\sequencesubtitleindent | & |\titleindentamount| \\ @@ -3096,19 +3100,13 @@ %Extra Lines & |\contentsvolumesectiontitlesecondlineindentamount| & |0pt| \\ %Poem & |\contentspoemtitleindentamount| & |\contentsindentoneamount| \\ %Extra Lines & |\contentspoemtitlesecondlineindentamount| & |\contentsindentoneamount| \\ -%Poem Subtitle & |\contentspoemsubtitleindentindentamount| & |\contentsindenttwoamount| \\ %Poem Section & |\contentspoemsectiontitleindentamount| & |\contentsindenttwoamount| \\ %Extra Lines & |\poemsectiontitlesecondlineindentamount| & |\contentsindenttwoamount| \\ %Sequence & |\contentssequencetitleindentamount| & |\contentsindentoneamount|\ \\ %Extra Lines & |\contentssequencetitlesecondlineindentamount| & |\contentsindentoneamount| \\ -%Sequence Subtitle & |\contentssequencesubtitleindenamountt | & |\contentsindentotwoamount| \\ -%Extra Lines & |\contentssequencesubtitlesecondlineindentamount| & |\contentsindenttwoamount| \\ %Sequence Section & |\contentssequencesectiontitleindentamount| & |\contentsindenttwoamount| \\ %Extra Lines & |\contentssequencesectiontitlesecondlineindentamount| & |\contentsindenttwoamount| \\ -%Sequence Section Subtitle & |\contentssequencesectionsubtitleindentamount| & |\contentsindentthreeamount| \\ -%Extra Lines & |\contentssequencesectionsubtitlesecondlineindentamount| & |\contentsindenthtreeamount| \\ %Sequence Subsection & |\contentssequencesubsectiontitleindentamount| & |\contentsindentthreeamount| \\ -%Sequence Subsubsection & |\contentssequencesubsubsectiontitleindentamount| & |\contentsindentfouramount| \\ %Appendix or Foreword & |\contentsappendixtitleindentamount| & |0pt| \\ %Notes Sections & |\contentsnotestitleindentamount| & |0pt| % @@ -5999,7 +5997,12 @@ \newcommand{\@poempagetotextnotes}[1]{% \immediate\write\textnotes{\string\par\string\argpageref\string{#1\string}\string\unskip}% \@pagemarktotextnotes{#1}} -\newcommand{\@poemtitletotextnotes}[1]{\literaltextnote{\textbf{#1}}} +\newcommand{\@poemtitletotextnotes}[1]{% +\ifputpagenumberinnotes% +\literaltextnote{\textbf{#1}}% +\else% +\literaltextnote{\par}\literaltextnote{\textbf{#1}}% +\fi} % \end{macrocode} % % \subsection{~Appendices, Forewords, Contents Entries} diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty index 40a126fc701..756f8a04270 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/09/15 v3.13 poemscol file] + [2019/09/27 v3.14 poemscol file] %|\prosexyznote| %% @@ -1015,7 +1015,12 @@ \newcommand{\@poempagetotextnotes}[1]{% \immediate\write\textnotes{\string\par\string\argpageref\string{#1\string}\string\unskip}% \@pagemarktotextnotes{#1}} -\newcommand{\@poemtitletotextnotes}[1]{\literaltextnote{\textbf{#1}}} +\newcommand{\@poemtitletotextnotes}[1]{% +\ifputpagenumberinnotes% +\literaltextnote{\textbf{#1}}% +\else% +\literaltextnote{\par}\literaltextnote{\textbf{#1}}% +\fi} \newif\ifappendixincontents \appendixincontentstrue \newif\ifforewordincontents -- cgit v1.2.3