fixed catcode issues with Pygments macros in .dtx files or with babel magyar; improved code typesetting in documentation; improved changelog for v2.6

Author: gpoore

source/minted.dtx

@@ -31,7 +31,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{minted}
 %<*package>
-    [2021/12/23 v2.6dev Yet another Pygments shim for LaTeX]
+    [2021/12/24 v2.6dev Yet another Pygments shim for LaTeX]
 %</package>
 %<*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
@@ -195,7 +205,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{2587}
+% \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
@@ -218,11 +228,11 @@
 %
 % \begin{changelog}{v2.6}{2021/12/??}
 % \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<style>} (for example, what was previously \texttt{\string\PYGdefault} is now simply \texttt{\string\PYG}).
 % \item Removed Python-based MD5 hashing for XeTeX, which was necessary before XeTeX added \texttt{\string\mdfivesum} in 2017.
 % \item The default for \texttt{stripnl} is now \texttt{false}, so that original code is preserved exactly by default (\#198).
 % \item Added support for \texttt{fontencoding} option from \texttt{fvextra} (\#208).
-% \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).
-% \item Fixed \texttt{autogobble} compatibility with \texttt{fancyvrb} 4.0+ (\#315, \#316).
 % \item Added note to FAQ about getting \texttt{texi2pdf} to work with \texttt{minted} given \texttt{texi2pdf}'s assumptions about temp files (\#186).
 % \item Reimplemented \texttt{bgcolor} option to be compatible with \texttt{color} package.
 % \end{changelog}
@@ -556,6 +566,8 @@
 %   \item framed
 %   \item shellesc (for luatex 0.87+)
 %   \item catchfile
+%
+%   ~
 % \end{list}
 % \endgroup
 % \end{multicols}
@@ -2453,11 +2465,13 @@
 %
 % Takes a single argument that is the detokenized style name.  Getting the detokenized style name here requires expansion (|\edef|) in an earlier macro (currently |\minted@defstyle|) to convert |\minted@get@opt{style}{default}| into detokenized text.  The |style| value is always wrapped in |\detokenize| when it is set, so expansion automatically detokenizes.  Detokenization can be important depending on active characters.  Expansion is important because the style name may be used with caching, so we need the current value retrieved by |\minted@get@opt|, not the value at the end of the document when cache data is written to the |.aux| file.  
 %
-% Certain catcodes are required when loading Pygments style definitions from file.  |catchfile| should automatically set everything to correct default values, except for |@| and |\endlinechar| which are handled manually.  If a different approach to handling macros is ever used in the future, these require special handling:
+% Certain catcodes are required when loading Pygments style definitions from file.
 % \begin{itemize}
-% \item Backtick |`| is made active by some \pkg{babel} package options, such as |magyar|.
+% \item At sign |@| would be handled by the |\makeatletter| within the Pygments style definition if the style was brought in via |\input|, but |\makeatletter| doesn't affect tokenization with the |catchfile| approach.
 % \item Percent |%| may not have its normal meaning within a |.dtx| file.
+% \item Backtick |`| is made active by some \pkg{babel} package options, such as |magyar|.
 % \end{itemize}
+% |\endlinechar| also requires special handling to avoid introducing unwanted spaces.
 %
 % The |\ifx\PYG\relax| tests detect outdated style definitions from \pkg{minted} <2.6 and replace them when possible, and also detect missing styles.  Before \pkg{minted} 2.6, style macros used a |\PYG<style>| prefix and were defined globally.  Starting with 2.6, styles are redefined upon every use (within groups), and all styles use macros with a |\PYG| prefix.  This allows more robust treatment of style names that involve punctuation characters and numbers.
 %    \begin{macrocode}
@@ -2485,7 +2499,7 @@
     }%
    }%
   \CatchFileDef{\minted@tmp@filecontents}%
-   {\minted@pygstylepath@load}{\catcode`@=11\endlinechar=-1}%
+   {\minted@pygstylepath@load}{\catcode`@=11\catcode`\%=14\catcode``=12\endlinechar=-1}%
   \begingroup
   \let\PYG\relax
   \minted@tmp@filecontents
@@ -2500,7 +2514,7 @@
       > \minted@pygstylepath@save
     }%
     \CatchFileDef{\minted@tmp@filecontents}%
-     {\minted@pygstylepath@load}{\catcode`@=11\endlinechar=-1}%
+     {\minted@pygstylepath@load}{\catcode`@=11\catcode`\%=14\catcode``=12\endlinechar=-1}%
     \minted@tmp@filecontents
     \ifx\PYG\relax
       \PackageError{minted}%

source/minted.sty

@@ -27,7 +27,7 @@
 %% and the derived file minted.sty.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{minted}
-    [2021/12/22 v2.6dev Yet another Pygments shim for LaTeX]
+    [2021/12/24 v2.6dev Yet another Pygments shim for LaTeX]
 \RequirePackage{keyval}
 \RequirePackage{kvoptions}
 \RequirePackage{fvextra}
@@ -518,7 +518,7 @@
     }%
    }%
   \CatchFileDef{\minted@tmp@filecontents}%
-   {\minted@pygstylepath@load}{\catcode`@=11\endlinechar=-1}%
+   {\minted@pygstylepath@load}{\catcode`@=11\catcode`\%=14\catcode``=12\endlinechar=-1}%
   \begingroup
   \let\PYG\relax
   \minted@tmp@filecontents
@@ -533,7 +533,7 @@
       > \minted@pygstylepath@save
     }%
     \CatchFileDef{\minted@tmp@filecontents}%
-     {\minted@pygstylepath@load}{\catcode`@=11\endlinechar=-1}%
+     {\minted@pygstylepath@load}{\catcode`@=11\catcode`\%=14\catcode``=12\endlinechar=-1}%
     \minted@tmp@filecontents
     \ifx\PYG\relax
       \PackageError{minted}%