Skip to content

Commit

Permalink
Merge pull request #755 from coatless/feature/rmarkdown-vignettes
Browse files Browse the repository at this point in the history
Switched Rcpp vignettes away from highlight to RMarkdown (close #604)
  • Loading branch information
eddelbuettel committed Sep 21, 2017
2 parents bbd670b + dc19510 commit 85f5c3d
Show file tree
Hide file tree
Showing 21 changed files with 6,651 additions and 6,309 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -6,6 +6,7 @@ src/*.dll
src/symbols.rds
.Rhistory
.RData
.DS_Store

## QtCreator
Rcpp.pro
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -17,7 +17,7 @@ before_install:
- ./run.sh bootstrap

install:
- ./run.sh install_aptget r-cran-runit r-cran-inline r-cran-rbenchmark r-cran-highlight r-cran-pkgkitten
- ./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

script:
- ./run.sh run_tests
Expand Down
38 changes: 38 additions & 0 deletions ChangeLog
@@ -1,3 +1,41 @@
2017-09-20 James J Balamuta <balamut2@illinois.edu>

* DESCRIPTION (Version, Date): Roll minor version
* vignettes/jss.bst: Removed
* vignettes/rcpp-docs.cls: idem

2017-09-20 Dirk Eddelbuettel <edd@debian.org>

* vignettes/Rcpp-FAQ.Rmd: Modified formatting and cleaned a bit more.
* vignettes/Rcpp-sugar.Rmd: Idem
* vignettes/Rcpp-introduction.Rmd: Added new PeerJ preprint

2017-09-19 James J Balamuta <balamut2@illinois.edu>

* vignettes/Rcpp-FAQ.Rmd: Formatted and cleaned up vignette.
* vignettes/Rcpp-sugar.Rmd: Idem

2017-09-19 Dirk Eddelbuettel <edd@debian.org>

* vignettes/Rcpp-attributes.Rmd: Formatted and cleaned up vignette.
* vignettes/Rcpp-extending.Rmd: Idem
* vignettes/Rcpp-modules.Rmd: Idem
* vignettes/Rcpp-package.Rmd: Idem
* vignettes/Rcpp-quickref.Rmd: Idem

2017-09-18 James J Balamuta <balamut2@illinois.edu>

* DESCRIPTION (Suggests): Added rmarkdown, knitr, and pinp dependencies
* .travis.yml: idem
* vignettes/Rcpp-quickref.Rmd: Translated vignette from highlight/sweave
to RMarkdown for use with the pinp template.
* vignettes/Rcpp-sugar.Rmd: Idem
* vignettes/Rcpp-package.Rmd: Idem
* vignettes/Rcpp-modules.Rmd: Idem
* vignettes/Rcpp-FAQ.Rmd: Idem
* vignettes/Rcpp-extending.Rmd: Idem
* vignettes/Rcpp-attributes.Rmd: Idem

2017-09-03 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version
Expand Down
10 changes: 5 additions & 5 deletions DESCRIPTION
@@ -1,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 0.12.12.3
Date: 2017-09-03
Version: 0.12.12.4
Date: 2017-09-20
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
Nathan Russell, Douglas Bates and John Chambers
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Expand All @@ -15,10 +15,10 @@ Description: The 'Rcpp' package provides R functions as well as C++ classes whic
by Eddelbuettel and Balamuta (2017, PeerJ); see 'citation("Rcpp")' for details.
Depends: R (>= 3.0.0)
Imports: methods, utils
Suggests: RUnit, inline, rbenchmark, highlight, pkgKitten (>= 0.1.2)
VignetteBuilder: highlight
Suggests: RUnit, inline, rbenchmark, knitr, rmarkdown, pinp, pkgKitten (>= 0.1.2)
VignetteBuilder: knitr
URL: http://www.rcpp.org, http://dirk.eddelbuettel.com/code/rcpp.html, https://github.com/RcppCore/Rcpp
License: GPL (>= 2)
BugReports: https://github.com/RcppCore/Rcpp/issues
MailingList: Please send questions and comments regarding Rcpp to rcpp-devel@lists.r-forge.r-project.org
RoxygenNote: 5.0.1
RoxygenNote: 6.0.1
3 changes: 3 additions & 0 deletions inst/NEWS.Rd
Expand Up @@ -24,6 +24,9 @@
addressing issue \ghit{682}).
\item Added a new vignette \sQuote{Rcpp-introduction} based on new PeerJ
preprint, renamed existing introduction to \sQuote{Rcpp-jss-2011}.
\item Transitioned all vignettes to the pinp RMarkdown template
(James Balamuta and Dirk Eddelbuettel in \ghpr{755} addressing
issue \ghit{604}).
}
}
}
Expand Down

0 comments on commit 85f5c3d

Please sign in to comment.