Get pandoc-crossref compatibility

chdemko · Jan 22, 2024 · 0379af3 · 0379af3
1 parent 7bf5fe9
commit 0379af3
Show file tree

Hide file tree

Showing 5 changed files with 131 additions and 13 deletions.
diff --git a/pandoc_numbering.py b/pandoc_numbering.py
@@ -8,6 +8,7 @@
 import re
 import unicodedata
 from functools import partial
+from textwrap import dedent
 
 from panflute import (
     BlockQuote,
@@ -1520,7 +1521,22 @@ def finalize(doc):
             doc.metadata["header-includes"] = MetaList(doc.metadata["header-includes"])
 
         doc.metadata["header-includes"].append(
-            MetaInlines(RawInline(r"\usepackage{tocloft}", "tex"))
+            MetaInlines(
+                RawInline(
+                    dedent(
+                        r"""
+                        \makeatletter
+                        \@ifpackageloaded{subfig}{
+                            \usepackage[subfigure]{tocloft}
+                        }{
+                            \usepackage{tocloft}
+                        }
+                        \makeatother
+                        """
+                    ),
+                    "tex",
+                )
+            )
         )
         doc.metadata["header-includes"].append(
             MetaInlines(RawInline(r"\usepackage{etoolbox}", "tex"))

diff --git a/tests/test_listings_meta.py b/tests/test_listings_meta.py
@@ -168,7 +168,16 @@ def test_listing_latex(self):
             r"""
 ---
 header-includes:
-- "`\\usepackage{tocloft}`{=tex}"
+- |
+  `
+  \makeatletter
+  \@ifpackageloaded{subfig}{
+      \usepackage[subfigure]{tocloft}
+  }{
+      \usepackage{tocloft}
+  }
+  \makeatother
+  `{=tex}
 - "`\\usepackage{etoolbox}`{=tex}"
 - "`\\newlistof{exercise}{exercise}{List of exercises}\\renewcommand{\\cftexercisetitlefont}{\\cfttoctitlefont}\\setlength{\\cftexercisenumwidth}{\\cftfignumwidth}\\setlength{\\cftexerciseindent}{\\cftfigindent}`{=tex}"
 - "`\\ifdef{\\mainmatter}{\\let\\oldmainmatter\\mainmatter\\renewcommand{\\mainmatter}[0]{\\listofexercise\\oldmainmatter}}{}`{=tex}"
@@ -178,7 +187,15 @@ def test_listing_latex(self):
       listing-title: List of exercises
 ---
 
-`\usepackage{tocloft}`{=tex}
+`
+\makeatletter
+\@ifpackageloaded{subfig}{
+    \usepackage[subfigure]{tocloft}
+}{
+    \usepackage{tocloft}
+}
+\makeatother
+`{=tex}
 
 `\usepackage{etoolbox}`{=tex}
 
@@ -260,7 +277,16 @@ def test_listing_latex_format(self):
             r"""
 ---
 header-includes:
-- "`\\usepackage{tocloft}`{=tex}"
+- |
+  `
+  \makeatletter
+  \@ifpackageloaded{subfig}{
+      \usepackage[subfigure]{tocloft}
+  }{
+      \usepackage{tocloft}
+  }
+  \makeatother
+  `{=tex}
 - "`\\usepackage{etoolbox}`{=tex}"
 - "`\\newlistof{exercise}{exercise}{List of exercises}\\renewcommand{\\cftexercisetitlefont}{\\cfttoctitlefont}\\setlength{\\cftexercisenumwidth}{\\cftfignumwidth}\\setlength{\\cftexerciseindent}{\\cftfigindent}`{=tex}"
 - "`\\ifdef{\\mainmatter}{\\let\\oldmainmatter\\mainmatter\\renewcommand{\\mainmatter}[0]{\\listofexercise\\oldmainmatter}}{}`{=tex}"
@@ -276,7 +302,15 @@ def test_listing_latex_format(self):
 toccolor: blue
 ---
 
-`\usepackage{tocloft}`{=tex}
+`
+\makeatletter
+\@ifpackageloaded{subfig}{
+    \usepackage[subfigure]{tocloft}
+}{
+    \usepackage{tocloft}
+}
+\makeatother
+`{=tex}
 
 `\usepackage{etoolbox}`{=tex}
 

diff --git a/tests/test_para.py b/tests/test_para.py
@@ -196,12 +196,29 @@ def test_numbering_latex(self):
             r"""
 ---
 header-includes:
-- "`\\usepackage{tocloft}`{=tex}"
+- |
+  `
+  \makeatletter
+  \@ifpackageloaded{subfig}{
+      \usepackage[subfigure]{tocloft}
+  }{
+      \usepackage{tocloft}
+  }
+  \makeatother
+  `{=tex}
 - "`\\usepackage{etoolbox}`{=tex}"
 - "`\\ifdef{\\mainmatter}{\\let\\oldmainmatter\\mainmatter\\renewcommand{\\mainmatter}[0]{\\oldmainmatter}}{}`{=tex}"
 ---
 
-`\usepackage{tocloft}`{=tex}
+`
+\makeatletter
+\@ifpackageloaded{subfig}{
+    \usepackage[subfigure]{tocloft}
+}{
+    \usepackage{tocloft}
+}
+\makeatother
+`{=tex}
 
 `\usepackage{etoolbox}`{=tex}
 

diff --git a/tests/test_referencing.py b/tests/test_referencing.py
@@ -57,12 +57,29 @@ def test_referencing_latex(self):
             r"""
 ---
 header-includes:
-- "`\\usepackage{tocloft}`{=tex}"
+- |
+  `
+  \makeatletter
+  \@ifpackageloaded{subfig}{
+      \usepackage[subfigure]{tocloft}
+  }{
+      \usepackage{tocloft}
+  }
+  \makeatother
+  `{=tex}
 - "`\\usepackage{etoolbox}`{=tex}"
 - "`\\ifdef{\\mainmatter}{\\let\\oldmainmatter\\mainmatter\\renewcommand{\\mainmatter}[0]{\\oldmainmatter}}{}`{=tex}"
 ---
 
-`\usepackage{tocloft}`{=tex}
+`
+\makeatletter
+\@ifpackageloaded{subfig}{
+    \usepackage[subfigure]{tocloft}
+}{
+    \usepackage{tocloft}
+}
+\makeatother
+`{=tex}
 
 `\usepackage{etoolbox}`{=tex}
 

diff --git a/tests/test_referencing_meta.py b/tests/test_referencing_meta.py
@@ -82,7 +82,16 @@ def test_referencing_link_latex(self):
             r"""
 ---
 header-includes:
-- "`\\usepackage{tocloft}`{=tex}"
+- |
+  `
+  \makeatletter
+  \@ifpackageloaded{subfig}{
+      \usepackage[subfigure]{tocloft}
+  }{
+      \usepackage{tocloft}
+  }
+  \makeatother
+  `{=tex}
 - "`\\usepackage{etoolbox}`{=tex}"
 - "`\\ifdef{\\mainmatter}{\\let\\oldmainmatter\\mainmatter\\renewcommand{\\mainmatter}[0]{\\oldmainmatter}}{}`{=tex}"
 pandoc-numbering:
@@ -94,7 +103,15 @@ def test_referencing_link_latex(self):
       format-link-title: "**%D %d %T %t %g %s %n %p**"
 ---
 
-`\usepackage{tocloft}`{=tex}
+`
+\makeatletter
+\@ifpackageloaded{subfig}{
+    \usepackage[subfigure]{tocloft}
+}{
+    \usepackage{tocloft}
+}
+\makeatother
+`{=tex}
 
 `\usepackage{etoolbox}`{=tex}
 
@@ -192,7 +209,16 @@ def test_referencing_caption_latex(self):
             r"""
 ---
 header-includes:
-- "`\\usepackage{tocloft}`{=tex}"
+- |
+  `
+  \makeatletter
+  \@ifpackageloaded{subfig}{
+      \usepackage[subfigure]{tocloft}
+  }{
+      \usepackage{tocloft}
+  }
+  \makeatother
+  `{=tex}
 - "`\\usepackage{etoolbox}`{=tex}"
 - "`\\ifdef{\\mainmatter}{\\let\\oldmainmatter\\mainmatter\\renewcommand{\\mainmatter}[0]{\\oldmainmatter}}{}`{=tex}"
 pandoc-numbering:
@@ -204,7 +230,15 @@ def test_referencing_caption_latex(self):
       format-caption-title: "%D %d %T %t %g %s %n %c %p"
 ---
 
-`\usepackage{tocloft}`{=tex}
+`
+\makeatletter
+\@ifpackageloaded{subfig}{
+    \usepackage[subfigure]{tocloft}
+}{
+    \usepackage{tocloft}
+}
+\makeatother
+`{=tex}
 
 `\usepackage{etoolbox}`{=tex}