summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/fancyvrb
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-11-21 03:01:17 +0000
committerNorbert Preining <norbert@preining.info>2021-11-21 03:01:17 +0000
commit25fba613796cd9c1b2042e28152d451d8cddef4a (patch)
tree8b5bf577b5ce4f462634fd4405dc9e4d6c883fef /macros/latex/contrib/fancyvrb
parentd1279bd566b17ed06ef34f94854126ea7478355e (diff)
CTAN sync 202111210301
Diffstat (limited to 'macros/latex/contrib/fancyvrb')
-rw-r--r--macros/latex/contrib/fancyvrb/Changes1
-rw-r--r--macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdfbin140061 -> 140917 bytes
-rw-r--r--macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex18
-rw-r--r--macros/latex/contrib/fancyvrb/latex/fancyvrb.sty24
4 files changed, 30 insertions, 13 deletions
diff --git a/macros/latex/contrib/fancyvrb/Changes b/macros/latex/contrib/fancyvrb/Changes
index ee69c48a5a..7033c93e33 100644
--- a/macros/latex/contrib/fancyvrb/Changes
+++ b/macros/latex/contrib/fancyvrb/Changes
@@ -1,4 +1,5 @@
--- fancyvrb.sty
+4.0 2021/11/19 - added lastline=0 for no output (hv)
3.9 2021/10/15 - fix for \@currentcounter and \@currentlabel (hv)
3.8 2021/08/12 - fix for linenumbers and reused SaveVerbatim (hv)
(thanks to Ohad Kammar)
diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
index d72bd4cc2a..3542c93f54 100644
--- a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
+++ b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
index 368f4ac861..434aa99f99 100644
--- a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
+++ b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
@@ -61,7 +61,7 @@
% {\footnotesize \url{tvz@Princeton.EDU}}\\[5mm]
{Packaging and documentation by}\\
{\footnotesize Denis Girou (CNRS/IDRIS -- France),}\\[-2mm]
- {\footnotesize Sebastian Rahtz (Elsevier -- GB)}\\[-2mm]
+ {\footnotesize Sebastian Rahtz\dagger\ (Elsevier -- GB)}\\[-2mm]
{\footnotesize and}\\[-2mm]
{\footnotesize Herbert Voß\ (FU Berlin -- DE)}
}
@@ -714,7 +714,7 @@ bit klunky. Initially you must define the strings with
\begin{SideBySideExample}[gobble=2]
\newcommand*\FancyVerbStartString{FROM}
- \newcommand*\FancyVerbStopString{TO}
+ \renewcommand*\FancyVerbStopString{TO}
\begin{Verbatim}
First verbatim line.
FROM
@@ -726,6 +726,18 @@ bit klunky. Initially you must define the strings with
\noindent To redefine the strings, you must use \cs{renewcommand*}.
+With the setting \texttt{lastline=} or \texttt{lastline=0} nothing will be printed.
+
+\begin{SideBySideExample}[gobble=2]
+ foo
+ \begin{Verbatim}[frame=none,lastline=]
+ First verbatim line.
+ Second verbatim line.
+ Third verbatim line.
+ \end{Verbatim}
+ bar
+\end{SideBySideExample}
+
\subsubsection{Spaces and tab characters}
\begin{optlist}
@@ -736,7 +748,7 @@ bit klunky. Initially you must define the strings with
\begin{SideBySideExample}[gobble=0]
\begin{Verbatim}[showspaces=true]
- Verbatim line.
+ Verbatim line.
\end{Verbatim}
\end{SideBySideExample}
diff --git a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
index d256964b01..47ef7ea7ba 100644
--- a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
+++ b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
@@ -2,7 +2,7 @@
%% This is file `fancyvrb.sty',
%%
%% COPYRIGHT 1992-1999, by Timothy Van Zandt <tvz@zandtwerk.kellogg.nwu.edu>
-%% -2021, by Herbert Voss <hvoss@tug.org>
+%% 2000-... , 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.
@@ -13,9 +13,9 @@
%% verbatim environments and commands and extensive documentation.
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{3.9}
-\def\filedate{2021/10/15}
-\ProvidesPackage{fancyvrb}[2021/10/15 v3.9 verbatim text (tvz,hv)]
+\def\fileversion{4.0}
+\def\filedate{2021/11/19}
+\ProvidesPackage{fancyvrb}[2021/11/18 v4.0 verbatim text (tvz,hv)]
%\message{Style option: `fancyvrb' v\fileversion \space <\filedate> (tvz)}
\csname fancyvrb@loaded\endcsname
\let\fancyvrb@loaded\endinput
@@ -168,6 +168,7 @@
\def\KV@FV@firstline@default{%
\let\FancyVerbStartNum\z@
\let\FancyVerbStartString\relax}
+\def\FancyVerbStopNum{1}
\define@key{FV}{lastline}{%
\afterassignment\FV@ParseStop\@tempcnta=0#1\relax\@nil{#1}}
\def\FV@ParseStop#1\relax\@nil#2{%
@@ -180,7 +181,7 @@
\def\KV@FV@lastline@default{%
\let\FancyVerbStopNum\z@
\let\FancyVerbStopString\relax}
-\fvset{firstline,lastline}
+\fvset{firstline,lastline=\m@ne}
\newcount\FV@CodeLineNo
\def\FV@PreProcessLine{%
\global\advance\FV@CodeLineNo\@ne
@@ -221,7 +222,7 @@
%% SR modification end
\def\FV@DefineFindStop{%
\ifx\FancyVerbStopString\relax
- \ifnum\FancyVerbStopNum<\@ne
+ \ifnum\FancyVerbStopNum<\z@
\let\FV@FindStartStop\FV@@PreProcessLine
\else
\let\FV@FindStartStop\FV@FindStopNum
@@ -523,11 +524,12 @@
\catcode`\^^I=\active
\gdef\FV@DefineWhiteSpace{\def {\FV@Space}\def^^I{\FV@Tab}}%
\endgroup
+\define@key{FV}{file_ext}[.tex]{\def\FancyVerbFileExtension{#1}}
\define@key{FV}{defineactive}[]{\def\FancyVerbDefineActive{#1\relax}}
\define@key{FV}{defineactive*}{%
\expandafter\def\expandafter\FancyVerbDefineActive\expandafter{%
\FancyVerbDefineActive#1\relax}}
-\fvset{defineactive}
+\fvset{defineactive,file_ext=.tex}
\define@booleankey{FV}{showspaces}%
{\def\FV@Space{{\FancyVerbSpace}}}%
{\def\FV@Space{\ }}
@@ -730,9 +732,11 @@
\penalty\interlinepenalty}%
\box\@tempboxa
\else
- \ifx\FV@ProcessLine\FV@ListProcessLine@i
- \FV@Error{Empty verbatim environment}{}%
- \FV@ProcessLine{}%
+ \ifnum\FancyVerbStopNum>\@ne
+ \ifx\FV@ProcessLine\FV@ListProcessLine@i
+ \FV@Error{Empty verbatim environment}{}%
+ \FV@ProcessLine{}%
+ \fi
\fi
\fi
\fi}