summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/poemscol/poemscol.pdfbin478911 -> 547680 bytes
-rw-r--r--Master/texmf-dist/source/latex/poemscol/poemscol.dtx47
-rw-r--r--Master/texmf-dist/tex/latex/poemscol/poemscol.sty17
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
4 files changed, 45 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
index 330fe9ac0f2..7324e4d0b61 100644
--- a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
+++ b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
index e0f9529ab78..aa09d058cf7 100644
--- a/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
+++ b/Master/texmf-dist/source/latex/poemscol/poemscol.dtx
@@ -18,7 +18,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
%<package>\ProvidesPackage{poemscol}
-%<package> [2007/07/14 v2.53 poemscol file]
+%<package> [2011/08/30 v2.54 poemscol file]
%
%<*driver>
\documentclass{ltxdoc}
@@ -32,7 +32,7 @@
%</driver>
% \fi
%
-% \CheckSum{5979}
+% \CheckSum{5986}
%
% \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
@@ -195,6 +195,11 @@
% is provided using providecommand for compatibility}
% \changes{v2.53}{2007/07/14}{Changed the name of an internal token
% register to avoid a conflict with babel}
+% \changes{v2.531}{2011/08/16}{Fixed a typo in example code.}
+% \changes{v2.54}{2011/08/16}{Fixed a (recently introduced!) bug that caused marginal line
+% numbers to align to the wrong line. Added a command to let the user
+% choose the first line number appear in the margin, so that the
+% marginal line number will always be a round number.}
% \GetFileInfo{poemscol.sty}
%
% \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
@@ -230,13 +235,13 @@
% \textsc, \unskip}
% \setcounter{IndexColumns}{2}
% \MakeShortVerb{|}
-% \def\fileversion{2.53}
-% \def\filedate{14 July 2007}
-% \def\docdate{14 July 2007}
+% \def\fileversion{2.54}
+% \def\filedate{30 August 2011}
+% \def\docdate{30 August 2011}
% \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{July 14, 2007}
+% \date{August 30, 2011}
% \maketitle
% \begin{abstract}
% \textsf{poemscol} provides macros for \LaTeX\ for setting
@@ -818,6 +823,15 @@
% |\label| from \LaTeX.) |\pageref{text of label}| will set the page
% number of the page on which the label appears.
%
+% \DescribeMacro{\setmargnumbegin}\label{setmargnumbegin}
+% You may wish not only to set the line number of the first line of the
+% poem, but to set the line number at which the first number will
+% appear in the margin. You might, for instance, if your poem begins at
+% line 137, not want marginal line numbers at lines 142, 147, 152 and
+% so on, but at lines 140, 145, 150 and so on. |\setmargnumbegin{}|
+% enables you to set the line number at which the first number will
+% appear in the margin.
+%
% \section{Making a table of contents}
% \DescribeMacro{\makepoemcontents}
% I found the normal \LaTeX\ macros for making tables of contents
@@ -1008,7 +1022,7 @@
% section, and 4. The name of the section as you wish it to appear in
% the Table of Contents. So, for instance
% \begin{verbatim}
-% \putmultipleindex{fir}{INDEX OF FIRST LINES]{Index of First
+% \putmultiplepoemindex{fir}{INDEX OF FIRST LINES]{Index of First
% Lines}{First Line Index} \end{verbatim}
% includes an index with shortcut ``fir,'' title ``INDEX OF FIRST
% LINES,'' running header ``Index of First Lines,'' and contents
@@ -1363,7 +1377,7 @@
% argument for the lemma and the comment). There won't be an entry
% for a poem in the ``Xyznotes'' endnotes section unless there
% actually is an xyznote for the poem. |\prosexyznote| takes the same
-% arguments |\proseexplanatory| does (which is to say, an aptional
+% arguments |\proseexplanatory| does (which is to say, an optional
% argument for a label for entering line ranges, an argument for a
% label to capture the line number of the first line, and an argument
% for the lemma and the comment). |\pmxyznote| behaves exactly like
@@ -1832,7 +1846,7 @@
% make up one yourself.
%
% |\margreftextnote| uses |\marginpar| rather
-% that |\pmclsidepar| to set the note, because I had to use
+% than |\pmclsidepar| to set the note, because I had to use
% |\marginpar| for |\JHpoemtitle| and its siblings, and I wanted the
% whole family of markers to be controlled by the same settings. You
% use the settings that control the behavior of |\marginpar| (e.g.
@@ -3509,12 +3523,11 @@
% \marginpar{\textrm{\scriptsize\theverselinenumber}\hfil}%
% \fi%
% \fi
- \ifnumbersswitch\pmclsidepar{\hfil\textrm{\scriptsize\theverselinenumber}}%
+ \ifnumbersswitch\pmclsidepar{\textrm{\scriptsize\theverselinenumber}}%
\else%
- \ifnumbersright\pmclrightsidepar{\hfil\textrm{\scriptsize\theverselinenumber}}%
+ \ifnumbersright\pmclrightsidepar{\textrm{\scriptsize\theverselinenumber}}%
\else%
- \pmclleftsidepar
-{\textrm{\scriptsize\theverselinenumber}\hfil}%
+ \pmclleftsidepar{\textrm{\scriptsize\theverselinenumber}}%
\fi%
\fi%
% \marn{\hfil\textrm{\theverselinenumber}}
@@ -3529,8 +3542,13 @@
% \end{macro}
% \begin{macro}{\verseline}
% \begin{macrocode}
+
\newif\ifspeciallinelock
\speciallinelockfalse
+\newcounter{margnumbegin}
+\setcounter{margnumbegin}{0}
+\newcommand{\setmargnumbegin}[1]{\setcounter{margnumbegin}{#1}%
+\addtocounter{margnumbegin}{-1}}
\newcommand{\verseline}{\ifspeciallinelock%
\relax\else%
\nolinebreak\incrementverselinenumber%
@@ -3541,12 +3559,13 @@
\newcommand{\incrementverselinenumber}{%
\nolinebreak\addtocounter{verselinenumber}{1}%
\addtocounter{printlineindex}{1}%
+\ifnum\theverselinenumber>\themargnumbegin
\ifnum\theprintlineindex>\thelineindexrepeat%
\ifverselinenumbers\nobreak%
\putverselinenumber\nobreak%
\fi\nobreak%
\setcounter{printlineindex}{0}%
- \fi%
+ \fi\fi%
}
\newcommand{\setverselinemodulo}[1]{%
\setcounter{lineindexrepeat}{#1}%
diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
index 54e7c537624..1e2c6d6d511 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}
- [2007/07/14 v2.53 poemscol file]
+ [2011/08/30 v2.54 poemscol file]
@@ -455,20 +455,24 @@
\numbersgutterfalse}
\newcommand{\putverselinenumber}{\nolinebreak\begin{marginenvironment}%
\nolinebreak%
- \ifnumbersswitch\pmclsidepar{\hfil\textrm{\scriptsize\theverselinenumber}}%
+ \ifnumbersswitch\pmclsidepar{\textrm{\scriptsize\theverselinenumber}}%
\else%
- \ifnumbersright\pmclrightsidepar{\hfil\textrm{\scriptsize\theverselinenumber}}%
+ \ifnumbersright\pmclrightsidepar{\textrm{\scriptsize\theverselinenumber}}%
\else%
- \pmclleftsidepar
-{\textrm{\scriptsize\theverselinenumber}\hfil}%
+ \pmclleftsidepar{\textrm{\scriptsize\theverselinenumber}}%
\fi%
\fi%
\nolinebreak%
\end{marginenvironment}%
\nolinebreak%
}
+
\newif\ifspeciallinelock
\speciallinelockfalse
+\newcounter{margnumbegin}
+\setcounter{margnumbegin}{0}
+\newcommand{\setmargnumbegin}[1]{\setcounter{margnumbegin}{#1}%
+\addtocounter{margnumbegin}{-1}}
\newcommand{\verseline}{\ifspeciallinelock%
\relax\else%
\nolinebreak\incrementverselinenumber%
@@ -479,12 +483,13 @@
\newcommand{\incrementverselinenumber}{%
\nolinebreak\addtocounter{verselinenumber}{1}%
\addtocounter{printlineindex}{1}%
+\ifnum\theverselinenumber>\themargnumbegin
\ifnum\theprintlineindex>\thelineindexrepeat%
\ifverselinenumbers\nobreak%
\putverselinenumber\nobreak%
\fi\nobreak%
\setcounter{printlineindex}{0}%
- \fi%
+ \fi\fi%
}
\newcommand{\setverselinemodulo}[1]{%
\setcounter{lineindexrepeat}{#1}%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 1d5329a28d3..714872fe89f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1743,6 +1743,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
'pageslts' => 'tex -translate-file=empty.tcx', # no 8-bit
'papermas', => 'tex',
'pauldoc' => 'latex', # requires interaction
+ 'poemscol' => 'latex', # requires interaction
'polski' => 'latex', # requires interaction
'psfragx' => 'latex', # requires interaction
'schedule' => 'latex', # requires interaction