fancyvrb (20nov18)

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

6 files changed, 18 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/fancyvrb/Changes b/Master/texmf-dist/doc/latex/fancyvrb/Changes
index 8e791480e68..a95b586354e 100644
--- a/Master/texmf-dist/doc/latex/fancyvrb/Changes
+++ b/Master/texmf-dist/doc/latex/fancyvrb/Changes
@@ -1,4 +1,6 @@
 --- fancyvrb.sty
+3.1a 2018/11/20   - small changes to the documentation (hv)  
+3.1  2018/11/17   - load package xcolor only if it is not done already (hv)  
 3.0  2018/11/01   - remove the example part from francyvrb (hv)  
 2.9  2018/10/31   - made \UseVerb robust (hv)  
 2.81 2011/04/06  - added optional argument vspace for the 
diff --git a/Master/texmf-dist/doc/latex/fancyvrb/README b/Master/texmf-dist/doc/latex/fancyvrb/README
index e33f473666c..3f69712c5e0 100644
--- a/Master/texmf-dist/doc/latex/fancyvrb/README
+++ b/Master/texmf-dist/doc/latex/fancyvrb/README
@@ -1,11 +1,10 @@
 
               --------------------------------------------------
               |                   `fancyvrb'                   |
-              |                  Version 2.9                   |
-              |                  Oct 31, 2018                  |
+              |                  Version 3.1                   |
+              |                  Nov 17, 2018                  |
               |                                                |
-	      | Timothy Van Zandt (Princeton University - USA) |
-              |              <tvz@Princeton.EDU>               |
+              | Timothy Van Zandt (Princeton University - USA) |
               |                                                |
               |     Packaging, documentation and support       |
               |       Denis Girou (CNRS/IDRIS - France)        |
@@ -14,6 +13,8 @@
               |       Herbert Voss, Berlin (hvoss@tug.org)     |
               --------------------------------------------------
 
+Report bugs to hvoss@tug.org
+
 
   The `fancyvrb' package provides very sophisticated facilities for reading
 and writing verbatim TeX code. Users can perform common tasks like changing
diff --git a/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb-doc.pdf b/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb-doc.pdf
index 5bccf8e4b18..481e13e6b30 100644
--- a/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb-doc.pdf
+++ b/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb-doc.tex b/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb-doc.tex
index 457a4d26efd..f5de65ae369 100644
--- a/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb-doc.tex
+++ b/Master/texmf-dist/doc/latex/fancyvrb/fancyvrb-doc.tex
@@ -55,15 +55,15 @@
 \pstrickstrue
 %
 \title{The `\textsf{fancyvrb}' package\\Fancy Verbatims in \LaTeX}
-\author{Timothy Van Zandt\\Princeton University\\Princeton -- USA\\
-        {\footnotesize \url{tvz@Princeton.EDU}}\\[5mm]
+\author{Timothy Van Zandt\\Princeton University\\Princeton -- USA\\[5mm]
+%        {\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 Herbert Voß\ (FU Berlin -- DE)}
         }
-\date{Version 3.0\\ \today}
+\date{Version 3.1a\\ \today}
 
 \fvset{frame=single,xrightmargin=0cm,numbers=left,numbersep=3pt,commentchar=Z}
 
@@ -77,6 +77,10 @@
   text and conditionally processing text.
 \end{abstract}
 
+\begin{center}
+Report bugs to \url{hvoss@tug.org}
+\end{center}
+
 \vfill
 Thanks to 
 Philippe Esperet, %\url{esperet@marie.polytechnique.fr}, 
diff --git a/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty b/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
index c0982956a43..13a796577ca 100644
--- a/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
+++ b/Master/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
@@ -13,14 +13,14 @@
 %%   verbatim environments and commands and extensive documentation.
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{3.0}
-\def\filedate{2018/11/01}
+\def\fileversion{3.1a}
+\def\filedate{2018/11/20}
 \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
+\@ifpackageloaded{xcolor}{}{\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}}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 389881f75e2..2d7b8ca66dd 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -443,7 +443,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'extractpdfmark', "die 'skipping, compiled program'",
  'fac',         "die 'skipping, noinfo license'",
  'famt',        "die 'skipping, noinfo license'",
- 'fancyvrb',    "&MAKEfancyvrb",
+ 'fancyvrb',    "&MAKEflatten",
  'faq',         "die 'skipping, use FAQ-en'",
  'faq-en',      "die 'skipping, use FAQ-en'",
  'faq-fr',      "die 'skipping, nonfree'",
@@ -5058,16 +5058,6 @@ sub MAKExmltex {
   &runjob("$CP manual* *xml test* *txt $docdir");
 }
 
-sub MAKEfancyvrb {
- &setup;
- chdir("$DEST/doc/latex/$package");
- print "\t SPECIAL $package: move contrib\n";
- &SYSTEM("$MV contrib/README README.contrib");
- &SYSTEM("$MV contrib/* .; rmdir contrib");
- &buildfilelist;
- &donormal("nosetup");
-}
-
 sub MAKEucs {
  &setup;
  chdir("$DEST/doc/latex/$package");