Skip to content

Commit

Permalink
feat: merge changes from pandoc 3.6 LaTeX template (#414)
Browse files Browse the repository at this point in the history
* feat: merge changes from pandoc 3.6 LaTeX & Beamer template
* feat: merge changes from pandoc 3.6.1 LaTeX & Beamer template
* feat: add new partial `$font-settings.latex()$` to the release script
* chore: add changelog for version `3.1.0`
  • Loading branch information
Wandmalfarbe authored Jan 18, 2025
1 parent 5dddcb3 commit c250725
Show file tree
Hide file tree
Showing 7 changed files with 147 additions and 139 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

All notable changes to this project are documented in this file. On the [releases page](https://github.com/Wandmalfarbe/pandoc-latex-template/releases/) you can see all released versions of the Eisvogel template and download the [latest version](https://github.com/Wandmalfarbe/pandoc-latex-template/releases/latest).

## [3.1.0] - 2025-01-18

- feat: Merge changes from the pandoc default LaTeX template from version 3.6 ([f1c01b0](https://github.com/jgm/pandoc-templates/commit/f1c01b0ee3562f54bfe7730939e7ec0a48769953)).
- feat: Merge changes from the pandoc default LaTeX template from version 3.6.1 ([b033aa1](https://github.com/jgm/pandoc-templates/commit/b033aa1ff304a87b15866517938fc87a20077a16)).
- docs: add example `twoside` for a two-sided document (#412)
- docs: add example `columns` for a two column document (#411)
- docs: remove unneeded package `ulem` from the section *Required LaTeX Packages* in the README and from ci
- docs: fix typos and convert links to HTTPS (#400, deining)
- chore: update copyright year in LICENSE
- ci: bump GitHub action workflows to avoid deprecation warnings (#401, deining)
- fix: correct link to commit 2a6268d in CHANGELOG.md

## [3.0.0] - 2025-01-11

**This release contains breaking changes.**
Expand Down Expand Up @@ -201,6 +213,7 @@ the [documentation on docker hub](https://hub.docker.com/r/pandoc/extra).

- First release of the template as a ZIP file with the examples.

[3.1.0]: https://github.com/Wandmalfarbe/pandoc-latex-template/compare/v3.0.0...v3.1.0
[3.0.0]: https://github.com/Wandmalfarbe/pandoc-latex-template/compare/v2.5.0...v3.0.0
[2.5.0]: https://github.com/Wandmalfarbe/pandoc-latex-template/compare/v2.4.2...v2.5.0
[2.4.2]: https://github.com/Wandmalfarbe/pandoc-latex-template/compare/v2.4.1...v2.4.2
Expand Down
18 changes: 0 additions & 18 deletions template-multi-file/common.latex
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ $else$
\usepackage{setspace}
\setstretch{1.2}
$endif$

$--
$-- paragraph formatting
$--
Expand Down Expand Up @@ -51,14 +50,12 @@ $if(block-headings)$
\makeatother
$endif$
$endif$

$--
$-- verbatim in notes
$--
$if(verbatim-in-note)$
\usepackage{fancyvrb}
$endif$

$-- highlighting
$if(listings)$
\usepackage{listings}
Expand Down Expand Up @@ -88,7 +85,6 @@ $highlighting-macros$
\DefineVerbatimEnvironment{Highlighting}{Verbatim}{breaklines,fontsize=$if(code-block-font-size)$$code-block-font-size$$else$\small$endif$,commandchars=\\\{\}}

$endif$

$--
$-- tables
$--
Expand All @@ -115,7 +111,6 @@ $else$
\makesavenoteenv{longtable}
$endif$
$endif$

$--
$-- graphics
$--
Expand All @@ -142,7 +137,6 @@ $endif$
$if(svg)$
\usepackage{svg}
$endif$

$--
$-- strikeout/underline
$--
Expand Down Expand Up @@ -170,7 +164,6 @@ $if(CJKmainfont)$
$endif$
\fi
$endif$

$--
$-- CSL citations
$--
Expand Down Expand Up @@ -209,7 +202,6 @@ $if(csl-refs)$
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{\strut#1\strut}}
\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
$endif$

$--
$-- Babel language support
$--
Expand Down Expand Up @@ -243,32 +235,27 @@ $if(selnolig-langs)$
\fi
$endif$
$endif$

$--
$-- pagestyle
$--
$if(pagestyle)$
\pagestyle{$pagestyle$}
$endif$

$--
$-- prevent overfull lines
$--
\setlength{\emergencystretch}{3em} % prevent overfull lines

$--
$-- tight lists
$--
\providecommand{\tightlist}{%
\setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}

$--
$-- subfigure support
$--
$if(subfigure)$
\usepackage{subcaption}
$endif$

$--
$-- text direction support for pdftex
$--
Expand All @@ -281,7 +268,6 @@ $if(dir)$
\newenvironment{LTR}{\beginL}{\endL}
\fi
$endif$

$--
$-- bibliography support support for natbib and biblatex
$--
Expand All @@ -295,10 +281,6 @@ $for(bibliography)$
\addbibresource{$bibliography$}
$endfor$
$endif$
$if(nocite-ids)$
\nocite{$for(nocite-ids)$$it$$sep$, $endfor$}
$endif$

$--
$-- csquotes
$--
Expand Down
43 changes: 25 additions & 18 deletions template-multi-file/eisvogel.beamer
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,24 @@ $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$}
Expand All @@ -122,24 +140,7 @@ $endif$
$if(outertheme)$
\useoutertheme[$for(outerthemeoptions)$$outerthemeoptions$$sep$,$endfor$]{$outertheme$}
$endif$
% 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()$
$font-settings.latex()$
$common.latex()$
$for(header-includes)$
$header-includes$
Expand Down Expand Up @@ -221,6 +222,9 @@ $else$
$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}
Expand All @@ -229,6 +233,9 @@ $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}
Expand Down
4 changes: 4 additions & 0 deletions template-multi-file/eisvogel.latex
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ $else$
\setcounter{secnumdepth}{-\maxdimen} % remove section numbering
$endif$
$fonts.latex()$
$font-settings.latex()$
$common.latex()$
$for(header-includes)$
$header-includes$
Expand Down Expand Up @@ -174,6 +175,9 @@ $body$
$if(has-frontmatter)$
\backmatter
$endif$
$if(nocite-ids)$
\nocite{$for(nocite-ids)$$it$$sep$, $endfor$}
$endif$
$if(natbib)$
$if(bibliography)$
$if(biblio-title)$
Expand Down
103 changes: 103 additions & 0 deletions template-multi-file/font-settings.latex
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
$-- User font settings (must come after default font and Beamer theme)
$if(fontfamily)$
\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
$endif$
\ifPDFTeX\else
% xetex/luatex font selection
$if(mainfont)$
$if(mainfontfallback)$
\ifLuaTeX
\usepackage{luaotfload}
\directlua{luaotfload.add_fallback("mainfontfallback",{
$for(mainfontfallback)$"$mainfontfallback$"$sep$,$endfor$
})}
\fi
$endif$
\setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$$if(mainfontfallback)$,RawFeature={fallback=mainfontfallback}$endif$]{$mainfont$}
$endif$
$if(sansfont)$
$if(sansfontfallback)$
\ifLuaTeX
\usepackage{luaotfload}
\directlua{luaotfload.add_fallback("sansfontfallback",{
$for(sansfontfallback)$"$sansfontfallback$"$sep$,$endfor$
})}
\fi
$endif$
\setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$$if(sansfontfallback)$,RawFeature={fallback=sansfontfallback}$endif$]{$sansfont$}
$endif$
$if(monofont)$
$if(monofontfallback)$
\ifLuaTeX
\usepackage{luaotfload}
\directlua{luaotfload.add_fallback("monofontfallback",{
$for(monofontfallback)$"$monofontfallback$"$sep$,$endfor$
})}
\fi
$endif$
\setmonofont[$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$if(monofontfallback)$,RawFeature={fallback=monofontfallback}$endif$]{$monofont$}
$endif$
$for(fontfamilies)$
\newfontfamily{$fontfamilies.name$}[$for(fontfamilies.options)$$fontfamilies.options$$sep$,$endfor$]{$fontfamilies.font$}
$endfor$
$if(mathfont)$
$if(mathspec)$
\ifXeTeX
\setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
\else
\setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
\fi
$else$
\setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
$endif$
$endif$
$if(CJKmainfont)$
\ifXeTeX
\usepackage{xeCJK}
\setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
$if(CJKsansfont)$
\setCJKsansfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKsansfont$}
$endif$
$if(CJKmonofont)$
\setCJKmonofont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmonofont$}
$endif$
\fi
$endif$
$if(luatexjapresetoptions)$
\ifLuaTeX
\usepackage[$for(luatexjapresetoptions)$$luatexjapresetoptions$$sep$,$endfor$]{luatexja-preset}
\fi
$endif$
$if(CJKmainfont)$
\ifLuaTeX
\usepackage[$for(luatexjafontspecoptions)$$luatexjafontspecoptions$$sep$,$endfor$]{luatexja-fontspec}
\setmainjfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
\fi
$endif$
\fi
$if(zero-width-non-joiner)$
%% Support for zero-width non-joiner characters.
\makeatletter
\def\zerowidthnonjoiner{%
% Prevent ligatures and adjust kerning, but still support hyphenating.
\texorpdfstring{%
\TextOrMath{\nobreak\discretionary{-}{}{\kern.03em}%
\ifvmode\else\nobreak\hskip\z@skip\fi}{}%
}{}%
}
\makeatother
\ifPDFTeX
\DeclareUnicodeCharacter{200C}{\zerowidthnonjoiner}
\else
\catcode`^^^^200c=\active
\protected\def ^^^^200c{\zerowidthnonjoiner}
\fi
%% End of ZWNJ support
$endif$
% Use upquote if available, for straight quotes in verbatim environments
\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
\IfFileExists{microtype.sty}{% use microtype if available
\usepackage[$for(microtypeoptions)$$microtypeoptions$$sep$,$endfor$]{microtype}
\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
}{}

Loading

0 comments on commit c250725

Please sign in to comment.