From 0f274cbeb1205f6b677c117e09b1252da1355bad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 25 Dec 2021 21:41:49 +0000 Subject: minted (25dec21) git-svn-id: svn://tug.org/texlive/trunk@61405 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/minted/Makefile | 38 -- Master/texmf-dist/doc/latex/minted/minted.pdf | Bin 807079 -> 845885 bytes Master/texmf-dist/source/latex/minted/Makefile | 38 ++ Master/texmf-dist/source/latex/minted/minted.dtx | 422 +++++++++++++++-------- Master/texmf-dist/source/latex/minted/minted.ins | 2 +- Master/texmf-dist/tex/latex/minted/minted.sty | 305 +++++++++------- Master/texmf-dist/tex/latex/minted/minted1.sty | 2 +- 7 files changed, 482 insertions(+), 325 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/minted/Makefile create mode 100644 Master/texmf-dist/source/latex/minted/Makefile (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/minted/Makefile b/Master/texmf-dist/doc/latex/minted/Makefile deleted file mode 100644 index ae199e79d50..00000000000 --- a/Master/texmf-dist/doc/latex/minted/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -TEXFLAGS = -e '$$pdflatex=q/pdflatex %O -shell-escape %S/' -pdf -LATEXMK = latexmk - -PACKAGE = minted.dtx \ - minted.ins \ - minted.pdf \ - README \ - Makefile - -.PHONY: minted all doc dist clean cleanall - -minted: minted.sty - -doc: minted.pdf - -all: minted doc - -minted.sty: minted.ins minted.dtx - tex minted.ins - -minted.pdf: minted.sty minted.gls minted.dtx - $(LATEXMK) $(TEXFLAGS) minted.dtx - -minted.gls: minted.glo - makeindex -s gglo.ist -o minted.gls minted.glo - -minted.glo: minted.dtx minted.sty - $(LATEXMK) $(TEXFLAGS) minted.dtx - -dist: $(PACKAGE) - @$(RM) minted.zip - @zip minted-$(shell grep '^\\ProvidesPackage' < minted.sty | grep -o '\').zip $(PACKAGE) - -clean: - @$(RM) *.aux *.log *.out *.toc *.fdb_latexmk *.ilg *.glo *.gls *.lol - -cleanall: clean - @$(RM) minted.sty minted.zip diff --git a/Master/texmf-dist/doc/latex/minted/minted.pdf b/Master/texmf-dist/doc/latex/minted/minted.pdf index 9558879271e..a66953bc0e1 100644 Binary files a/Master/texmf-dist/doc/latex/minted/minted.pdf and b/Master/texmf-dist/doc/latex/minted/minted.pdf differ diff --git a/Master/texmf-dist/source/latex/minted/Makefile b/Master/texmf-dist/source/latex/minted/Makefile new file mode 100644 index 00000000000..ae199e79d50 --- /dev/null +++ b/Master/texmf-dist/source/latex/minted/Makefile @@ -0,0 +1,38 @@ +TEXFLAGS = -e '$$pdflatex=q/pdflatex %O -shell-escape %S/' -pdf +LATEXMK = latexmk + +PACKAGE = minted.dtx \ + minted.ins \ + minted.pdf \ + README \ + Makefile + +.PHONY: minted all doc dist clean cleanall + +minted: minted.sty + +doc: minted.pdf + +all: minted doc + +minted.sty: minted.ins minted.dtx + tex minted.ins + +minted.pdf: minted.sty minted.gls minted.dtx + $(LATEXMK) $(TEXFLAGS) minted.dtx + +minted.gls: minted.glo + makeindex -s gglo.ist -o minted.gls minted.glo + +minted.glo: minted.dtx minted.sty + $(LATEXMK) $(TEXFLAGS) minted.dtx + +dist: $(PACKAGE) + @$(RM) minted.zip + @zip minted-$(shell grep '^\\ProvidesPackage' < minted.sty | grep -o '\').zip $(PACKAGE) + +clean: + @$(RM) *.aux *.log *.out *.toc *.fdb_latexmk *.ilg *.glo *.gls *.lol + +cleanall: clean + @$(RM) minted.sty minted.zip diff --git a/Master/texmf-dist/source/latex/minted/minted.dtx b/Master/texmf-dist/source/latex/minted/minted.dtx index 3a15d7c1e69..3d2ac0219d0 100644 --- a/Master/texmf-dist/source/latex/minted/minted.dtx +++ b/Master/texmf-dist/source/latex/minted/minted.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2013-2017 by Geoffrey M. Poore +% Copyright (C) 2013-2021 by Geoffrey M. Poore % Copyright (C) 2010-2011 by Konrad Rudolph % --------------------------------------------------------------------------- % This work may be distributed and/or modified under the @@ -31,7 +31,7 @@ %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{minted} %<*package> - [2017/07/19 v2.5 Yet another Pygments shim for LaTeX] + [2021/12/24 v2.6 Yet another Pygments shim for LaTeX] % %<*driver> \documentclass{ltxdoc} @@ -49,10 +49,6 @@ \usepackage[svgnames]{xcolor} \usepackage{textcomp} \usepackage[cache, langlinenos]{minted} -% Need to set the style here so that it is defined and brought in here. -% If the style is set later, then docstrip interferes with any comments in -% the style definition so that they appear as literal text in the document. -\setminted{style=default} \usepackage{environ} \usepackage{graphicx} @@ -61,6 +57,20 @@ \makeatletter +% The typesetting for macrocode doesn't use \@noligs, which upquote modifies. +% So apply the upquote fix to \verbatim@nolig@list as well, which is in macrocode. +\begingroup +\catcode`'=\active +\catcode``=\active +\g@addto@macro\verbatim@nolig@list{% + \let'\textquotesingle + \let`\textasciigrave + \ifx\encodingdefault\upquote@OTone + \ifx\ttdefault\upquote@cmtt + \def'{\char13 }% + \def`{\char18 }% + \fi\fi} +\endgroup % Create a short verbatim pipe that handles quotation marks properly \begingroup @@ -98,8 +108,8 @@ \g@addto@macro\changestext{\end{itemize}}% } \newcommand{\PrintChangelog}{% - \addcontentsline{toc}{section}{Version History} \section*{Version History}% + \addcontentsline{toc}{section}{Version History} \label{sec:version-history} \begin{description}% \changestext @@ -195,7 +205,7 @@ % % \fi % -% \CheckSum{2604} +% \CheckSum{2593} % % \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 +226,18 @@ % % % +% \begin{changelog}{v2.6}{2021/12/24} +% \item \texttt{autogobble} automatically uses \texttt{python} or \texttt{python3} executables, depending on availability, instead of requiring \texttt{python}. A custom executable can be specified by redefining \texttt{\string\MintedPython} (\#277, \#287). +% \item Fixed \texttt{autogobble} compatibility with \texttt{fancyvrb} 4.0+ (\#315, \#316). +% \item Pygments style names may now contain arbitrary non-whitespace characters. Previously, style names containing digits and some punctuation characters were incompatible (\#210, \#294, \#299, \#317). Pygments macros are now only defined just before use locally within \texttt{minted} commands and environments, rather than globally. Pygments macros now always use a \texttt{\string\PYG} prefix regardless of style, rather than a prefix of the form \texttt{\string\PYG