From 053e863d132996b7ab5686ede2b74dba754e9f94 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 25 May 2010 23:23:36 +0000 Subject: fancyvrb update (25may10) git-svn-id: svn://tug.org/texlive/trunk@18492 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty | 35 +++++++++++------------ Master/texmf-dist/tex/latex/fancyvrb/fvrb-ex.sty | 26 ++++++++--------- Master/texmf-dist/tex/latex/fancyvrb/hbaw.sty | 11 +++---- Master/texmf-dist/tex/latex/fancyvrb/hcolor.sty | 11 +++---- 4 files changed, 37 insertions(+), 46 deletions(-) (limited to 'Master/texmf-dist/tex/latex/fancyvrb') 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 +%% 2010, by Herbert Voss +%% +%% 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 -%% July 17, 1998 %% %% COPYRIGHT 1992-1999, by Timothy Van Zandt @@ -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) -%% March 27, 1998 +%% Denis Girou (CNRS/IDRIS - France) 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) -%% March 27, 1998 +%% Denis Girou (CNRS/IDRIS - France) 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) -%% March 27, 1998 +%% Denis Girou (CNRS/IDRIS - France) March 27, 1998 %% %% Package `hcolor' %% -- cgit v1.2.3