diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty | 78 |
1 files changed, 52 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty index 541ca0ad1fc..c003418243d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -65,7 +65,7 @@ \renewcommand*{\FV@SingleFrameSep}{} \def\FV@BUseVerbatim#1{% - \LWR@atbeginverbatim[\LWR@FVstyle]{0}{verbatim}% + \LWR@atbeginverbatim{0}{verbatim}% \FV@BVerbatimBegin#1\FV@BVerbatimEnd% \LWR@afterendverbatim{0}% } @@ -73,12 +73,38 @@ \newcommand*{\LWR@FVstyle}{} \newcommand*{\LWR@fvstartnone}{% \LWR@traceinfo{fvstartnone}% -\LWR@atbeginverbatim[\LWR@FVstyle]{0}{verbatim}% +\BlockClass[\LWR@FVstyle]{fancyvrb} +\LWR@stoppars +\ifx\FV@LabelPositionTopLine\relax\else + \ifx\FV@LabelBegin\relax\else + \FancyVerbRuleColor{\LWR@FVfindbordercolor} + \LWR@htmltagc{% + div class="fancyvrblabel" % extra space + style="color: \LWR@origpound\LWR@tempcolor"% + } + \LWR@print@textrm{\FV@LabelBegin}% \textrm preserves emdash + \LWR@htmltagc{/div}\LWR@orignewline% + \fi +\fi +\LWR@atbeginverbatim{0}{verbatim}% } \newcommand*{\LWR@fvendnone}{% \LWR@traceinfo{fvendnone}% \LWR@afterendverbatim{0}% +\LWR@stoppars% +\ifx\FV@LabelPositionBottomLine\relax\else + \ifx\FV@LabelEnd\relax\else + \FancyVerbRuleColor{\LWR@FVfindbordercolor} + \LWR@htmltagc{% + div class="fancyvrblabel" % extra space + style="color: \LWR@origpound\LWR@tempcolor"% + } + \LWR@print@textrm{\FV@LabelEnd} + \LWR@htmltagc{/div}\LWR@orignewline% + \fi +\fi +\endBlockClass } \newcommand*{\LWR@fvstartsingle}{% @@ -111,10 +137,10 @@ } \newcommand*{\LWR@FVborderstyle}[1]{% -padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; % -\LWR@FVfindbordercolor % -border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt % -solid \LWR@origpound\LWR@tempcolor ; % +padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; % space +\LWR@FVfindbordercolor\LWR@indentHTMLtwo% +border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt % space +solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space } \def\FV@Frame@none{% @@ -127,7 +153,10 @@ solid \LWR@origpound\LWR@tempcolor ; % \FV@Frame@none% default values \def\FV@Frame@single{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{}% +}% \let\FV@BeginListFrame\LWR@fvstartsingle% \let\FV@LeftListFrame\FV@LeftListFrame@Single% \let\FV@RightListFrame\FV@RightListFrame@Single% @@ -135,7 +164,10 @@ solid \LWR@origpound\LWR@tempcolor ; % \def\FV@Frame@lines{% \renewcommand*{\LWR@FVstyle}{% - \LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-top}% + \LWR@indentHTMLtwo% + \LWR@FVborderstyle{-bottom}% }% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% @@ -143,21 +175,30 @@ solid \LWR@origpound\LWR@tempcolor ; % \let\FV@EndListFrame\LWR@fvendline} \def\FV@Frame@topline{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-top}% +}% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendnone} \def\FV@Frame@bottomline{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-bottom}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-bottom}% +}% \let\FV@BeginListFrame\LWR@fvstartnone% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendline} \def\FV@Frame@leftline{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-left}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-left}% +}% \ifx\FancyVerbFillColor\relax% \let\FV@FrameFillLine\relax% \else% @@ -182,25 +223,10 @@ solid \LWR@origpound\LWR@tempcolor ; % \ifnum#1=\z@ \ifx\FV@LabelPositionTopLine\relax \else - \LWR@FVfindbordercolor - \LWR@htmltagc{% - div class="fancyvrblabel" % extra space - style="color: \LWR@origpound\LWR@tempcolor"% - } - \LWR@print@textrm{\FV@LabelBegin}% \textrm preserves emdash - \LWR@htmltagc{/div} \fi \else \ifx\FV@LabelPositionBottomLine\relax \else - \LWR@FVfindbordercolor - - \LWR@htmltagc{% - div class="fancyvrblabel" % extra space - style="color: \LWR@origpound\LWR@tempcolor"% - } - \LWR@print@textrm{\FV@LabelEnd} - \LWR@htmltagc{/div} \fi \fi \fi |