Merge branch 'feature/fix-theme-loading'

Witiko · Jun 25, 2021 · 3c3de76 · 3c3de76
2 parents 584c04e + 67aaf40
commit 3c3de76
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/markdown.dtx b/markdown.dtx
@@ -11104,10 +11104,14 @@ would use the following code in the preamble of your document:
   \StrSubstitute{#1}{/}{_}[\markdownLaTeXThemePackageName]%
   \edef\markdownLaTeXThemePackageName{%
     markdowntheme\markdownLaTeXThemePackageName}%
-  \expandafter\ifmarkdownLaTeXLoaded\expandafter\expandafter
-    \expandafter\@gobble\expandafter\fi%  Remove \AtEndOfPackage if loaded
-  \expandafter\AtEndOfPackage\expandafter{\expandafter\RequirePackage
-    \expandafter{\markdownLaTeXThemePackageName}}}%
+  \ifmarkdownLaTeXLoaded
+    \expandafter\RequirePackage\expandafter{%
+      \markdownLaTeXThemePackageName}%
+  \else
+    \expandafter\AtEndOfPackage\expandafter{%
+      \expandafter\RequirePackage\expandafter{%
+        \markdownLaTeXThemePackageName}}%
+  \fi}%
 %    \end{macrocode}
 % \iffalse
 %</latex>

diff --git a/tests/templates/latex/input.tex.m4 b/tests/templates/latex/input.tex.m4
@@ -1,7 +1,8 @@
 \documentclass{minimal}
 \csname UseRawInputEncoding\endcsname
 % Load the package.
-\usepackage[theme=witiko/markdown/test]{markdown}
+\usepackage{markdown}
+\markdownSetup{theme=witiko/markdown/test}
 % Load the support files.
 \input setup\relax
 % Load the test-specific setup.

diff --git a/tests/templates/latex/verbatim.tex.m4 b/tests/templates/latex/verbatim.tex.m4
@@ -1,7 +1,8 @@
 \documentclass{minimal}
 \csname UseRawInputEncoding\endcsname
 % Load the package.
-\usepackage[theme=witiko/markdown/test]{markdown}
+\usepackage{markdown}
+\markdownSetup{theme=witiko/markdown/test}
 % Load the support files.
 \input setup\relax
 % Load the test-specific setup.