Merge pull request #516 from Witiko/fix/minted3

Support minted 3.0
Witiko · Oct 13, 2024 · e0f0b08 · e0f0b08
2 parents ce859c5 + b697ae5
commit e0f0b08
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -20,6 +20,7 @@ EXAMPLES_SOURCES=examples/context-mkiv.tex \
   examples/optex.tex
 EXAMPLES=examples/context-mkiv.pdf \
   examples/latex-pdftex.pdf examples/latex-xetex.pdf examples/latex-luatex.pdf \
+  examples/latex-tex4ht.html examples/latex-tex4ht.css \
   examples/optex.pdf
 TESTS=tests/test.sh tests/test.py tests/requirements.txt tests/support/*.tex \
   tests/templates/*/*/head.tex.m4 tests/templates/*/*/body.tex.m4 \

diff --git a/examples/Makefile b/examples/Makefile
@@ -30,6 +30,7 @@ LUACLI_OPTIONS=\
 OUTPUT=\
   context-mkiv.pdf \
   latex-pdftex.pdf latex-xetex.pdf latex-luatex.pdf \
+  latex-tex4ht.html latex-tex4ht.css \
   optex.pdf
 
 # This is the default pseudo-target.

diff --git a/markdown.dtx b/markdown.dtx
@@ -2,8 +2,7 @@
 %<*driver>
 \documentclass{ltxdockit}
 \usepackage[american]{babel}
-\usepackage{amsmath,btxdockit,doc,fancyvrb,graphicx,hologo,microtype}
-\IfFileExists{minted2.sty}{\usepackage{minted2}}{\usepackage{minted}}
+\usepackage{amsmath,btxdockit,doc,fancyvrb,graphicx,hologo,microtype,minted}
 
 % Set up the style.
 \usepackage{xcolor}
@@ -37176,17 +37175,6 @@ end
             \catcode`\#=12\relax
           }
           {
-            \ltx@ifpackageloaded
-              { minted2 }
-              {
-                \catcode`\#=6\relax
-                \exp_args:NV
-                  \inputminted
-                  \l_tmpa_tl
-                  { #1 }
-                \catcode`\#=12\relax
-              }
-              {
 %    \end{macrocode}
 % \par
 % \begin{markdown}
@@ -37195,9 +37183,9 @@ end
 %
 % \end{markdown}
 %  \begin{macrocode}
-                \ltx@ifpackageloaded
-                  { listings }
-                  { \lstinputlisting[language=\l_tmpa_tl]{#1} }
+            \ltx@ifpackageloaded
+              { listings }
+              { \lstinputlisting[language=\l_tmpa_tl]{#1} }
 %    \end{macrocode}
 % \par
 % \begin{markdown}
@@ -37207,8 +37195,7 @@ end
 %
 % \end{markdown}
 %  \begin{macrocode}
-                  { \markdownRendererInputFencedCode{#1}{}{} }
-              }
+              { \markdownRendererInputFencedCode{#1}{}{} }
           }
       }
   }