vertbars (16dec18)

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

6 files changed, 113 insertions, 231 deletions

diff --git a/Master/texmf-dist/doc/latex/vertbars/README b/Master/texmf-dist/doc/latex/vertbars/README.md
index 9d037914bc4..9ff5647a458 100644
--- a/Master/texmf-dist/doc/latex/vertbars/README
+++ b/Master/texmf-dist/doc/latex/vertbars/README.md
@@ -6,24 +6,15 @@ Place vertical bars in the margin around material.
 (Also see the changebar package.)
 This package uses lineno to do its thing.
 
-INSTALLATION
-------------
-
-Run `pdflatex` on vertbars.tex to produce the files
-  vertbars.ins and vertbars.sty,
-as well as to compile the PDF documentation.
-
-Execute `tex vertbars.ins` to produce the files above
-except vertbars.ins itself (and the PDF file, obviously).
 
 
 COPYRIGHT AND LICENSING
 -----------------------
 
-Authors: Peter Wilson (Herries Press)  
-Maintainer: Will Robertson (will dot robertson at latex-project dot org)  
-Copyright 2000 Peter Wilson  
-Copyright 2010 Will Robertson
+Authors: Peter Wilson (Herries Press)
+Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+Copyright 2000 Peter Wilson
+Copyright 2010-2018 Will Robertson
 
 
 This work may be distributed and/or modified under the
@@ -38,15 +29,16 @@ This work consists of the files vertbars.tex and the
 derived files vertbars.sty and vertbars.ins.
 
 
+
 MAINTENANCE
 -----------
 
-Please report bugs or request features:  
+Please report bugs or request features:
   <http://github.com/wspr/herries-press/issues>
 
-Developmental and historical versions:  
+Developmental and historical versions:
   <http://github.com/wspr/herries-press>
 
-Current release version:   
-  <http://ctan.tug.org/pkg/vertbars>  
+Current release version:
+  <http://ctan.tug.org/pkg/vertbars>
 
