Skip to content

Commit a2a0853

Browse files
authored
Pandoc 3.8.2.1 adds a counter into table (#596)
1 parent fc089cc commit a2a0853

File tree

48 files changed

+99
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+99
-8
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ jobs:
3232
matrix:
3333
config:
3434
# testing R release with last shipped pandoc version in RStudio IDE and new pandoc
35-
- {os: windows-latest, pandoc: '3.5', r: 'release'}
36-
- {os: macOS-latest, pandoc: '3.5', r: 'release'}
35+
- {os: windows-latest, pandoc: '3.6.3', r: 'release'}
36+
- {os: macOS-latest, pandoc: '3.6.3', r: 'release'}
3737
- {os: ubuntu-latest, pandoc: 'devel', r: 'release'}
3838
# testing older pandoc versions
39-
- {os: ubuntu-latest, pandoc: '3.2.1', r: 'release'} # special \pandocbounded change
40-
- {os: ubuntu-latest, pandoc: '3.1.7', r: 'release'} # special citeproc change
39+
- {os: ubuntu-latest, pandoc: '3.8.2.1', r: 'release'} # special counter table addition
40+
- {os: ubuntu-latest, pandoc: '3.2.1', r: 'release'} # special \pandocbounded change
41+
- {os: ubuntu-latest, pandoc: '3.1.7', r: 'release'} # special citeproc change
4142
- {os: ubuntu-latest, pandoc: '2.19.2', r: 'release'}
4243
- {os: ubuntu-latest, pandoc: '2.18', r: 'release'}
4344
- {os: ubuntu-latest, pandoc: '2.17.1.1', r: 'release'}

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Type: Package
22
Package: rticles
33
Title: Article Formats for R Markdown
4-
Version: 0.27.11
4+
Version: 0.27.12
55
Authors@R: c(
66
person("JJ", "Allaire", , "[email protected]", role = "aut"),
77
person("Yihui", "Xie", , "[email protected]", role = "aut",

NEWS.md

Lines changed: 2 additions & 0 deletions

R/utils.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ pdf_document_format <- function(format,
229229
pandoc3 = rmarkdown::pandoc_available("3"),
230230
pandoc317 = rmarkdown::pandoc_available("3.1.7"), # new citeproc command
231231
pandoc318 = rmarkdown::pandoc_available("3.1.8"), # revised citeproc command
232-
pandoc321 = rmarkdown::pandoc_available("3.2.1") # new pandocbounded comment required
232+
pandoc321 = rmarkdown::pandoc_available("3.2.1"), # new pandocbounded comment required
233+
pandoc3821 = rmarkdown::pandoc_available("3.8.2.1") # new table counter required
233234
))
234235
fmt$pandoc$args <- c(fmt$pandoc$args, args)
235236
fmt

inst/rmarkdown/templates/acm/resources/template.tex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
$if(tables)$
7777
% From pandoc table feature
7878
\usepackage{longtable,booktabs,array}
79+
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
80+
$endif$
7981
$if(multirow)$
8082
\usepackage{multirow}
8183
$endif$

inst/rmarkdown/templates/acs/resources/template.tex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@
8181
$if(tables)$
8282
% From pandoc table feature
8383
\usepackage{longtable,booktabs,array}
84+
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
85+
$endif$
8486
$if(multirow)$
8587
\usepackage{multirow}
8688
$endif$

inst/rmarkdown/templates/aea/resources/template.tex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
$if(tables)$
3636
% From pandoc table feature
3737
\usepackage{longtable,booktabs,array}
38+
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
39+
$endif$
3840
$if(multirow)$
3941
\usepackage{multirow}
4042
$endif$

inst/rmarkdown/templates/agu/resources/template.tex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
$if(tables)$
7777
% From pandoc table feature
7878
\usepackage{longtable,booktabs,array}
79+
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
80+
$endif$
7981
$if(multirow)$
8082
\usepackage{multirow}
8183
$endif$

inst/rmarkdown/templates/amq/resources/template.tex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@
250250
$if(tables)$
251251
% From pandoc table feature
252252
\usepackage{longtable,booktabs,array}
253+
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
254+
$endif$
253255
$if(multirow)$
254256
\usepackage{multirow}
255257
$endif$

inst/rmarkdown/templates/ams/resources/template.tex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
$if(tables)$
3030
% From pandoc table feature
3131
\usepackage{longtable,booktabs,array}
32+
$if(pandoc3821)$\newcounter{none} % for unnumbered tables
33+
$endif$
3234
$if(multirow)$
3335
\usepackage{multirow}
3436
$endif$

0 commit comments

Comments
 (0)