Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ jobs:
matrix:
config:
# testing R release with last shipped pandoc version in RStudio IDE and new pandoc
- {os: windows-latest, pandoc: '3.5', r: 'release'}
- {os: macOS-latest, pandoc: '3.5', r: 'release'}
- {os: windows-latest, pandoc: '3.6.3', r: 'release'}
- {os: macOS-latest, pandoc: '3.6.3', r: 'release'}
- {os: ubuntu-latest, pandoc: 'devel', r: 'release'}
# testing older pandoc versions
- {os: ubuntu-latest, pandoc: '3.2.1', r: 'release'} # special \pandocbounded change
- {os: ubuntu-latest, pandoc: '3.1.7', r: 'release'} # special citeproc change
- {os: ubuntu-latest, pandoc: '3.8.2.1', r: 'release'} # special counter table addition
- {os: ubuntu-latest, pandoc: '3.2.1', r: 'release'} # special \pandocbounded change
- {os: ubuntu-latest, pandoc: '3.1.7', r: 'release'} # special citeproc change
- {os: ubuntu-latest, pandoc: '2.19.2', r: 'release'}
- {os: ubuntu-latest, pandoc: '2.18', r: 'release'}
- {os: ubuntu-latest, pandoc: '2.17.1.1', r: 'release'}
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: rticles
Title: Article Formats for R Markdown
Version: 0.27.11
Version: 0.27.12
Authors@R: c(
person("JJ", "Allaire", , "[email protected]", role = "aut"),
person("Yihui", "Xie", , "[email protected]", role = "aut",
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ supported by the `copernicus.cls`, and fix an issue where the section headers we

## MINOR CHANGES

- Adapt all templates to new Pandoc 3.8.2.1 change regarding table counter definition (#595).

- Patch `WileyNDJ` template used in `sim_article()` to fix an issue with `etex` package not being useful anymore in recent LaTeX distributions (#593).

- Update all templates to work with Pandoc 3.2.1 by adding the definition of new `\pandocbounded` command used by Pandoc's LaTeX writers (see more at https://github.com/jgm/pandoc/releases/tag/3.2.1 and https://github.com/jgm/pandoc/issues/9660) (#571, #576).
Expand Down
3 changes: 2 additions & 1 deletion R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ pdf_document_format <- function(format,
pandoc3 = rmarkdown::pandoc_available("3"),
pandoc317 = rmarkdown::pandoc_available("3.1.7"), # new citeproc command
pandoc318 = rmarkdown::pandoc_available("3.1.8"), # revised citeproc command
pandoc321 = rmarkdown::pandoc_available("3.2.1") # new pandocbounded comment required
pandoc321 = rmarkdown::pandoc_available("3.2.1"), # new pandocbounded comment required
pandoc3821 = rmarkdown::pandoc_available("3.8.2.1") # new table counter required
))
fmt$pandoc$args <- c(fmt$pandoc$args, args)
fmt
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/acm/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/acs/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/aea/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/agu/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/amq/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/ams/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/arxiv/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/asa/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/biometrics/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/copernicus/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@
% $if(tables)$
% % From pandoc table feature
% \usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
% $if(multirow)$
% \usepackage{multirow}
% $endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/elsevier/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/frontiers/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/glossa/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/ieee/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/ims/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/informs/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/iop/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/isba/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/jasa/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/jedm/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/joss/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/jss/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/lipics/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/lncs/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/mdpi/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/mnras/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/oup_v0/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/oup_v1/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/peerj/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/pihph/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ \section*{\textcolor{pihphgreen}{Comments invited}}
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/plos/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/pnas/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/rjournal/resources/RJwrapper.tex
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/rsos/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/rss/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array, tabularx}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/sage/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/sim/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
2 changes: 2 additions & 0 deletions inst/rmarkdown/templates/springer/resources/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
$if(tables)$
% From pandoc table feature
\usepackage{longtable,booktabs,array}
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
$endif$
$if(multirow)$
\usepackage{multirow}
$endif$
Expand Down
Loading
Loading