fancyvrb update (25may10)

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

1 files changed, 37 insertions, 36 deletions

diff --git a/Master/texmf-dist/source/latex/fancyvrb/fancyvrb.dtx b/Master/texmf-dist/source/latex/fancyvrb/fancyvrb.dtx
index dfdb8778a59..d6f70214c16 100644
--- a/Master/texmf-dist/source/latex/fancyvrb/fancyvrb.dtx
+++ b/Master/texmf-dist/source/latex/fancyvrb/fancyvrb.dtx
@@ -2,16 +2,16 @@
 %%
 %% Package `fancyvrb'
 %%
-%% COPYING:
-%%   The files of this package "fancyvrb" are released under the Artistic
-%%   License Version 2. A copy of that license is included in the file
-%%   artistic2.txt. The package consists of the following files:
-%%     README artistic2.txt fancyvrb.cb fancyvrb.dtx fancyvrb.ins
+%% COPYRIGHT 1992-2010, by Timothy Van Zandt <tvz@zandtwerk.kellogg.nwu.edu>
+%%           2010, by Herbert Voss <hvoss@tug.org>
+%%
+%% This package may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.0 or, at your option, any later version.
 %%
-%% Timothy Van Zandt <tvz@zandtwerk.kellogg.nwu.edu>
-%% July 17, 1998
 %%
 % \fi
+% \changes{v2.8}{2010/05/15}{fixed bug with several trailing spaces (hv)}
 % \changes{v2.7a}{2008/02/07}{NMM fixed lastline=firstline bug}
 % \changes{v2.7}{2000/03/21}{DG/SR changed how fancyvrb.cfg included}
 % \changes{v2.6}{1998/07/17}{. Three bug corrected, options numberblanklines,
@@ -21,8 +21,6 @@
 % \changes{v2.0 Beta}{1994/03/30}{First version personally shown by Timothy
 %                                 \textsc{van Zandt}.}
 %
-% \CheckSum{3113}
-%
 % \newif\ifPostScriptFonts
 % \IfFileExists{times.sty}{\PostScriptFontstrue}{}
 %
@@ -195,13 +193,15 @@
 %
 % \title{The `\textsf{fancyvrb}' package\\Fancy Verbatims in \LaTeX}
 % \author{Timothy Van Zandt\\Princeton University\\Princeton -- USA\\
-%         {\footnotesize email: tvz@Princeton.EDU}\\[5mm]
-%         {Packaging, documentation and support originally (but no longer) by}\\
-%         {\footnotesize Denis Girou (CNRS/IDRIS -- France)}\\[-2mm]
+%         {\footnotesize \url{tvz@Princeton.EDU}}\\[5mm]
+%         {Packaging and documentation by}\\
+%         {\footnotesize Denis Girou (CNRS/IDRIS -- France),}\\[-2mm]
+%         {\footnotesize Sebastian Rahtz (Elsevier -- GB)}\\[-2mm]
 %         {\footnotesize and}\\[-2mm]
-%         {\footnotesize Sebastian Rahtz (Elsevier -- GB)}}
-% \date{Version 2.7a\\ 7-Feb-2008\\
-%       {\small Documentation revised 7-Feb-2008}}
+%         {\footnotesize Herbert Vo\ss\ (FU Berlin -- DE)}
+%         }
+% \date{Version 2.8\\ \today\\
+%      {\small Documentation revised \today}}
 %
 % \maketitle
 %
@@ -1309,13 +1309,13 @@
 %
 %   For interesting comments and suggestions, we would like to thank specially
 % (alphabetic order): Philippe \textsc{Esperet}
