summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fancyvrb
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-11-01 22:10:32 +0000
committerKarl Berry <karl@freefriends.org>2018-11-01 22:10:32 +0000
commit7871fabe40409a7420143e8084f639f6173204f9 (patch)
tree54b89cf39168ac92acbab29a4fff70271df739e7 /Master/texmf-dist/tex/latex/fancyvrb
parent15360daf880519448794c8bc606dad9d850bb7a8 (diff)
fancyvrb (1nov18)
git-svn-id: svn://tug.org/texlive/trunk@49045 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fancyvrb')
-rw-r--r--Master/texmf-dist/tex/latex/fancyvrb/fancyvrb-ex.sty (renamed from Master/texmf-dist/tex/latex/fancyvrb/fvrb-ex.sty)119
-rw-r--r--Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty156
-rw-r--r--Master/texmf-dist/tex/latex/fancyvrb/hbaw.sty158
-rw-r--r--Master/texmf-dist/tex/latex/fancyvrb/hcolor.sty161
4 files changed, 81 insertions, 513 deletions
diff --git a/Master/texmf-dist/tex/latex/fancyvrb/fvrb-ex.sty b/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb-ex.sty
index e3e1a70c55c..054ede2ada7 100644
--- a/Master/texmf-dist/tex/latex/fancyvrb/fvrb-ex.sty
+++ b/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb-ex.sty
@@ -1,101 +1,71 @@
%%
-%% This is file `fvrb-ex.sty',
-%% generated with the docstrip utility.
+%% This is file `fancyvrb-ex.sty',
%%
-%% The original source files were:
+%% COPYRIGHT 2018-, by Herbert Voss <hvoss@tug.org>
%%
-%% fvrb-ex.dtx (with options: `fvrb-ex')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
-%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from fvrb-ex.sty.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file fvrb-ex.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%
-%% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
-%%
-%% COPYING:
%% 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
+%% Either version 1.3 or, at your option, any later version.
%%
-%% Package `fvrb-ex'
+%% DESCRIPTION:
+%% fancyvrb.sty is a LaTeX style option, containing flexible
+%% verbatim environments and commands and extensive documentation.
+%% it is based on the work of Denis Girou
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.9}
-\def\filedate{2010/05/16}
-\ProvidesPackage{fvrb-ex}[\filedate]
-\message{`fvrb-ex' v\fileversion, \filedate\space (Denis Girou)}
-\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\relax
-\LoadPStricks
-\ifpstricks\RequirePackage{pstricks}\fi
-\RequirePackage{fancyvrb}
-\newread\ttyin
-\def\iden#1{#1}
-\def\strip#1#2 \@gobble{\def #1{#2}}
-\def\@defpar{\par}
-\def\@gobble#1{}
-\def\Ask#1#2{%
-\message{#2}\read\ttyin to #1\ifx#1\@defpar\def#1{}\else
-\iden{\expandafter\strip\expandafter#1#1\@gobble\@gobble} \@gobble\fi}
-\def\Answer@Yes{y}
-\def\Answer@No{n}
-\def\Question@Mark{?}
-\def\Question@Color{Color version? (y=yes)}
+\def\fileversion{0.01}
+\def\filedate{2018/11/01}
+\ProvidesPackage{fancyvrb-ex}[\filedate]
+\message{Style option: `fancyvrb-ex' v\fileversion \space <\filedate> (tvz)}
+\csname fancyvrb-ex@loaded\endcsname
+\expandafter\let\csname fancyvrb-ex@loaded\endcsname\endinput
+\newif\ifEX@pstricks \EX@pstricksfalse
+\DeclareOption{pstricks}{\EX@pstrickstrue}
+\newif\ifEX@color\EX@colorfalse
+\DeclareOption{color}{\global\EX@colortrue}
+\ProcessOptions
+\RequirePackage{fancyvrb} % Standard LaTeX `color' package
+\RequirePackage{xcolor} % Standard LaTeX `color' package
+\def\FV@Error#1#2{%
+ \edef\@tempc{#2}\expandafter\errhelp\expandafter{\@tempc}%
+ \errmessage{FancyVerb Error:^^J\space\space #1^^J}}
+
+\def\FV@eha{Your command was ignored. Type <return> to continue.}
+
+% The exa part of fancyvrb
+%
\def\Highlight@Attributes{} % Default=nothing
\def\NoHighlight@Attributes{} % Default=nothing
-\ifx\ColorVersion\Answer@Yes
- \RequirePackage{color} % Standard LaTeX `color' package
+\ifEX@color
\RequirePackage{hcolor} % Color version
+\else
+ \RequirePackage{hbaw} % black and white version
\fi
-\ifx\ColorVersion\Answer@No
- \RequirePackage{color} % Standard LaTeX `color' package
- \RequirePackage{hbaw} % Black and white version
-\fi
-\ifx\ColorVersion\Question@Mark
- \Ask\ColorVersion{^^J\Question@Color}
- \ifx\ColorVersion\Answer@Yes
- \RequirePackage{color} % Standard LaTeX `color' package
- \RequirePackage{hcolor} % Color version
- \else
- \RequirePackage{color} % Standard LaTeX `color' package
- \RequirePackage{hbaw} % Black and white version
- \fi
-\fi
-\fvset{gobble=2}
+\ifEX@pstricks\RequirePackage{pstricks}\fi
+%
+%\fvset{gobble=0}
\newif\ifFvrbEx@Grid
+%
\def\Example{%
\catcode`\^^M=\active
\@ifnextchar[{\catcode`\^^M=5\Example@}{\catcode`\^^M=5\Begin@Example}}
+%
\def\endExample{%
\end{VerbatimOut}%
\Below@Example{\input{\jobname.tmp}}}
+%
\def\Example@[#1]{\fvset{#1}\Begin@Example}
+%
\def\CenterExample{%
\catcode`\^^M=\active
\@ifnextchar[{\catcode`\^^M=5\Example@}{\catcode`\^^M=5\Begin@Example}}
+%
\def\endCenterExample{%
\end{VerbatimOut}%
\center
\Below@Example{\input{\jobname.tmp}}
\endcenter}
+%
\def\SideBySideExample{%
\catcode`\^^M=\active
\@ifnextchar[{\catcode`\^^M=5\Example@}%
@@ -103,13 +73,13 @@
\def\endSideBySideExample{%
\end{VerbatimOut}%
\SideBySide@Example{\input{\jobname.tmp}}}
-\newcommand{\Begin@Example}{%
+\newcommand\Begin@Example{%
\parindent=0pt
\multiply\topsep by 2
\VerbatimEnvironment
\begin{VerbatimOut}[codes={\catcode`\^^a3=12\catcode`\^^a7=12\catcode`\^^b5=12%
\catcode`\^^b6=12}]{\jobname.tmp}}
-\newcommand{\Below@Example}[1]{%
+\newcommand\Below@Example[1]{%
\VerbatimInput[gobble=0,commentchar=^^a3,commandchars=^^a7^^b5^^b6,numbersep=3pt]%
{\jobname.tmp}
\catcode`\^^a3=9\relax%
@@ -135,7 +105,7 @@
xleftmargin=5mm,xrightmargin=0pt]{\jobname.tmp}
\end{minipage}}
\ifx\PSTricksLoaded\endinput
- \newcommand{\showgrid}{\FvrbEx@Gridtrue}
+ \newcommand\showgrid{\FvrbEx@Gridtrue}
\newpsobject{FvrbExGrid}{psgrid}{subgriddiv=0,griddots=10,gridlabels=7pt}
\def\PCenterExample{\@ifnextchar[{\Pst@Example}{\Pst@@Example}}
\def\endPCenterExample{%
@@ -168,6 +138,7 @@
\def\Picture@Size{(#1,#2)(#3,#4)}%
\Begin@Example}
\fi % End \ifx\PSTricksLoaded
+%%
\endinput
%%
-%% End of file `fvrb-ex.sty'.
+%% End of file `fancyvrb-ex.sty'.
diff --git a/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty b/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
index 5840c7f3df1..c0982956a43 100644
--- a/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
+++ b/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
@@ -1,56 +1,26 @@
%%
%% This is file `fancyvrb.sty',
-%% generated with the docstrip utility.
%%
-%% The original source files were:
-%%
-%% fancyvrb.dtx (with options: `fancyvrb')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
-%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from fancyvrb.sty.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file fancyvrb.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%
-%% Package `fancyvrb'
-%%
-%% 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.
-%%
-%%
-
%% COPYRIGHT 1992-1999, by Timothy Van Zandt <tvz@zandtwerk.kellogg.nwu.edu>
+%% 2010-2018, 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.
+%% Either version 1.3 or, at your option, any later version.
%%
%% DESCRIPTION:
%% fancyvrb.sty is a LaTeX style option, containing flexible
%% verbatim environments and commands and extensive documentation.
%%
-%% This is a companion to the `fancybox' package.
-%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.7a, with DG/SPQR fixes, and firstline=lastline fix}
-\def\filedate{2008/02/07}
+\def\fileversion{3.0}
+\def\filedate{2018/11/01}
\ProvidesPackage{fancyvrb}[\filedate]
\message{Style option: `fancyvrb' v\fileversion \space <\filedate> (tvz)}
\csname fancyvrb@loaded\endcsname
\let\fancyvrb@loaded\endinput
+%\ProcessOptions
+\RequirePackage{xcolor} % Standard LaTeX `color' package
\def\FV@Error#1#2{%
\edef\@tempc{#2}\expandafter\errhelp\expandafter{\@tempc}%
\errmessage{FancyVerb Error:^^J\space\space #1^^J}}
@@ -159,9 +129,12 @@
\expandafter\def\expandafter#1\expandafter{#1#2\relax}}
\define@key{FV}{codes}[]{\def\FancyVerbCodes{#1\relax}}
\define@key{FV}{codes*}{%
- \expandafter\def\expandafter\FancyVerbCodes\expandafter{%
- \FancyVerbCodes#1\relax}}
+ \expandafter\def\expandafter\FancyVerbCodes\expandafter{\FancyVerbCodes#1\relax}}
\fvset{codes}
+%
+\define@key{FV}{vspace}[\topsep]{\def\FancyVerbVspace{#1}}
+\fvset{vspace}
+%
\define@key{FV}{commandchars}[\\\{\}]%
{\def\@tempa{#1}%
\ifx\@tempa\FV@None
@@ -242,9 +215,7 @@
}
\def\FV@@FindStartString#1#2{%
\edef\@fooA{#1}\edef\@fooB{#2}%
- \ifx\@fooA\@fooB
- \FV@DefineFindStop
- \fi
+ \ifx\@fooA\@fooB\FV@DefineFindStop\fi
}
%% SR modification end
\def\FV@DefineFindStop{%
@@ -398,7 +369,7 @@
\def\FV@GetLine{\@noligs\expandafter\FV@CheckScan\FancyVerbGetLine}
%% DG/SR modification end
\begingroup
-\catcode`\^^M=\active
+\catcode`\^^M=\active%
\gdef\FancyVerbGetLine#1^^M{%
\@nil%
\FV@CheckEnd{#1}%
@@ -536,33 +507,16 @@
\def\FV@MakeUnActive{}
\begingroup
\catcode`\`=\active
-\gdef\FV@fontfamily@tt{%
- \def\FV@FontScanPrep{\FV@MakeActive\`}%
-%% SR modification begin - 1995
-%% \def\FV@FontFamily{\tt`{{\string`}}}}
- \def\FV@FontFamily{\ttfamily\edef`{{\string`}}}}
-%% SR modification end
-\gdef\FV@fontfamily@cmtt{%
- \def\FV@FontScanPrep{\FV@MakeActive\`}%
- \def\FV@FontFamily{\edef`{{\string`}}\fontfamily{cmtt}}}
+\gdef\FV@fontfamily@tt{\def\FV@FontScanPrep{\FV@MakeActive\`}\def\FV@FontFamily{\ttfamily\edef`{{\string`}}}}
+\gdef\FV@fontfamily@cmtt{\def\FV@FontScanPrep{\FV@MakeActive\`}\def\FV@FontFamily{\edef`{{\string`}}\fontfamily{cmtt}}}
\endgroup
-\@namedef{FV@fontfamily@cmtt-spanish}{%
- \def\FV@FontScanPrep{}%
- \def\FV@FontFamily{\fontfamily{cmtt}}}
-\@namedef{FV@fontfamily@courier}{%
- \def\FV@FontScanPrep{}%
-%% SR modification begin - 1995
-%% \def\FV@FontFamily{\fontfamily{rpcr}}}
- \def\FV@FontFamily{\fontfamily{pcr}}}
-%% SR modification end
-\@namedef{FV@fontfamily@helvetica}{%
- \def\FV@FontScanPrep{}%
-%% SR modification begin - 1995
-%% \def\FV@FontFamily{\fontfamily{rphv}}}
- \def\FV@FontFamily{\fontfamily{phv}}}
-%% SR modification end
-\fvset{fontfamily=tt,fontsize=auto,fontshape=auto,fontseries=auto,
- baselinestretch=auto}
+\@namedef{FV@fontfamily@cmtt-spanish}{\def\FV@FontScanPrep{}\def\FV@FontFamily{\fontfamily{cmtt}}}
+\@namedef{FV@fontfamily@courier}{\def\FV@FontScanPrep{}\def\FV@FontFamily{\fontfamily{pcr}}}
+\@namedef{FV@fontfamily@helvetica}{\def\FV@FontScanPrep{}\let\FV@FontFamily\sffamily}
+% \def\FV@FontFamily{\fontfamily{phv}}}
+\def\myFont{}
+\@namedef{FV@fontfamily@myFont}{\def\FV@FontScanPrep{}\def\FV@FontFamily{\myFont}}
+\fvset{fontfamily=tt,fontsize=auto,fontshape=auto,fontseries=auto,baselinestretch=auto}
\begingroup
\catcode`\ =\active
\catcode`\^^I=\active
@@ -684,7 +638,8 @@
\leftmargin\z@
\fi}
\def\FV@ListVSpace{%
- \@topsepadd\topsep
+% \@topsepadd\topsep
+ \@topsepadd=\FancyVerbVspace
\if@noparlist\advance\@topsepadd\partopsep\fi
\if@inlabel
\vskip\parskip
@@ -956,64 +911,48 @@
\begingroup
\baselineskip\z@skip
\kern\FV@FrameSep\relax
-%% DG/SR modification begin - May. 19, 1998
-%% \FV@SingleFrameLine
\FV@SingleFrameLine{\@ne}%
-%% DG/SR modification end
\endgroup}
\def\FV@SingleFrameSep{%
\hbox to \z@{%
\kern\leftmargin
\hbox to\linewidth{%
\FancyVerbRuleColor{%
-%% DG modification begin - June 18, 1997 (\FV@FrameSep missing)
\ifx\FancyVerbFillColor\relax
\vrule\@width 0pt\@height\FV@FrameSep\relax
\fi
-%% DG modification end
\vrule\@width\FV@FrameRule\relax
\ifx\FancyVerbFillColor\relax
\hfil
\else
{\FancyVerbFillColor\leaders\hrule\@height\FV@FrameSep\hfil}%
\fi
-%% DG modification begin - June 18, 1997 (\FV@FrameSep missing)
\ifx\FancyVerbFillColor\relax
\vrule\@width 0pt\@height\FV@FrameSep\relax
\fi
-%% DG modification end
\vrule\@width\FV@FrameRule\relax}}%
\hss}}
\def\FV@LeftListFrame@Single{%
\strut
{\FancyVerbRuleColor{\vrule \@width\FV@FrameRule}}%
\FV@FrameFillLine
-%% DG modification begin - June 18, 1997 (to fill color on left side)
-%% \kern\FV@FrameSep}
\ifx\FancyVerbFillColor\relax
\kern\FV@FrameSep
\else
{\noexpand\leavevmode\FancyVerbFillColor{\vrule\@width\FV@FrameSep}}%
\fi}
-%% DG modification end
\def\FV@RightListFrame@Single{%
-%% DG modification begin - June 18, 1997 (to fill color on right side)
-%% \kern\FV@FrameSep
\ifx\FancyVerbFillColor\relax
\kern\FV@FrameSep
\else
{\noexpand\leavevmode\FancyVerbFillColor{\vrule\@width\FV@FrameSep}}%
\fi
{\noexpand\leavevmode\FancyVerbRuleColor{\vrule\@width\FV@FrameRule}}}
-%% DG modification end
\def\FV@EndListFrame@Single{%
\penalty\@M
\FV@SingleFrameSep
\penalty\@M
-%% DG/SR modification begin - May. 19, 1998
-%% \FV@SingleFrameLine}
\FV@SingleFrameLine{\@ne}}
-%% DG/SR modification end
\define@key{FV}{framerule}{%
\@tempdima=#1\relax
\edef\FV@FrameRule{\number\@tempdima sp\relax}}
@@ -1052,32 +991,26 @@
\def\@tempa{#1}\def\@tempb{auto}%
\ifx\@tempa\@tempb
\def\FV@SetLineNo{%
- \c@FancyVerbLine\FV@CodeLineNo
+ \c@FancyVerbLine\FV@CodeLineNo%
\advance\c@FancyVerbLine\m@ne}%
- \else
+ \else%
\def\@tempb{last}%
\ifx\@tempa\@tempb
- \let\FV@SetLineNo\relax
- \else
-%% DG/SR modification begin - Jan. 19, 1998
-%% \def\FV@SetLineNo{\c@FancyVerbLine#1}%
+ \let\FV@SetLineNo\relax%
+ \else%
\def\FV@SetLineNo{%
- \c@FancyVerbLine#1
+ \c@FancyVerbLine#1%
\advance\c@FancyVerbLine\m@ne}%
-%% DG/SR modification end
- \fi
+ \fi%
\fi}
\define@booleankey{FV}{numberblanklines}%
{\let\if@FV@NumberBlankLines\iftrue}
{\let\if@FV@NumberBlankLines\iffalse}
\fvset{numberblanklines=true}
-%% DG/SR modification begin - May. 20, 1998
-%%\def\refstepcounter#1{% Adapted from latex.ltx
\def\FV@refstepcounter#1{%
-%% DG/SR modification end
\stepcounter{#1}%
- \protected@edef\@currentlabel
- {\csname p@#1\endcsname\arabic{FancyVerbLine}}}
+ \protected@edef\@currentlabel{\csname p@#1\endcsname\arabic{FancyVerbLine}}%
+}
\def\FV@StepLineNo{%
\FV@SetLineNo%
\def\FV@StepLineNo{%
@@ -1090,16 +1023,11 @@
\fi%
\fi}%
\FV@StepLineNo}
-%% DG/SR modification begin - 1995
-%%\def\theFancyVerbLine{\rm\tiny\arabic{FancyVerbLine}}
\def\theFancyVerbLine{\rmfamily\tiny\arabic{FancyVerbLine}}
-%% DG/SR modification end
\define@key{FV}{numbers}[none]{%
\@ifundefined{FV@Numbers@#1}%
{\FV@Error{Numbers style `#1' not defined.}\FV@eha}%
{\@nameuse{FV@Numbers@#1}}}
-%% DG modification begin - Dec. 20, 1995 and Jan. 28, 1998
-%%\def\FV@Numbers@none{\let\FV@LeftListNumber\relax}
\def\FV@Numbers@none{%
\let\FV@LeftListNumber\relax
\let\FV@RightListNumber\relax}
@@ -1107,22 +1035,14 @@
\define@key{FV}{stepnumber}{\FV@StepNumber#1}
\def\KV@FV@stepnumber@default{\FV@StepNumber\@ne}
\fvset{stepnumber}
-%% DG modification begin - Dec. 20, 1995
-%%\def\FV@Numbers@left{%
-%% \def\FV@LeftListNumber{\hbox to\z@{%
-%% \hss\theFancyVerbLine\kern\FV@NumberSep}}}
\def\FV@Numbers@left{%
-%% DG/SR modification begin - Apr. 28, 1998
\let\FV@RightListNumber\relax
-%% DG/SR modification end
\def\FV@LeftListNumber{%
\@tempcnta=\FV@CodeLineNo
\@tempcntb=\FV@CodeLineNo
\divide\@tempcntb\FV@StepNumber
\multiply\@tempcntb\FV@StepNumber
\ifnum\@tempcnta=\@tempcntb
-%% DG/SR modification begin - Apr. 28, 1998
-%% \hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}%
\if@FV@NumberBlankLines
\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}%
\else
@@ -1131,12 +1051,9 @@
\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}%
\fi
\fi
-%% DG/SR modification end
\fi}}
\def\FV@Numbers@right{%
-%% DG/SR modification begin - Apr. 28, 1998
\let\FV@LeftListNumber\relax
-%% DG/SR modification end
\def\FV@RightListNumber{%
\@tempcnta=\FV@CodeLineNo
\@tempcntb=\FV@CodeLineNo
@@ -1281,7 +1198,7 @@
\define@key{FV}{aftersave}{\def\FancyVerbAfterSave{#1}}
\fvset{aftersave=}
\def\FV@UseVerb#1{\mbox{\FV@UseKeyValues\FV@FormattingPrep#1}}
-\def\UseVerb{\FV@Command{}{UseVerb}}
+\DeclareRobustCommand\UseVerb{\FV@Command{}{UseVerb}}
\def\FVC@UseVerb#1{%
\@ifundefined{FV@SV@#1}%
{\FV@Error{Short verbatim text never saved to name `#1'}\FV@eha}%
@@ -1413,11 +1330,10 @@
\ignorespaces}
\def\endlrbox{\unskip\egroup}
\fi
-%% DG/SR modification begin - Mar 21 2000
-%%\@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/hbaw.sty b/Master/texmf-dist/tex/latex/fancyvrb/hbaw.sty
deleted file mode 100644
index 8c63a2b7e3c..00000000000
--- a/Master/texmf-dist/tex/latex/fancyvrb/hbaw.sty
+++ /dev/null
@@ -1,158 +0,0 @@
-%%
-%% This is file `hbaw.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% fvrb-ex.dtx (with options: `hbaw')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
-%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from hbaw.sty.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file fvrb-ex.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%
-%% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
-%%
-%% COPYING:
-%% 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
-%%
-%% Package `hbaw'
-%%
-\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.4}
-\def\filedate{1998/03/19}
-\ProvidesPackage{hbaw}[\filedate]
-\message{`hbaw' v\fileversion, \filedate\space (Denis Girou)}
-\newcommand{\FvrbEx@ColoredBox}[3]{%
-\fboxsep=1pt\fcolorbox{#2}{#2}{\textcolor{#3}{\textbf{#1}}}}
-\def\Highlight@Attributes{%
-\def\HLa##1{\ifmmode\mathbf{##1}\else\textbf{##1}\fi}
-\def\HLb##1{\ifmmode\mathsl{##1}\else\textsl{##1}\fi}
-\def\HLc##1{##1}
-\def\HLd##1{##1}
-\def\HLe##1{\ifmmode\mathbf{##1}\else\textbf{##1}\fi}
-\def\HLf##1{##1}
-\def\HLq##1{##1}
-\def\HLr##1{##1}
-\def\HLz##1{##1}
-\def\HLBFa##1{\ifmmode\mathbf{##1}\else\textbf{##1}\fi}
-\def\HLBFb##1{\ifmmode\mathbf{##1}\else\textbf{##1}\fi}
-\def\HLBFc##1{\ifmmode\mathbf{##1}\else\textbf{##1}\fi}
-\def\HLBFd##1{\ifmmode\mathbf{##1}\else\textbf{##1}\fi}
-\def\HLBFe##1{\ifmmode\mathbf{##1}\else\textbf{##1}\fi}
-\def\HLBFf##1{\ifmmode\mathbf{##1}\else\textbf{##1}\fi}
-\def\HLBFz##1{\ifmmode\mathbf{##1}\else\textbf{##1}\fi}
-\def\HLITa##1{\ifmmode\mathnormal{##1}\else\textsl{##1}\fi}
-\def\HLITb##1{\ifmmode\mathnormal{##1}\else\textsl{##1}\fi}
-\def\HLITc##1{\ifmmode\mathnormal{##1}\else\textsl{##1}\fi}
-\def\HLITd##1{\ifmmode\mathnormal{##1}\else\textsl{##1}\fi}
-\def\HLITe##1{\ifmmode\mathnormal{##1}\else\textsl{##1}\fi}
-\def\HLITf##1{\ifmmode\mathnormal{##1}\else\textsl{##1}\fi}
-\def\HLITz##1{\ifmmode\mathnormal{##1}\else\textsl{##1}\fi}
-\def\HLSCa##1{\ifmmode\mathit{##1}\else\textsc{##1}\fi}
-\def\HLSCb##1{\ifmmode\mathit{##1}\else\textsc{##1}\fi}
-\def\HLSCc##1{\ifmmode\mathit{##1}\else\textsc{##1}\fi}
-\def\HLSCd##1{\ifmmode\mathit{##1}\else\textsc{##1}\fi}
-\def\HLSCe##1{\ifmmode\mathit{##1}\else\textsc{##1}\fi}
-\def\HLSCf##1{\ifmmode\mathit{##1}\else\textsc{##1}\fi}
-\def\HLSCz##1{\ifmmode\mathit{##1}\else\textsc{##1}\fi}
-\def\HLTTa##1{\ifmmode\mathtt{##1}\else\texttt{##1}\fi}
-\def\HLTTb##1{\ifmmode\mathtt{##1}\else\texttt{##1}\fi}
-\def\HLTTc##1{\ifmmode\mathtt{##1}\else\texttt{##1}\fi}
-\def\HLTTd##1{\ifmmode\mathtt{##1}\else\texttt{##1}\fi}
-\def\HLTTe##1{\ifmmode\mathtt{##1}\else\texttt{##1}\fi}
-\def\HLTTf##1{\ifmmode\mathtt{##1}\else\texttt{##1}\fi}
-\def\HLTTq##1{\ifmmode\mathtt{##1}\else\texttt{##1}\fi}
-\def\HLTTr##1{\ifmmode\mathtt{##1}\else\texttt{##1}\fi}
-\def\HLTTz##1{\ifmmode\mathtt{##1}\else\texttt{##1}\fi}
-\def\HLITTTa##1{\ifmmode\mathtt{##1}\else\textsl{\texttt{##1}}\fi}
-\def\HLITTTb##1{\ifmmode\mathtt{##1}\else\textsl{\texttt{##1}}\fi}
-\def\HLITTTc##1{\ifmmode\mathtt{##1}\else\textsl{\texttt{##1}}\fi}
-\def\HLITTTd##1{\ifmmode\mathtt{##1}\else\textsl{\texttt{##1}}\fi}
-\def\HLITTTe##1{\ifmmode\mathtt{##1}\else\textsl{\texttt{##1}}\fi}
-\def\HLITTTf##1{\ifmmode\mathtt{##1}\else\textsl{\texttt{##1}}\fi}
-\def\HLITTTz##1{\ifmmode\mathtt{##1}\else\textsl{\texttt{##1}}\fi}
-\def\HLCBBa##1{\FvrbEx@ColoredBox{##1}{blue}{black}}
-\def\HLCBBb##1{\FvrbEx@ColoredBox{##1}{cyan}{black}}
-\def\HLCBBc##1{\FvrbEx@ColoredBox{##1}{green}{black}}
-\def\HLCBBd##1{\FvrbEx@ColoredBox{##1}{magenta}{black}}
-\def\HLCBBe##1{\FvrbEx@ColoredBox{##1}{red}{black}}
-\def\HLCBBf##1{\FvrbEx@ColoredBox{##1}{yellow}{black}}
-\def\HLCBBz##1{\FvrbEx@ColoredBox{##1}{black}{black}}
-\def\HLCBWa##1{\FvrbEx@ColoredBox{##1}{blue}{white}}
-\def\HLCBWb##1{\FvrbEx@ColoredBox{##1}{green}{white}}
-\def\HLCBWc##1{\FvrbEx@ColoredBox{##1}{green}{white}}
-\def\HLCBWd##1{\FvrbEx@ColoredBox{##1}{magenta}{white}}
-\def\HLCBWe##1{\FvrbEx@ColoredBox{##1}{red}{white}}
-\def\HLCBWf##1{\FvrbEx@ColoredBox{##1}{green}{white}}
-\def\HLCBWz##1{\FvrbEx@ColoredBox{##1}{black}{white}}
-\def\HLSa##1{\underline{##1}}
-\def\HLSb##1{\underline{##1}}
-\def\HLSc##1{\underline{##1}}
-\def\HLSd##1{\underline{##1}}
-\def\HLSe##1{\underline{##1}}
-\def\HLSf##1{\underline{##1}}
-\def\HLSz##1{\underline{##1}}
-\def\HLSaa##1{\underline{##1}}
-\def\HLSbb##1{\underline{##1}}
-\def\HLScc##1{\underline{##1}}
-\def\HLSdd##1{\underline{##1}}
-\def\HLSee##1{\underline{##1}}
-\def\HLSef##1{\underline{##1}}
-\def\HLSez##1{\underline{##1}}
-}
-\def\NoHighlight@Attributes{%
-\catcode`\^^a7=0\relax%
-\catcode`\^^b5=1\relax%
-\catcode`\^^b6=2\relax%
-\def\HLa##1{##1}%
-\def\HLb##1{##1}%
-\def\HLc##1{##1}%
-\def\HLd##1{##1}%
-\def\HLe##1{##1}%
-\def\HLf##1{##1}%
-\def\HLBFa##1{##1}%
-\def\HLBFb##1{##1}%
-\def\HLBFc##1{##1}%
-\def\HLBFd##1{##1}%
-\def\HLBFe##1{##1}%
-\def\HLBFf##1{##1}%
-\def\HLITa##1{##1}%
-\def\HLITb##1{##1}%
-\def\HLITc##1{##1}%
-\def\HLITd##1{##1}%
-\def\HLITe##1{##1}%
-\def\HLITf##1{##1}%
-\def\HLCBBa##1{##1}%
-\def\HLCBBb##1{##1}%
-\def\HLCBBc##1{##1}%
-\def\HLCBBd##1{##1}%
-\def\HLCBBe##1{##1}%
-\def\HLCBBf##1{##1}%
-\def\HLCBBz##1{##1}%
-\def\HLCBWa##1{##1}%
-\def\HLCBWb##1{##1}%
-\def\HLCBWc##1{##1}%
-\def\HLCBWd##1{##1}%
-\def\HLCBWe##1{##1}%
-\def\HLCBWf##1{##1}%
-\def\HLCBWz##1{##1}%
-}
-\Highlight@Attributes
-\endinput
-%%
-%% End of file `hbaw.sty'.
diff --git a/Master/texmf-dist/tex/latex/fancyvrb/hcolor.sty b/Master/texmf-dist/tex/latex/fancyvrb/hcolor.sty
deleted file mode 100644
index 89ee76508bf..00000000000
--- a/Master/texmf-dist/tex/latex/fancyvrb/hcolor.sty
+++ /dev/null
@@ -1,161 +0,0 @@
-%%
-%% This is file `hcolor.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% fvrb-ex.dtx (with options: `hcolor')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
-%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from hcolor.sty.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file fvrb-ex.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%
-%% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
-%%
-%% COPYING:
-%% 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
-%%
-%% Package `hcolor'
-%%
-\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.4}
-\def\filedate{1998/03/19}
-\ProvidesPackage{hcolor}[\filedate]
-\message{`hcolor' v\fileversion, \filedate\space (Denis Girou)}
-\newcommand{\FvrbEx@ColoredUnderline}[3]{%
-$\setbox\z@\hbox{\begingroup#3\endgroup}%
-\dp\z@\z@\m@th\color{#1}\underline{\textcolor{#2}{\box\z@}}$}
-\newcommand{\FvrbEx@ColoredBox}[3]{%
-\fboxsep=1pt\fcolorbox{#2}{#2}{\textcolor{#3}{\textbf{#1}}}}
-\def\Highlight@Attributes{%
-\def\HLa##1{\textcolor{blue}{##1}}
-\def\HLb##1{\textcolor{cyan}{##1}}
-\def\HLc##1{\textcolor{green}{##1}}
-\def\HLd##1{\textcolor{magenta}{##1}}
-\def\HLe##1{\textcolor{red}{##1}}
-\def\HLf##1{\textcolor{yellow}{##1}}
-\def\HLq##1{\textcolor{PaleGreen}{##1}}
-\def\HLr##1{\textcolor{SlateBlue}{##1}}
-\def\HLz##1{\textcolor{black}{##1}}
-\def\HLBFa##1{\textcolor{blue}{\textbf{##1}}}
-\def\HLBFb##1{\textcolor{cyan}{\textbf{##1}}}
-\def\HLBFc##1{\textcolor{green}{\textbf{##1}}}
-\def\HLBFd##1{\textcolor{magenta}{\textbf{##1}}}
-\def\HLBFe##1{\textcolor{red}{\textbf{##1}}}
-\def\HLBFf##1{\textcolor{yellow}{\textbf{##1}}}
-\def\HLBFz##1{\textcolor{black}{\textbf{##1}}}
-\def\HLITa##1{\textcolor{blue}{\textsl{##1}}}
-\def\HLITb##1{\textcolor{cyan}{\textsl{##1}}}
-\def\HLITc##1{\textcolor{green}{\textsl{##1}}}
-\def\HLITd##1{\textcolor{magenta}{\textsl{##1}}}
-\def\HLITe##1{\textcolor{red}{\textsl{##1}}}
-\def\HLITf##1{\textcolor{yellow}{\textsl{##1}}}
-\def\HLITz##1{\textcolor{black}{\textsl{##1}}}
-\def\HLSCa##1{\textcolor{blue}{\textsc{##1}}}
-\def\HLSCb##1{\textcolor{cyan}{\textsc{##1}}}
-\def\HLSCc##1{\textcolor{green}{\textsc{##1}}}
-\def\HLSCd##1{\textcolor{magenta}{\textsc{##1}}}
-\def\HLSCe##1{\textcolor{red}{\textsc{##1}}}
-\def\HLSCf##1{\textcolor{yellow}{\textsc{##1}}}
-\def\HLSCz##1{\textcolor{black}{\textsc{##1}}}
-\def\HLTTa##1{\textcolor{blue}{\texttt{##1}}}
-\def\HLTTb##1{\textcolor{cyan}{\texttt{##1}}}
-\def\HLTTc##1{\textcolor{green}{\texttt{##1}}}
-\def\HLTTd##1{\textcolor{magenta}{\texttt{##1}}}
-\def\HLTTe##1{\textcolor{red}{\texttt{##1}}}
-\def\HLTTf##1{\textcolor{yellow}{\texttt{##1}}}
-\def\HLTTq##1{\textcolor{ForestGreen}{\texttt{##1}}}
-\def\HLTTr##1{\textcolor{PineGreen}{\texttt{##1}}}
-\def\HLTTz##1{\textcolor{black}{\texttt{##1}}}
-\def\HLITTTa##1{\textcolor{blue}{\textsl{\texttt{##1}}}}
-\def\HLITTTb##1{\textcolor{cyan}{\textsl{\texttt{##1}}}}
-\def\HLITTTc##1{\textcolor{green}{\textsl{\texttt{##1}}}}
-\def\HLITTTd##1{\textcolor{magenta}{\textsl{\texttt{##1}}}}
-\def\HLITTTe##1{\textcolor{red}{\textsl{\texttt{##1}}}}
-\def\HLITTTf##1{\textcolor{yellow}{\textsl{\texttt{##1}}}}
-\def\HLITTTz##1{\textcolor{black}{\textsl{\texttt{##1}}}}
-\def\HLCBBa##1{\FvrbEx@ColoredBox{##1}{blue}{black}}
-\def\HLCBBb##1{\FvrbEx@ColoredBox{##1}{cyan}{black}}
-\def\HLCBBc##1{\FvrbEx@ColoredBox{##1}{green}{black}}
-\def\HLCBBd##1{\FvrbEx@ColoredBox{##1}{magenta}{black}}
-\def\HLCBBe##1{\FvrbEx@ColoredBox{##1}{red}{black}}
-\def\HLCBBf##1{\FvrbEx@ColoredBox{##1}{yellow}{black}}
-\def\HLCBBz##1{\FvrbEx@ColoredBox{##1}{black}{black}}
-\def\HLCBWa##1{\FvrbEx@ColoredBox{##1}{blue}{white}}
-\def\HLCBWb##1{\FvrbEx@ColoredBox{##1}{cyan}{white}}
-\def\HLCBWc##1{\FvrbEx@ColoredBox{##1}{green}{white}}
-\def\HLCBWd##1{\FvrbEx@ColoredBox{##1}{magenta}{white}}
-\def\HLCBWe##1{\FvrbEx@ColoredBox{##1}{red}{white}}
-\def\HLCBWf##1{\FvrbEx@ColoredBox{##1}{yellow}{white}}
-\def\HLCBWz##1{\FvrbEx@ColoredBox{##1}{black}{white}}
-\def\HLSa##1{\color{blue}\underline{##1}}
-\def\HLSb##1{\color{cyan}\underline{##1}}
-\def\HLSc##1{\color{green}\underline{##1}}
-\def\HLSd##1{\color{magenta}\underline{##1}}
-\def\HLSe##1{\color{red}\underline{##1}}
-\def\HLSf##1{\color{yellow}\underline{##1}}
-\def\HLSz##1{\color{black}\underline{##1}}
-\def\HLSaa##1{\FvrbEx@ColoredUnderline{blue}{black}{##1}}
-\def\HLSbb##1{\FvrbEx@ColoredUnderline{cyan}{black}{##1}}
-\def\HLScc##1{\FvrbEx@ColoredUnderline{green}{black}{##1}}
-\def\HLSdd##1{\FvrbEx@ColoredUnderline{magenta}{black}{##1}}
-\def\HLSee##1{\FvrbEx@ColoredUnderline{red}{black}{##1}}
-\def\HLSef##1{\FvrbEx@ColoredUnderline{yellow}{black}{##1}}
-\def\HLSez##1{\FvrbEx@ColoredUnderline{black}{black}{##1}}
-}
-\def\NoHighlight@Attributes{%
-\catcode`\^^a7=0\relax%
-\catcode`\^^b5=1\relax%
-\catcode`\^^b6=2\relax%
-\def\HLa##1{##1}%
-\def\HLb##1{##1}%
-\def\HLc##1{##1}%
-\def\HLd##1{##1}%
-\def\HLe##1{##1}%
-\def\HLf##1{##1}%
-\def\HLBFa##1{##1}%
-\def\HLBFb##1{##1}%
-\def\HLBFc##1{##1}%
-\def\HLBFd##1{##1}%
-\def\HLBFe##1{##1}%
-\def\HLBFf##1{##1}%
-\def\HLITa##1{##1}%
-\def\HLITb##1{##1}%
-\def\HLITc##1{##1}%
-\def\HLITd##1{##1}%
-\def\HLITe##1{##1}%
-\def\HLITf##1{##1}%
-\def\HLCBBa##1{##1}%
-\def\HLCBBb##1{##1}%
-\def\HLCBBc##1{##1}%
-\def\HLCBBd##1{##1}%
-\def\HLCBBe##1{##1}%
-\def\HLCBBf##1{##1}%
-\def\HLCBBz##1{##1}%
-\def\HLCBWa##1{##1}%
-\def\HLCBWb##1{##1}%
-\def\HLCBWc##1{##1}%
-\def\HLCBWd##1{##1}%
-\def\HLCBWe##1{##1}%
-\def\HLCBWf##1{##1}%
-\def\HLCBWz##1{##1}%
-}
-\Highlight@Attributes
-\endinput
-%%
-%% End of file `hcolor.sty'.