texlive[45979] Master/texmf-dist: poemscol (3dec17)
commits+karl at tug.org
commits+karl at tug.org
Sun Dec 3 23:19:26 CET 2017
Revision: 45979
http://tug.org/svn/texlive?view=revision&revision=45979
Author: karl
Date: 2017-12-03 23:19:26 +0100 (Sun, 03 Dec 2017)
Log Message:
-----------
poemscol (3dec17)
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
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/poemscol/poemscolcheatsheet.tex
Modified: trunk/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/poemscol/poemscolcheatsheet.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/poemscol/poemscolcheatsheet.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/poemscol/poemscolcheatsheet.tex 2017-12-03 22:19:26 UTC (rev 45979)
@@ -0,0 +1,118 @@
+\documentclass[12pt]{article}
+\usepackage{geometry}
+\usepackage{supertabular}
+\geometry{left=1in,right=1in,top=1in,bottom=1in}
+\raggedbottom
+\title{\textsf{poemscol} Cheat Sheet}
+\author{John Burt}
+\date{May 19, 2006}
+
+% \addtolength{\textwidth}{1in}
+% \addtolength{\oddsidemargin}{-.5in}
+% \addtolength{\evensidemargin}{-.5in}
+% \addtolength{\textheight}{1.25in}
+% \addtolength{\topmargin}{-.5in}
+% \pagestyle{myheadings}
+% \markboth{John Burt}{John Burt}
+\begin{document}
+\maketitle
+\begin{supertabular}{|l|l|}
+\hline \textbf{Dependencies} & \\
+\hline general &geometry,ifthen,keyval,mparhack,makeidx\\
+if footnotes & [para,ruled] manyfoot\\
+if prose sections & [left,modulo]lineno\\
+if cropmarks & [letter,pdftex,cam]crop\\
+\hline \textbf{Setup} & \\
+\hline & \verb|\makeverselinenumbers| \\
+ & \verb|\global\verselinenumbersfalse|\\
+ & \verb|\stanzaatbottom{*}| \\
+ & \verb|\nostanzaatbottom{\relax}| \\
+ & \verb|\leftheader{}| \\
+ & \verb|\rightheader{}| \\
+ & \verb|\setcounter{lineindexrepeat}{}| \\
+ for endnote sections & \verb|\maketextnotes \puttextnotes | \\
+ & \verb|\makeemendations \putemendations|\\
+ & \verb|\makeexplanatorynotes \putexplanatorynotes| \\
+ & \verb|\global\includeaccidentalstrue| \\
+ & \verb|\global\includetypescriptstrue| \\
+ & \verb|\indexingontrue \putpoemindex| \\
+for footnotes & \verb|\textnotesatfoot| \\
+ & \verb|\emendationsatfoot| \\
+ & \verb|\explanationsatfoot| \\
+``Plain'' footnotes & \verb|\global\textfootnotesparafalse| \\
+ & \verb|\global\emendationfootnotesparafalse| \\
+ & \verb|\global\explanfootnotesparafalse |\\
+ & \verb|\global\sourcesfootnotesparafalse |\\
+Contents & \verb|\makepoemcontents| \\
+put this one first & \verb|\putpoemcontents| \\
+\hline
+\end{supertabular}
+\newpage
+\begin{supertabular}{|l|l|}
+\hline \textbf{Poetic elements} & \\
+\hline Titles & \verb|\poemtitle{}| \\
+ & \verb|\poemsectiontitle{}| \\
+ & \verb|\poemsubtitle{}| \\
+ & \verb|\poemtitlefirstline{} \poemtitlemiddleline{} \poemtitlelastline{}| \\
+ & \verb|\sequencetitle{}| \\
+ & \verb|\sequencefirstsectiontitle{} \sequencesectiontitle{} | \\
+ & \verb|\sequencesectiontitlefirstline{}| etc. \\
+ & \verb|\sequencesubsectiontitle{}| \\
+ & \verb|\prosesectiontitle{}| \\
+ & \verb|\epigraph{} \headnote{}| \\
+ & \verb|\attribution{}| \\
+ & \verb|\dedication{}| \\
+Main Text & \verb|\begin{poem} \end{poem}| \\
+ & \verb|\begin{stanza} \end{stanza}| \\
+ & \verb|\begin{prosesection} \end{prosesection}| \\
+ & \verb|\verseline| \\
+ & \verb|\brokenline| \\
+ & \verb|\versephantom{}| \\
+ & \verb|\stanzalinestraddle| \\
+ & \verb|\linebend| \\
+ & \verb|\verseindent| \\
+ & \verb|\begin{rightflushverse} \rightflushversebegin| \\
+ & \verb|\poemlinelabel{} \proselinelabel{}| \\
+\hline \textbf{Notes} & \\
+\hline & \verb|\textnote[label]{}| \\
+ &\verb| \emendation[label]{}| \\
+ & \verb|\explanatory[label]{}| \\
+ & \verb|\sources{}| \\
+ & \verb|\accidental{} \tsvariant{} \tsentry| \\
+ & \verb|\sameword \missingpunct| \\
+ & \verb|\literalexplain{} \literalemendation{}| \\
+ & \verb|\prosetextnote[end label]{beginning label}{}| etc. \\
+ & \verb|\definenewnotetype{cmd}{extension}{running head entry}|\\
+ & \verb|{title}{contents} |\\
+\hline \textbf{Collections} & \\
+\hline & \verb|\begin{volumetitlepage} \end{volumetitlepage} | \\
+ & \verb|\volumetitle{} \volumetitlefirstline{} \volumesubtitle{}| \\
+ & \verb|\volumeepigraph{} \volumeattribution{}| \\
+ & \verb|\volumededication{}| \\
+ \hline
+\end{supertabular}
+\newpage
+\begin{supertabular}{|l|l|}
+\hline \textbf{Annotation by Paragraph} & \\
+\textbf{and Sentence Number} & \\
+\hline & \verb|\pmsentence| \verb|\pmpara| \\
+& \verb|\pmsentencebypara \sentencelabel{}| \\
+& \verb|\pmtextnote[]{} \pmexplanatory[]{}|\\
+& \verb|\pmemendation[]{} \biblechapter \bibleverse| \\
+\hline \textbf{Parallel Texts} & \\
+\hline & \verb|\startparalleltexts| \\
+ & \verb|\startversopage \finishversopage| \\
+ & \verb|\startrectopage \finishrectopage| \\
+ & \verb|\synchrolabel \synchroref |\\
+ & \verb|\cleartorecto \cleartoverso| \\
+ & \verb|\setsynchroflag{}| \\
+% \xA5 & \xA5 \\
+% \xA5 & \xA5 \\
+% \xA5 & \xA5 \\
+% \xA5 & \xA5 \\
+
+\hline
+\end{supertabular}
+
+
+\end{document}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/poemscol/poemscolcheatsheet.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/poemscol/poemscol.dtx 2017-12-03 22:19:10 UTC (rev 45978)
+++ trunk/Master/texmf-dist/source/latex/poemscol/poemscol.dtx 2017-12-03 22:19:26 UTC (rev 45979)
@@ -19,7 +19,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
%<package>\ProvidesPackage{poemscol}
-%<package> [2017/10/23 v2.87 poemscol file]
+%<package> [2017/11/30 v2.9 poemscol file]
%
%<*driver>
\documentclass{ltxdoc}
@@ -33,7 +33,7 @@
%</driver>
% \fi
%
-% \CheckSum{8070}
+% \CheckSum{8158}
%
% \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
@@ -222,6 +222,9 @@
% in when centertitles is issued. New boolean to adjust placement of marginal
% reference markers in jhtextnote and related commands.}
% \changes{v2.87}{2017/10/23}{Notes to appear at the end of individual poems.}
+% \changes{v2.88}{2017/10/29}{Revisions to manual.}
+% \changes{v2.89}{2017/11/30}{Append the date to the end of the poem.}
+% \changes{v2.9}{2017/12/02}{Date aligns with left margin of poem even when poem is centered.}
% \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
% \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip}
% \DoNotIndex{\newcommand, \section, \subsection, \subsubsection,
@@ -254,15 +257,15 @@
% \textsc, \unskip}
% \setcounter{IndexColumns}{2}
% \MakeShortVerb{|}
-% \def\fileversion{2.87}
-% \def\filedate{23 October 2017}
-% \def\docdate{23 October 2017}
+% \def\fileversion{2.9}
+% \def\filedate{2 December 2017}
+% \def\docdate{2 December 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{23 October 2017}
+% \date{2 December 2017}
% \maketitle
% \begin{abstract} \textsf{poemscol} provides macros for \LaTeX\ for
% setting collections of poetry. It is especially suited for setting
@@ -437,7 +440,7 @@
% versions 2.3 or later of \textsf{poemscol}.
%
%
-% \subsection{~Parallel Text Editions} If you are using the |\keeptitlestraight|
+% \subsection{~Parallel text editions} If you are using the |\keeptitlestraight|
% hack described below at \ref{parallelhack}, you should add \textsf{etoolbox}
% to your package list. If you are using the six pre-defined endnote sections
% for parallel text editions (|\rectotexnote|, |\versotextnote|, |\rectoemendation|, |\versoemendation|,
@@ -614,7 +617,7 @@
% argument. Alternatively, the length |\versewidth| can be used as the
% argument. You can set the length of |\versewidth| to the proper
% amount using |\settowidth| as follows:
-% \DescribeMacro{\versewidth}
+% \DescribeMacro{\versewidth} \label{centeringtextblock}
% |\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]|.
@@ -637,7 +640,7 @@
% 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 centring the text block again by issuing
+% You can turn on centering the text block again by issuing
% |\textcenteringturnedontrue|.
%
% \textsf{poemscol} turns off automatic hyphenation in poetry
@@ -1007,7 +1010,7 @@
% \DescribeMacro{\putemendations}
% \DescribeMacro{\putexplanatory}
% |\puttextnotes|, and its siblings |\putemendations| and
-% |\putexplanatory|, linput the formatted notes
+% |\putexplanatory|, input the formatted notes
% sections, and put entries for them into your table of contents.
% You will have to run \LaTeX\ again to set the
% table of contents properly. The first run sets a label to find the
@@ -1082,7 +1085,7 @@
% information (such as italicization) in titles or first lines without
% messing up their sort order.
%
-% \subsection{~Making Multiple Indices}\label{multipleindex}
+% \subsection{~Making multiple indices}\label{multipleindex}
% \textsf{poemscol} can work with \textsf{splitindex} to generate
% more than one index. You might, for instance, wish a separate index
% of titles and index of first lines, or an index of proper names. To
@@ -1117,10 +1120,10 @@
%
% To include the indices, and to add entries for them to the table of
% contents, issue |\putmultiplepoemindex| for each one.
-% |\putmultiplepoemindex| takes four arguments, which are: 1. The
-% three letter ``shortcut'' used by |\splitindex|, 2. The title of
-% the Index on its first page, 3. The running header for that index
-% section, and 4. The name of the section as you wish it to appear in
+% |\putmultiplepoemindex| takes four arguments, which are: 1.\ The
+% three letter ``shortcut'' used by |\splitindex|, 2.\ The title of
+% the Index on its first page, 3.\ The running header for that index
+% section, and 4.\ The name of the section as you wish it to appear in
% the Table of Contents. So, for instance
% \begin{verbatim}
% \putmultiplepoemindex{fir}{INDEX OF FIRST LINES}{Index of First
@@ -1238,17 +1241,18 @@
% hanging indent, to give prominence to the line number.
% \end{sloppypar}
%
+%\begin{sloppypar}
% You may have notes with multiple paragraphs. The default settings for all of
% the forms of endnotes are set with hanging indentation, which probably is not
% a good idea for multiple paragraph notes. There are two ways of approaching
% this problem. The first way is to change all of the paragraphs of the notes to
% normal indentation, which you can do by issuing
-% |\literaltextnote{\setlength{\parindent}{\noteindentation}}| (you can pick the indentation)
+% |\literaltextnote{\setlength{\parindent}{\noteindentation}}| (you can pick the
+% indentation, but the default value is 1 em)
% just after issuing |\maketextnotes.| You should remember to issue similar
% commands for emendations, explanatory notes, and whatever kinds of notes you
-% create using |\definenewnotetype|. By default, |\noteparbreak| indents the new paragraph
-% 1em. You can change this by changing the value of the length
-% |\noteindentation|.
+% create using |\definenewnotetype|.
+% \end{sloppypar}
%
% \DescribeMacro{\noteparbreak}
% Alternatively, if you want to keep the hanging indent for the page number, but still have paragraph
@@ -1277,7 +1281,7 @@
% the table of contents by changing the definition of
% |\contentsendnotesindent| (set by default to |\contentsindentone|)
% or |\contentsendnotesfont| (set by default to
-% |\contentspoemtitlefont|.
+% |\contentspoemtitlefont|.)
%
% \subsection{~Textual notes of various kinds}
% \DescribeMacro{\sources} To record information about the copy text,
@@ -1291,13 +1295,15 @@
% typesetting information to other sections by using
% |\literalemend{}|, |\literalexplain{}|, or |\literalcontents{}|.
% There is also a |\literaltextnote{}| command, which is equivalent to
-% |\sources{}|.
+% |\sources{}|. Although they do the same thing, I use |\sources{}| to
+% send editorial information to the texual note section, but use
+% |\literaltexnote{}| to send formatting instructions to the textual note section.
%
% \DescribeMacro{\textnote}
% \DescribeMacro{\emendation}
% \DescribeMacro{\explanatory}
% |\textnote{}| is used to capture variants and tie them to the
-% correct line number. You don't have to count line numbers.
+% correct line number. You don't have to count line numbers;
% \textsf{poemscol} keeps track of them for you. Issue |\textnote{}|
% immediately after the |\verseline| command which marks the ending of
% the line you wish to comment upon. Put the text of your note (which
@@ -1377,7 +1383,8 @@
% for \textsf{poemscol}. \textsf{poemscol} will not complain about
% this.
%
-% If a textual note \emph{ends} with a quotation in verse, you should
+% \DescribeMacro{\quotedversecorrectiontextnote} If a textual note
+% \emph{ends} with a quotation in verse, you should
% follow the |\textnote{}| entry with
% |\quotedversecorrectiontextnote|. I found that if I quoted verse in
% the note sections a dirty trick I used to send the notes to the
@@ -1552,7 +1559,7 @@
% |\pmexplanatory|.
%
% \section{Multi-level footnotes} \label{makingfootnotes}
-% \textsf{poemscol} will set multiple
+% \DescribeMacro{\textnotesatfoot} \textsf{poemscol} will set multiple
% levels of footnotes in block paragraphs, separating each level with
% a rule. To enable this feature, call the \textsf{manyfoot} package
% as follows in your preamble: |\usepackage[ruled,para*]{manyfoot}|.
@@ -1582,6 +1589,10 @@
% just writes its argument onto the external file for textual notes.
%
%
+% \DescribeMacro{\iftextfootnotespara}
+% \DescribeMacro{\ifsourcesfootnotespara}
+% \DescribeMacro{\ifemendationfootnotespara}
+% \DescribeMacro{\ifexplanfootnotespara}
% To change the style of your footnotes between plain and
% para modes, globally change the values some of the following
% booleans. |\ifsourcesfootnotespara|, obviously, is true if
@@ -1591,8 +1602,8 @@
% |\ifemendationfootnotespara|, or |\ifexplanfootnotespara| are the
% booleans which set the style of footnotes from |\emendation| and
% |\explanatory| respectively. By default, footnotes from
-% |\emendation| are set in ``para'' mode, and footnotes from
-% |\explanatory| are set in ``plain'' mode. g explanatory
+% |\emendation| are set in ``para'' mode (|\emendationfootnotesparatrue|), and footnotes from
+% |\explanatory| are set in ``plain'' mode (|\explanfootnotesparafalse|). To change explanatory
% footnotes from plain to para mode, for instance, issue
% |\global\explanfootnotesparatrue|. Counterintuitive as it sounds,
% you must issue this \emph{before} issuing |\textnotesatfoot| (or the
@@ -1601,7 +1612,7 @@
%
% When |\sources| is defined to send endnotes to the textual notes
% section, they usually appear immediately underneath the title of
-% the volume or poem they comment upon. If you are having |\sources|
+% the volume or poem they comment upon in the endnotes section. If you are having |\sources|
% output footnotes, it would be a good idea to open the note with the
% title of the volume or poem it is a comment upon, in case there is
% more than one poem on the page.
@@ -1614,6 +1625,7 @@
% be more of an idiosyncrasy than a bug, particularly if the symbol
% is changed from * to something like ``stanza break at page turn.''
%
+% \DescribeMacro{\DeclareNewFootnote}
% To create a new level of footnote, you must first declare it to
% make it known to \textsf{manyfoot}, which requires each level of
% footnote to be given a unique suffix (usually a capital letter of
@@ -1624,15 +1636,16 @@
% range of line numbers of the lemma. To define a footnote called
% |\mynote{}|, first declare new footnote |\footnoteE| (A, B, C and D
% are reserved for sources, textual notes, emendations, and explanatory notes,
-% respectively). Then issue
-% |\newcommand{\mynote}[2][0]{\setlemmarange{#1}|\\
-% |\FootnotetextE{\citerange}{#2}|
-% | \resetlemmacounters}| (|\setlemmarange|, |\citerange|, and
+% respectively). Then issue: \begin{verbatim}
+% \newcommand{\mynote}[2][0]{\setlemmarange{#1}\\
+% \FootnotetextE{\citerange}{#2}
+% \resetlemmacounters} \end{verbatim}
+% |\setlemmarange|, |\citerange|, and
% |\resetlemmacounters| enable your footnote to handle line ranges in
-% the lemma.) If a |\mynote| refers to a range of lines, you can issue
+% the lemma. If a |\mynote| refers to a range of lines, you can issue
% the same kinds of optional argument that are used with |\textnote|.
%
-% \section{Note at the end of poems}
+% \section{Notes at the end of poems}
% \DescribeMacro{\poemendnote}
% \DescribeMacro{\makepoemendnotes}
% \DescribeMacro{\putpoemendnotes}
@@ -1648,7 +1661,7 @@
% By default, each poem end note is given its own paragraph. To concatenate
% them into a single paragraph, issue |\poemendnotessingleparfalse|.
%
-% \section{Pulling it all together}
+% \section{Printing endnotes and index}
% \DescribeMacro{\testforauxonfirstrun} If you don't want to listen to
% \LaTeX\ complain about missing references during your first run,
% issue |\testforauxonfirstrun|, which won't let |\finish|,
@@ -1709,23 +1722,49 @@
% table of contents.
%
%
-% \section{Special cases}
+% \section{Special Cases}
% \subsection{~Epigraphs, attributions etc.}
% \DescribeMacro{\epigraph} \DescribeMacro{\headnote}
% \DescribeMacro{\attribution} \DescribeMacro{\poemdedication}
-% |\epigraph|, |\headnote|, |\attribution|, and |\poemdedication| set
+% |\epigraph{}|, |\headnote{}|, |\attribution{}|, and |\poemdedication{}| set
% their arguments as epigraphs, headnotes, attributions, or
-% dedications. If you have dedications, epigraphs, or attributions on
+% dedications for poems or poetic sequences. You can adjust the left and right margins
+% of epigraphs by changing the values of |\epigraphquoteleftmargin|
+% or |\epigraphquoterightmargin|.
+% If you have dedications, epigraphs, or attributions on
% the divider pages of editions that combine several volumes of
% poetry, use |\volumededication{}|, |\volumeepigraph{}|, and
-% |\volumeattribution{}|. You can adjust the left and right margins
-% of epigraphs by changing the values of |\epigraphquoteleftmargin|
-% or |\epigraphquoterightmargin|
+% |\volumeattribution{}|.
+%
+% \subsection{~Appending Publication Date}
+% \DescribeMacro{\poemdate} You can append the date of the poem
+% with |\poemdate{}|. Issue |\poemdate{}| just after |\end{poem}|. You can
+% include both the composition and publication date if you wish simply by
+% including both dates in the argument.
+% (In fact, you can put anything in the argument, not just dates.) By default |\poemdate| places the
+% date one |\bigskip| under left margin of the verse block of the poem,
+% whether the poem is set at the left
+% margin or whether the verse block is centered on the longest line.
+% You can move the placement of the date left or right
+% by changing the value of the length |\dateindent|. If you wish to change
+% |\dateindent| you will have to issue |\setlength{\dateindent}{your value}| before
+% each instance of |\poemdate|, since \textsf{poemscol} recalculates
+% |\dateident| freshly for every poem.
+%
+% There is a slight bug in |\poemdate|. If there is a page turn between the last line of the
+% poem and the date, and the last line has a runover portion, the date will be set
+% 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 get rid of the orphan date line. (For |\longpage| and |\shortpage| see section \ref{longpage},
+% page \pageref{longpage}.)
%
-% \subsection{~Inset prose quotations}
+% \subsection{~Pausing line numbering}
% \DescribeMacro{\saveverselinenumber}
-% \DescribeMacro{\restoreverselinenumber} Sometimes you will have inset prose
-% passages, but you will not wish to start the line numbering over
+% \DescribeMacro{\restoreverselinenumber} There are cases in which you
+% might want to pause and resume line numbering later at the same number.
+% For instance, you may have inset prose
+% passages which do not take line numbers, but you wish to resume line numbering the verse
% after the passage. The way to set this is to issue |\end{stanza}|
% at the end of the stanza before the prose insert. Then issue
% |\saveverselinenumber|. Then issue |\end{poem}|. Insert the prose
@@ -1773,14 +1812,23 @@
% may get a complaint on your log file about an overfull |\hbox| if
% you do this, however.
%
-% \subsection{~Italicized poem titles and empty poem titles} Titles
+% \subsection{~Empty poem titles and italicized poem titles}
+%
+% \DescribeMacro{\poemtitlenotitle{}}
+% |\poemtitlenotitle{}|, with its paradoxical name, is for poems
+% without formal titles. Usually such poems are referred to by their
+% first lines. This macro does not produce a title in the text, but
+% sets its argument in the table of contents and in the notes. Usually
+% you use the first line as the moral equivalent of a title.
+%
+% \DescribeMacro{\poemtitleitalic{}{}}
+% Titles
% with italics or other special formatting posed special problems in
% earlier versions (before version 1.7) since the typesetting commands
% gummed up how I passed parameters around that I was unable to solve
% using |\protect|. All of these commands are obsolete now, but are
% retained for backward compatibility.
-%
-% \DescribeMacro{\poemtitleitalic{}{}} |\poemtitleitalic{}{}| takes
+% |\poemtitleitalic{}{}| takes
% two arguments. The first is the title of the poem with the italics
% (or small capitals or international characters or what have you),
% for typesetting, and the second is the title without the commands,
@@ -1787,16 +1835,10 @@
% for cross reference purposes. (Actually, now that \textsf{poemscol}
% no longer needs to treat italics in titles in a different way, it can
% be anything you want, since the second argument is discarded.)
+
%
-% \DescribeMacro{\poemtitlenotitle{}}
-% |\poemtitlenotitle{}|, with its paradoxical name, is for poems
-% without formal titles. Usually such poems are referred to by their
-% first lines. This macro does not produce a title in the text, but
-% sets its argument in the table of contents and in the notes. Usually
-% you use the first line as the moral equivalent of a title.
-%
% \DescribeMacro{\poemtitlenotitleitalic{}{}}
-% |\poemtitlenotitleitalic{}{}|, with its even more paradoxical name,
+% |\poemtitlenotitleitalic{}{}|, with its doubly paradoxical name,
% is for poems without formal titles but with italicized words in their
% first lines. |\poemtitlenotitleitalic{}{}| takes two arguments. The
% first is the first line with the italics (for typesetting
@@ -1822,8 +1864,8 @@
% explicitly how the title is to be broken up in the text and in the
% table of contents. You can construct variants of these macros for
% dealing with special cases I didn't anticipate by using
-% |\poemsectiontitlebaretitle{}| and |\literalcontents{}| and its
-% siblings.\end{sloppypar}
+% the macros described in \ref{customizing titles}.
+%.\end{sloppypar}
%
% \subsection{~Poetic sequences}\label{poeticsequences}
%
@@ -2026,13 +2068,13 @@
% p.~\pageref{JHpoemtitle} for how to construct similar commands for
% sequences, sequence sections, and so on.
%
-% The following related commands are defined already
+% The following related commands are defined already:
% \begin{itemize}
-% \item |\JHsequencetitle|, \item |\JHsequencefirstsectiontitle|,
-% \item |\JHsequencesectiontitle|, \item |\JHsequencesubsectiontitle|,
-% \item |\JHpoemsectiontitle|, \item |\JHpoemfirstsectiontitle|,
-% \item |\JHpoemsubtitle|, \item |\JHepigraph|,\item |\JHprosesectiontitle|, and
-% \item |\JHdedication|.\end{itemize}
+% \item |\JHsequencetitle| \item |\JHsequencefirstsectiontitle|
+% \item |\JHsequencesectiontitle| \item |\JHsequencesubsectiontitle|
+% \item |\JHpoemsectiontitle| \item |\JHpoemfirstsectiontitle|
+% \item |\JHpoemsubtitle| \item |\JHepigraph| \item |\JHprosesectiontitle|
+% \item |\JHdedication| \end{itemize}
%
% If you are using |\JHpoemtitle| and its siblings, you need to be
% sure to add \textsf{mparhack} to your package list. You can prevent
@@ -2054,7 +2096,7 @@
% attached to lines to which text notes refer showing where in the
% apparatus a comment upon that line is to be found.
% |\margreftextnote| sets a label in the textual notes section, and
-% set a marginal note with a page reference to that label. Issue
+% sets a marginal note with a page reference to that label in the main text. 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 placed, as
@@ -2073,7 +2115,8 @@
%
% 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
+% will move in closer to the line. (To center the verse block on the longest line,
+% see section \ref{centeringtextblock}.) If you would prefer to keep the marginal
% references in the margin, set the boolean |\margrefstomargin| true.
%
% \begin{sloppypar}
@@ -2094,7 +2137,7 @@
% \DescribeMacro{\margrefexplanatory}|\margrefexplanatory| is a
% version of |\margreftextnote| for explanatory notes.
%
-% \subsection{~Quoted Verse}
+% \subsection{~Quoted verse}
% Sometimes you wish to quote verse within verse (as when a speaker
% in a verse play quotes a poem). \DescribeMacro{\quotedverse} The
% |quotedverse| environment is desiged for this contingency.
@@ -2102,10 +2145,11 @@
% \subsection{~Visual formatting}
% \DescribeMacro{\longpage}
% \DescribeMacro{\shortpage}
+% \label{longpage}
% The ideal in \LaTeX\ is to separate
% content markup and formatting as completely as possible. In the text
% itself you simply mark the logical units (a poem, a title, a stanza,
-% a textual note), and a header program like this interprets the
+% a textual note), and a header program (like \textsf{poemscol}) interprets the
% meaning of those terms typographically. However, one still winds up
% having to do some visual formatting. Especially in prose sections,
% such as in the textual notes, you will sometimes have to enlarge or
@@ -2175,8 +2219,8 @@
% stanzaskip & |\medskip| & Extra skip between stanzas \\
% titleindent & |\titleindentamount| (1pc) & use |\setlength| to
% change \\
-% parindent & titleindentamount & \relax \\
-% volumetitleshift & volumetitleshiftamount & use |\setlength| to
+% parindent & |\titleindentamount| & \relax \\
+% volumetitleshift & |\volumetitleshiftamount| (1pc) & use |\setlength| to
% change \\
% contentsindentone & 24pt & \relax \\
% contentsindenttwo & 42pt & \relax \\
@@ -2233,7 +2277,7 @@
%% reproduce this setting by issuing |\tightleading|, although I would
%% advise not doing so unless you are under financial constraints.
%
-% \section{Prose Sections with Line Numbers} \label{prosesections} \textsf{poemscol}
+% \section{Prose Sections with line numbers} \label{prosesections} \textsf{poemscol}
% uses the \textsf{lineno} package to make marginal line numbers for
% prose sections such as the Author's Introduction, Afterword,
% Author's Notes, or such prose interludes or prose poems the volume
@@ -2406,7 +2450,7 @@
% ignore a lot of griping until
% \LaTeX\ has generated the .aux file at the end of the first run.
%
-% \section{Paragraph and Sentence Annotation}\label{paragraphsentence}
+% \section{Paragraph and sentence annotation}\label{paragraphsentence}
% \subsection{~Setup}
% Annotating a prose section by sentence number, or by paragraph number and
% sentence number, has some advantages over annotating it by line
@@ -2541,7 +2585,7 @@
% |\textbf| and |\small|. Either can
% be changed with |\renewcommand|.
%
-% \subsection{~Cross Reference by Sentence and Paragraph}
+% \subsection{~Cross references by sentence and paragraph}
% \DescribeMacro{\sentencelabel}
% To make labels that refer to sentences or paragraphs, issue
% |\sentencelabel{}|. The label will be either both the paragraph
@@ -2549,7 +2593,7 @@
% by paragraph), or only the sentence number (if you are not resetting
% sentence numbers by paragraph).
%
-% \subsection{~End notes by Sentence and Paragraph}
+% \subsection{~End notes by sentence and paragraph}
%
% \begin{sloppypar}
% \DescribeMacro{\pmtextnote}
@@ -2584,17 +2628,17 @@
% |\sources| needs no special handling if you are annotating by
% sentence and paragraph.
%
-% \subsection{~Footnotes by Sentence and Paragraph}
+% \subsection{~Footnotes by sentence and paragraph}
% |\textnoteatfoot| shifts |\pmtextnotes| to the foot, as with
% |\prosetextnote|. |\emendationsatfoot| and |\explanationsatfoot|
% work the same way.
-% \subsection{~Bible Chapter and Verse}
+% \subsection{~Bible chapter and verse}
% Since |\pmsentence| and |\pmpar| are the moral equivalents of bible
% verse and chapter, |\biblechapter| and |\bibleverse| are provided
% for convenience.
-% \section{Parallel Text Editions} \label{parallelhack}
-% \subsection{~Setup for Parallel Texts in Verse}
+% \section{Parallel text editions} \label{parallelhack}
+% \subsection{~Setup for parallel texts in verse}
% \textsf{poemscol} can make parallel
% text editions in which the contrasting versions are set on facing
% verso and recto pages. \textsf{poemscol} does not automatically provide the page
@@ -2666,7 +2710,7 @@
% or |\rectoset at p@emtitle| for |\set at p@emtitle|, using
% all the same arguments you would have used with |\set at p@emtitle|.
%
-%\subsection{~Parallel Texts and on the fly note types}
+%\subsection{~Parallel texts and on the fly note types}
% If you are making a parallel text edition, you may need to
% use |\definenewnotetype| to make the different kinds of endnote
% for the parallel texts. For instance,
@@ -2736,7 +2780,7 @@
% |\nofiftytextnoteyettrue%|\\
% |}|
%
-% \subsection{~Parallel Texts and Generic Note types}
+% \subsection{~Parallel texts and generic note types}
% \DescribeMacro{\rectotexnote}
% \DescribeMacro{\rectoemendation}
% \DescribeMacro{\rectoexplanatory}
@@ -2788,7 +2832,7 @@
% |\putrectoexplanatorynotes| at the point where you wish them to appear. These commands
% behave exactly like |\puttextnotes|.
%
-% \subsection{~Parallel Text Labels}
+% \subsection{~Parallel text labels}
% \DescribeMacro{\synchrolabel} \DescribeMacro{\synchroref}
% \DescribeMacro{\setsynchroflag} You may want to mark cross references
% to make it clear to the reader which line of the poem on the recto side
@@ -2828,7 +2872,7 @@
% \synchroref{full ten years old}}\verseline
% \end{verbatim}
%
-% \subsection{~Parallel Prose Passages}
+% \subsection{~Parallel prose passages}
% \DescribeMacro{parallelprose}
% \DescribeMacro{\startparalleltextprose}
% \DescribeMacro{\finishparalleltextprose}
@@ -2863,7 +2907,7 @@
% no longer justified, once you add the page break.
% To fix this, add an |\hfil| between each word of the last line.
%
-% \section{Using \textsf{poemscol} in a Multilingual World}
+% \section{Using \textsf{poemscol} in a multilingual world}
%
% \begin{sloppypar}
% \DescribeMacro{\changecontentsname}
@@ -3381,8 +3425,9 @@
\addtolength{\leftmargin}{-#1}%
\addtolength{\leftmargin}{-0.5\leftmargin}%
\iflinenumberscenteredwithverse\v at riablemarginpar\fi}
-%
+\newif\iflastpoemcentered
\newenvironment{pmclverse}[1][\linewidth]{%
+\global\lastpoemcenteredfalse
\let\\=\@centercr%
\list{}{\itemsep\z@
\itemindent -\runoverindentvalue
@@ -3390,6 +3435,7 @@
\ifdim #1 < \linewidth
\iftextcenteringturnedon
\c at nterverseblock{#1}%
+ \global\lastpoemcenteredtrue
\else
\rightmargin \leftmargin
\addtolength{\leftmargin}{-\versemarginadjust}\fi
@@ -3399,7 +3445,26 @@
\fi
\advance\leftmargin\runoverindentvalue}
\item[]}
-{\endlist}% from 2.72 with additions
+{\endlist}
+% next is from 2.88
+%\newenvironment{pmclverse}[1][\linewidth]{%
+%\let\\=\@centercr%
+%\list{}{\itemsep\z@
+%\itemindent -\runoverindentvalue
+%\listparindent \itemindent
+% \ifdim #1 < \linewidth
+% \iftextcenteringturnedon
+% \c at nterverseblock{#1}%
+% \else
+% \rightmargin \leftmargin
+% \addtolength{\leftmargin}{-\versemarginadjust}\fi
+% \else
+% \rightmargin \leftmargin
+% \addtolength{\leftmargin}{-\versemarginadjust}
+% \fi
+%\advance\leftmargin\runoverindentvalue}
+%\item[]}
+%{\endlist}% from 2.72 with additions
% \newenvironment{pmclverse}[1][\linewidth]{%
% \let\\=\@centercr%
% \list{}{\itemsep\z@
@@ -5586,6 +5651,18 @@
\emph{#1}\end{volumetitlepagequote}}
\newcommand{\volumeattribution}[1]{\par\smallskip\begin{volumetitlepagequote}
{\small \emph{#1}}\end{volumetitlepagequote}}
+%\newcommand{\poemdate}[1]{\begin{prosesection}\bigskip\raggedright[#1]\bigskip\end{prosesection}}
+\newlength{\dateindent}%
+\setlength{\dateindent}{\leftmargin}%
+\newcommand{\variabledateindent}{%
+\setlength{\dateindent}{\linewidth}%
+\addtolength{\dateindent}{-\versewidth}%
+\addtolength{\dateindent}{-.5\dateindent}}
+%\newcommand{\poemdate}[1]{\bigskip\begin{raggedleft}\hspace{\dateindent}#1\end{raggedleft}\bigskip}%
+\newcommand{\poemdate}[1]{\iflastpoemcentered\variabledateindent%
+\else\setlength{\dateindent}{\leftmargin}%
+\fi%
+\bigskip\begin{raggedleft}\hspace{\dateindent}#1\end{raggedleft}\bigskip}%
% \end{macrocode}
% \end{macro}
% \end{macro}
Modified: trunk/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/poemscol/poemscol.sty 2017-12-03 22:19:10 UTC (rev 45978)
+++ trunk/Master/texmf-dist/tex/latex/poemscol/poemscol.sty 2017-12-03 22:19:26 UTC (rev 45979)
@@ -22,10 +22,11 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}[1997/12/01]
\ProvidesPackage{poemscol}
- [2017/10/23 v2.87 poemscol file]
+ [2017/11/30 v2.9 poemscol file]
+
%%
%% In my own book I also, strictly to save money, and at the price of
%% some ugliness, changed the definition of |\normalsize| and |\small|,
@@ -145,7 +146,9 @@
\addtolength{\leftmargin}{-#1}%
\addtolength{\leftmargin}{-0.5\leftmargin}%
\iflinenumberscenteredwithverse\v at riablemarginpar\fi}
+\newif\iflastpoemcentered
\newenvironment{pmclverse}[1][\linewidth]{%
+\global\lastpoemcenteredfalse
\let\\=\@centercr%
\list{}{\itemsep\z@
\itemindent -\runoverindentvalue
@@ -153,6 +156,7 @@
\ifdim #1 < \linewidth
\iftextcenteringturnedon
\c at nterverseblock{#1}%
+ \global\lastpoemcenteredtrue
\else
\rightmargin \leftmargin
\addtolength{\leftmargin}{-\versemarginadjust}\fi
@@ -162,7 +166,7 @@
\fi
\advance\leftmargin\runoverindentvalue}
\item[]}
-{\endlist}% from 2.72 with additions
+{\endlist}
\newif\ifinquotedverse
@@ -1458,6 +1462,16 @@
\emph{#1}\end{volumetitlepagequote}}
\newcommand{\volumeattribution}[1]{\par\smallskip\begin{volumetitlepagequote}
{\small \emph{#1}}\end{volumetitlepagequote}}
+\newlength{\dateindent}%
+\setlength{\dateindent}{\leftmargin}%
+\newcommand{\variabledateindent}{%
+\setlength{\dateindent}{\linewidth}%
+\addtolength{\dateindent}{-\versewidth}%
+\addtolength{\dateindent}{-.5\dateindent}}
+\newcommand{\poemdate}[1]{\iflastpoemcentered\variabledateindent%
+\else\setlength{\dateindent}{\leftmargin}%
+\fi%
+\bigskip\begin{raggedleft}\hspace{\dateindent}#1\end{raggedleft}\bigskip}%
\def\strip#1>{}
\newcommand{\literaltextnote}[1]{\iftextnotesatend
\begingroup
More information about the tex-live-commits
mailing list