Merge pull request #498 from Witiko/fix/import

Properly load LaTeX themes when `theme` or `import` is used in `\usepackage[...]{markdown}`
Witiko · Sep 9, 2024 · c4ef2e4 · c4ef2e4
2 parents 0ceded6 + b602f0a
commit c4ef2e4
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 22 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,11 @@
 
 ## 3.7.1
 
+Fixes:
+
+- Properly load LaTeX themes when `theme` or `import` is used in
+  `\usepackage[...]{markdown}`. (#471, #498)
+
 ## 3.7.0 (2024-08-30)
 
 Development:

diff --git a/markdown.dtx b/markdown.dtx
@@ -35880,17 +35880,6 @@ end
 % \par
 % \begin{markdown}
 %
-%### Options
-% The supplied package options are processed using the \mref{markdownSetup} macro.
-%
-% \end{markdown}
-%  \begin{macrocode}
-\DeclareOption*{%
-  \expandafter\markdownSetup\expandafter{\CurrentOption}}%
-\ProcessOptions\relax
-%    \end{macrocode}
-% \begin{markdown}
-%
 %### Themes {#latex-themes-implementation}
 %
 % This section overrides the plain \TeX{} implementation of the theme-loading
@@ -35978,9 +35967,8 @@ end
         { #1 }
       \AtEndOfPackage
         {
-          \@@_load_theme:nn
+          \@@_set_theme:n
             { #1 }
-            { #2 }
         }
     \fi
   }
@@ -36254,6 +36242,25 @@ end
 % See Section <#sec:latex-token-renderer-prototypes> for the actual
 % definitions.
 %
+%### Options
+% The supplied package options are processed using the \mref{markdownSetup} macro.
+%
+% \end{markdown}
+% \iffalse
+%</themes-witiko-markdown-defaults-latex>
+%<*latex>
+% \fi
+%  \begin{macrocode}
+\DeclareOption*{%
+  \expandafter\markdownSetup\expandafter{\CurrentOption}}%
+\ProcessOptions\relax
+%    \end{macrocode}
+% \iffalse
+%</latex>
+%<*themes-witiko-markdown-defaults-latex>
+% \fi
+% \begin{markdown}
+%
 %### Token Renderer Prototypes {#latex-token-renderer-prototypes}
 %
 % The following configuration should be considered placeholder. If the option

diff --git a/tests/support/markdownthemewitiko_markdown_test.sty b/tests/support/markdownthemewitiko_markdown_test.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage
   {markdownthemewitiko_markdown_test}%
-  [2023/12/29 A LaTeX theme for the Markdown package that writes used renderers to the log for testing]
+  [2024/09/09 A LaTeX theme for the Markdown package that writes used renderers to the log for testing]
 \markdownLoadPlainTeXTheme
diff --git a/tests/support/markdownthemewitiko_markdown_test_latex.sty b/tests/support/markdownthemewitiko_markdown_test_latex.sty
@@ -0,0 +1,9 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage
+  {markdownthemewitiko_markdown_test_latex}%
+  [2024/09/09 A LaTeX theme for the Markdown package that writes used renderers to the log for testing]
+\markdownSetup {
+  import = {
+    witiko/markdown/test = snippet
+  }
+}
diff --git a/tests/templates/latex/input/head.tex.m4 b/tests/templates/latex/input/head.tex.m4
@@ -2,15 +2,15 @@
 \csname UseRawInputEncoding\endcsname
 
 % Load the package.
-\usepackage[plain]{markdown}
+\usepackage[plain, import=witiko/markdown/test/latex]{markdown}
+\markdownSetupSnippet{testSnippet}{
+  snippet = witiko/markdown/test/latex/snippet,
+}
 
 % Load the support files.
 \markdownSetup {
   eagerCache = false,
   outputDir = OUTPUT_DIRECTORY,
-  import = {
-    witiko/markdown/test = snippet as testSnippet,
-  }
 }
 
 \begin{document}
diff --git a/tests/templates/latex/verbatim/head.tex.m4 b/tests/templates/latex/verbatim/head.tex.m4
@@ -2,15 +2,15 @@
 \csname UseRawInputEncoding\endcsname
 
 % Load the package.
-\usepackage[plain]{markdown}
+\usepackage[plain, theme=witiko/markdown/test/latex]{markdown}
+\markdownSetupSnippet{testSnippet}{
+  snippet = witiko/markdown/test/latex/snippet,
+}
 
 % Load the support files.
 \markdownSetup {
   eagerCache = false,
   outputDir = OUTPUT_DIRECTORY,
-  import = {
-    witiko/markdown/test = snippet as testSnippet,
-  }
 }
 
 \begin{document}