latex, template - pandoc now uses partials for LaTeX and split beamer in its own template

This is a breaking change for users who have custom templates. The new templates are more modular and easier to customize, but they now mix Pandoc's partial and Quarto's partials.

Changes:

- Add an new template logic dedicated to beamer as Pandoc has split beamer in its own template. Aim is to make it easy to update the beamer template in the future.
- Add a new LaTeX template that is based on the default template, but it is split into several partials that are provided by Pandoc and by Quarto.
- Adapt the update script to use the new partials and to update the beamer template separately.
- Add two Quarto partials that are used in the new LaTeX template: `babel-lang.tex` and `biblio-config.tex`.

The new organization possibly could break custom format that tweak the `pandoc.tex` partials as it now contains part of the default `common.latex` partial from Pandoc. This means that if you have a custom template that uses `pandoc.tex` you will need to update it to use the new partials.

Author: cderv

package/src/common/update-pandoc.ts

@@ -198,6 +198,7 @@ async function writePandocTemplates(
   );
   const latexOutdir = join(formatSrcDir, "pdf", "pandoc");
   const revealOutdir = join(formatSrcDir, "revealjs", "pandoc");
+  const beamerOutdir = join(formatSrcDir, "beamer", "pandoc");
   const asciidocOutdir = join(formatSrcDir, "asciidoc", "pandoc");
   const typstOutdir = join(formatSrcDir, "typst", "pandoc");
 
