texlive[52574] Master/texmf-dist: poemscol (29oct19)
commits+karl at tug.org
commits+karl at tug.org
Tue Oct 29 22:24:43 CET 2019
Revision: 52574
http://tug.org/svn/texlive?view=revision&revision=52574
Author: karl
Date: 2019-10-29 22:24:43 +0100 (Tue, 29 Oct 2019)
Log Message:
-----------
poemscol (29oct19)
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 2019-10-29 21:24:28 UTC (rev 52573)
+++ trunk/Master/texmf-dist/source/latex/poemscol/poemscol.dtx 2019-10-29 21:24:43 UTC (rev 52574)
@@ -23,7 +23,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
%<package>\ProvidesPackage{poemscol}
-%<package> [2019/09/27 v3.14 poemscol file]
+%<package> [2019/10/29 v3.141 poemscol file]
%
%<*driver>
\documentclass{ltxdoc}
@@ -38,7 +38,7 @@
%</driver>
% \fi
%
-% \CheckSum{9920}
+% \CheckSum{9964}
%
% \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
@@ -258,6 +258,11 @@
% \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}
+% \changes{v3.141}{2019/10/27}{Manual revisions. Fixed spacing of sentence and
+% paragraph numbers in
+% sections numbered by paragraph and sentence. You can suppress the appearance of the
+% first sentence number, whether in the margin or in the running text. You can suppress
+% the appearance of the first paragraph number, whether in the margin or in the running text.}
% \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
% \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip}
% \DoNotIndex{\newcommand, \section, \subsection, \subsubsection,
@@ -290,15 +295,15 @@
% \textsc, \unskip}
% \setcounter{IndexColumns}{2}
% \MakeShortVerb{|}
-% \def\fileversion{3.14}
-% \def\filedate{27 September 2019}
-% \def\docdate{27 September 2019}
+% \def\fileversion{3.141}
+% \def\filedate{29 October 2019}
+% \def\docdate{29 October 2019}
% \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{27 September 2019}
+% \date{29 October 2019}
% \maketitle
% \begin{abstract} \textsf{poemscol} provides commands for \LaTeX\ for
% setting collections of poetry. It is especially suited for setting
@@ -348,7 +353,7 @@
% break at the bottom of a page which the reader might not notice.
% Doing this by hand is not only tedious and easy to get wrong, but
% also a process you will have to start over again if anything about
-% your volume changes, if you add a poem, say, or even decide to break
+% your volume changes --- if you add a poem, say, or even decide to break
% a title across two lines. \textsf{poemscol} takes care of this
% process, so that the editor need never worry about it, automatically
% marking cases where the page break coincides with a stanza break
@@ -391,7 +396,7 @@
% numbering will also be stable across multiple editions, and, like line numbers in verse,
% provides a common system of reference.
%
-% \textsf{poemscol} also provides
+% \textsf{poemscol} provides
% the ability to make cross references to verse line numbers, to line numbers in prose sections,
% or to paragraph and sentence numbers in sections with ``paragraph and sentence'' annotation.
%
@@ -458,7 +463,7 @@
% Encoding Initiative, transforming your texts from \LaTeX\ to XML
% would largely (although not entirely) be a matter of performing a
% series of global search-and-replaces, and could conceivably be done
-% with a perl script.
+% with XSLT or with perl.
%
% This is a long manual, but there is no need to study it all before beginning.
% In the first place, it includes all the commented-on source code for the
@@ -1183,9 +1188,8 @@
% automatically anyway). |\verseindent| indents the line a bit less
% than the run over portion of long ``bent'' lines are indented, so
% that the two cases can be visually distinguished. By default, the
-% length of |\verseindent| is 2 em. To change it, say to 3 em, issue
-% |\renewcommand{\verseindent}{\hspace{3em}}|.
-% Alternatively, you can change the length |\verseindentamount| by
+% length of |\verseindent| is 2 em. To change it, say to 3 em, you should change
+% the length |\verseindentamount| by
% issuing |\setlength{\verseindentamount}{3em}|.\end{sloppypar}\goodbreak
%
% You can create a hierarchy of indentations by issuing |\verseindent|
@@ -1861,7 +1865,9 @@
% 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.
+% \textsf{poemscol} will let you do this, but the results will be strange. Also, |\putitleinnotesfalse|
+% applies only the textnotes. Emendations, explanatory notes, and any note types you create
+% with |\definenewnotetype| will include the title of the poem.
%
% \goodbreak
% \DescribeMacro{\contentsendnotesindent}
@@ -2314,6 +2320,7 @@
% By default, each poem end note is given its own paragraph. To concatenate
% them into one big paragraph, issue |\poemendemendationnotessingleparfalse|.
%
+% \begin{sloppypar}
% \DescribeMacro{\poemendexplanatorynote}
% \DescribeMacro{\makepoemendexplanatorynotes}
% \DescribeMacro{\putpoemendexplanatorynotes}
@@ -2322,7 +2329,7 @@
% after |\begin{poem}|. Issue |\poemendexplanatorynote| where you wish to make a note,
% using the same conventions you use for |\textnote|. Where you want to output
% the notes, issue |\putpoemendexplanatorynotes|. These notes can have multi-line lemmas,
-% just like textual notes.
+% just like textual notes.\end{sloppypar}
%
% By default, each poem end note is given its own paragraph. To concatenate
% them into one big paragraph, issue |\poemendexplanatorynotessingleparfalse|.
@@ -2449,33 +2456,68 @@
% \DescribeMacro{\attribution} \DescribeMacro{\poemdedication}
% |\epigraph|, |\headnote|, |\attribution|, and |\poemdedication| set
% their arguments as epigraphs, headnotes, attributions, or
-% dedications for poems or poetic sequences. \goodbreak
+% dedications for poems or poetic sequences.
+% There are in addition the special commands |\JHepigraph| and |\JHdedication|, which place
+% a mark in the margin
+% showing where in the notes comments on that epigraph or dedication may be found.
%
+% \DescribeMacro{\volumeepigraph} If you have dedications, epigraphs, or attributions on
+% the divider pages of editions that combine several volumes of
+% poetry, use |\volumededication|, |\volumeepigraph|, and
+% |\volumeattribution|.
+%
+% \DescribeMacro{\centertitles}
+% If |\centertitles| or |\centeritlescheme| is in effect, epigraphs, headnotes, dedications,
+% and attributions will all be centered on the page. (|\volumeepigraph|, |\volumededication|,
+% and |\volumeattribution|, however, are unaffected by |\centertitles|.)
% If your epigraph or headnote is a prose passage of more than one line, or
% of more than one paragraph, or a verse
-% passage of more than one stanza, the |\epigraph| command will work
-% properly, which is to say it will draw the margins in towards the center,
+% passage of more than line, or even more than one stanza, the |\epigraph| command will work
+% properly if |\centertitles| is in effect, which is to say it will draw the margins in towards the center,
% rather than centering the epigraph line by line.
%
+% Issuing |\centertitles| moves the margins in on both sides by the length
+% |\centerepigraphindentation| (the default is 6em). The margins for
+% uncentered epigraphs and the like are controlled by the length |\normalepigraphindentation|
+% (the default is 1.5em). Both values can be adjusted by using |\setlength|.
+%
+% After issuing |\centertitles| you can move epigraphs and similar things back to the margin
+% by issuing |\centerepigraphsonfalse|. After issuing |\centertitles| you can put titles at the margin
+% while leaving epigraphs alone by issuing |\centertitlesonfalse|.
+%
% If you use the standard \LaTeX\ |verse|
% environment within an epigraph, you may wish to add a |\smallskip| between
% stanzas. (To my eye that environment does not leave enough white space between
-% stanzas.) Alternatively, you can use the special |pmclverse| environment
-% within the |epigraphenvironment| environment. You can even use
-% the |poem| environment within the |epigraphenvironment| environment, but if
+% stanzas.) Alternatively, you can use the special |pmclverse| environment.
+% You can even use
+% the |poem| environment, but if
+% you do this, you should so mark line breaks with |\\| and stanza breaks
+% with a blank line, as in the standard |verse| environment. If
% you mark up the epigraph with things like |\verseline| and |\end{stanza}| you may wind
-% up with marginal line numbers, so mark line breaks with |\\| and stanza breaks
-% with a blank line, as in the standard |verse| environment.)
+% up with marginal line numbers in your epigraph.
%
+% \begin{sloppypar}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 |\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. \end{sloppypar}
+%
+% \DescribeMacro{\shortpoemepigraph}
+% \DescribeMacro{\shortpoemdedication}
+% \DescribeMacro{\shortpoemattribution}
% Because |\centerepigraphs| merely
-% draws in the margins on both sides, short passages may not appear
-% centered very well, unless you fool around with |\versewidth| to
-% find a satisfactory value. |\shortpoemepigraph| and similar commands, described
-% below, are better for single line epigraphs.
+% draws in the margins on both sides rather than centering each line
+% line by line, short epigraphs may not appear
+% well centered. |\shortpoemepigraph| |\shortpoemdedication| and
+% |\shortpoemattribution|, are better for single line epigraphs,
+% since they will center their arguments line by line.
%
-% \DescribeMacro{\shortpoemepigraph}
-% \DescribeMacro{shortpoemdedication}
-% \DescribeMacro{shortpoemattribution} \begin{sloppypar} The commands
+% \begin{sloppypar} The commands
% |\shortpoemepigraph| |\shortpoemdedication| and
% |\shortpoemattribution| will all place their texts in
% accordance with the title placement scheme you select in your
@@ -2486,59 +2528,19 @@
% margin.
% |\titlescenteredonleftverseblockscheme| will center them over the
% 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. 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
+% left margin of a centered verse block.
+% |\centertitlesscheme| will center them over a centered verse block.
+% You can center epigraphs and similar things on the page over an uncentered verse block
+% by issuing the boolean |\centerepigraphson|.
+%
+% \DescribeMacro{\JHshortepigraph}
+% I have also defined
% |\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|.\end{sloppypar}
+% found, in the manner of |\JHpoemtitle|.
+% These commands too obey the title placement scheme that may be in effect. \end{sloppypar}
%
-% \DescribeMacro{\centertitles}
-% Issuing |\centertitles| moves the margins in on both sides by the length
-% |\centerepigraphindentation| (the default is 6em). The margins for
-% uncentered epigraphs and the like are controlled by the length |\normalepigraphindentation|
-% (the default is 1.5em). Both values can be adjusted by using |\setlength|.
-%
-% After issuing |\centertitles| you can move epigraphs and similar things back to the margin
-% by issuing |\centerepigraphsonfalse|. After issuing |\centertitles| you can put titles at the margin
-% while leaving epigraphs alone by issuing |\centertitlesonfalse|.
-%
-% If you have dedications, epigraphs, or attributions on
-% the divider pages of editions that combine several volumes of
-% poetry, use |\volumededication|, |\volumeepigraph|, and
-% |\volumeattribution|. These commands are unaffected by |\centertitles|.
-%
-% \begin{sloppypar}
-% \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|. 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 attributions on volume title pages, which are set
-% using the |\volumededication|, |\volumeepigraph|, and
-% |\volumeattribution| commands.)\end{sloppypar}
-%
% \subsection{~Appending publication date}
% \DescribeMacro{\poemdate} You can append the date of the poem
% with |\poemdate|. Issue |\poemdate| just after |\end{poem}|. You can
@@ -2559,7 +2561,8 @@
% flush with the indented runover portion of the line rather than with the beginning
% of the line. This should not in practice
% be a problem, because you should use |\longpage| or several |\shortpage| commands
-% to move the widow date line anyway. (For |\longpage| and |\shortpage| see section \ref{longpage},
+% to move the widowed date line anyway.
+% (For |\longpage| and |\shortpage| see section \ref{longpage},
% page \pageref{longpage}.)
%
% \subsection{~Pausing line numbering}
@@ -2649,7 +2652,7 @@
% |\sequencesectiontitle| sets the titles of the sections of the
% sequence, and |\sequencesubsectiontitle| sets the titles of
% subsections of the sequence (there is even a command for the title
-% of sub-subsections, |\sequencesubsbusectiontitle|).
+% of sub-subsections, |\sequencesubsubsectiontitle|).
% |\sequencefirstsectiontitle| gives a little more
% vertical space between the main title and the first section title
% than |\sequencesectiontitle| gives between adjacent sections later
@@ -2686,8 +2689,8 @@
% \item |\poemtitlenotitle|
% \item |\poemtitlenocontents|
% \item |\poemtitlebaretitle|
-% \item |\poemonlycontents|
-% \item |\poemonlynotes|
+% \item |\poemtitleonlycontents|
+% \item |\poemtitleonlynotes|
% \end{itemize}
% \item Poems in Sections
% \begin{itemize}
@@ -2856,6 +2859,7 @@
% no longer needs to treat italics in titles in a different way, it can
% be anything you want, since the second argument is discarded.)
%
+% \begin{sloppypar}
% \DescribeMacro{\poemtitlenotitleitalic}
% |\poemtitlenotitleitalic|, with its doubly paradoxical name,
% is for poems without formal titles but with italicized words in their
@@ -2864,7 +2868,7 @@
% purposes), and the second is the
% first line without the italics (for crossreference purposes). This command
% is obsolete now that italics in titles no longer require special
-% handing, but is retained for backwards compatibility.
+% handing, but is retained for backwards compatibility.\end{sloppypar}
%
% \subsection{~Problem titles}
% \DescribeMacro{\poemtitlebaretitle}
@@ -3024,7 +3028,7 @@
% by changing the definition of the indentation command. (e.g.
% |\renewcommand{\poemtitleindent}{\hspace{3em}}.)| For many of these
% indentations you can also simply change the applicable length (e.g.
-% |\setlength{\\sequencesubtitleindentmount}{\titleindenttwoamount}|. )
+% |\setlength{\sequencesubtitleindentmount}{\titleindenttwoamount}|. )
%
% The ``amount'' part in the command
% is important. |\poemtitleindentamount| is a length. On the other
@@ -3035,7 +3039,7 @@
% indentations. In the table ``Extra Lines'' refers to the indentation for the second and third lines
% (and so on) of multi-line titles. If you wish to change the
% indentation of any of the titles whose default length is listed as
-% 0 in the table below, you must use the |\renewcommand| method. (I
+% 0 in the table, you must use the |\renewcommand| method. (I
% found that setting the length of one of the indentations to 0pt
% added a few points of white space I could not figure out how to get
% rid of, so by default those commands are defined not by using a
@@ -3107,6 +3111,7 @@
%Sequence Section & |\contentssequencesectiontitleindentamount| & |\contentsindenttwoamount| \\
%Extra Lines & |\contentssequencesectiontitlesecondlineindentamount| & |\contentsindenttwoamount| \\
%Sequence Subsection & |\contentssequencesubsectiontitleindentamount| & |\contentsindentthreeamount| \\
+% Sequnce Subsubsection & Does not appear in Contents & \\
%Appendix or Foreword & |\contentsappendixtitleindentamount| & |0pt| \\
%Notes Sections & |\contentsnotestitleindentamount| & |0pt|
%
@@ -3227,11 +3232,11 @@
% You can find the default
% definitions of those ``fancy'' and ``main'' below at \ref{pagestyledefs}, page \pageref{pagestyledefs}.
%
-%
+%\begin{sloppypar}
% You can change the text in the left (verso) running head
% by issuing |\leftheader{your header}| or |\volumeheader{your header}|. (The commands
% are synonyms.) You can change the text in the right (recto) running head by issuing
-% |\rightheader{your header}|.
+% |\rightheader{your header}|. \end{sloppypar}
%
% \subsection{~Special page style for long poems} The fancy page style ``longpoem''
% will add information of the form ``firstline--lastline'' to the running header. This
@@ -3251,17 +3256,20 @@
% headers for the backmatter
% sections.
%
+% \begin{sloppypar}
% The header will include the abbreviation l.\ (for a single line) or ll.\ (for a range of lines).
% You can change either abbreviation with |\changesinglelineabbrev| or
% |\changemultiplelineabbrev|. So, for instance, to get rid of the abbreviations
% entirely, issue |\changemultiplelineabbrev{\relax}| and |\changesinglelineabbrev{\relax}|.
+% \end{sloppypar}
%
+% \begin{sloppypar}
% You may need to play with |\leftheader| and |\rightheader| to get the information you
% want into the header. You might, for instance, what to use something like
% |\leftheader{``Your main title'' \hfil ``Your poem title''}| and
% |\rightheader{``Your volume title'' \hfil ``Your poem title''}|. Whatever else you put into
% the header, the last thing should be your poem title, since it will be followed by the line
-% numbers.
+% numbers.\end{sloppypar}
%
% \subsection{~Page geometry and type leading}
%
@@ -3404,6 +3412,7 @@
%
%
% \subsection{Endnotes for prose sections}
+% \begin{sloppypar}
% \DescribeMacro{\prosetextnote}
% \DescribeMacro{\prosemendation}
% \DescribeMacro{\proseexplanatory}
@@ -3435,8 +3444,8 @@
% every note. The third argument is the text of the note, which
% should include both the lemma and the rest of the note, as in the
% notes for verse sections.
-% |\proseemendation[]| and
-% |\proseexplanatory[]| are coded the same way. So, if you wished
+% |\proseemendation| and
+% |\proseexplanatory| are coded the same way. So, if you wished
% to make a textual note on a passage that begins with ``Call me
% Ishmael.'' and ends ``a way of driving away the spleen,'' you would
% issue at the point where the note is to
@@ -3446,7 +3455,7 @@
% {Call me Ishmael \ldots\ a way of driving away the spleen] text of
% textual note} \end{verbatim} On the
% last line of the passage to which the note refers you would
-% issue: \\ |\proselinelabel{a way of driving away the spleen}|.
+% issue: \\ |\proselinelabel{a way of driving away the spleen}|.\end{sloppypar}
%
% \DescribeMacro{\prosetsvariant}
% \DescribeMacro{\proseaccidental}
@@ -3453,9 +3462,9 @@
% \DescribeMacro{\prosetsaccidental}
% You can issue |\sources| and |\tsentry| in prose contexts as usual.
% For typescript variants and accidental variants you need to issue
-% |\prosetsvariant[]|, |\proseaccidental|, and
+% |\prosetsvariant|, |\proseaccidental|, and
% |\prosetsaccidental|. |\prosetsvariant| is entered just as
-% |\prosetextnote[]| is, with an optional argument (for use with
+% |\prosetextnote| is, with an optional argument (for use with
% line ranges, as usual), and two mandatory arguments (the first a
% label to capture the line number, the second the lemma and comment).
%
@@ -3542,7 +3551,7 @@
% line, marking them with these commmands will ensure that the
% marginal sentence numbers do not overwrite each other. These commands
% are something of a kludge, but they will do until I figure out how
-% to do this better.
+% to do this better.\newpage
%
% \DescribeMacro{\pmnumberstoright}
% \DescribeMacro{\pmnumberstoleft}
@@ -3558,7 +3567,7 @@
% (|\versenumberstoright| or whatever) again when you move from a
% prose to a verse environment.
%
-%
+% \begin{sloppypar}
% |\runningsentencenumberformat| sets the format of running sentence
% numbers. Currently it is |\textsuperscript| (the numbers are set as superscripts) and |\tiny|.
% The format of marginal sentence
@@ -3565,6 +3574,7 @@
% numbers is set by |\marginsentencenumberformat|. Currently it is
% |\tiny|. Definitions of both commands are found at section \ref{runningsentencenumberformat},
% page \pageref{runningsentencenumberformat}. You can change either with |\renewcommmand|.
+%\end{sloppypar}
%
% \DescribeMacro{\pmpara}
% \DescribeMacro{\pmsentencebypara}
@@ -3610,6 +3620,15 @@
% |\textbf| and |\small|. The definitions of these commands are found at
% section \ref{pmparrunningformat}, page \pageref{pmparrunningformat}, Either can
% be changed with |\renewcommand|.
+%
+% \DescribeMacro{\ifsupressfirstpara}
+% \DescribeMacro{\ifsuppressfirstsentence}
+% Some readers find it annoying to have the first sentence or the first paragraph marked.
+% To suppress the appearance of the first sentence number, whether in the margin or in the
+% running text, issue |\suppressfirstsentencetrue|. To suppress the appearance of the
+% first paragraph number, whether in the margin or in the running text, issue |\suppressfirstparatrue|.
+% These commands will not affect the appearance of entries in the endnote
+% sections or in the footnotes.
%
% \subsection{~Cross references by sentence and paragraph}
% \DescribeMacro{\sentencelabel}
@@ -3663,7 +3682,7 @@
% |\prosetextnote|. |\emendationsatfoot| and |\explanationsatfoot|
% work the same way.
% \subsection{~Bible chapter and verse}
-% Since |\pmsentence| and |\pmpar| are the moral equivalents of bible
+% Since |\pmsentence| and |\pmpara| are the moral equivalents of bible
% verse and chapter, |\biblechapter| and |\bibleverse| are provided
% for convenience.
@@ -3685,6 +3704,7 @@
% side. |\synchroref| will even tag the marginal line number it makes
% with a marker to specify the text to which it refers.
%
+% \begin{sloppypar}
% \DescribeMacro{\startparalleltexts}
% \DescribeMacro{\finishparalleltexts}
% \DescribeEnv{parallelverse}
@@ -3697,7 +3717,7 @@
% |\begin{parallelverse}| and |\end{parallelverse}| rather than |\startparalleltexts|
% and |\finishparalleltexts|.
% |\startparalleltexts| and |\finishparalleltexts| can be issued on their own
-% but I have combined them to make the |parallelverse| environment.
+% but I have combined them to make the |parallelverse| environment. \end{sloppypar}
%
% Although usually with \textsf{poemscol} it is up to you where to put
% the marginal line numbers, when you issue |\startparalleltexts| the
@@ -3706,7 +3726,7 @@
% correspond to which lines in the verso text, which
% are made with |\synchroref|) are in the right margin.
%
-%
+%\begin{sloppypar}
% \DescribeMacro{\startrectopage}
% \DescribeMacro{\finishrectopage}
% \DescribeMacro{\startversopage}
@@ -3717,8 +3737,8 @@
% |\finishrectopage|. You have to declare the page breaks manually,
% so be sure you are putting the |\finishversopage| or |\finishrectopage| commands
% in places which
-% will work. |\finishparalleltexts| just makes certain that stanzas, and poems
-% that you opened in a region of parallel texts are closed when you leave it.
+% will work. |\finishparalleltexts| just makes certain that stanzas, and poems,
+% that you opened in a region of parallel texts are closed when you leave it.\end{sloppypar}
%
% \DescribeMacro{\versopoemtitle}
% \DescribeMacro{\rectopoemtitle}
@@ -3776,21 +3796,21 @@
% \medskip
%
% \noindent|\newcommand{\keeptitlesstraight}{|\\
-% |\pretocmd{\fivetextnote}{\versotitleinnotescheck}{\relax}{\relax}|
-% |\pretocmd{\fiveemendation}{\versotitleinnotescheck}{\relax}{\relax}|
-% |\pretocmd{\fiveexplanatory}{\versotitleinnotescheck}{\relax}{\relax}|
-% |\pretocmd{\fiftytextnote}{\rectotitleinnotescheck}{\relax}{\relax}|
-% |\pretocmd{\fiftyemendation}{\rectotitleinnotescheck}{\relax}{\relax}|
-% |\pretocmd{\fiftyexplanatory}{\rectotitleinnotescheck}{\relax}{\relax}|
+% |\pretocmd{\fivetextnote}{\versotitleinnotescheck}{\relax}{\relax}|\\
+% |\pretocmd{\fiveemendation}{\versotitleinnotescheck}{\relax}{\relax}|\\
+% |\pretocmd{\fiveexplanatory}{\versotitleinnotescheck}{\relax}{\relax}|\\
+% |\pretocmd{\fiftytextnote}{\rectotitleinnotescheck}{\relax}{\relax}|\\
+% |\pretocmd{\fiftyemendation}{\rectotitleinnotescheck}{\relax}{\relax}|\\
+% |\pretocmd{\fiftyexplanatory}{\rectotitleinnotescheck}{\relax}{\relax}|\\
% |}|
%
% \medskip
-%
+%\begin{sloppypar}
% All those fields filled with |\relax| are for reporting the success or failure
% |\pretocmd| has had in appending |\versotitleinnotescheck| (or |\rectotitleinnotescheck|)
% to the different endnotes commands. You may wish to replace
% the |\relax| with something like |\typeout{fiftytextnote modified}| or
-% |\typeout{fiftytextnote not modified}|.
+% |\typeout{fiftytextnote not modified}|. \end{sloppypar}
%
%If you are using the |\keeptitlestraight|
% hack described here, you should add \textsf{etoolbox}
@@ -3811,6 +3831,7 @@
% |}|
%
% \subsection{~Parallel texts and generic note types}
+% \begin{sloppypar}
% \DescribeMacro{\rectotexnote}
% \DescribeMacro{\rectoemendation}
% \DescribeMacro{\rectoexplanatory}
@@ -3822,13 +3843,21 @@
% editions: |\rectotextnote|, |\rectoeemendation|, |\rectoexplanatory|,
% |\versotextnote|, |\versoemendation|, and |\versoexplanatory,| as well as |\rectoprosetexnote|,
% |\versoprosetextnote,| |\rectoproseemendation,| |\versoproseemendation|,
-% |\rectoproseexplanatory|, and |\versoproseexplanatory.| (I have also defined
+% |\rectoproseexplanatory|, and |\versoproseexplanatory.|
+% \end{sloppypar}
+%
+% \begin{sloppypar}
+% I have also defined
% |\literalrectotextnote|, |\literalversotextnote|, |\literalrectoemendation|, |\literalversoemendation|,
% |\literalrectoexplain|, and |\literalversoexplain| for sending material other than formal
% endnotes to these endnote sections.
-% You can use all of these without issuing the moral equivalent of |\keeptitlesstraight| and
+% \end{sloppypar}
+%
+% You can use all of these without creating versions of |\keeptitlesstraight| and
% |\resettitleinnotes|.
%
+%
+% \begin{sloppypar}
% \DescribeMacro{\makerectotexnotes}
% \DescribeMacro{\makerectoemendations}
% \DescribeMacro{\makerectoexplanatorynotes}
@@ -3839,7 +3868,9 @@
% just as you would do with |\textnote|, |\emendation| or |\explanatory| (or |\literalversotextnote|
% |\literalversoemendation| and |\literalversoexplain|), without any of the special hacks
% I have just described.
+% \end{sloppypar}
%
+% \begin{sloppypar}
% \DescribeMacro{\changerectotextnotesname}
% \DescribeMacro{\changerectotextnotesheader}
% \DescribeMacro{\rectotextnotessinglepar}
@@ -3855,12 +3886,15 @@
% by changing the values of the booleans |\versotextnotessinglepar| and |\versotextnotestwocol|.
% Similar sets of commands are available for |\versoemendation| and |\versoexplanatory|
% and their recto equivalents.
+% \end{sloppypar}
%
+% \begin{sloppypar}
% \DescribeMacro{\putrectotextnotes}
% To include these note sections in your document, issue |\putversotextnotes|, |\putrectotextnotes|,
% |\putversoemendations|, |\putrectoemendations|, |\putversoexplanatorynotes|, or
% |\putrectoexplanatorynotes| at the point where you wish them to appear. These commands
% behave exactly like |\puttextnotes|.
+% \end{sloppypar}
%
% \subsection{~Parallel text labels}
% \DescribeMacro{\synchrolabel} \DescribeMacro{\synchroref}
@@ -3913,6 +3947,7 @@
% Like passages of parallel text in verse, parallel prose passages must start
% on a verso page.
%
+% \begin{sloppypar}
% \DescribeMacro{\startversoprosepage}
% \DescribeMacro{\finishversoprosepage}
% \DescribeMacro{\startrectoprosepage}
@@ -3924,6 +3959,7 @@
% text on the second page right after the |\startrectopage| command with
% no blank line. (Alternatively, you could just
% begin that page with |\noindent|.)
+% \end{sloppypar}
%
% \DescribeMacro{\parastart}
% \DescribeMacro{\paraend}
@@ -8184,6 +8220,8 @@
\newif{\ifprosebysentence}
\newif{\ifrunningsentencenumbers}\runningsentencenumberstrue
\newif{\ifmarginsentencenumbers}\marginsentencenumberstrue
+\newif{\ifsuppressfirstpara}\suppressfirstparafalse
+\newif{\ifsuppressfirstsentence}\suppressfirstsentencefalse
\newtoks{\pmnoteheader}
@@ -8204,7 +8242,13 @@
% margin. \label{runningsentencenumberformat}
% \begin{macrocode}
\newcommand{\runningsentencenumberformat}[1]{\nobreak%
-\textsuperscript{\scriptsize{#1}}\unskip\nobreak}
+\ifsuppressfirstsentence%
+\ifthenelse{\thepmsentencenumber=1}{\relax}{%
+\unskip\textsuperscript{\scriptsize{#1}}}%
+\unskip\nobreak%
+\else%
+\textsuperscript{\scriptsize{#1}}%\fi
+\unskip\nobreak}
\newcommand{\marginsentencenumberformat}[1]{\scriptsize{#1}}
\newcommand{\setpmmodulo}[1]{\setcounter{pmmodulo}{#1}%
\addtocounter{pmmodulo}{-1}%
@@ -8235,8 +8279,13 @@
% Macros for actually writing the numbers in the margin.
% \begin{macrocode}
\newcommand{\putpmsentencenumber}{%
+\ifsuppressfirstsentence%
+\ifthenelse{\thepmsentencenumber=1}{\relax}{\putpmmarginnumber{\thepmsentencenumber}%
+{\marginsentencenumberformat}}%
+\else%
\putpmmarginnumber{\thepmsentencenumber}%
-{\marginsentencenumberformat}}
+{\marginsentencenumberformat}%
+\fi}
\newcommand{\putpmmarginnumber}[2]{%
\nolinebreak\begin{marginenvironment}%
\nolinebreak%
@@ -8269,8 +8318,8 @@
\addtocounter{pmindexcount}{1}%
\leavevmode%
\ifthenelse{\value{pmindexcount}>\value{pmmodulo}}%
-{ \putpmsentencenumber\nobreak%
- \setcounter{pmindexcount}{0}%
+{\putpmsentencenumber\nobreak%
+\setcounter{pmindexcount}{0}%
}{\relax}%
\fi%
% create header for notes if any are to occur
@@ -8402,9 +8451,20 @@
% Formatting marginal and running paragraph numbers, printing them. \label{pmparrunningformat}
% \begin{macrocode}
\newcommand{\pmparmarformat}[1]{\textbf{{\small #1}}}
-\newcommand{\pmpararunningformat}[1]{\textbf{\small #1}}
+\newcommand{\pmpararunningformat}[1]{%
+\ifsuppressfirstpara%
+\ifthenelse{\thepmparagraph=1}{\relax}{\textbf{\small #1}~}%
+\else%
+\textbf{\small #1}~%
+\fi}
\newcommand{\putpmmarparanumber}{%
-\putpmmarginnumber{\llap{\thepmparagraph~~}}{\pmparmarformat}}
+\ifsuppressfirstpara%
+\ifthenelse{\thepmparagraph=1}{\relax}{\putpmmarginnumber{\llap{\thepmparagraph~~}}
+{\pmparmarformat}}%
+\else%
+\putpmmarginnumber{\llap{\thepmparagraph~~}}{\pmparmarformat}%
+\fi}
+
% \end{macrocode}
% \begin{macro}{\pmpara}
% Mark the beginning of each paragraph with |\pmpara|
Modified: trunk/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/poemscol/poemscol.sty 2019-10-29 21:24:28 UTC (rev 52573)
+++ trunk/Master/texmf-dist/tex/latex/poemscol/poemscol.sty 2019-10-29 21:24:43 UTC (rev 52574)
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}[1997/12/01]
\ProvidesPackage{poemscol}
- [2019/09/27 v3.14 poemscol file]
+ [2019/10/29 v3.141 poemscol file]
%|\prosexyznote|
%%
@@ -2554,6 +2554,8 @@
\newif{\ifprosebysentence}
\newif{\ifrunningsentencenumbers}\runningsentencenumberstrue
\newif{\ifmarginsentencenumbers}\marginsentencenumberstrue
+\newif{\ifsuppressfirstpara}\suppressfirstparafalse
+\newif{\ifsuppressfirstsentence}\suppressfirstsentencefalse
\newtoks{\pmnoteheader}
@@ -2567,7 +2569,13 @@
\noexplainyettrue%
}{}
\newcommand{\runningsentencenumberformat}[1]{\nobreak%
-\textsuperscript{\scriptsize{#1}}\unskip\nobreak}
+\ifsuppressfirstsentence%
+\ifthenelse{\thepmsentencenumber=1}{\relax}{%
+\unskip\textsuperscript{\scriptsize{#1}}}%
+\unskip\nobreak%
+\else%
+\textsuperscript{\scriptsize{#1}}%\fi
+\unskip\nobreak}
\newcommand{\marginsentencenumberformat}[1]{\scriptsize{#1}}
\newcommand{\setpmmodulo}[1]{\setcounter{pmmodulo}{#1}%
\addtocounter{pmmodulo}{-1}%
@@ -2594,8 +2602,13 @@
\setlength{\marginparsep}{18pt}%
}
\newcommand{\putpmsentencenumber}{%
+\ifsuppressfirstsentence%
+\ifthenelse{\thepmsentencenumber=1}{\relax}{\putpmmarginnumber{\thepmsentencenumber}%
+{\marginsentencenumberformat}}%
+\else%
\putpmmarginnumber{\thepmsentencenumber}%
-{\marginsentencenumberformat}}
+{\marginsentencenumberformat}%
+\fi}
\newcommand{\putpmmarginnumber}[2]{%
\nolinebreak\begin{marginenvironment}%
\nolinebreak%
@@ -2621,8 +2634,8 @@
\addtocounter{pmindexcount}{1}%
\leavevmode%
\ifthenelse{\value{pmindexcount}>\value{pmmodulo}}%
-{ \putpmsentencenumber\nobreak%
- \setcounter{pmindexcount}{0}%
+{\putpmsentencenumber\nobreak%
+\setcounter{pmindexcount}{0}%
}{\relax}%
\fi%
\ifpmparas%
@@ -2717,9 +2730,20 @@
\newif{\ifpmsentencebypara}% reset sentence counter every paragraph
\pmsentencebyparatrue
\newcommand{\pmparmarformat}[1]{\textbf{{\small #1}}}
-\newcommand{\pmpararunningformat}[1]{\textbf{\small #1}}
+\newcommand{\pmpararunningformat}[1]{%
+\ifsuppressfirstpara%
+\ifthenelse{\thepmparagraph=1}{\relax}{\textbf{\small #1}~}%
+\else%
+\textbf{\small #1}~%
+\fi}
\newcommand{\putpmmarparanumber}{%
-\putpmmarginnumber{\llap{\thepmparagraph~~}}{\pmparmarformat}}
+\ifsuppressfirstpara%
+\ifthenelse{\thepmparagraph=1}{\relax}{\putpmmarginnumber{\llap{\thepmparagraph~~}}
+{\pmparmarformat}}%
+\else%
+\putpmmarginnumber{\llap{\thepmparagraph~~}}{\pmparmarformat}%
+\fi}
+
\newcommand{\pmpara}{\leavevmode%
\pmparastrue\addtocounter{pmparagraph}{1}%
\ifpmparainmar% put in marginal paragraph number
More information about the tex-live-commits
mailing list