summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/fancyvrb
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-05-25 23:23:36 +0000
committerKarl Berry <karl@freefriends.org>2010-05-25 23:23:36 +0000
commit053e863d132996b7ab5686ede2b74dba754e9f94 (patch)
treee672d6c6fd5cf4239fe5f86f218dbc6d3d2b83c2 /Master/texmf-dist/source/latex/fancyvrb
parent881453d7cd5ef70e354de94c516b9ec01332e132 (diff)
fancyvrb update (25may10)
git-svn-id: svn://tug.org/texlive/trunk@18492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/fancyvrb')
-rw-r--r--Master/texmf-dist/source/latex/fancyvrb/fancyvrb.dtx73
-rw-r--r--Master/texmf-dist/source/latex/fancyvrb/fvrb-ex.dtx61
2 files changed, 67 insertions, 67 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
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}