diff --git a/Master/texmf-dist/doc/latex/vertbars/vertbars.pdf b/Master/texmf-dist/doc/latex/vertbars/vertbars.pdf
index d162d2e76f4..0b24afda942 100644
--- a/Master/texmf-dist/doc/latex/vertbars/vertbars.pdf
+++ b/Master/texmf-dist/doc/latex/vertbars/vertbars.pdf
diff --git a/Master/texmf-dist/doc/latex/vertbars/vertbars.tex b/Master/texmf-dist/doc/latex/vertbars/vertbars.tex
new file mode 100644
index 00000000000..8b5a3f34f70
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/vertbars/vertbars.tex
@@ -0,0 +1,93 @@
+
+\makeatletter
+\documentclass{ltxdoc}
+
+\usepackage[it,medium]{titlesec}
+
+\usepackage{array,bigfoot,vertbars}
+\usepackage[svgnames]{xcolor}
+\usepackage[colorlinks,linktocpage]{hyperref}
+
+\usepackage{geometry}
+\geometry{b5paper}
+
+\DeclareRobustCommand\pkg{\textsf}
+\def\pkgopt#1{\texttt{[#1]}}
+
+
+\usepackage[T1]{fontenc}
+\usepackage{microtype}
+\usepackage{lmodern}
+\usepackage[sc,osf]{mathpazo}
+\linespread{1.1}
+\frenchspacing
+
+\GetFileInfo{vertbars.sty}
+\begin{document}
+
+\title{The \pkg{vertbars} package}
+\author{%
+ Author: Peter Wilson, Herries Press\\
+ Maintainer: Will Robertson\\
+ \url{http://github.com/wspr/herries-press}%
+}
+\date{\fileversion \qquad \filedate}
+
+\maketitle
+
+\section{Documentation}
+
+Because this package uses \textsf{lineno} as a driver,
+please read the documentation of that package first to
+understand the mechanisms used here.
+
+The \textsf{vertbars} package takes the same options as the \textsf{lineno} package.
+In particular, the switch and switch* options control which side of the page any bars will be printed.
+The package automatically calls the lineno package, so you just need to write:
+\begin{verbatim}
+    \usepackage[...]{vertbars}
+\end{verbatim}
+
+The package provides the \texttt{vertbar} environment, which is equivalent to the linenumbers environment except that a vertical bar replaces the line number.
+Text paragraphs within a vertbar environment will be marked with a vertical bar in the margin.
+Nested environments generate multiple marginal bars.
+
+The width of the bars is controlled by the value of \cmd\barwidth, which is initialised to \verb|0.4pt|, and can be changed via \cmd\setlength.
+
+The horizontal separation between adjacent bars is controlled by the value of \cmd\barspace, which is initialised to \verb|0.5\linenumbersep|, and can be changed via \cmd\setlength.
+(\cmd\linenumbersep is a command from the lineno package that controls the spacing between line numbers and the text body).
+
+Note: Bars can only be applied to complete paragraphs.
+For bars between arbitrary points, use the \textsf{changebar} package.
+Any limitations of the \textsf{lineno} package apply equally to the \textsf{vertbars} package.
+
+\section*{Change History}
+
+\begin{itemize}
+\item[v1.0c] 2018-12-12 Add \cs{par} before and after the \texttt{vertbar} environment to avoid confusing/unwanted behaviour with paragraphs
+\item[v1.0b] 2010/11/27 Fix behaviour with \texttt{switch} option
+\item[v1.0a] 2009/09/04 New maintainer (Will Robertson)
+\end{itemize}
+
+
+
+\section*{Licence and copyright}
+
+This work may be modified and/or distributed under the terms and
+conditions of the \LaTeX\ Project Public License\footnote{\url{http://www.latex-project.org/lppl.txt}}, version~1.3c or later (your choice).
+The current maintainer of this work is Will Robertson.
+
+\bigskip
+  \noindent
+  Copyright Peter Wilson, 2000 \\
+  Copyright Will Robertson, 2010-2018 \\
+
+{\addtocontents{toc}{\protect\end{varwidth}\protect\hfill}}
+{\addtocontents{toc}{\protect\begin{varwidth}[t]{\protect\tocwidthB\protect\linewidth}}}
+\clearpage
+\parindent=0pt
+
+
+{\addtocontents{toc}{\protect\end{varwidth}}}
+
+\end{document}
diff --git a/Master/texmf-dist/source/latex/vertbars/vertbars.ins b/Master/texmf-dist/source/latex/vertbars/vertbars.ins
deleted file mode 100644
index d769a2ceb42..00000000000
--- a/Master/texmf-dist/source/latex/vertbars/vertbars.ins
+++ /dev/null
@@ -1,4 +0,0 @@
-%&latex
-\def\documentationCompile{N}
-\input vertbars.tex
-\csname@@end\endcsname
diff --git a/Master/texmf-dist/source/latex/vertbars/vertbars.tex b/Master/texmf-dist/source/latex/vertbars/vertbars.tex
deleted file mode 100644
index c00e2797337..00000000000
--- a/Master/texmf-dist/source/latex/vertbars/vertbars.tex
+++ /dev/null
@@ -1,204 +0,0 @@
-
-%%%%%%%%%1%%%%%%%%%2%%%%%%%%%3%%%%%%%%%4%%%%%%%%%5
-% Bundled source file for the VERTBARS package 
-%--------1---------2---------3---------4---------5
-% Please see the accompanying README for author,
-% license, documentation and installation information
-%%%%%%%%%1%%%%%%%%%2%%%%%%%%%3%%%%%%%%%4%%%%%%%%%5
-
-\RequirePackage{filecontents}
-\begin{filecontents}{vertbars.sty}
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{vertbars}[2010/11/27 v1.0b vertical bars in the margin]
-
-\newcommand{\LNenv}{runninglinenumbers}
-\DeclareOption{switch}{%
-  \renewcommand{\LNenv}{runningpagewiselinenumbers}
-  \PassOptionsToPackage{\CurrentOption}{lineno}
-}
-
-\DeclareOption{switch*}{%
-  \renewcommand{\LNenv}{runningpagewiselinenumbers}
-  \PassOptionsToPackage{\CurrentOption}{lineno}
-}
-
-\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{lineno}}
-\ProcessOptions\relax
-\RequirePackage{lineno}
-
-% Code to add stuff at start and end of a pre-existing zero argument macro:
-\newcommand{\addtodef}[3]{\begingroup
-  \@temptokena{#2}%
-  \toks@\expandafter{#1#3}%
-  \edef\x{\endgroup
-    \def\noexpand#1{\the\@temptokena \the\toks@}}%
-  \x
-}
-
-% It's useful to preserve \cmd\baselineskip:
-\newlength{\pwvbbl}
-\setlength{\pwvbbl}{\baselineskip}
-
-% Width of bars:
-\newlength{\barwidth}
-\setlength{\barwidth}{0.4pt}
-
-% Horizontal space between bars:
-\newlength{\barspace}
-\setlength{\barspace}{0.5\linenumbersep}
-
-\newcommand{\addtomakeLNL}{{\rule[-0.25\pwvbbl]{\barwidth}{1.1\pwvbbl}\hskip\barspace\relax}}
-\newcommand{\pwvbLNL}{}
-
-\newenvironment{vertbar}{%
-  \pagewiselinenumbers % <= added v1.0b
-  \begin{\LNenv}%
-    \addtodef{\pwvbLNL}{}{\addtomakeLNL}%
-    \let\LineNumber\pwvbLNL
-}{%
-  \end{\LNenv}%
-}
-
-\end{filecontents}
-%%%%%%%%%1%%%%%%%%%2%%%%%%%%%3%%%%%%%%%4%%%%%%%%%5
-
-
-% Conditionally compile the documentation & generate the .ins file:
-\providecommand\documentationCompile{Y}
-\makeatletter
-\if\documentationCompile N
-  \expandafter\@@end
-\fi
-
-
-\begin{filecontents*}{vertbars.ins}
-%&latex
-\def\documentationCompile{N}
-\input vertbars.tex
-\csname@@end\endcsname
-\end{filecontents*}
-
-
-
-
-\makeatletter
-\documentclass{article}
-
-\usepackage[it,medium]{titlesec}
-
-\usepackage{array,bigfoot,vertbars}
-\usepackage[svgnames]{xcolor}
-\usepackage[colorlinks,linktocpage]{hyperref}
-
-\usepackage{geometry}
-\geometry{b5paper}
-
-\usepackage{gmdoc}
-\usepackage{gmverb}
-\dekclubs
-\stanzaskip=\bigskipamount 
-\CodeSpacesGrey
-
-\usepackage{tocloft,varwidth}
-\setcounter{tocdepth}{1}
-\def\tocwidthA{0.55}
-\def\tocwidthB{0.44}
-\def\cftpartfont{\scshape}
-\def\cftsecfont{\small}
-\cftbeforesecskip=0pt
-\def\cftpartleader{}
-\def\cftpartafterpnum{\cftparfillskip}
-\def\cftsecleader{}
-\def\cftsecafterpnum{\cftparfillskip}
-
-\DeclareRobustCommand\pkg{\textsf}
-\def\pkgopt#1{\texttt{[#1]}}
-\newcommand\chng[1]{\marginpar{\footnotesize\raggedright\textsf{#1}}}
-
-\def\PDF{\textsc{pdf}}
-\def\PS{\textsc{ps}}
-\def\DVI{\textsc{dvi}}
-\def\EPS{\textsc{eps}}
-
-\usepackage{amsmath,listings}
-\lstset{basicstyle=\ttfamily,columns=fullflexible}
-
-\usepackage{changepage}
-\usepackage[T1]{fontenc}
-\usepackage{microtype}
-\usepackage{lmodern}
-\usepackage[sc,osf]{mathpazo}
-\linespread{1.1}
-\frenchspacing
-
-\GetFileInfo{vertbars.sty}
-\begin{document}
-{\addtocontents{toc}{\protect\begin{varwidth}[t]{\tocwidthA\linewidth}}}
-
-\title{The \pkg{vertbars} package}
-\author{%
- Author: Peter Wilson, Herries Press\\
- Maintainer: Will Robertson\\
- \texttt{will dot robertson at latex-project dot org}%
-}
-\date{\fileversion \qquad \filedate}
-
-\maketitle
-
-\section{Documentation}
-
-Because this package uses \textsf{lineno} as a driver,
-please read the documentation of that package first to
-understand the mechanisms used here.
-
-The \textsf{vertbars} package takes the same options as the \textsf{lineno} package.
-In particular, the switch and switch* options control which side of the page any bars will be printed.
-The package automatically calls the lineno package, so you just need to write:
-\begin{verbatim}
-    \usepackage[...]{vertbars}
-\end{verbatim}
-
-The package provides the \texttt{vertbar} environment, which is equivalent to the linenumbers environment except that a vertical bar replaces the line number.
-Text paragraphs within a vertbar environment will be marked with a vertical bar in the margin. 
-Nested environments generate multiple marginal bars.
-
-The width of the bars is controlled by the value of \cmd\barwidth, which is initialised to \verb|0.4pt|, and can be changed via \cmd\setlength.
-
-The horizontal seperation between adjacent bars is controlled by the value of \cmd\barspace, which is initialised to \verb|0.5\linenumbersep|, and can be changed via \cmd\setlength.
-(\cmd\linenumbersep is a command from the lineno package that controls the spacing between line numbers and the text body).
-
-Note: Bars can only be applied to complete paragraphs.
-For bars between arbitrary points, use the \textsf{changebar} package.
-Any limitations of the \textsf{lineno} package apply equally to the \textsf{vertbars} package.
-
-\section*{Change History}
-
-\begin{itemize}
-\item[v1.0b] 2010/11/27 Fix behaviour with \texttt{switch} option
-\item[v1.0a] 2009/09/04 New maintainer (Will Robertson)
-\end{itemize}
-
-
-
-\section*{Licence and copyright}
-  
-This work may be modified and/or distributed under the terms and
-conditions of the \LaTeX\ Project Public License\footnote{\url{http://www.latex-project.org/lppl.txt}}, version~1.3c or later (your choice).
-The current maintainer of this work is Will Robertson.
-
-\bigskip
-  \noindent
-  Copyright Peter Wilson, 2000 \\
-  Copyright Will Robertson, 2010 \\
-
-{\addtocontents{toc}{\protect\end{varwidth}\protect\hfill}}
-{\addtocontents{toc}{\protect\begin{varwidth}[t]{\protect\tocwidthB\protect\linewidth}}}
-\clearpage
-\parindent=0pt
-
-\section{Implementation}
-\DocInput{vertbars.sty}
-
-{\addtocontents{toc}{\protect\end{varwidth}}}
-
-\end{document}
diff --git a/Master/texmf-dist/tex/latex/vertbars/vertbars.sty b/Master/texmf-dist/tex/latex/vertbars/vertbars.sty
index bb988addbf3..9b24d204964 100644
--- a/Master/texmf-dist/tex/latex/vertbars/vertbars.sty
+++ b/Master/texmf-dist/tex/latex/vertbars/vertbars.sty
@@ -1,9 +1,12 @@
-%% LaTeX2e file `vertbars.sty'
-%% generated by the `filecontents' environment
-%% from source `vertbars' on 2010/11/27.
-%%
+%%%%%%%%%1%%%%%%%%%2%%%%%%%%%3%%%%%%%%%4%%%%%%%%%5
+%% Bundled source file for the VERTBARS package
+%%-------1---------2---------3---------4---------5
+%% Please see the accompanying README for author,
+%% license, documentation and installation information
+%%%%%%%%%1%%%%%%%%%2%%%%%%%%%3%%%%%%%%%4%%%%%%%%%5
+
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{vertbars}[2010/11/27 v1.0b vertical bars in the margin]
+\ProvidesPackage{vertbars}[2018/12/16 v1.0c vertical bars in the margin]
 
 \newcommand{\LNenv}{runninglinenumbers}
 \DeclareOption{switch}{%
@@ -45,11 +48,13 @@
 \newcommand{\pwvbLNL}{}
 
 \newenvironment{vertbar}{%
-  \pagewiselinenumbers % <= added v1.0b
+  \par
+  \pagewiselinenumbers
   \begin{\LNenv}%
     \addtodef{\pwvbLNL}{}{\addtomakeLNL}%
     \let\LineNumber\pwvbLNL
 }{%
   \end{\LNenv}%
+  \par
 }