Skip to content

Commit 30faace

Browse files
authored
Merge pull request #747 from RcppCore/feature/new-vignette
Feature/new vignette (closes #746)
2 parents 72dfb68 + 5be2465 commit 30faace

File tree

11 files changed

+3099
-1208
lines changed

11 files changed

+3099
-1208
lines changed

ChangeLog

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
2017-09-02 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Version): Roll minor version
4+
5+
* vignettes/Rcpp-jss-2011.Rnw: Renamed again from Rcpp-introduction-2011,
6+
added reference to new Rcpp-introduction
7+
8+
* inst/bib/Rcpp.bib: Merged bibliography from new vignette; also added
9+
PeerJ Preprint with new Rcpp Introduction
10+
11+
2017-09-01 Dirk Eddelbuettel <[email protected]>
12+
13+
* vignettes/Rcpp-introduction.Rnw: New introductory vignette from PeerJ
14+
preprints but typeset 'more nicely'
15+
16+
* vignettes/rcpp-docs.cls: New LaTeX style file derived from pnas-new
17+
and its supporting files
18+
19+
* vignettes/figures/: Three support figures for new vignette
20+
* vignettes/intro2Rcpp.bib: New bibliography
21+
22+
* vignettes/Rcpp-introduction-2011.Rnw: Renamed from from Rcpp-introduction
23+
124
2017-08-26 Dirk Eddelbuettel <[email protected]>
225

326
* .travis.yml (before_install): Use https for curl fetch

DESCRIPTION

Lines changed: 4 additions & 4 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.1
4-
Date: 2017-08-05
3+
Version: 0.12.12.2
4+
Date: 2017-09-02
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]>
@@ -11,8 +11,8 @@ Description: The 'Rcpp' package provides R functions as well as C++ classes whic
1111
code as well as easier integration of third-party libraries. Documentation
1212
about 'Rcpp' is provided by several vignettes included in this package, via the
1313
'Rcpp Gallery' site at <http://gallery.rcpp.org>, the paper by Eddelbuettel and
14-
Francois (2011, JSS), and the book by Eddelbuettel (2013, Springer); see
15-
'citation("Rcpp")' for details on these last two.
14+
Francois (2011, JSS), the book by Eddelbuettel (2013, Springer) and the paper
15+
by Eddelbuettel and Balamuta (2017, PeerJ); see 'citation("Rcpp")' for details.
1616
Depends: R (>= 3.0.0)
1717
Imports: methods, utils
1818
Suggests: RUnit, inline, rbenchmark, highlight, pkgKitten (>= 0.1.2)

cleanup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ rm -f confdefs.h config.log config.status \
2626
inst/unitTests/testRcppClass/src/symbols.rds \
2727
vignettes/*.aux vignettes/*.log vignettes/*.out \
2828
vignettes/*.tex vignettes/*.bbl vignettes/*.blg \
29-
vignettes/*.toc vignettes/*.tpt
29+
vignettes/*.toc vignettes/*.tpt vignettes/*.xwm
3030

3131
rm -rf autom4te.cache inst/lib/ inst/doc/man/ inst/doc/html/ inst/doc/latex/ \
3232
inst/doc/auto inst/bib/auto inst/doc/Rcpp-*/auto/ src-* vignettes/auto

inst/NEWS.Rd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
\item Rewrote the macOS sections to depend on official documentation due
1616
to large changes in the macOS toolchain. (James Balamuta in \ghpr{742}
1717
addressing issue \ghit{682}).
18+
\item Added a new vignette \sQuote{Rcpp-introduction} based on new PeerJ
19+
preprint, renamed existing introduction to \sQuote{Rcpp-jss-2011}.
1820
}
1921
}
2022
}

0 commit comments

Comments
 (0)