From 87a1506c79f11d95db6f76fcf855254de07c7211 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Mon, 30 Oct 2017 14:41:45 -0500 Subject: [PATCH 1/4] deprecating old date(time) classes as outlined in Nov 2016 --- ChangeLog | 6 ++++++ inst/NEWS.Rd | 3 +++ inst/include/Rcpp.h | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a00f38257..4feaea9fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-10-30 Dirk Eddelbuettel + + * inst/include/Rcpp.h: Unless RCPP_FORCE_OLD_DATE_DATETIME_VECTORS is + defined, define RCPP_NEW_DATE_DATETIME_VECTORS to switch to new date and + datetime vector as announced in release 0.12.8 one year ago + 2017-10-03 Dirk Eddelbuettel * inst/include/Rcpp/iostream/Rstreambuf.h: White-space edits diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index 68b2a8461..406332c4e 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -11,6 +11,9 @@ added to \code{MatrixRow} as well (Dan Dillon in \ghpr{750}). \item The \code{Rostream} object now contains a \code{Buffer} rather than allocating one (Kirill Müller in \ghpr{763}). + \item New \code{DateVector} and \code{DatetimeVector} classes are now the + default fully deprecating the old classes as announced one year ago. + } \item Changes in Rcpp Package: \itemize{ diff --git a/inst/include/Rcpp.h b/inst/include/Rcpp.h index 64be50266..0d2b9dbc0 100644 --- a/inst/include/Rcpp.h +++ b/inst/include/Rcpp.h @@ -56,7 +56,9 @@ #include #include -// #define RCPP_NEW_DATE_DATETIME_VECTORS 1 +#if !defined(RCPP_FORCE_OLD_DATE_DATETIME_VECTORS) + #define RCPP_NEW_DATE_DATETIME_VECTORS 1 +#endif #include #include From 5106e2ca5ca0282ae7130f9b2aa493aa52b4ef46 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Mon, 30 Oct 2017 15:25:33 -0500 Subject: [PATCH 2/4] roll minor version --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 30df99b74..6194c9b0c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: Rcpp Title: Seamless R and C++ Integration -Version: 0.12.13.1 -Date: 2017-09-29 +Version: 0.12.13.2 +Date: 2017-10-30 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou, Nathan Russell, Douglas Bates and John Chambers Maintainer: Dirk Eddelbuettel From b3fa43ca3202b8d6f2594ecb89d2bc3e7a3df868 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Mon, 30 Oct 2017 16:43:50 -0500 Subject: [PATCH 3/4] two \pnasbreak added for pinp 0.0.3 --- ChangeLog | 3 +++ vignettes/Rcpp-package.Rmd | 2 ++ vignettes/Rcpp-quickref.Rmd | 2 ++ 3 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4feaea9fd..d7a82a384 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ defined, define RCPP_NEW_DATE_DATETIME_VECTORS to switch to new date and datetime vector as announced in release 0.12.8 one year ago + * vignettes/Rcpp-package.Rmd: Added \pnasbreak at end + * vignettes/Rcpp-quickref.Rmd: Idem + 2017-10-03 Dirk Eddelbuettel * inst/include/Rcpp/iostream/Rstreambuf.h: White-space edits diff --git a/vignettes/Rcpp-package.Rmd b/vignettes/Rcpp-package.Rmd index 2930d6622..e0cf6a3dc 100644 --- a/vignettes/Rcpp-package.Rmd +++ b/vignettes/Rcpp-package.Rmd @@ -489,3 +489,5 @@ detail, and references to further examples were provided. does not cover the behavior of `Rcpp.package.skeleton` when `attributes` is set to `FALSE` as we try to encourage package developpers to use attributes. + +\pnasbreak diff --git a/vignettes/Rcpp-quickref.Rmd b/vignettes/Rcpp-quickref.Rmd index 772c431cd..9198c6f32 100644 --- a/vignettes/Rcpp-quickref.Rmd +++ b/vignettes/Rcpp-quickref.Rmd @@ -551,3 +551,5 @@ b_persist <- list(stats=b$stats(), x=b$x) rm(b) */ ``` + +\pnasbreak From 2b20f7cec38af4ad77bc7ae8e45e2f1b9937ac3c Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sat, 4 Nov 2017 16:54:14 -0500 Subject: [PATCH 4/4] updated \pnasbreak use for pinp 0.0.4 --- ChangeLog | 11 ++++++++--- vignettes/Rcpp-FAQ.Rmd | 3 +++ vignettes/Rcpp-attributes.Rmd | 3 +++ vignettes/Rcpp-extending.Rmd | 3 +++ vignettes/Rcpp-modules.Rmd | 3 +++ vignettes/Rcpp-package.Rmd | 2 -- vignettes/Rcpp-quickref.Rmd | 2 -- vignettes/Rcpp-sugar.Rmd | 3 +++ 8 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7a82a384..334f12794 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,17 @@ +2017-11-04 Dirk Eddelbuettel + + * vignettes/Rcpp-FAQ.Rmd: Add 'skip_final_break: true' toggle + * vignettes/Rcpp-attributes.Rmd: Idem + * vignettes/Rcpp-extending.Rmd: Idem + * vignettes/Rcpp-modules.Rmd: Idem + * vignettes/Rcpp-sugar.Rmd: Idem + 2017-10-30 Dirk Eddelbuettel * inst/include/Rcpp.h: Unless RCPP_FORCE_OLD_DATE_DATETIME_VECTORS is defined, define RCPP_NEW_DATE_DATETIME_VECTORS to switch to new date and datetime vector as announced in release 0.12.8 one year ago - * vignettes/Rcpp-package.Rmd: Added \pnasbreak at end - * vignettes/Rcpp-quickref.Rmd: Idem - 2017-10-03 Dirk Eddelbuettel * inst/include/Rcpp/iostream/Rstreambuf.h: White-space edits diff --git a/vignettes/Rcpp-FAQ.Rmd b/vignettes/Rcpp-FAQ.Rmd index 3fd62197e..75cdb0abd 100644 --- a/vignettes/Rcpp-FAQ.Rmd +++ b/vignettes/Rcpp-FAQ.Rmd @@ -63,6 +63,9 @@ bibliography: Rcpp # Customize footer, eg by referencing the vignette footer_contents: "Rcpp Vignette" +# Omit \pnasbreak at end +skip_final_break: true + # Produce a pinp document output: pinp::pinp diff --git a/vignettes/Rcpp-attributes.Rmd b/vignettes/Rcpp-attributes.Rmd index 4a71009c2..f9d6bbdda 100644 --- a/vignettes/Rcpp-attributes.Rmd +++ b/vignettes/Rcpp-attributes.Rmd @@ -70,6 +70,9 @@ bibliography: Rcpp # Customize footer, eg by referencing the vignette footer_contents: "Rcpp Vignette" +# Omit \pnasbreak at end +skip_final_break: true + # Produce a pinp document output: pinp::pinp diff --git a/vignettes/Rcpp-extending.Rmd b/vignettes/Rcpp-extending.Rmd index 698951be4..15a225a1a 100644 --- a/vignettes/Rcpp-extending.Rmd +++ b/vignettes/Rcpp-extending.Rmd @@ -67,6 +67,9 @@ bibliography: Rcpp # Customize footer, eg by referencing the vignette footer_contents: "Rcpp Vignette" +# Omit \pnasbreak at end +skip_final_break: true + # Produce a pinp document output: pinp::pinp diff --git a/vignettes/Rcpp-modules.Rmd b/vignettes/Rcpp-modules.Rmd index 4117b7212..1550d7ee7 100644 --- a/vignettes/Rcpp-modules.Rmd +++ b/vignettes/Rcpp-modules.Rmd @@ -67,6 +67,9 @@ bibliography: Rcpp # Customize footer, eg by referencing the vignette footer_contents: "Rcpp Vignette" +# Omit \pnasbreak at end +skip_final_break: true + # Produce a pinp document output: pinp::pinp diff --git a/vignettes/Rcpp-package.Rmd b/vignettes/Rcpp-package.Rmd index e0cf6a3dc..2930d6622 100644 --- a/vignettes/Rcpp-package.Rmd +++ b/vignettes/Rcpp-package.Rmd @@ -489,5 +489,3 @@ detail, and references to further examples were provided. does not cover the behavior of `Rcpp.package.skeleton` when `attributes` is set to `FALSE` as we try to encourage package developpers to use attributes. - -\pnasbreak diff --git a/vignettes/Rcpp-quickref.Rmd b/vignettes/Rcpp-quickref.Rmd index 9198c6f32..772c431cd 100644 --- a/vignettes/Rcpp-quickref.Rmd +++ b/vignettes/Rcpp-quickref.Rmd @@ -551,5 +551,3 @@ b_persist <- list(stats=b$stats(), x=b$x) rm(b) */ ``` - -\pnasbreak diff --git a/vignettes/Rcpp-sugar.Rmd b/vignettes/Rcpp-sugar.Rmd index 0db669028..76bbe331f 100644 --- a/vignettes/Rcpp-sugar.Rmd +++ b/vignettes/Rcpp-sugar.Rmd @@ -69,6 +69,9 @@ bibliography: Rcpp # Customize footer, eg by referencing the vignette footer_contents: "Rcpp Vignette" +# Omit \pnasbreak at end +skip_final_break: true + # Produce a pinp document output: pinp::pinp