poemscol (9aug20)

git-svn-id: svn://tug.org/texlive/trunk@56082 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 14 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/poemscol/README b/Master/texmf-dist/doc/latex/poemscol/README
index 77ba584f9b2..0588fa44cb4 100644
--- a/Master/texmf-dist/doc/latex/poemscol/README
+++ b/Master/texmf-dist/doc/latex/poemscol/README
@@ -1,5 +1,5 @@
 POEMSCOL.STY
-(c) John Burt 2002-2019
+(c) John Burt 2002-2020
 Released under the LaTeX public license 1.3c
 
 poemscol.sty is a set of LaTeX macros for typesetting critical editions of 
diff --git a/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf b/Master/texmf-dist/doc/latex/poemscol/poemscol.pdf
index a0fc2fe82c8..3fcff165d81 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 b1dd14c6d94..5f1b81d4af7 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>   [2020/06/12 v3.141592 poemscol file] 
+%<package>   [2020/06/12 v3.1415926 poemscol file] 
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -273,6 +273,7 @@
 % traditional footnotes, at the bottom of the page like ``Layered'' footnotes, or at the 
 % end of the poem. Marginal marks set by JHpoemtitle can be placed 
 % independently of the marginal marks produced by margreftextnote..}
+% \changes{v3.1415926}{2020/08/08}{Bug fix. Extra white space problem. Thanks to David Carlisle.}
 % \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother}
 % \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip}
 % \DoNotIndex{\newcommand, \section, \subsection, \subsubsection,
@@ -305,15 +306,15 @@
 % \textsc, \unskip} 
 % \setcounter{IndexColumns}{2} 
 % \MakeShortVerb{|}
-% \def\fileversion{3.141592} 
-% \def\filedate{12 June 2020} 
-% \def\docdate{12 June 2020}
+% \def\fileversion{3.1415926} 
+% \def\filedate{8 August 2020} 
+% \def\docdate{8 August 2020}
 %  \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{12 June 2020} 
+% \date{8 August 2020} 
 % \maketitle
 % \begin{abstract} \textsf{poemscol} provides commands for \LaTeX\ for
 % setting collections of poetry.  It is especially suited for setting
@@ -5684,16 +5685,16 @@
 \nolinebreak\incrementverselinenumber%
 \fi%
 \speciallinelockfalse%
-\nolinebreak\\
+\nolinebreak\\%
 }
 % \newif\iflongpoemon
 % \longpoemonfalse
 \newcommand{\incrementverselinenumber}{%
 \nolinebreak\addtocounter{verselinenumber}{1}%
 %\iflongpoemon\marksthe{verselinemark}{\theverselinenumber}\fi%
-\makeatletter
- \@ifundefined{marksthe}{\relax}{\marksthe{verselinemark}{\theverselinenumber}}
-\makeatother
+%\makeatletter
+ \@ifundefined{marksthe}{\relax}{\marksthe{verselinemark}{\theverselinenumber}}%
+%\makeatother
   \addtocounter{printlineindex}{1}%
   \ifnum\theprintlineindex>\thelineindexrepeat%
     \ifverselinenumbers\nobreak%
diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty
index 895a3b53780..279323a456d 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}
-   [2020/06/12 v3.141592 poemscol file]
+   [2020/06/12 v3.1415926 poemscol file]
  %|\prosexyznote|
 
 %%
@@ -763,13 +763,11 @@
 \nolinebreak\incrementverselinenumber%
 \fi%
 \speciallinelockfalse%
-\nolinebreak\\
+\nolinebreak\\%
 }
 \newcommand{\incrementverselinenumber}{%
 \nolinebreak\addtocounter{verselinenumber}{1}%
-\makeatletter
- \@ifundefined{marksthe}{\relax}{\marksthe{verselinemark}{\theverselinenumber}}
-\makeatother
+ \@ifundefined{marksthe}{\relax}{\marksthe{verselinemark}{\theverselinenumber}}%
   \addtocounter{printlineindex}{1}%
   \ifnum\theprintlineindex>\thelineindexrepeat%
     \ifverselinenumbers\nobreak%