Actualize to Pandoc 3.3

estedeahora · estedeahora · commit 1a4fe1f5d543 · 2024-10-23T18:27:43.000-03:00
diff --git a/R/sysdata.rda b/R/sysdata.rda
diff --git a/data-raw/pandoc_options.R b/data-raw/pandoc_options.R
@@ -6,7 +6,7 @@ sheets <- c("type", "opts", "lua")
 pandoc_options <- lapply(sheets, \(.x) readxl::read_excel(data_excel, sheet = .x))
 names(pandoc_options) <- sheets
 
-pandoc_req <- "3.2"
+pandoc_req <- "3.3"
 guri_version <- "1.0.0"
 
 usethis::use_data(pandoc_options, guri_version, pandoc_req,
diff --git a/inst/files-pkg/filters/include-float-in-format.lua b/inst/files-pkg/filters/include-float-in-format.lua
@@ -116,8 +116,8 @@ local function fig_latex(label, float_attr)
 
   local raw_elem = '\\begin{figure}\n' ..
                     '\\centering\n' .. 
-                    '\\includegraphics[width=0.95\\textwidth]{' .. root .. label .. '}\n' .. 
-                    '\\caption{' .. title .. '}\n' .. 
+                    '\\pandocbounded{' .. '\\includegraphics[width=0.95\\textwidth,keepaspectratio]{' .. root .. label .. '}' .. '}\n' ..
+                    '\\caption{' .. title .. '}\n' ..
                     source .. note ..
                     '\\label{' .. label .. '}\n' ..
                     '\\end{figure}'
diff --git a/inst/files-pkg/filters/zotero-SuppressAuthor.lua b/inst/files-pkg/filters/zotero-SuppressAuthor.lua
diff --git a/inst/files-pkg/template/template.html b/inst/files-pkg/template/template.html
@@ -31,14 +31,8 @@
   $header-includes$
 $endfor$
 $if(math)$
-$if(mathjax)$
-  <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
-$endif$
   $math$
 $endif$
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
 </head>
 <body>
 $for(include-before)$
diff --git a/inst/files-pkg/template/template.latex b/inst/files-pkg/template/template.latex
@@ -219,15 +219,17 @@ $endif$
 $if(n_figs)$
 \usepackage{graphicx}
 \makeatletter
-\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
-\def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}
-\makeatother
-% Scale images if necessary, so that they will not overflow the page
-% margins by default, and it is still possible to overwrite the defaults
-% using explicit options in \includegraphics[width, height, ...]{}
-\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
+\newsavebox\pandoc@box
+\newcommand*\pandocbounded[1]{% scales image to fit in text height/width
+  \sbox\pandoc@box{#1}%
+  \Gscale@div\@tempa{\textheight}{\dimexpr\ht\pandoc@box+\dp\pandoc@box\relax}%
+  \Gscale@div\@tempb{\linewidth}{\wd\pandoc@box}%
+  \ifdim\@tempb\p@<\@tempa\p@\let\@tempa\@tempb\fi% select the smaller of both
+  \ifdim\@tempa\p@<\p@\scalebox{\@tempa}{\usebox\pandoc@box}%
+  \else\usebox{\pandoc@box}%
+  \fi%
+}
 % Set default figure placement to htbp
-\makeatletter
 \def\fps@figure{htbp}
 \makeatother
 $endif$
@@ -361,6 +363,11 @@ $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$
 
 $for(header-includes)$
@@ -371,9 +378,6 @@ $endfor$
 ${custom_journal.sty()}
 %%% CUSTOM JOURNAL (END)
 
-\ifLuaTeX
-  \usepackage{selnolig}  % disable illegal ligatures
-\fi
 $if(dir)$
 \ifPDFTeX
   \TeXXeTstate=1
