diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 4464460b0..30ae38516 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -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'} diff --git a/DESCRIPTION b/DESCRIPTION index e691a8dbf..742a80e9d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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", , "jj@posit.co", role = "aut"), person("Yihui", "Xie", , "xie@yihui.name", role = "aut", diff --git a/NEWS.md b/NEWS.md index f6908478b..490087fcc 100644 --- a/NEWS.md +++ b/NEWS.md @@ -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). diff --git a/R/utils.R b/R/utils.R index bf4686108..70d6adaa2 100644 --- a/R/utils.R +++ b/R/utils.R @@ -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 diff --git a/inst/rmarkdown/templates/acm/resources/template.tex b/inst/rmarkdown/templates/acm/resources/template.tex index 68699492e..bbc51a025 100644 --- a/inst/rmarkdown/templates/acm/resources/template.tex +++ b/inst/rmarkdown/templates/acm/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/acs/resources/template.tex b/inst/rmarkdown/templates/acs/resources/template.tex index 57e805d92..d22b673d6 100644 --- a/inst/rmarkdown/templates/acs/resources/template.tex +++ b/inst/rmarkdown/templates/acs/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/aea/resources/template.tex b/inst/rmarkdown/templates/aea/resources/template.tex index 0c5b99329..dab352aa8 100644 --- a/inst/rmarkdown/templates/aea/resources/template.tex +++ b/inst/rmarkdown/templates/aea/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/agu/resources/template.tex b/inst/rmarkdown/templates/agu/resources/template.tex index aa262c4d0..c316460d4 100644 --- a/inst/rmarkdown/templates/agu/resources/template.tex +++ b/inst/rmarkdown/templates/agu/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/amq/resources/template.tex b/inst/rmarkdown/templates/amq/resources/template.tex index 595d7851b..31c7b3e63 100644 --- a/inst/rmarkdown/templates/amq/resources/template.tex +++ b/inst/rmarkdown/templates/amq/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/ams/resources/template.tex b/inst/rmarkdown/templates/ams/resources/template.tex index 577f7c4b6..fd9efe1b6 100644 --- a/inst/rmarkdown/templates/ams/resources/template.tex +++ b/inst/rmarkdown/templates/ams/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/arxiv/resources/template.tex b/inst/rmarkdown/templates/arxiv/resources/template.tex index f79e2089e..e0278ce8c 100644 --- a/inst/rmarkdown/templates/arxiv/resources/template.tex +++ b/inst/rmarkdown/templates/arxiv/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/asa/resources/template.tex b/inst/rmarkdown/templates/asa/resources/template.tex index 7052025ee..b76e9e2d7 100644 --- a/inst/rmarkdown/templates/asa/resources/template.tex +++ b/inst/rmarkdown/templates/asa/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/bioinformatics/resources/template.tex b/inst/rmarkdown/templates/bioinformatics/resources/template.tex index f55d11684..c7deb2157 100644 --- a/inst/rmarkdown/templates/bioinformatics/resources/template.tex +++ b/inst/rmarkdown/templates/bioinformatics/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/biometrics/resources/template.tex b/inst/rmarkdown/templates/biometrics/resources/template.tex index 631b03ed7..8c803d484 100644 --- a/inst/rmarkdown/templates/biometrics/resources/template.tex +++ b/inst/rmarkdown/templates/biometrics/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/copernicus/resources/template.tex b/inst/rmarkdown/templates/copernicus/resources/template.tex index 3390f044f..11a163450 100644 --- a/inst/rmarkdown/templates/copernicus/resources/template.tex +++ b/inst/rmarkdown/templates/copernicus/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/elsevier/resources/template.tex b/inst/rmarkdown/templates/elsevier/resources/template.tex index ab6e0028e..10b85ac28 100644 --- a/inst/rmarkdown/templates/elsevier/resources/template.tex +++ b/inst/rmarkdown/templates/elsevier/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/frontiers/resources/template.tex b/inst/rmarkdown/templates/frontiers/resources/template.tex index 0c931d7e0..a8a1e375c 100644 --- a/inst/rmarkdown/templates/frontiers/resources/template.tex +++ b/inst/rmarkdown/templates/frontiers/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/glossa/resources/template.tex b/inst/rmarkdown/templates/glossa/resources/template.tex index 7145f6cf1..867c38a73 100644 --- a/inst/rmarkdown/templates/glossa/resources/template.tex +++ b/inst/rmarkdown/templates/glossa/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/ieee/resources/template.tex b/inst/rmarkdown/templates/ieee/resources/template.tex index 15d437329..6a1757260 100644 --- a/inst/rmarkdown/templates/ieee/resources/template.tex +++ b/inst/rmarkdown/templates/ieee/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/ims/resources/template.tex b/inst/rmarkdown/templates/ims/resources/template.tex index cd4332cef..c0a2b5d03 100644 --- a/inst/rmarkdown/templates/ims/resources/template.tex +++ b/inst/rmarkdown/templates/ims/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/informs/resources/template.tex b/inst/rmarkdown/templates/informs/resources/template.tex index 1ea17b552..ed589505a 100644 --- a/inst/rmarkdown/templates/informs/resources/template.tex +++ b/inst/rmarkdown/templates/informs/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/iop/resources/template.tex b/inst/rmarkdown/templates/iop/resources/template.tex index 94be6573d..1d0728f63 100644 --- a/inst/rmarkdown/templates/iop/resources/template.tex +++ b/inst/rmarkdown/templates/iop/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/isba/resources/template.tex b/inst/rmarkdown/templates/isba/resources/template.tex index cfd013993..1d6964560 100644 --- a/inst/rmarkdown/templates/isba/resources/template.tex +++ b/inst/rmarkdown/templates/isba/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/jasa/resources/template.tex b/inst/rmarkdown/templates/jasa/resources/template.tex index 6d0a9b249..4694171db 100644 --- a/inst/rmarkdown/templates/jasa/resources/template.tex +++ b/inst/rmarkdown/templates/jasa/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/jedm/resources/template.tex b/inst/rmarkdown/templates/jedm/resources/template.tex index 51eb0bc48..a49f7c479 100644 --- a/inst/rmarkdown/templates/jedm/resources/template.tex +++ b/inst/rmarkdown/templates/jedm/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/joss/resources/template.tex b/inst/rmarkdown/templates/joss/resources/template.tex index d1a4c675f..d386dad7d 100644 --- a/inst/rmarkdown/templates/joss/resources/template.tex +++ b/inst/rmarkdown/templates/joss/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/jss/resources/template.tex b/inst/rmarkdown/templates/jss/resources/template.tex index 7ff7a1c50..e5cfc190b 100644 --- a/inst/rmarkdown/templates/jss/resources/template.tex +++ b/inst/rmarkdown/templates/jss/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/lipics/resources/template.tex b/inst/rmarkdown/templates/lipics/resources/template.tex index 946696bcf..5c65c0812 100644 --- a/inst/rmarkdown/templates/lipics/resources/template.tex +++ b/inst/rmarkdown/templates/lipics/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/lncs/resources/template.tex b/inst/rmarkdown/templates/lncs/resources/template.tex index cb2effcbf..f18457be0 100644 --- a/inst/rmarkdown/templates/lncs/resources/template.tex +++ b/inst/rmarkdown/templates/lncs/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/mdpi/resources/template.tex b/inst/rmarkdown/templates/mdpi/resources/template.tex index 43e6c36e5..182b9d5b2 100644 --- a/inst/rmarkdown/templates/mdpi/resources/template.tex +++ b/inst/rmarkdown/templates/mdpi/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/mnras/resources/template.tex b/inst/rmarkdown/templates/mnras/resources/template.tex index a798e1113..e8cc65a24 100644 --- a/inst/rmarkdown/templates/mnras/resources/template.tex +++ b/inst/rmarkdown/templates/mnras/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/oup_v0/resources/template.tex b/inst/rmarkdown/templates/oup_v0/resources/template.tex index 2fb2d1afd..1d9cc3ab4 100644 --- a/inst/rmarkdown/templates/oup_v0/resources/template.tex +++ b/inst/rmarkdown/templates/oup_v0/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/oup_v1/resources/template.tex b/inst/rmarkdown/templates/oup_v1/resources/template.tex index 8eb41753e..4e72e5d05 100644 --- a/inst/rmarkdown/templates/oup_v1/resources/template.tex +++ b/inst/rmarkdown/templates/oup_v1/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/peerj/resources/template.tex b/inst/rmarkdown/templates/peerj/resources/template.tex index 810783cc9..cd69bc69b 100644 --- a/inst/rmarkdown/templates/peerj/resources/template.tex +++ b/inst/rmarkdown/templates/peerj/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/pihph/resources/template.tex b/inst/rmarkdown/templates/pihph/resources/template.tex index fbf47c1b2..ad8396e43 100644 --- a/inst/rmarkdown/templates/pihph/resources/template.tex +++ b/inst/rmarkdown/templates/pihph/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/plos/resources/template.tex b/inst/rmarkdown/templates/plos/resources/template.tex index 263178679..313deadd9 100644 --- a/inst/rmarkdown/templates/plos/resources/template.tex +++ b/inst/rmarkdown/templates/plos/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/pnas/resources/template.tex b/inst/rmarkdown/templates/pnas/resources/template.tex index b7d624dd9..8ec00f689 100644 --- a/inst/rmarkdown/templates/pnas/resources/template.tex +++ b/inst/rmarkdown/templates/pnas/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/rjournal/resources/RJwrapper.tex b/inst/rmarkdown/templates/rjournal/resources/RJwrapper.tex index ac8bfe087..f96e6bb6b 100644 --- a/inst/rmarkdown/templates/rjournal/resources/RJwrapper.tex +++ b/inst/rmarkdown/templates/rjournal/resources/RJwrapper.tex @@ -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$ diff --git a/inst/rmarkdown/templates/rsos/resources/template.tex b/inst/rmarkdown/templates/rsos/resources/template.tex index 414d69064..7bdfe361c 100644 --- a/inst/rmarkdown/templates/rsos/resources/template.tex +++ b/inst/rmarkdown/templates/rsos/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/rss/resources/template.tex b/inst/rmarkdown/templates/rss/resources/template.tex index 82bf38b8a..b3aa5aac0 100644 --- a/inst/rmarkdown/templates/rss/resources/template.tex +++ b/inst/rmarkdown/templates/rss/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/sage/resources/template.tex b/inst/rmarkdown/templates/sage/resources/template.tex index 9d524b18a..dd2a7ce48 100644 --- a/inst/rmarkdown/templates/sage/resources/template.tex +++ b/inst/rmarkdown/templates/sage/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/sim/resources/template.tex b/inst/rmarkdown/templates/sim/resources/template.tex index 0e58440e7..ea3efb62a 100644 --- a/inst/rmarkdown/templates/sim/resources/template.tex +++ b/inst/rmarkdown/templates/sim/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/springer/resources/template.tex b/inst/rmarkdown/templates/springer/resources/template.tex index a05399b3b..114a21551 100644 --- a/inst/rmarkdown/templates/springer/resources/template.tex +++ b/inst/rmarkdown/templates/springer/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/tf/resources/template.tex b/inst/rmarkdown/templates/tf/resources/template.tex index 861e24633..85cf1ab7d 100644 --- a/inst/rmarkdown/templates/tf/resources/template.tex +++ b/inst/rmarkdown/templates/tf/resources/template.tex @@ -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$ diff --git a/inst/rmarkdown/templates/trb/resources/template.tex b/inst/rmarkdown/templates/trb/resources/template.tex index b99076942..971ec3a56 100644 --- a/inst/rmarkdown/templates/trb/resources/template.tex +++ b/inst/rmarkdown/templates/trb/resources/template.tex @@ -56,6 +56,8 @@ $if(tables)$ % From pandoc table feature \usepackage{longtable,booktabs,array} +$if(pandoc3821)$\newcounter{none} % for unnumbered tables +$endif$ $if(multirow)$ \usepackage{multirow} $endif$ diff --git a/inst/rmarkdown/templates/wellcomeor/resources/template.tex b/inst/rmarkdown/templates/wellcomeor/resources/template.tex index 4ab002ed7..b8c7b88f2 100644 --- a/inst/rmarkdown/templates/wellcomeor/resources/template.tex +++ b/inst/rmarkdown/templates/wellcomeor/resources/template.tex @@ -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$ diff --git a/tests/testit/test-formats.R b/tests/testit/test-formats.R index c620cc7b3..073b476a3 100644 --- a/tests/testit/test-formats.R +++ b/tests/testit/test-formats.R @@ -41,7 +41,7 @@ test_format("ajs", skip = !rmarkdown::pandoc_available("2.7")) test_format("amq") test_format("ams", skip = !rmarkdown::pandoc_available("2.10")) test_format("arxiv") -test_format("asa", skip = TRUE) # ASA format currently broken +test_format("asa") test_format("bioinformatics") test_format("biometrics") test_format("copernicus") @@ -55,7 +55,7 @@ test_format("ims") test_format("ims", output_options = list(journal = "aap")) test_format("informs", skip = !rmarkdown::pandoc_available("2.10")) test_format("isba", skip = !rmarkdown::pandoc_available("2.10")) -test_format("iop", skip = TRUE) # IOP format currently broken +test_format("iop") test_format("jasa") test_format("jedm") test_format("joss") diff --git a/tests/testthat/test-check-template.R b/tests/testthat/test-check-template.R index 32f996811..f576f7b88 100644 --- a/tests/testthat/test-check-template.R +++ b/tests/testthat/test-check-template.R @@ -53,6 +53,9 @@ test_that("tightlist is defined in all templates", { test_that("part for Pandoc's tables is defined in all templates", { for (f in temp_file) { expect_contains(f, "if(tables)", fixed = TRUE) + # including change from pandoc 3.8.2.1 about new counter + expect_contains(f, "if(pandoc3821)", fixed = TRUE) + expect_contains(f, "$\\newcounter{none}", fixed = TRUE) } })