fancyvrb spacing, tex4ht r623

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

1 files changed, 59 insertions, 67 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht b/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht
index 5056598ac73..050ea6560fe 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht
@@ -1,36 +1,28 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% fancyvrb.4ht                          2009-05-21-09:32 %
-% Copyright (C) 1997--2009       Eitan M. Gurari         %
-%                                                        %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c of this license or (at your option) any   %
-% later version. The latest version of this license is   %
-% in                                                     %
-%   http://www.latex-project.org/lppl.txt                %
-% and version 1.3c or later is part of all distributions %
-% of LaTeX version 2005/12/01 or later.                  %
-%                                                        %
-% This work has the LPPL maintenance status "maintained".%
-%                                                        %
-% This Current Maintainer of this work                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
-
+% fancyvrb.4ht                          2019-11-13-14:16 %
+% Copyright (C) 1997-2009       Eitan M. Gurari         %
+% Copyright 2009-2019 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
 
    \pend:def\FV@FormattingPrep{\let\fv:color\empty
   \ifx \color\:UnDef\else\Configure{color}{\xdef\fv:color}\fi
 }
-\append:def\FV@FormattingPrep{\a:fancyvrb
+\append:def\FV@FormattingPrep{\a:fancyvrb%
    \ifx \FV@BeginListFrame\relax\else
    \tmp:dim=\FV@FrameRule \edef\HSize{\the\tmp:dim}%
    \a:fancyvrbframe
@@ -49,13 +41,13 @@
 \fi
 %
    \bgroup
-  \ifx \fv:color\empty \else{
-     \let\HColor\fv:color \a:fancyvrbcolor
+  \ifx \fv:color\empty \else{%
+     \let\HColor\fv:color \a:fancyvrbcolor%
   }\fi
-  \ifx \FancyVerbFillColor\relax \else
+  \ifx \FancyVerbFillColor\relax \else%
      \:fvcolor \b:fancyvrbcolor \FancyVerbFillColor!*?: %
   \fi
-  \ifx \FancyVerbRuleColor\relax \else
+  \ifx \FancyVerbRuleColor\relax \else%
      \:fvcolor \c:fancyvrbcolor \FancyVerbRuleColor!*?: %
   \fi
 \egroup
@@ -66,15 +58,15 @@
 %
 }
 \def\FV@ListProcessLine#1{%
-    \hbox{\c:fancyvrb \anc:lbl r{FancyVerbLine}\FV@LeftListNumber
-      \FV@LeftListFrame \e:fancyvrb \FancyVerbFormatLine{#1}\f:fancyvrb
-      \FV@RightListFrame \csname FV@RightListNumber\endcsname
+    \hbox{\c:fancyvrb \anc:lbl r{FancyVerbLine}\FV@LeftListNumber%
+      \FV@LeftListFrame \e:fancyvrb \FancyVerbFormatLine{#1}\f:fancyvrb%
+      \FV@RightListFrame \csname FV@RightListNumber\endcsname %
           \d:fancyvrb}}
-\def\FV@EndList{\FV@ListProcessLastLine  \FV@EndListFrame
-  \IgnorePar\b:fancyvrb\par\@endparenv
+\def\FV@EndList{\FV@ListProcessLastLine  \FV@EndListFrame%
+  \IgnorePar\b:fancyvrb\par\@endparenv%
   \endgroup   \@endpetrue}
 \def\FV@StepLineNo{%
-  \FV@SetLineNo
+  \FV@SetLineNo%
   \def\FV@StepLineNo{\SkipRefstepAnchor\refstepcounter{FancyVerbLine}}%
   \FV@StepLineNo}
 \begingroup
@@ -90,57 +82,57 @@
     \expandafter\@tempa\string#1{\mbox{\a:verb##2\b:verb}\endgroup}%
     \FancyVerbGetVerb\FV@EOL}%
 \endgroup
-\def\FV@UseVerb#1{\mbox{\FV@UseKeyValues
-   \let\a:fancyvrb\empty \FV@FormattingPrep
+\def\FV@UseVerb#1{\mbox{\FV@UseKeyValues%
+   \let\a:fancyvrb\empty \FV@FormattingPrep%
    \a:verb #1\b:verb}}
 \def\:fvcolor#1{\def\a:color##1##2!*?: {%
-   \Configure{SetHColor}#1{##1}}}
+   \Configure{SetHColor}#1{##1}}}%
 \define@key{FV}{framerule}{%
-  \@tempdima=#1\relax
+  \@tempdima=#1\relax%
   \edef\FV@FrameRule{\number\@tempdima sp\relax}%
-  {\Advance:\fancyvrbNo by 1   \tmp:dim=\FV@FrameRule
+  {\Advance:\fancyvrbNo by 1   \tmp:dim=\FV@FrameRule%
    \edef\HSize{\the\tmp:dim}%
    \e:fancyvrbframe}}
 \define@key{FV}{framesep}{%
-  \@tempdima=#1\relax
+  \@tempdima=#1\relax%
   \edef\FV@FrameSep{\number\@tempdima sp\relax}%
-  {\Advance:\fancyvrbNo by 1    \tmp:dim=\FV@FrameSep
+  {\Advance:\fancyvrbNo by 1    \tmp:dim=\FV@FrameSep%
    \edef\HSize{\the\tmp:dim}%
    \f:fancyvrbframe}}
 \def\FV@BVerbatimBegin{%
-  \begingroup
-    \let\a:fancyvrb\empty \IgnorePar
-    \FV@UseKeyValues
-    \FV@BeginVBox
-    \let\FV@ProcessLine\FV@BProcessLine
-    \FV@FormattingPrep
-    \FV@ObeyTabsInit \a:BVerbatimInput
+  \ht:special{t4ht@(}\begingroup%
+    \let\a:fancyvrb\empty\IgnorePar%
+    \FV@UseKeyValues%
+    \FV@BeginVBox%
+    \let\FV@ProcessLine\FV@BProcessLine%
+    \FV@FormattingPrep%
+    \FV@ObeyTabsInit\a:BVerbatimInput\ht:special{t4ht@)}
 }%
-\def\FV@BVerbatimEnd{\b:BVerbatimInput \FV@EndVBox\endgroup}
-\def\FV@BProcessLine#1{\hbox{\FancyVerbFormatLine
+\def\FV@BVerbatimEnd{\b:BVerbatimInput\ht:special{t4ht@(}\FV@EndVBox\ht:special{t4ht@)}\endgroup}
+\def\FV@BProcessLine#1{\hbox{\FancyVerbFormatLine%
    {\c:BVerbatimInput#1\d:BVerbatimInput}}}
 \NewConfigure{BVerbatimInput}{4}
 \def\V@@footnotetext{%
-\leavevmode
-   \vbox\bgroup
+\leavevmode%
+   \vbox\bgroup%
       \leftskip0pt {\ht:everypar{}\parindent0pt\leavevmode}%
       \protected@edef
   \@currentlabel{\csname p@footnote\endcsname\@thefnmark}%
 \anc:lbl f{footnote}%
 %
-      \a:footnotetext
-      \b:footnotetext
-      \csname a:footnotebody\endcsname
-      \bgroup
-          \reset@font\footnotesize
-          \bgroup
-             \aftergroup\V@@@footnotetext
-             \ignorespaces
+      \a:footnotetext%
+      \b:footnotetext%
+      \csname a:footnotebody\endcsname%
+      \bgroup%
+          \reset@font\footnotesize%
+          \bgroup %
+             \aftergroup\V@@@footnotetext %
+             \ignorespaces%
 }
 \def\V@@@footnotetext{%
-      \egroup
-      \csname b:footnotebody\endcsname
-      \c:footnotetext
+      \egroup%
+      \csname b:footnotebody\endcsname%
+      \c:footnotetext%
    \ht:special{t4ht@[}\egroup\ht:special{t4ht@]}%
 }