Skip to content

Commit 4aa0a44

Browse files
BlackEddercderv
BlackEdder
and
cderv
authored
Update CSLreferences usage in line with upstream (#390)
Co-authored-by: christophe dervieux <christophe.dervieux@gmail.com>
1 parent e894ed5 commit 4aa0a44

File tree

34 files changed

+70
-68
lines changed

34 files changed

+70
-68
lines changed

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: rticles
22
Type: Package
33
Title: Article Formats for R Markdown
4-
Version: 0.19.1
4+
Version: 0.19.2
55
Authors@R: c(
66
person("JJ", "Allaire", role = "aut", email = "jj@rstudio.com"),
77
person("Yihui", "Xie", role = c("aut", "cre"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")),

‎NEWS.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
rticles 0.20
22
---------------------------------------------------------------------
33

4+
- Fix issue with Pandoc's citation processing by updating all templates with last relevant changes from Pandoc's default template (thanks, @BlackEdder, @dahrens, #390)
5+
46
- remove warning in `joss_article()` about `citation_package` (thanks, @llrs, #389).
57

68
- fix an issue with `rjournal_article()` template to insert newline in author's block only if a field exist (thanks, @huizezhang-sherry, #387)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
\everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
7575
{\par}
7676
% For Pandoc 2.11+
77-
\newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing
77+
\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
7878
{% don't indent paragraphs
7979
\setlength{\parindent}{0pt}
8080
% turn on hanging indent if param 1 is 1
@@ -88,7 +88,7 @@
8888
\usepackage{calc} % for calculating minipage widths
8989
\newcommand{\CSLBlock}[1]{#1\hfill\break}
9090
\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
91-
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}}
91+
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
9292
\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
9393
$endif$
9494

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
\everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
7373
{\par}
7474
% For Pandoc 2.11+
75-
\newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing
75+
\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
7676
{% don't indent paragraphs
7777
\setlength{\parindent}{0pt}
7878
% turn on hanging indent if param 1 is 1
@@ -86,7 +86,7 @@
8686
\usepackage{calc} % for calculating minipage widths
8787
\newcommand{\CSLBlock}[1]{#1\hfill\break}
8888
\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
89-
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}}
89+
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
9090
\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
9191
$endif$
9292

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
\everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
3636
{\par}
3737
% For Pandoc 2.11+
38-
\newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing
38+
\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
3939
{% don't indent paragraphs
4040
\setlength{\parindent}{0pt}
4141
% turn on hanging indent if param 1 is 1
@@ -49,7 +49,7 @@
4949
\usepackage{calc} % for calculating minipage widths
5050
\newcommand{\CSLBlock}[1]{#1\hfill\break}
5151
\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
52-
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}}
52+
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
5353
\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
5454
$endif$
5555

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
\everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
7777
{\par}
7878
% For Pandoc 2.11+
79-
\newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing
79+
\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
8080
{% don't indent paragraphs
8181
\setlength{\parindent}{0pt}
8282
% turn on hanging indent if param 1 is 1
@@ -90,7 +90,7 @@
9090
\usepackage{calc} % for calculating minipage widths
9191
\newcommand{\CSLBlock}[1]{#1\hfill\break}
9292
\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
93-
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}}
93+
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
9494
\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
9595
$endif$
9696

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
\everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
250250
{\par}
251251
% For Pandoc 2.11+
252-
\newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing
252+
\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
253253
{% don't indent paragraphs
254254
\setlength{\parindent}{0pt}
255255
% turn on hanging indent if param 1 is 1
@@ -263,7 +263,7 @@
263263
\usepackage{calc} % for calculating minipage widths
264264
\newcommand{\CSLBlock}[1]{#1\hfill\break}
265265
\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
266-
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}}
266+
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
267267
\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
268268
$endif$
269269

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
\everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
7777
{\par}
7878
% For Pandoc 2.11+
79-
\newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing
79+
\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
8080
{% don't indent paragraphs
8181
\setlength{\parindent}{0pt}
8282
% turn on hanging indent if param 1 is 1
@@ -90,7 +90,7 @@
9090
\usepackage{calc} % for calculating minipage widths
9191
\newcommand{\CSLBlock}[1]{#1\hfill\break}
9292
\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
93-
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}}
93+
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
9494
\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
9595
$endif$
9696

‎inst/rmarkdown/templates/arxiv/resources/template.tex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
\everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
4949
{\par}
5050
% For Pandoc 2.11+
51-
\newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing
51+
\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
5252
{% don't indent paragraphs
5353
\setlength{\parindent}{0pt}
5454
% turn on hanging indent if param 1 is 1
@@ -62,7 +62,7 @@
6262
\usepackage{calc} % for calculating minipage widths
6363
\newcommand{\CSLBlock}[1]{#1\hfill\break}
6464
\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
65-
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}}
65+
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
6666
\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
6767
$endif$
6868

‎inst/rmarkdown/templates/asa/resources/template.tex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
\everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
4141
{\par}
4242
% For Pandoc 2.11+
43-
\newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing
43+
\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
4444
{% don't indent paragraphs
4545
\setlength{\parindent}{0pt}
4646
% turn on hanging indent if param 1 is 1
@@ -54,7 +54,7 @@
5454
\usepackage{calc} % for calculating minipage widths
5555
\newcommand{\CSLBlock}[1]{#1\hfill\break}
5656
\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
57-
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}}
57+
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
5858
\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
5959
$endif$
6060

0 commit comments

Comments
 (0)