summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/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/tex/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/tex/latex/fancyvrb')
-rw-r--r--Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty35
-rw-r--r--Master/texmf-dist/tex/latex/fancyvrb/fvrb-ex.sty26
-rw-r--r--Master/texmf-dist/tex/latex/fancyvrb/hbaw.sty11
-rw-r--r--Master/texmf-dist/tex/latex/fancyvrb/hcolor.sty11
4 files changed, 37 insertions, 46 deletions
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'
%%