fancyvrb update (25may10)

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

12 files changed, 193 insertions, 316 deletions

diff --git a/Master/texmf-dist/doc/latex/fancyvrb/Changes b/Master/texmf-dist/doc/latex/fancyvrb/Changes
new file mode 100644
index 00000000000..9658bfd588e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fancyvrb/Changes
@@ -0,0 +1,11 @@
+--- fancyvrb.sty
+2.8  2010/05/14  - fixed several trailing spaces (hv)
+                 - changed license to LPPL
+2.7a 2008/02/07  - NMM fixed lastline=firstline bug
+2.7  2000/03/21  - changed how fancyvrb.cfg included DG/SR 
+2.6  1998/07/17  - Three bug corrected, options numberblanklines,
+                   label, labelposition and leftline added and few
+                   precisions.
+v2.5  1998/01/28 - First public release.
+v2.0  1994/03/30 - First version personally shown by Timothy
+                   \textsc{van Zandt}
diff --git a/Master/texmf-dist/doc/latex/fancyvrb/Makefile b/Master/texmf-dist/doc/latex/fancyvrb/Makefile
new file mode 100644
index 00000000000..8b32c059eb8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fancyvrb/Makefile
@@ -0,0 +1,67 @@
+
+# `Makefile' for `pst-3dplot.pdf', hv, 2007/03/17
+
+.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
+
+PACKAGE = fvrb-ex
+
+MAIN = $(PACKAGE)
+
+TDS = ~/PSTricks/PSTricks-TDS
+
+LATEX = latex
+
+ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
+
+ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(MAIN).tex README Changes Makefile
+
+all : doc clean 
+doc: $(MAIN).pdf
+
+$(MAIN).pdf : $(MAIN).ps
+	GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
+
+$(MAIN).ps : $(MAIN).dvi
+	dvips $<
+
+$(MAIN).dvi : $(MAIN).dtx
+	$(LATEX) $<
+	makeindex -s gind.ist $(basename $<)
+	makeindex -s gglo.ist -o $(basename $<).gls $(basename $<).glo
+#	bibtex $(basename $<)
+	$(LATEX) $<
+	$(LATEX) $<
+
+clean : 
+	$(RM) $(addprefix $(MAIN), .cb .cb? .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .bbl )
+	$(RM) $(addprefix $(MAIN), .dvi .ps .xcp)
+	$(RM) file.txt hello.f90
+
+veryclean : clean
+	$(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
+
+arch :
+	zip $(ARCHNAME).zip $(ARCHFILES)
+
+tds:
+	cp -u Changes     $(TDS)/doc/generic/$(PACKAGE)/
+	cp -u README      $(TDS)/doc/generic/$(PACKAGE)/
+	cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/
+#
+	cp -u Changes        $(TDS)/tex/latex/$(PACKAGE)/
+	cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/
+#
+	cp -u Changes        $(TDS)/tex/generic/$(PACKAGE)/
+	cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/
+#
+	cp -u Changes        $(TDS)/dvips/$(PACKAGE)/
+	cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/
+	cp -u $(PACKAGE).pro ~/Links/dvips-local/
+#
+	cp -u Changes     $(TDS)/source/$(PACKAGE)/
+	cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/
+	cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/
+	cp -u Makefile    $(TDS)/source/$(PACKAGE)/
+
+
+# EOF
diff --git a/Master/texmf-dist/doc/latex/fancyvrb/artistic2.txt b/Master/texmf-dist/doc/latex/fancyvrb/artistic2.txt
deleted file mode 100644
index 24bd750dfaa..00000000000
--- a/Master/texmf-dist/doc/latex/fancyvrb/artistic2.txt
+++ /dev/null
@@ -1,192 +0,0 @@
-                            The Artistic License
-                         Version 2.0beta4, October 2000
-
-                         Copyright (C) 2000, Larry Wall.
-        Everyone is permitted to copy and distribute verbatim copies
-         of this license document, but changing it is not allowed.
-
-                                  Preamble
-
-This copyright license states the terms under which a given free software Package may be copied, modified and/or redistributed, while the Originator(s) maintain some artistic control over the future development of that Package (at least as much artistic control as can be given under copyright law while still making the Package open source and free software).
-
-This license is bound by copyright law, and thus it legally applies only to works which the copyright holder has permitted copying, distribution or modification under the terms of the Artistic License, Version 2.0.
-
-You are reminded that You are always permitted to make arrangements wholly outside of a given copyright license directly with the copyright holder(s) of a given Package. If the terms of this license impede your ability to make full use of the Package, You are encouraged to contact the copyright holder(s) and seek a different licensing arrangement.
-
-                                Definitions
-
-"Package" refers to the collection of files distributed by the Originator(s), and derivatives of that collection of files created through textual modification.
-
-"Standard Version" refers to the Package if it has not been modified, or has been modified only in ways suggested by the Originator(s).
-
-"Modified Version" refers to the Package, if it has been changed by You via textual modification of the source code, and such changes were not suggested by the Originator(s).
-
-"Originator" refers to the author(s) and/or copyright holder(s) of the Standard Version of the Package.
-
-"You" and "Your" refers to any person who would like to copy, distribute, or modify the Package.
-
-"Distribution Fee" is any fee that You charge for providing a copy of this Package to another party. It does not refer to licensing fees.
-
-"Freely Available" means that:
-
-       (a) no fee is charged for the right to use the item (though a
-           Distribution Fee may be charged).
-
-       (b) recipients of the item may redistribute it under the same
-           conditions they received it.
-
-       (c) If the item is a binary, object code, bytecode, the complete
-           corresponding machine-readable source code is included with the
-           item.
-
-
-         Permission for Use and Modification Without Redistribution
-
-  (1) You are permitted to use the Standard Version and create and use
-      Modified Versions for any purpose without restriction, provided that
-      you do not redistribute the Modified Version to others outside of your
-      company or organization.
-
-
-           Permissions for Redistribution of the Standard Version
-
-  (2) You may make available verbatim copies of the source code of the
-      Standard Version of this Package in any medium without restriction,
-      either gratis or for a Distribution Fee, provided that you duplicate
-      all of the original copyright notices and associated disclaimers.  At
-      Your discretion, such verbatim copies may or may not include compiled
-      bytecode, object code or binary versions of the corresponding source
-      code in the same medium.
-
-  (3) You may apply any bug fixes, portability changes, and other
-      modifications made available from any of the Originator(s).  The
-      resulting modified Package will still be considered the Standard
-      Version, and may be copied, modified and redistributed under the terms
-      of the original license of the Standard Version as if it were the
-      Standard Version.
-
-
- Permissions for Redistribution of Modified Versions of the Package as Source
-
-  (4) You may modify your copy of the source code of this Package in any way
-      and distribute that Modified Version (either gratis or for a
-      Distribution Fee, and with or without a corresponding binary, bytecode
-      or object code version of the Modified Version) provided that You
-      clearly indicate what changes You made to the Package, and provided
-      that You do at least ONE of the following:
-
-       (a) make the Modified Version available to the Originator(s) of the
-           Standard Version, under the exact license of the Standard
-           Version, so that the Originator(s) may include your modifications
-           into the Standard Version (at their discretion).
-
-       (b) modify any installation scripts and procedures so that
-           installation of the Modified Version will never conflict with an
-           installation of the Standard Version, include for each program
-           installed by the Modified Version clear documentation describing
-           how it differs from the Standard Version, and rename your
-           Modified Version so that the name is substantially different from
-           the Standard Version.
-
-       (c) permit and encourage anyone who receives a copy of the Modified
-           Version permission to make your modifications Freely Available in
-           some specific way.                                               
-
-      If Your Modified Version is in turn derived from a Modified Version
-      made by a third party, then You are still required to ensure that Your
-      Modified Version complies with the requirements of this license.
-
-
-      Permissions for Redistribution of Non-Source Versions of Package
-
-  (5) You may distribute binary, object code, bytecode or other non-source
-      versions of the Standard Version of the Package, provided that you
-      include complete instructions on where to get the source code of the
-      Standard Version.  Such instructions must be valid at the time of Your
-      distribution.  If these instructions, at any time while You are
-      carrying our such distribution, become invalid, you must provide new
-      instructions on demand or cease further distribution.  If You cease
-      distribution within thirty days after You become aware that the
-      instructions are invalid, then You do not forfeit any of Your rights
-      under this license.
-
-  (6) You may distribute binary, object code, bytecode or other non-source
-      versions of a Modified Version provided that You do at least ONE of
-      the following:
-
-       (a) include a copy of the corresponding source code for the Modified
-           Version under the terms indicated in (4).
-
-       (b) ensure that the installation of Your non-source Modified Version
-           does not conflict in any way with an installation of the Standard
-           Version, include for each program installed by the Modified
-           Version clear documentation describing how it differs from the
-           Standard Version, and rename your Modified Version so that the
-           name is substantially different from the Standard Version.
-
-       (c) ensure that the Modified Version includes notification of the
-           changes made from the Standard Version, and offer to provide
-           machine-readable source code (under a license that permits making
-           that source code Freely Available) of the Modified Version via
-           mail order.
-
-
-        Permissions for Inclusion of the Package in Aggregate Works
-  
-  (7) You may aggregate this Package (either the Standard Version or
-      Modified Version) with other packages and distribute the resulting
-      aggregation provided that You do not charge a licensing fee for the
-      Package.  Distribution Fees are permitted, and licensing fees for
-      other packages in the aggregation are permitted.  Your permission to
-      distribute Standard or Modified Versions of the Package is still
-      subject to the other terms set forth in other sections of this
-      license.
-
-  (8) In addition to the permissions given elsewhere by this license, You
-      are also permitted to link Modified and Standard Versions of this
-      Package with other works and distribute the result without
-      restriction, provided You have produced binary program(s) that do not
-      overtly expose the interfaces of the Package.  This includes
-      permission to embed the Package in a larger work of your own without
-      exposing a direct interface to the Package.  This also includes
-      permission to build stand-alone binary or bytecode versions of your
-      scripts that require the Package, but do not otherwise give the casual
-      user direct access to the Package itself.
-
-
-        Items That are Never Considered Part of a Modified Version Package
-
-  (9) Works (including, but not limited to, subroutines and scripts) that
-      you have linked or aggregated with the Package that merely extend or
-      make use of the Package, but are not intended to cause the Package to
-      operate differently from the Standard Version, do not, by themselves,
-      cause the Package to be a Modified Version.  In addition, such works
-      are not considered parts of the Package itself, and are not bound by
-      the terms of the Package's license.
-
-
-              Acceptance of License and Disclaimer of Warranty
-
- (10) You are not required to accept this License, since you have not signed
-      it.  However, nothing else grants you permission to copy, modify or
-      distribute the Standard or Modified Versions of the Package.  These
-      actions are prohibited by copyright law if you do not accept this
-      License.  Therefore, by copying, modifying or distributing Standard
-      and Modified Versions of the Package, you indicate your acceptance of
-      the license of the Package.
-
-
- (11) Disclaimer of Warranty:
-
-       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-       A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT UNLESS REQUIRED BY
-       LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER OR CONTRIBUTOR
-       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-       OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-       OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, PROFITS; OR
-       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-       OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-       EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb.pdf b/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb.pdf
index 68ceb0c65df..4790d104af7 100644
--- a/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb.pdf
+++ b/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb.pdf
diff --git a/Master/texmf-dist/doc/latex/fancyvrb/fvrb-ex.pdf b/Master/texmf-dist/doc/latex/fancyvrb/fvrb-ex.pdf
new file mode 100644
index 00000000000..5ba2d54c27d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fancyvrb/fvrb-ex.pdf
diff --git a/Master/texmf-dist/doc/latex/fancyvrb/t-fvrbex.tex b/Master/texmf-dist/doc/latex/fancyvrb/t-fvrbex.tex
index 928ebcb7627..fcc3de7801a 100644
--- a/Master/texmf-dist/doc/latex/fancyvrb/t-fvrbex.tex
+++ b/Master/texmf-dist/doc/latex/fancyvrb/t-fvrbex.tex
@@ -24,23 +24,23 @@
 %% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
 %%
 %% COPYING:
-%%   The files of this package "fvrb-ex" are released under the Artistic
-%%   License Version 2. A copy of that license is included in the file
-%%   artistic2.txt inside the fancyvrb package. This package consists of
-%%   the following files:
-%%     README fvrb-ex.dtx fvrb-ex.ins
+%% 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.
 %%
-%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
-%% March 27, 1998
+%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr> March 27, 1998
 %%
 %% File `t-fvrbex'
 %%
 \documentclass{article}
 
-\newif\ifpstricks
-\IfFileExists{pstricks.sty}
-{\usepackage[bawcolor,pstricks]{fvrb-ex}\pstrickstrue}
-{\usepackage[bawcolor]{fvrb-ex}}
+\usepackage[bawcolor,pstricks]{fvrb-ex}
+\pstrickstrue
+\usepackage[T1]{fontenc}
+\usepackage[latin1]{inputenc}
+\usepackage[charter]{mathdesign}
+\usepackage{url}
+\usepackage{xcolor}
 
 \begin{document}
 
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
diff --git a/Master/texmf-dist/source/latex/fancyvrb/fvrb-ex.dtx b/Master/texmf-dist/source/latex/fancyvrb/fvrb-ex.dtx
index aeba5405e00..65d24f0fd09 100644
--- a/Master/texmf-dist/source/latex/fancyvrb/fvrb-ex.dtx
+++ b/Master/texmf-dist/source/latex/fancyvrb/fvrb-ex.dtx
@@ -3,27 +3,23 @@
 %% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
 %%
 %% COPYING:
-%%   The files of this package "fvrb-ex" are released under the Artistic
-%%   License Version 2. A copy of that license is included in the file
-%%   artistic2.txt inside the fancyvrb package. This package consists of
-%%   the following files:
-%%     README fvrb-ex.dtx fvrb-ex.ins
+%% 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.
 %%
-%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
-%% March 27, 1998
+%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr> March 27, 1998
 %%
 % \fi
 %
+% \changes{v1.9}{2010/05/16}{Use LPPL as license and fix bug with loading pstricks (hv)}
 % \changes{v1.8}{2010/01/04}{Use ^^ instead of eight-bits chars. [KB/ER]}
 % \changes{v1.7}{1998/03/26}{First public release.}
 % \changes{v0.1}{1995}{First personal version.}
 %
-% \CheckSum{1322}
-%
 % \newif\ifmulticols
-% \IfFileExists{multicol.sty}{\multicolstrue}{}
+% \IfFileExists{multicol.sty}{\multicolstrue}{\multicolsfalse}
 % \newif\ifpstricks
-% \IfFileExists{pstricks.sty}{\pstrickstrue}{}
+% \IfFileExists{pstricks.sty}{\pstrickstrue}{\pstricksfalse}
 %
 % \DoNotIndex{\\,\^,\£,\§,\µ,\¶} ^^A Unefficient...
 % \DoNotIndex{\@defpar,\@gobble,\@ifnextchar,\@tempdimb}
@@ -64,8 +60,7 @@
 %        Example environments\\with the \FVrbPackage{} package}
 % \author{Denis Girou\\CNRS/IDRIS\\Orsay -- France\\
 %         {\footnotesize email: Denis.Girou@idris.fr}}
-% \date{Version 1.7\\March 27, 1998\\
-%       {\small Documentation revised March 27, 1998}}
+% \date{Version 1.9\\\today}
 %
 % \maketitle
 %
@@ -483,7 +478,6 @@
 % Rolf \textsc{Niepraschk}\break\relax \verb+<niepraschk@ptb.de>+ for their
 % tests and comments on preliminary versions of this package.
 %
-% \StopEventually{}
 %
 % ^^A .................... End of the documentation part ....................
 %
@@ -498,12 +492,11 @@
 %<*driver>
 \documentclass{ltxdoc}
 \GetFileInfo{fvrb-ex.dtx}
-\IfFileExists{pstricks.sty}{\usepackage[baw,pstricks]{fvrb-ex}}%
-                           {\usepackage[baw]{fvrb-ex}}
+\usepackage[baw,pstricks]{fvrb-ex}
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
-\OnlyDescription                % Comment it for implementation details
+%%\OnlyDescription                % Comment it for implementation details
 %\Oldmakeindex                   % Uncomment if your MakeIndex is pre-0.9
 \hbadness=7000                  % Over and under full box warnings
 \begin{document}
@@ -536,22 +529,18 @@
 %
 % Who we are.
 %    \begin{macrocode}
-\def\fileversion{1.7}
-\def\filedate{1998/03/26}
+\def\fileversion{1.9}
+\def\filedate{2010/05/16}
 \ProvidesPackage{fvrb-ex}[\filedate]
 \message{`fvrb-ex' v\fileversion, \filedate\space (Denis Girou)}
 %    \end{macrocode}
 %
-% Require the \FVrbPackage{} package.
-%    \begin{macrocode}
-\RequirePackage{fancyvrb}
-%    \end{macrocode}
-%
 % Require PSTricks if specified (to define the \texttt{PCenterExample} and
 % \texttt{PSideBySideExample} environments).
 %    \begin{macrocode}
-\DeclareOption{pstricks}{%
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi}
+\newif\ifpstricks\pstricksfalse
+\let\LoadPStricks=\relax
+\DeclareOption{pstricks}{\def\LoadPStricks{\RequirePackage{pstricks}}\pstrickstrue}
 %    \end{macrocode}
 %
 % Declaration of the explicit black and white version.
@@ -571,7 +560,14 @@
 %
 % Process the options.
 %    \begin{macrocode}
-\ProcessOptions
+\ProcessOptions\relax
+\LoadPStricks
+%    \end{macrocode}
+%
+% Require the \FVrbPackage{} package.
+%    \begin{macrocode}
+\ifpstricks\RequirePackage{pstricks}\fi
+\RequirePackage{fancyvrb}
 %    \end{macrocode}
 %
 % To ask an interactive question if necessary (code from `docstrip').
@@ -1373,10 +1369,13 @@ $\setbox\z@\hbox{\begingroup#3\endgroup}%
 %    \begin{macrocode}
 \documentclass{article}
 
-\newif\ifpstricks
-\IfFileExists{pstricks.sty}
-{\usepackage[bawcolor,pstricks]{fvrb-ex}\pstrickstrue}
-{\usepackage[bawcolor]{fvrb-ex}}
+\usepackage[bawcolor,pstricks]{fvrb-ex}
+\pstrickstrue
+\usepackage[T1]{fontenc}
+\usepackage[latin1]{inputenc}
+\usepackage[charter]{mathdesign}
+\usepackage{url}
+\usepackage{xcolor}
 
 \begin{document}
 
diff --git a/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty b/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
index 19b0b7b717f..5840c7f3df1 100644
--- a/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
+++ b/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
@@ -23,14 +23,13 @@
 %%
 %% 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
 %%
 
 %% COPYRIGHT 1992-1999, by Timothy Van Zandt <tvz@zandtwerk.kellogg.nwu.edu>
@@ -401,7 +400,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%
@@ -1080,19 +1079,16 @@
   \protected@edef\@currentlabel
     {\csname p@#1\endcsname\arabic{FancyVerbLine}}}
 \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}
 %% DG/SR modification begin - 1995
 %%\def\theFancyVerbLine{\rm\tiny\arabic{FancyVerbLine}}
@@ -1421,6 +1417,7 @@
 %%\@input{fancyvrb.rc}
 \InputIfFileExists{fancyvrb.cfg}{}{}
 %% DG/SR modification end
+%%% \PrintIndex
 \endinput
 %%
 %% End of file `fancyvrb.sty'.
diff --git a/Master/texmf-dist/tex/latex/fancyvrb/fvrb-ex.sty b/Master/texmf-dist/tex/latex/fancyvrb/fvrb-ex.sty
index f15067300ca..e3e1a70c55c 100644
--- a/Master/texmf-dist/tex/latex/fancyvrb/fvrb-ex.sty
+++ b/Master/texmf-dist/tex/latex/fancyvrb/fvrb-ex.sty
@@ -24,29 +24,29 @@
 %% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
 %%
 %% COPYING:
-%%   The files of this package "fvrb-ex" are released under the Artistic
-%%   License Version 2. A copy of that license is included in the file
-%%   artistic2.txt inside the fancyvrb package. This package consists of
-%%   the following files:
-%%     README fvrb-ex.dtx fvrb-ex.ins
+%% 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.
 %%
-%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
-%% March 27, 1998
+%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr> March 27, 1998
 %%
 %% Package `fvrb-ex'
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.7}
-\def\filedate{1998/03/26}
+\def\fileversion{1.9}
+\def\filedate{2010/05/16}
 \ProvidesPackage{fvrb-ex}[\filedate]
 \message{`fvrb-ex' v\fileversion, \filedate\space (Denis Girou)}
-\RequirePackage{fancyvrb}
-\DeclareOption{pstricks}{%
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi}
+\newif\ifpstricks\pstricksfalse
+\let\LoadPStricks=\relax
+\DeclareOption{pstricks}{\def\LoadPStricks{\RequirePackage{pstricks}}\pstrickstrue}
 \DeclareOption{baw}{\def\ColorVersion{n}}
 \DeclareOption{color}{\def\ColorVersion{y}}
 \DeclareOption{bawcolor}{\def\ColorVersion{?}}
-\ProcessOptions
+\ProcessOptions\relax
+\LoadPStricks
+\ifpstricks\RequirePackage{pstricks}\fi
+\RequirePackage{fancyvrb}
 \newread\ttyin
 \def\iden#1{#1}
 \def\strip#1#2 \@gobble{\def #1{#2}}
diff --git a/Master/texmf-dist/tex/latex/fancyvrb/hbaw.sty b/Master/texmf-dist/tex/latex/fancyvrb/hbaw.sty
index 728f4fe345e..8c63a2b7e3c 100644
--- a/Master/texmf-dist/tex/latex/fancyvrb/hbaw.sty
+++ b/Master/texmf-dist/tex/latex/fancyvrb/hbaw.sty
@@ -24,14 +24,11 @@
 %% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
 %%
 %% COPYING:
-%%   The files of this package "fvrb-ex" are released under the Artistic
-%%   License Version 2. A copy of that license is included in the file
-%%   artistic2.txt inside the fancyvrb package. This package consists of
-%%   the following files:
-%%     README fvrb-ex.dtx fvrb-ex.ins
+%% 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.
 %%
-%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
-%% March 27, 1998
+%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr> March 27, 1998
 %%
 %% Package `hbaw'
 %%
diff --git a/Master/texmf-dist/tex/latex/fancyvrb/hcolor.sty b/Master/texmf-dist/tex/latex/fancyvrb/hcolor.sty
index 7a078bc2411..89ee76508bf 100644
--- a/Master/texmf-dist/tex/latex/fancyvrb/hcolor.sty
+++ b/Master/texmf-dist/tex/latex/fancyvrb/hcolor.sty
@@ -24,14 +24,11 @@
 %% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
 %%
 %% COPYING:
-%%   The files of this package "fvrb-ex" are released under the Artistic
-%%   License Version 2. A copy of that license is included in the file
-%%   artistic2.txt inside the fancyvrb package. This package consists of
-%%   the following files:
-%%     README fvrb-ex.dtx fvrb-ex.ins
+%% 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.
 %%
-%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
-%% March 27, 1998
+%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr> March 27, 1998
 %%
 %% Package `hcolor'
 %%