-% \texttt{<esperet@marie.polytechnique.fr>}, Michael \textsc{Friendly}
-% \texttt{<friendly@hotspur.psych.yorku.ca>}, Rolf \textsc{Niepraschk}
-% \texttt{<niepraschk@ptb.de>} and for bug reports Mario \textsc{Hassler}
+% \url{esperet@marie.polytechnique.fr}, Michael \textsc{Friendly}
+% \url{friendly@hotspur.psych.yorku.ca}, Rolf \textsc{Niepraschk}
+% \url{niepraschk@gmx.de} and for bug reports Mario \textsc{Hassler}
 % \relax\unskip\break
-% \texttt{<HASSLER@ippnv2.ipp.kfa-juelich.de>}, Mikhail \textsc{Kolodin}
+% \url{HASSLER@ippnv2.ipp.kfa-juelich.de}, Mikhail \textsc{Kolodin}
 % \relax\unskip\break
-% \texttt{<myke@morrigan.spb.su>} and Vladimir \textsc{Volovich}
+% \url{myke@morrigan.spb.su}, Andreas Matthias, Ulrich M. Schwarz, and Vladimir \textsc{Volovich}
 % \verb+<vvv@vvv.vsu.ru>+.
 % \ifChangeBar\end{changebar}\fi
 %
@@ -1351,7 +1351,6 @@
 %   \texttt{macros/latex/contrib/supported/listings}, 1996-1997.
 %\end{thebibliography}
 %
-% \StopEventually{}
 %
 % ^^A .................... End of the documentation part ....................
 %
@@ -1367,7 +1366,11 @@
 \documentclass{ltxdoc}
 \GetFileInfo{fancyvrb.dtx}
 \usepackage{color}
-\usepackage{fancyvrb}
+\usepackage{fancyvrb,shortvrb}
+\usepackage[T1]{fontenc}
+\usepackage[latin1]{inputenc}
+\usepackage[charter]{mathdesign}
+\usepackage{url}
 \newif\ifChangeBar
 \IfFileExists{changebar.sty}%
              {\ChangeBartrue\usepackage[dvips,rightbars]{changebar}}{}
@@ -2379,7 +2382,7 @@
 \begingroup
 \catcode`\^^M=\active
 \gdef\FancyVerbGetLine#1^^M{%
-  \@nil
+  \@nil%
   \FV@CheckEnd{#1}%
   \ifx\@tempa\FV@EnvironName%            % True if end is found
     \ifx\@tempb\FV@@@CheckEnd\else\FV@BadEndError\fi%
@@ -3843,19 +3846,16 @@
 % \begin{macro}{\FV@StepLineNo}
 %    \begin{macrocode}
 \def\FV@StepLineNo{%
-  \FV@SetLineNo
-%% DG/SR modification begin - Apr. 28, 1998 and May 20, 1998
-%%  \def\FV@StepLineNo{\refstepcounter{FancyVerbLine}}%
+  \FV@SetLineNo%
   \def\FV@StepLineNo{%
-    \if@FV@NumberBlankLines
-      \FV@refstepcounter{FancyVerbLine}
-    \else
-      \ifx\FV@Line\empty
-      \else
-        \FV@refstepcounter{FancyVerbLine}
-      \fi
+    \if@FV@NumberBlankLines%
+      \FV@refstepcounter{FancyVerbLine}%
+    \else%
+      \ifx\FV@Line\empty%
+      \else%
+        \FV@refstepcounter{FancyVerbLine}%
+      \fi%
     \fi}%
-%% DG/SR modification end
   \FV@StepLineNo}
 %    \end{macrocode}
 % \end{macro}
@@ -4538,6 +4538,7 @@
 %
 % \noindent Error messages to void:
 %
+% \iffalse
 % \begin{verbatim}
 % \FV@CheckBadBegin
 % \FV@CheckBadEnd
@@ -4567,11 +4568,11 @@
 %     Type \space H <return> \space for immediate help. **}%
 %   \errmessage{#1^^J}}
 % \end{verbatim}
-%
+% \fi
 %</fancyvrb>
 %
 % \Finale
-% \PrintIndex
+%%% \PrintIndex
 % \PrintChanges
 %
 \endinput