From 0ab6316f3c9ffb5bfbe36c367287e657e7aa72d2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 17 May 2024 22:15:02 +0000 Subject: fvextra (18may24) git-svn-id: svn://tug.org/texlive/trunk@71282 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fvextra/fvextra.sty | 71 ++++++++++++++++--------- 1 file changed, 46 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/fvextra/fvextra.sty b/Master/texmf-dist/tex/latex/fvextra/fvextra.sty index 20e5ee58ed8..03eb1dc27e3 100644 --- a/Master/texmf-dist/tex/latex/fvextra/fvextra.sty +++ b/Master/texmf-dist/tex/latex/fvextra/fvextra.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2016-2022 by Geoffrey M. Poore +%% Copyright (C) 2016-2024 by Geoffrey M. Poore %% -------------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -20,7 +20,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{fvextra} - [2023/11/28 v1.6.1 fvextra - extensions and patches for fancyvrb] + [2024/05/16 v1.7.0 fvextra - extensions and patches for fancyvrb] \RequirePackage{etoolbox} \RequirePackage{fancyvrb} \RequirePackage{upquote} @@ -326,12 +326,16 @@ \makeatother} \def\FVExtraUnexpandedReadStarOArgMArgBVArg#1#{% \FV@UnexpandedReadStarOArgMArgBVArg@i{#1}} -\def\FV@UnexpandedReadStarOArgMArgBVArg@i#1#2#3{% - \FVExtraAlwaysUnexpanded{\FVExtraUnexpandedReadStarOArgMArgBVArg#1{#2}{#3}}} +\def\FV@UnexpandedReadStarOArgMArgBVArg@i#1#2{% + \FV@UnexpandedReadStarOArgMArgBVArg@ii{#1}{#2}} +\def\FV@UnexpandedReadStarOArgMArgBVArg@ii#1#2#3#{% + \FV@UnexpandedReadStarOArgMArgBVArg@iii{#1}{#2}{#3}} +\def\FV@UnexpandedReadStarOArgMArgBVArg@iii#1#2#3#4{% + \FVExtraAlwaysUnexpanded{\FVExtraUnexpandedReadStarOArgMArgBVArg#1{#2}#3{#4}}} \FVExtrapdfstringdefDisableCommands{% \makeatletter - \def\FV@UnexpandedReadStarOArgMArgBVArg@i#1#2#3{% - \FVExtraPDFStringVerbatimDetokenize{#3}}% + \def\FV@UnexpandedReadStarOArgMArgBVArg@iii#1#2#3#4{% + \FVExtraPDFStringVerbatimDetokenize{#4}}% \makeatother} \def\FVExtraPDFStringEscapeChar#1{% \ifcsname FV@PDFStringEscapeChar@#1\endcsname @@ -1272,17 +1276,19 @@ \def\FVB@VerbatimBuffer{% \@bsphack \begingroup - \setcounter{FancyVerbBufferLine}{0}% - \let\c@FancyVerbLine\c@FancyVerbBufferLine - \setcounter{FancyVerbBufferIndex}{0}% - \setcounter{FV@oldbufferlength}{\expandafter\value\expandafter{\FV@bufferlengthname}}% - \expandafter\setcounter\expandafter{\FV@bufferlengthname}{0}% \FV@UseKeyValues + \setcounter{FancyVerbBufferLine}% + {\expandafter\value\expandafter{\FV@bufferlengthname}}% + \let\c@FancyVerbLine\c@FancyVerbBufferLine + \setcounter{FancyVerbBufferIndex}% + {\expandafter\value\expandafter{\FV@bufferlengthname}}% \ifbool{FV@globalbuffer}% {\global\booltrue{FV@globalbuffer@tmp}}% - {\global\boolfalse{FV@globalbuffer@tmp}}% - \global\let\FV@bufferlengthname@tmp\FV@bufferlengthname - \global\let\FancyVerbBufferLineName@tmp\FancyVerbBufferLineName + {\global\boolfalse{FV@globalbuffer@tmp}% + \setcounter{FV@oldbufferlength}% + {\expandafter\value\expandafter{\FV@bufferlengthname}}% + \global\let\FV@bufferlengthname@tmp\FV@bufferlengthname + \global\let\FancyVerbBufferLineName@tmp\FancyVerbBufferLineName}% \global\let\FV@afterbuffer@tmp\FV@afterbuffer \FV@DefineWhiteSpace \def\FV@ProcessLine{\stepcounter{FancyVerbBufferIndex}\FV@Bufferer}% @@ -1292,28 +1298,27 @@ \FancyVerbFormatCom \FV@Scan} \def\FVE@VerbatimBuffer{% - \endgroup - \@esphack - \expandafter\setcounter\expandafter{\FV@bufferlengthname@tmp}% + \expandafter\setcounter\expandafter{\FV@bufferlengthname}% {\value{FancyVerbBufferIndex}}% \setcounter{FancyVerbBufferIndex}{0}% + \endgroup + \@esphack \begingroup \FV@afterbuffer@tmp + \global\let\FV@afterbuffer@tmp\relax \endgroup \ifbool{FV@globalbuffer@tmp}% {}% - {\ifnum\value{FV@oldbufferlength}>% - \expandafter\value\expandafter{\FV@bufferlengthname@tmp}\relax - \expandafter\setcounter\expandafter{\FV@bufferlengthname@tmp}% - {\value{FV@oldbufferlength}}% - \fi - \loop\unless\ifnum\expandafter\value\expandafter{\FV@bufferlengthname@tmp}=0\relax + {\loop\unless\ifnum\expandafter\value\expandafter{\FV@bufferlengthname@tmp}= + \value{FV@oldbufferlength}\relax \expandafter\global\expandafter\let\csname \FancyVerbBufferLineName@tmp \expandafter\arabic\expandafter{\FV@bufferlengthname@tmp}% \endcsname\FV@Undefined \expandafter\addtocounter\expandafter{\FV@bufferlengthname@tmp}{-1}% - \repeat}} + \repeat + \global\let\FV@bufferlengthname@tmp\relax + \global\let\FancyVerbBufferLineName@tmp\relax}} \def\endVerbatimBuffer{\FVE@VerbatimBuffer} \newcommand{\VerbatimInsertBuffer}[1][]{% \begingroup @@ -1338,7 +1343,7 @@ \global\let\FV@EnvironName\relax \let\next\relax \else - \ifcsname \FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}\endcsname + \ifcsname\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}\endcsname \expandafter\let\expandafter\FV@Line@Buffer \csname\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}\endcsname \expandafter\VerbatimInsertBuffer@def@FV@Line\expandafter{\FV@Line@Buffer}% @@ -1357,6 +1362,22 @@ \FVB@Verbatim \FVE@Verbatim \setcounter{FancyVerbBufferIndex}{0}% + \endgroup + \@doendpe} +\newcommand{\VerbatimClearBuffer}[1][]{% + \begingroup + \def\FV@KeyValues{#1}% + \FV@UseKeyValues + \setcounter{FancyVerbBufferIndex}% + {\expandafter\value\expandafter{\FV@bufferlengthname}}% + \expandafter\setcounter\expandafter{\FV@bufferlengthname}{0}% + \loop\unless\ifnum\value{FancyVerbBufferIndex}<1\relax + \expandafter\global\expandafter\let + \csname\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}\endcsname + \FV@Undefined + \addtocounter{FancyVerbBufferIndex}{-1}% + \repeat + \setcounter{FancyVerbBufferIndex}{0}% \endgroup} \def\FV@Command#1#2{% \FVExtra@ifstarVArg -- cgit v1.2.3