texlive[41745] Master/texmf-dist: minted (21jul16)
commits+karl at tug.org
commits+karl at tug.org
Thu Jul 21 23:18:02 CEST 2016
Revision: 41745
http://tug.org/svn/texlive?view=revision&revision=41745
Author: karl
Date: 2016-07-21 23:18:02 +0200 (Thu, 21 Jul 2016)
Log Message:
-----------
minted (21jul16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/minted/minted.pdf
trunk/Master/texmf-dist/source/latex/minted/minted.dtx
trunk/Master/texmf-dist/tex/latex/minted/minted.sty
Modified: trunk/Master/texmf-dist/doc/latex/minted/minted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/minted/minted.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/minted/minted.dtx 2016-07-21 21:17:50 UTC (rev 41744)
+++ trunk/Master/texmf-dist/source/latex/minted/minted.dtx 2016-07-21 21:18:02 UTC (rev 41745)
@@ -31,7 +31,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{minted}
%<*package>
- [2016/07/14 v2.3 Yet another Pygments shim for LaTeX]
+ [2016/07/20 v2.4 Yet another Pygments shim for LaTeX]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -195,7 +195,7 @@
%</driver>
% \fi
%
-% \CheckSum{2928}
+% \CheckSum{2542}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -216,6 +216,12 @@
%
%
%
+% \begin{changelog}{v2.4}{2016/07/20}
+% \item Line breaking and all associated options are now completely delegated to \texttt{fvextra}.
+% \item Fixed a bug from v2.2 that could cause the first command or environment to vanish when \texttt{caching=false} (related to work on \texttt{\string\MintedPygmentize}).
+% \end{changelog}
+%
+%
% \begin{changelog}{v2.3}{2016/07/14}
% \item The \texttt{fvextra} package is now required. \texttt{fvextra} extends and patches \texttt{fancyvrb}, and includes improved versions of \texttt{fancyvrb} extensions that were formerly in \texttt{minted}.
% \item As part of \texttt{fvextra}, the \texttt{upquote} package is always loaded. \texttt{fvextra} brings the new option \texttt{curlyquotes}, which allows curly single quotation marks instead of the literal backtick and typewriter single quotation mark produced by \texttt{upquote}. This allows the default \texttt{upquote} behavior to be disabled when desired.
@@ -2568,8 +2574,9 @@
\minted at def@optfv at switch{samepage}
\minted at def@optfv at switch{showtabs}
\minted at def@optfv at switch{obeytabs}
-% The following are patches currently added onto fancyvrb
\minted at def@optfv at switch{breaklines}
+\minted at def@optfv at switch{breakbytoken}
+\minted at def@optfv at switch{breakbytokenanywhere}
\minted at def@optfv{breakindent}
\minted at def@optfv at switch{breakautoindent}
\minted at def@optfv{breaksymbol}
@@ -2596,12 +2603,6 @@
%
% Finally, options specific to \pkg{minted}.
%
-% An option to force |breaklines| to work at the Pygments token level, rather than at the character level. This is useful in keeping things like strings from being split between lines.
-% \begin{macrocode}
-\minted at def@opt at switch{breakbytoken}
-\minted at def@opt at switch{breakbytokenanywhere}
-% \end{macrocode}
-%
% |bgcolor|. The original, |minipage|- and |\colorbox|-based solution was replaced with a |framed|-based solution in version 2.2. A dedicated framing package will often be preferable.
% \begin{macrocode}
\minted at def@opt{bgcolor}
@@ -2740,8 +2741,11 @@
%
% \textbf{This macro must always be checked carefully whenever it is modified.} Under no circumstances should |#1| be written to or opened by Python in write mode. When |\inputminted| is used, |#1| will be an external file that is brought in for highlighting, so it must be left intact.
%
+% At the very beginning, a check is performed to make sure that style macros exist. This must be done before the highlighted content is generated, so that temp file names can be shared without accidental overwriting. Styles are generated here, rather than when a style is set, so that creating the style macros is done as late as possible in case a custom |pygmentize| is in use via |\MintedPygmentize|.
+%
% \begin{macrocode}
\newcommand{\minted at pygmentize}[2][\minted at outputdir\minted at jobname.pyg]{%
+ \minted at checkstyle{\minted at get@opt{style}{default}}%
\stepcounter{minted at pygmentizecounter}%
\ifthenelse{\equal{\minted at get@opt{autogobble}{false}}{true}}%
{\def\minted at codefile{\minted at outputdir\minted at jobname.pyg}}%
@@ -2895,185 +2899,24 @@
% \begin{macro}{\minted at inputpyg}
% For increased clarity, the actual |\input| process is separated out into its own macro.
%
-% A check is performed to make sure that style macros exist. This is done here, rather than when a style is set, so that creating the style macros is done as late as possible in case a custom |pygmentize| is in use via |\MintedPygmentize|. At the last possible moment, |\PYG| is |\let| to |\PYG<style>|. All modifications to the style macro for breaking are made to |\PYG<style>| rather than |\PYG|, so that the |\let|ing that must ultimately take place will indeed do what is intended.
+% At the last possible moment, |\PYG| is |\let| to |\PYG|\meta{style} and redefined to used appropriate line breaking via |\VerbatimPygments| from \pkg{fvextra}.
%
-% The |bgcolor| option needs to be dealt with in different ways depending on whether we are using |\mintinline|. It is simplest to apply this option here, so that the macro redefinitions may be local and thus do not need to be manually reset later. To simplify the logic, |breakbytoken| is turned on if |breakbytokenanywhere| is on.
+% The |bgcolor| option needs to be dealt with in different ways depending on whether we are using |\mintinline|. It is simplest to apply this option here, so that the macro redefinitions may be local and thus do not need to be manually reset later.
% \begin{macrocode}
-\def\minted at BreakBeforePrep@extension{%
- \ifcsname FV at BreakBefore@Token\@backslashchar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZbs}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\FV at underscorechar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZus}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\@charlb\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZob}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\@charrb\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZcb}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{^}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZca}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\FV at ampchar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZam}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{<}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZlt}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{>}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZgt}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\FV at hashchar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZsh}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\@percentchar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZpc}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\FV at dollarchar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZdl}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{-}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZhy}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{'}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZsq}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{"}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZdq}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\FV at tildechar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZti}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{@}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZat}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{[}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZlb}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{]}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZrb}}{}%
- \fi
-}
-\def\minted at BreakAfterPrep@extension{%
- \ifcsname FV at BreakAfter@Token\@backslashchar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZbs}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\FV at underscorechar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZus}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\@charlb\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZob}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\@charrb\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZcb}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{^}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZca}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\FV at ampchar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZam}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{<}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZlt}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{>}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZgt}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\FV at hashchar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZsh}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\@percentchar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZpc}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\FV at dollarchar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZdl}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{-}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZhy}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{'}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZsq}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{"}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZdq}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\FV at tildechar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZti}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{@}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZat}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{[}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZlb}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{]}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZrb}}{}%
- \fi
-}
\newcommand{\minted at inputpyg}{%
- \minted at checkstyle{\minted at get@opt{style}{default}}%
- \let\FV at BreakBeforePrep@orig\FV at BreakBeforePrep
- \def\FV at BreakBeforePrep{%
- \FV at BreakBeforePrep@orig\minted at BreakBeforePrep@extension}%
- \let\FV at BreakAfterPrep@orig\FV at BreakAfterPrep
- \def\FV at BreakAfterPrep{%
- \FV at BreakAfterPrep@orig\minted at BreakAfterPrep@extension}%
- \ifthenelse{\equal{\minted at get@opt{breakbytokenanywhere}{false}}{true}}%
- {\setkeys{minted at opt@cmd}{breakbytoken=true}}{}%
- \ifthenelse{\boolean{FV at BreakAnywhere}}%
- {\expandafter\let\expandafter\minted at orig@PYG at breakanywhere%
- \csname PYG\minted at get@opt{style}{default}\endcsname
- \expandafter\def\csname PYG\minted at get@opt{style}{default}\endcsname##1##2{%
- \minted at orig@PYG at breakanywhere{##1}%
- {\FancyVerbBreakStart##2\FancyVerbBreakStop}}}{}%
- \ifx\FV at BreakBefore\@empty
- \ifx\FV at BreakAfter\@empty
- \else
- \expandafter\let\expandafter\minted at orig@PYG at breakbeforeafter%
- \csname PYG\minted at get@opt{style}{default}\endcsname
- \expandafter\def\csname PYG\minted at get@opt{style}{default}\endcsname##1##2{%
- \minted at orig@PYG at breakbeforeafter{##1}%
- {\FancyVerbBreakStart##2\FancyVerbBreakStop}}%
- \fi
- \else
- \expandafter\let\expandafter\minted at orig@PYG at breakbeforeafter%
- \csname PYG\minted at get@opt{style}{default}\endcsname
- \expandafter\def\csname PYG\minted at get@opt{style}{default}\endcsname##1##2{%
- \minted at orig@PYG at breakbeforeafter{##1}%
- {\FancyVerbBreakStart##2\FancyVerbBreakStop}}%
- \fi
+ \expandafter\let\expandafter\minted at PYGstyle%
+ \csname PYG\minted at get@opt{style}{default}\endcsname
+ \VerbatimPygments{\PYG}{\minted at PYGstyle}%
\ifthenelse{\boolean{minted at isinline}}%
{\ifthenelse{\equal{\minted at get@opt{breaklines}{false}}{true}}%
{\let\FV at BeginVBox\relax
\let\FV at EndVBox\relax
\def\FV at BProcessLine##1{\FancyVerbFormatLine{##1}}%
- \ifthenelse{\equal{\minted at get@opt{breakbytoken}{false}}{true}}%
- {\minted at inputpyg@breakbytoken
- \minted at inputpyg@inline}%
- {\minted at inputpyg@inline}}%
+ \minted at inputpyg@inline}%
{\minted at inputpyg@inline}}%
- {\ifthenelse{\equal{\minted at get@opt{breaklines}{false}}{true}}%
- {\ifthenelse{\equal{\minted at get@opt{breakbytoken}{false}}{true}}%
- {\minted at inputpyg@breakbytoken
- \minted at inputpyg@block}%
- {\minted at inputpyg@block}}%
- {\minted at inputpyg@block}}%
+ {\minted at inputpyg@block}%
}
-\def\minted at inputpyg@breakbytoken{%
- \expandafter\let\expandafter\minted at orig@PYG at breakbytoken%
- \csname PYG\minted at get@opt{style}{default}\endcsname
- \ifthenelse{\equal{\minted at get@opt{breakbytokenanywhere}{false}}{true}}%
- {\let\minted at orig@allowbreak\allowbreak
- \def\allowbreak{\let\allowbreak\minted at orig@allowbreak}%
- \expandafter\def\csname PYG\minted at get@opt{style}{default}\endcsname##1##2{%
- \allowbreak{}\leavevmode\hbox{\minted at orig@PYG at breakbytoken{##1}{##2}}}}%
- {\expandafter\def\csname PYG\minted at get@opt{style}{default}\endcsname##1##2{%
- \leavevmode\hbox{\minted at orig@PYG at breakbytoken{##1}{##2}}}}%
-}
\def\minted at inputpyg@inline{%
- \expandafter\let\expandafter\PYG%
- \csname PYG\minted at get@opt{style}{default}\endcsname
\ifthenelse{\equal{\minted at get@opt{bgcolor}{}}{}}%
{\minted at input{\minted at outputdir\minted at infile}}%
{\colorbox{\minted at get@opt{bgcolor}{}}{%
@@ -3080,8 +2923,6 @@
\minted at input{\minted at outputdir\minted at infile}}}%
}
\def\minted at inputpyg@block{%
- \expandafter\let\expandafter\PYG%
- \csname PYG\minted at get@opt{style}{default}\endcsname
\ifthenelse{\equal{\minted at get@opt{bgcolor}{}}{}}%
{\minted at input{\minted at outputdir\minted at infile}}%
{\begin{minted at colorbg}{\minted at get@opt{bgcolor}{}}%
Modified: trunk/Master/texmf-dist/tex/latex/minted/minted.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minted/minted.sty 2016-07-21 21:17:50 UTC (rev 41744)
+++ trunk/Master/texmf-dist/tex/latex/minted/minted.sty 2016-07-21 21:18:02 UTC (rev 41745)
@@ -27,7 +27,7 @@
%% and the derived file minted.sty.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{minted}
- [2016/07/14 v2.3 Yet another Pygments shim for LaTeX]
+ [2016/07/20 v2.4 Yet another Pygments shim for LaTeX]
\RequirePackage{keyval}
\RequirePackage{kvoptions}
\RequirePackage{fvextra}
@@ -662,6 +662,8 @@
\minted at def@optfv at switch{showtabs}
\minted at def@optfv at switch{obeytabs}
\minted at def@optfv at switch{breaklines}
+\minted at def@optfv at switch{breakbytoken}
+\minted at def@optfv at switch{breakbytokenanywhere}
\minted at def@optfv{breakindent}
\minted at def@optfv at switch{breakautoindent}
\minted at def@optfv{breaksymbol}
@@ -684,8 +686,6 @@
\minted at def@optfv at switch{breakanywhere}
\minted at def@optfv{breakanywheresymbolpre}
\minted at def@optfv{breakanywheresymbolpost}
-\minted at def@opt at switch{breakbytoken}
-\minted at def@opt at switch{breakbytokenanywhere}
\minted at def@opt{bgcolor}
\minted at def@opt at switch{autogobble}
\newcommand{\minted at encoding}{\minted at get@opt{encoding}{UTF8}}
@@ -729,6 +729,7 @@
\fi
\newcounter{minted at pygmentizecounter}
\newcommand{\minted at pygmentize}[2][\minted at outputdir\minted at jobname.pyg]{%
+ \minted at checkstyle{\minted at get@opt{style}{default}}%
\stepcounter{minted at pygmentizecounter}%
\ifthenelse{\equal{\minted at get@opt{autogobble}{false}}{true}}%
{\def\minted at codefile{\minted at outputdir\minted at jobname.pyg}}%
@@ -876,181 +877,20 @@
\ShellEscape{\minted at cmd}%
\minted at inputpyg}%
}
-\def\minted at BreakBeforePrep@extension{%
- \ifcsname FV at BreakBefore@Token\@backslashchar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZbs}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\FV at underscorechar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZus}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\@charlb\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZob}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\@charrb\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZcb}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{^}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZca}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\FV at ampchar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZam}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{<}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZlt}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{>}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZgt}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\FV at hashchar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZsh}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\@percentchar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZpc}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\FV at dollarchar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZdl}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{-}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZhy}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{'}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZsq}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{"}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZdq}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\FV at tildechar\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZti}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{@}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZat}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{[}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZlb}}{}%
- \fi
- \ifcsname FV at BreakBefore@Token\detokenize{]}\endcsname
- \@namedef{FV at BreakBefore@Token\detokenize{\PYGZrb}}{}%
- \fi
-}
-\def\minted at BreakAfterPrep@extension{%
- \ifcsname FV at BreakAfter@Token\@backslashchar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZbs}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\FV at underscorechar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZus}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\@charlb\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZob}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\@charrb\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZcb}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{^}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZca}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\FV at ampchar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZam}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{<}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZlt}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{>}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZgt}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\FV at hashchar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZsh}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\@percentchar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZpc}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\FV at dollarchar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZdl}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{-}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZhy}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{'}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZsq}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{"}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZdq}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\FV at tildechar\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZti}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{@}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZat}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{[}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZlb}}{}%
- \fi
- \ifcsname FV at BreakAfter@Token\detokenize{]}\endcsname
- \@namedef{FV at BreakAfter@Token\detokenize{\PYGZrb}}{}%
- \fi
-}
\newcommand{\minted at inputpyg}{%
- \minted at checkstyle{\minted at get@opt{style}{default}}%
- \let\FV at BreakBeforePrep@orig\FV at BreakBeforePrep
- \def\FV at BreakBeforePrep{%
- \FV at BreakBeforePrep@orig\minted at BreakBeforePrep@extension}%
- \let\FV at BreakAfterPrep@orig\FV at BreakAfterPrep
- \def\FV at BreakAfterPrep{%
- \FV at BreakAfterPrep@orig\minted at BreakAfterPrep@extension}%
- \ifthenelse{\equal{\minted at get@opt{breakbytokenanywhere}{false}}{true}}%
- {\setkeys{minted at opt@cmd}{breakbytoken=true}}{}%
- \ifthenelse{\boolean{FV at BreakAnywhere}}%
- {\expandafter\let\expandafter\minted at orig@PYG at breakanywhere%
- \csname PYG\minted at get@opt{style}{default}\endcsname
- \expandafter\def\csname PYG\minted at get@opt{style}{default}\endcsname##1##2{%
- \minted at orig@PYG at breakanywhere{##1}%
- {\FancyVerbBreakStart##2\FancyVerbBreakStop}}}{}%
- \ifx\FV at BreakBefore\@empty
- \ifx\FV at BreakAfter\@empty
- \else
- \expandafter\let\expandafter\minted at orig@PYG at breakbeforeafter%
- \csname PYG\minted at get@opt{style}{default}\endcsname
- \expandafter\def\csname PYG\minted at get@opt{style}{default}\endcsname##1##2{%
- \minted at orig@PYG at breakbeforeafter{##1}%
- {\FancyVerbBreakStart##2\FancyVerbBreakStop}}%
- \fi
- \else
- \expandafter\let\expandafter\minted at orig@PYG at breakbeforeafter%
- \csname PYG\minted at get@opt{style}{default}\endcsname
- \expandafter\def\csname PYG\minted at get@opt{style}{default}\endcsname##1##2{%
- \minted at orig@PYG at breakbeforeafter{##1}%
- {\FancyVerbBreakStart##2\FancyVerbBreakStop}}%
- \fi
+ \expandafter\let\expandafter\minted at PYGstyle%
+ \csname PYG\minted at get@opt{style}{default}\endcsname
+ \VerbatimPygments{\PYG}{\minted at PYGstyle}%
\ifthenelse{\boolean{minted at isinline}}%
{\ifthenelse{\equal{\minted at get@opt{breaklines}{false}}{true}}%
{\let\FV at BeginVBox\relax
\let\FV at EndVBox\relax
\def\FV at BProcessLine##1{\FancyVerbFormatLine{##1}}%
- \ifthenelse{\equal{\minted at get@opt{breakbytoken}{false}}{true}}%
- {\minted at inputpyg@breakbytoken
- \minted at inputpyg@inline}%
- {\minted at inputpyg@inline}}%
+ \minted at inputpyg@inline}%
{\minted at inputpyg@inline}}%
- {\ifthenelse{\equal{\minted at get@opt{breaklines}{false}}{true}}%
- {\ifthenelse{\equal{\minted at get@opt{breakbytoken}{false}}{true}}%
- {\minted at inputpyg@breakbytoken
- \minted at inputpyg@block}%
- {\minted at inputpyg@block}}%
- {\minted at inputpyg@block}}%
+ {\minted at inputpyg@block}%
}
-\def\minted at inputpyg@breakbytoken{%
- \expandafter\let\expandafter\minted at orig@PYG at breakbytoken%
- \csname PYG\minted at get@opt{style}{default}\endcsname
- \ifthenelse{\equal{\minted at get@opt{breakbytokenanywhere}{false}}{true}}%
- {\let\minted at orig@allowbreak\allowbreak
- \def\allowbreak{\let\allowbreak\minted at orig@allowbreak}%
- \expandafter\def\csname PYG\minted at get@opt{style}{default}\endcsname##1##2{%
- \allowbreak{}\leavevmode\hbox{\minted at orig@PYG at breakbytoken{##1}{##2}}}}%
- {\expandafter\def\csname PYG\minted at get@opt{style}{default}\endcsname##1##2{%
- \leavevmode\hbox{\minted at orig@PYG at breakbytoken{##1}{##2}}}}%
-}
\def\minted at inputpyg@inline{%
- \expandafter\let\expandafter\PYG%
- \csname PYG\minted at get@opt{style}{default}\endcsname
\ifthenelse{\equal{\minted at get@opt{bgcolor}{}}{}}%
{\minted at input{\minted at outputdir\minted at infile}}%
{\colorbox{\minted at get@opt{bgcolor}{}}{%
@@ -1057,8 +897,6 @@
\minted at input{\minted at outputdir\minted at infile}}}%
}
\def\minted at inputpyg@block{%
- \expandafter\let\expandafter\PYG%
- \csname PYG\minted at get@opt{style}{default}\endcsname
\ifthenelse{\equal{\minted at get@opt{bgcolor}{}}{}}%
{\minted at input{\minted at outputdir\minted at infile}}%
{\begin{minted at colorbg}{\minted at get@opt{bgcolor}{}}%
More information about the tex-live-commits
mailing list