Skip to content

Commit 85f5c3d

Browse files
authored
Merge pull request #755 from coatless/feature/rmarkdown-vignettes
Switched Rcpp vignettes away from highlight to RMarkdown (close #604)
2 parents bbd670b + dc19510 commit 85f5c3d

21 files changed

+6651
-6309
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ src/*.dll
66
src/symbols.rds
77
.Rhistory
88
.RData
9+
.DS_Store
910

1011
## QtCreator
1112
Rcpp.pro

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ before_install:
1717
- ./run.sh bootstrap
1818

1919
install:
20-
- ./run.sh install_aptget r-cran-runit r-cran-inline r-cran-rbenchmark r-cran-highlight r-cran-pkgkitten
20+
- ./run.sh install_aptget r-cran-runit r-cran-inline r-cran-rbenchmark r-cran-rmarkdown r-cran-knitr r-cran-pinp r-cran-pkgkitten
2121

2222
script:
2323
- ./run.sh run_tests

ChangeLog

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
2017-09-20 James J Balamuta <[email protected]>
2+
3+
* DESCRIPTION (Version, Date): Roll minor version
4+
* vignettes/jss.bst: Removed
5+
* vignettes/rcpp-docs.cls: idem
6+
7+
2017-09-20 Dirk Eddelbuettel <[email protected]>
8+
9+
* vignettes/Rcpp-FAQ.Rmd: Modified formatting and cleaned a bit more.
10+
* vignettes/Rcpp-sugar.Rmd: Idem
11+
* vignettes/Rcpp-introduction.Rmd: Added new PeerJ preprint
12+
13+
2017-09-19 James J Balamuta <[email protected]>
14+
15+
* vignettes/Rcpp-FAQ.Rmd: Formatted and cleaned up vignette.
16+
* vignettes/Rcpp-sugar.Rmd: Idem
17+
18+
2017-09-19 Dirk Eddelbuettel <[email protected]>
19+
20+
* vignettes/Rcpp-attributes.Rmd: Formatted and cleaned up vignette.
21+
* vignettes/Rcpp-extending.Rmd: Idem
22+
* vignettes/Rcpp-modules.Rmd: Idem
23+
* vignettes/Rcpp-package.Rmd: Idem
24+
* vignettes/Rcpp-quickref.Rmd: Idem
25+
26+
2017-09-18 James J Balamuta <[email protected]>
27+
28+
* DESCRIPTION (Suggests): Added rmarkdown, knitr, and pinp dependencies
29+
* .travis.yml: idem
30+
* vignettes/Rcpp-quickref.Rmd: Translated vignette from highlight/sweave
31+
to RMarkdown for use with the pinp template.
32+
* vignettes/Rcpp-sugar.Rmd: Idem
33+
* vignettes/Rcpp-package.Rmd: Idem
34+
* vignettes/Rcpp-modules.Rmd: Idem
35+
* vignettes/Rcpp-FAQ.Rmd: Idem
36+
* vignettes/Rcpp-extending.Rmd: Idem
37+
* vignettes/Rcpp-attributes.Rmd: Idem
38+
139
2017-09-03 Dirk Eddelbuettel <[email protected]>
240

341
* DESCRIPTION (Version, Date): Roll minor version

DESCRIPTION

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 0.12.12.3
4-
Date: 2017-09-03
3+
Version: 0.12.12.4
4+
Date: 2017-09-20
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
66
Nathan Russell, Douglas Bates and John Chambers
77
Maintainer: Dirk Eddelbuettel <[email protected]>
@@ -15,10 +15,10 @@ Description: The 'Rcpp' package provides R functions as well as C++ classes whic
1515
by Eddelbuettel and Balamuta (2017, PeerJ); see 'citation("Rcpp")' for details.
1616
Depends: R (>= 3.0.0)
1717
Imports: methods, utils
18-
Suggests: RUnit, inline, rbenchmark, highlight, pkgKitten (>= 0.1.2)
19-
VignetteBuilder: highlight
18+
Suggests: RUnit, inline, rbenchmark, knitr, rmarkdown, pinp, pkgKitten (>= 0.1.2)
19+
VignetteBuilder: knitr
2020
URL: http://www.rcpp.org, http://dirk.eddelbuettel.com/code/rcpp.html, https://github.com/RcppCore/Rcpp
2121
License: GPL (>= 2)
2222
BugReports: https://github.com/RcppCore/Rcpp/issues
2323
MailingList: Please send questions and comments regarding Rcpp to [email protected]
24-
RoxygenNote: 5.0.1
24+
RoxygenNote: 6.0.1

inst/NEWS.Rd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
addressing issue \ghit{682}).
2525
\item Added a new vignette \sQuote{Rcpp-introduction} based on new PeerJ
2626
preprint, renamed existing introduction to \sQuote{Rcpp-jss-2011}.
27+
\item Transitioned all vignettes to the pinp RMarkdown template
28+
(James Balamuta and Dirk Eddelbuettel in \ghpr{755} addressing
29+
issue \ghit{604}).
2730
}
2831
}
2932
}

0 commit comments

Comments
 (0)