@@ -219,12 +220,25 @@ async function writePandocTemplates(
       ],
       [latexOutdir]: [
         { from: "default.latex", to: "latex.template" },
+        // Template we need to tweak
         { from: "common.latex", to: "latex.common" },
-        { from: "after-header-includes.latex", to: "latex.after-header-includes" },
-        { from: "font-settings.latex", to: "latex.font-settings" },
-        { from: "fonts.latex", to: "latex.fonts" },
-        { from: "hypersetup.latex", to: "latex.hypersetup" },
-        { from: "passoptions.latex", to: "latex.passoptions" },
+        // Template kept unchanged
+        { from: "after-header-includes.latex" },
+        { from: "hypersetup.latex" },
+        { from: "font-settings.latex" },
+        { from: "fonts.latex" },
+        { from: "passoptions.latex" },
+      ],
+      [beamerOutdir]: [
+        { from: "default.beamer", to: "beamer.template" },
+        // Template we need to tweak
+        { from: "common.latex", to: "latex.common" },
+        // Template kept unchanged
+        { from: "after-header-includes.latex" },
+        { from: "hypersetup.latex" },
+        { from: "font-settings.latex" },
+        { from: "fonts.latex" },
+        { from: "passoptions.latex" },
       ],
       [asciidocOutdir]: [
         { from: "default.asciidoc", to: "asciidoc.template" },

src/format/pdf/format-pdf.ts

@@ -232,9 +232,12 @@ function createPdfFormat(
         }
 
         // Provide a custom template for this format
-        const partialNames = [
+        // Partials can be the one from Quarto division
+        const partialNamesQuarto: string[] = [
+          "babel-lang",
           "before-bib",
           "biblio",
+          "biblio-config",
           "citations",
           "doc-class",
           "graphics",
@@ -247,12 +250,38 @@ function createPdfFormat(
           "title",
           "toc",
         ];
-        extras.templateContext = {
-          template: formatResourcePath("pdf", "pandoc/template.tex"),
-          partials: partialNames.map((name) => {
-            return formatResourcePath("pdf", `pandoc/${name}.tex`);
-          }),
+        // or the one from Pandoc division (since Pandoc 3.6.3)
+        const partialNamesPandoc: string[] = [
+          "after-header-includes",
+          "common",
+          "font-settings",
+          "fonts",
+          "hypersetup",
+          "passoptions",
+        ];
+
+        const createTemplateContext = function (
+          to: string,
+          partialNamesQuarto: string[],
+          partialNamesPandoc: string[],
+        ) {
+          return {
+            template: formatResourcePath(to, "pandoc/template.tex"),
+            partials: [
+              ...partialNamesQuarto.map((name) => {
+                return formatResourcePath(to, `pandoc/${name}.tex`);
+              }),
+              ...partialNamesPandoc.map((name) => {
+                return formatResourcePath(to, `pandoc/${name}.latex`);
+              }),
+            ],
+          };
         };
+        extras.templateContext = createTemplateContext(
+          displayName === "Beamer" ? "beamer" : "pdf",
+          partialNamesQuarto,
+          partialNamesPandoc,
+        );
 
         // Don't shift the headings if we see any H1s (we can't shift up any longer)
         const hasLevelOneHeadings = await hasL1Headings(markdown);

src/resources/formats/beamer/pandoc/after-body.tex

@@ -0,0 +1,10 @@
+\usepackage{bookmark}
+\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available
+\urlstyle{$if(urlstyle)$$urlstyle$$else$same$endif$}
+$if(links-as-notes)$
+% Make links footnotes instead of hotlinks:
+\DeclareRobustCommand{\href}[2]{#2\footnote{\url{#1}}}
+$endif$
+$if(verbatim-in-note)$
+\VerbatimFootnotes % allow verbatim text in footnotes
+$endif$

src/resources/formats/beamer/pandoc/after-header-includes.latex

@@ -0,0 +1,29 @@
+$--
+$-- Babel language support
+$--
+$if(lang)$
+\ifLuaTeX
+\usepackage[bidi=basic$for(babeloptions)$,$babeloptions$$endfor$]{babel}
+\else
+\usepackage[bidi=default$for(babeloptions)$,$babeloptions$$endfor$]{babel}
+\fi
+$if(babel-lang)$
+$if(mainfont)$
+\ifPDFTeX
+\else
+\babelfont{rm}[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$$if(mainfontfallback)$,RawFeature={fallback=mainfontfallback}$endif$]{$mainfont$}
+\fi
+$endif$
+$endif$
+$for(babelfonts/pairs)$
+\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$}
+$endfor$
+% get rid of language-specific shorthands (see #6817):
+\let\LanguageShortHands\languageshorthands
+\def\languageshorthands#1{}
+$if(selnolig-langs)$
+\ifLuaTeX
+  \usepackage[$for(selnolig-langs)$$it$$sep$,$endfor$]{selnolig} % disable illegal ligatures
+\fi
+$endif$
+$endif$

src/resources/formats/beamer/pandoc/babel-lang.tex

@@ -0,0 +1,204 @@
+$passoptions.latex()$
+\documentclass[
+$if(fontsize)$
+  $fontsize$,
+$endif$
+  ignorenonframetext,
+$if(handout)$
+  handout,
+$endif$
+$if(aspectratio)$
+  aspectratio=$aspectratio$,
+$endif$
+$if(babel-lang)$
+  $babel-lang$,
+$endif$
+$for(classoption)$
+  $classoption$$sep$,
+$endfor$
+]{$documentclass$}
+$if(geometry)$
+\geometry{$for(geometry)$$geometry$$sep$,$endfor$}
+$endif$
+\newif\ifbibliography
+$if(background-image)$
+\usebackgroundtemplate{%
+  \includegraphics[width=\paperwidth]{$background-image$}%
+}
+% In beamer background-image does not work well when other images are used, so this is the workaround
+\pgfdeclareimage[width=\paperwidth,height=\paperheight]{background}{$background-image$}
+\usebackgroundtemplate{\pgfuseimage{background}}
+$endif$
+\usepackage{pgfpages}
+\setbeamertemplate{caption}[numbered]
+\setbeamertemplate{caption label separator}{: }
+\setbeamercolor{caption name}{fg=normal text.fg}
+\beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$
+$--
+$-- section numbering
+$--
+$if(numbersections)$
+$else$
+% remove section numbering
+\setbeamertemplate{part page}{
+  \centering
+  \begin{beamercolorbox}[sep=16pt,center]{part title}
+    \usebeamerfont{part title}\insertpart\par
+  \end{beamercolorbox}
+}
+\setbeamertemplate{section page}{
+  \centering
+  \begin{beamercolorbox}[sep=12pt,center]{section title}
+    \usebeamerfont{section title}\insertsection\par
+  \end{beamercolorbox}
+}
+\setbeamertemplate{subsection page}{
+  \centering
+  \begin{beamercolorbox}[sep=8pt,center]{subsection title}
+    \usebeamerfont{subsection title}\insertsubsection\par
+  \end{beamercolorbox}
+}
+$endif$
+$for(beameroption)$
+\setbeameroption{$beameroption$}
+$endfor$
+% Prevent slide breaks in the middle of a paragraph
+\widowpenalties 1 10000
+\raggedbottom
+$if(section-titles)$
+\AtBeginPart{
+  \frame{\partpage}
+}
+\AtBeginSection{
+  \ifbibliography
+  \else
+    \frame{\sectionpage}
+  \fi
+}
+\AtBeginSubsection{
+  \frame{\subsectionpage}
+}
+$endif$
+$fonts.latex()$
+$-- Set Beamer theme before user font settings so they can override theme
+$if(theme)$
+\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$}
+$endif$
+$if(colortheme)$
+\usecolortheme[$for(colorthemeoptions)$$colorthemeoptions$$sep$,$endfor$]{$colortheme$}
+$endif$
+$if(fonttheme)$
+\usefonttheme[$for(fontthemeoptions)$$fontthemeoptions$$sep$,$endfor$]{$fonttheme$}
+$endif$
+$if(mainfont)$
+\usefonttheme{serif} % use mainfont rather than sansfont for slide text
+$endif$
+$if(innertheme)$
+\useinnertheme[$for(innerthemeoptions)$$innerthemeoptions$$sep$,$endfor$]{$innertheme$}
+$endif$
+$if(outertheme)$
+\useoutertheme[$for(outerthemeoptions)$$outerthemeoptions$$sep$,$endfor$]{$outertheme$}
+$endif$
+$font-settings.latex()$
+$common.latex()$
+$for(header-includes)$
+$header-includes$
+$endfor$
+$after-header-includes.latex()$
+$hypersetup.latex()$
+
+$if(title)$
+\title$if(shorttitle)$[$shorttitle$]$endif${$title$$if(thanks)$\thanks{$thanks$}$endif$}
+$endif$
+$if(subtitle)$
+\subtitle$if(shortsubtitle)$[$shortsubtitle$]$endif${$subtitle$}
+$endif$
+\author$if(shortauthor)$[$shortauthor$]$endif${$for(author)$$author$$sep$ \and $endfor$}
+\date$if(shortdate)$[$shortdate$]$endif${$date$}
+$if(institute)$
+\institute$if(shortinstitute)$[$shortinstitute$]$endif${$for(institute)$$institute$$sep$ \and $endfor$}
+$endif$
+$if(titlegraphic)$
+\titlegraphic{
+$for(titlegraphic)$
+  \includegraphics$if(titlegraphicoptions)$[$for(titlegraphicoptions)$$titlegraphicoptions$$sep$, $endfor$]$endif${$titlegraphic$}$sep$\enspace
+$endfor$}
+$endif$
+$if(logo)$
+\logo{\includegraphics{$logo$}}
+$endif$
+
+\begin{document}
+$if(title)$
+\frame{\titlepage}
+$if(abstract)$
+\begin{abstract}
+$abstract$
+\end{abstract}
+$endif$
+$endif$
+
+$for(include-before)$
+$include-before$
+
+$endfor$
+$if(toc)$
+$if(toc-title)$
+\renewcommand*\contentsname{$toc-title$}
+$endif$
+\begin{frame}[allowframebreaks]
+$if(toc-title)$
+  \frametitle{$toc-title$}
+$endif$
+  \setcounter{tocdepth}{$toc-depth$}
+  \tableofcontents
+\end{frame}
+\setcounter{tocdepth}{$toc-depth$}
+\tableofcontents
+}
+$endif$
+$if(lof)$
+\listoffigures
+$endif$
+$if(lot)$
+\listoftables
+$endif$
+$if(linestretch)$
+\setstretch{$linestretch$}
+$endif$
+$body$
+
+$if(natbib)$
+$if(bibliography)$
+$if(biblio-title)$
+$if(has-chapters)$
+\renewcommand\bibname{$biblio-title$}
+$else$
+\renewcommand\refname{$biblio-title$}
+$endif$
+$endif$
+\begin{frame}[allowframebreaks]{$biblio-title$}
+$if(nocite-ids)$
+  \nocite{$for(nocite-ids)$$it$$sep$, $endfor$}
+$endif$
+  \bibliographytrue
+  \bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$}
+\end{frame}
+
+$endif$
+$endif$
+$if(biblatex)$
+\begin{frame}[allowframebreaks]{$biblio-title$}
+$if(nocite-ids)$
+  \nocite{$for(nocite-ids)$$it$$sep$, $endfor$}
+$endif$
+  \bibliographytrue
+  \printbibliography[heading=none]
+\end{frame}
+
+$endif$
+$for(include-after)$
+$include-after$
+
+$endfor$
+\end{document}

src/resources/formats/beamer/pandoc/beamer.template

@@ -0,0 +1,8 @@
+$if(title)$
+\frame{\titlepage}
+$if(abstract)$
+\begin{abstract}
+$abstract$
+\end{abstract}
+$endif$
+$endif$

src/resources/formats/beamer/pandoc/before-bib.tex

@@ -0,0 +1,18 @@
+$--
+$-- bibliography support support for natbib and biblatex
+$--
+
+$-- biblio-config: false will not emit the bibliography configuration. 
+$-- This is useful if the bibliography configuration is already handled by a class file, for example.
+$if(biblio-config)$ $-- <-- QUARTO ONLY VARIABLE
+$if(natbib)$
+\usepackage[$natbiboptions$]{natbib}
+\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
+$endif$
+$if(biblatex)$
+\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex}
+$for(bibliography)$
+\addbibresource{$bibliography$}
+$endfor$
+$endif$
+$endif$