colophon (3jun18)

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

6 files changed, 15 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/colophon/CHANGES b/Master/texmf-dist/doc/latex/colophon/CHANGES
index 2d1fd97935d..f3110c62ef9 100644
--- a/Master/texmf-dist/doc/latex/colophon/CHANGES
+++ b/Master/texmf-dist/doc/latex/colophon/CHANGES
@@ -1 +1,7 @@
+03 Jun 1202 (03 Jun 2018):  Added a \par at the close of the
+colophon environment.  Otherwise you need a blank line or
+\par in there manually, which seems silly.  Also ironed out
+some inconsistencies in license version (1.3 v. 1.3c), and
+updated the copyright year.  v1.1.
+
 13 Apr 1202 (15 Apr 2018):  Initial release.
diff --git a/Master/texmf-dist/doc/latex/colophon/README b/Master/texmf-dist/doc/latex/colophon/README
index 917c1eb532d..9d3e3588750 100644
--- a/Master/texmf-dist/doc/latex/colophon/README
+++ b/Master/texmf-dist/doc/latex/colophon/README
@@ -1,12 +1,12 @@
 +AMDG
 
-This document is copyright 2015 by Donald P. Goodman, and is
+This document is copyright 2018 by Donald P. Goodman, and is
 released publicly under the LaTeX Project Public License.  The
 distribution and modification of this work is constrained by the
 conditions of that license.  See
 	http://www.latex-project.org/lppl.txt
 for the text of the license.  This document is released
-under version 1.3 of that license, and this work may be distributed
+under version 1.3c of that license, and this work may be distributed
 or modified under the terms of that license or, at your option, any
 later version.
 
diff --git a/Master/texmf-dist/doc/latex/colophon/colophon.pdf b/Master/texmf-dist/doc/latex/colophon/colophon.pdf
index 1770f9b9569..043107cadef 100644
--- a/Master/texmf-dist/doc/latex/colophon/colophon.pdf
+++ b/Master/texmf-dist/doc/latex/colophon/colophon.pdf
diff --git a/Master/texmf-dist/source/latex/colophon/colophon.dtx b/Master/texmf-dist/source/latex/colophon/colophon.dtx
index 31bdb91260d..557b8c161e7 100644
--- a/Master/texmf-dist/source/latex/colophon/colophon.dtx
+++ b/Master/texmf-dist/source/latex/colophon/colophon.dtx
@@ -11,7 +11,7 @@
 % conditions of that license.  See
 % 	http://www.latex-project.org/lppl.txt
 % for the text of the license.  This document is released
-% under version 1.3 of that license, and this work may be distributed
+% under version 1.3c of that license, and this work may be distributed
 % or modified under the terms of that license or, at your option, any
 % later version.
 % 
@@ -26,7 +26,7 @@
 
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{colophon}[2018/04/01 v1.0 Support for highly configurable colophons]
+%<package>\ProvidesPackage{colophon}[2018/04/01 v1.1 Support for highly configurable colophons]
 %<*driver>
 \documentclass{ltxdoc}
 
@@ -90,7 +90,7 @@
 \end{document}
 %</driver> \fi
 %
-% \title{The |colophon| Package, v1.0}
+% \title{The |colophon| Package, v1.1}
 % \author{Donald P.\ Goodman III}
 % \date{\today}
 %
@@ -538,6 +538,7 @@
 %    \begin{macrocode}
 \def\endcolophon{%
 	\clpn@postpar%
+	\par%
 	\egroup%
 	\vskip\clpn@underspace
 	\ifclpn@fullpage%
diff --git a/Master/texmf-dist/source/latex/colophon/colophon.ins b/Master/texmf-dist/source/latex/colophon/colophon.ins
index d5f573dad57..bc11f4a4223 100644
--- a/Master/texmf-dist/source/latex/colophon/colophon.ins
+++ b/Master/texmf-dist/source/latex/colophon/colophon.ins
@@ -10,7 +10,7 @@
 % conditions of that license.  See
 % 	http://www.latex-project.org/lppl.txt
 % for the text of the license.  This document is released
-% under version 1.3 of that license, and this work may be distributed
+% under version 1.3c of that license, and this work may be distributed
 % or modified under the terms of that license or, at your option, any
 % later version.
 % 
diff --git a/Master/texmf-dist/tex/latex/colophon/colophon.sty b/Master/texmf-dist/tex/latex/colophon/colophon.sty
index 454dd39f8dc..07d54597054 100644
--- a/Master/texmf-dist/tex/latex/colophon/colophon.sty
+++ b/Master/texmf-dist/tex/latex/colophon/colophon.sty
@@ -26,7 +26,7 @@
 %% derived files colophon.sty and colophon.pdf.
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{colophon}[2018/04/01 v1.0 Support for highly configurable colophons]
+\ProvidesPackage{colophon}[2018/04/01 v1.1 Support for highly configurable colophons]
 \RequirePackage{xkeyval}
 \newif\ifclpn@clrpg\clpn@clrpgfalse%
 \def\colophonclrpg{\clpn@clrpgtrue}%
@@ -145,6 +145,7 @@
 }%
 \def\endcolophon{%
 \clpn@postpar%
+\par%
 \egroup%
 \vskip\clpn@underspace
 \ifclpn@fullpage%