diff --git a/ChangeLog b/ChangeLog index c7561c91d..04515f295 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2025-07-18 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version and date + * inst/include/Rcpp/config.h: Idem + + * R/asis.R (asisWeave, asisTangle): Borrowed with thanks from R.rsp + and shortened / simplified to provide 'asis' vignette processor + * R/zzz.R (.onLoad): Register new vignette processor + * vignettes/*.asis: New files with vignette info from .Rnw files + * vignettes/pdf/*.pdf: Moved to directory vignettes/ + * vignettes/*.Rnw: Removed + * man/asisWeave.Rd: Documentation + 2025-07-01 Dirk Eddelbuettel * DESCRIPTION (Date, Version): Release 1.1.0 diff --git a/DESCRIPTION b/DESCRIPTION index 2e6c8f3a7..31ed13b2b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: Rcpp Title: Seamless R and C++ Integration -Version: 1.1.0 -Date: 2025-07-01 +Version: 1.1.0.1 +Date: 2025-07-18 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org", comment = c(ORCID = "0000-0001-6419-907X")), person("Romain", "Francois", role = "aut", @@ -35,3 +35,4 @@ BugReports: https://github.com/RcppCore/Rcpp/issues MailingList: rcpp-devel@lists.r-forge.r-project.org RoxygenNote: 6.1.1 Encoding: UTF-8 +VignetteBuilder: Rcpp diff --git a/NAMESPACE b/NAMESPACE index 45a07c50f..1af902e22 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -33,8 +33,7 @@ export(Module, cpp_object_initializer, cpp_object_dummy, Rcpp.plugin.maker, - getRcppVersion - ) + getRcppVersion) S3method(print, bytes) S3method(format, Rcpp_stack_trace) S3method(str, Rcpp_stack_trace) diff --git a/R/asis.R b/R/asis.R new file mode 100644 index 000000000..5d7e363a2 --- /dev/null +++ b/R/asis.R @@ -0,0 +1,56 @@ +## These two functions are borrowed with grateful appreciation from the R.rsp package +## by Henrik Bengtsson licensed under LGPL (>= 2.1) and somewhat simplified / shortened +## feature-reduced here. Please see the R.rsp for a full-featured version and documentation + +##' Simple \sQuote{asis} Vignette Processor +##' +##' To pass pre-made pdf vignettes through \dQuote{as is}, a simple vignette +##' process is added. It is derived from the more feature-complete one in the \pkg{R.rsp} +##' package. To use it, add files named like the pdf file plus an appended \code{.asis} +##' with the vignette metainformation and register the vignette processor, see the examples. +##' +##' @title Process pdf vignettes \sQuote{asis} +##' @name asisWeave +##' @param file character Filename to be processed +##' @param ... dots Currently ignored +##' @param pattern character A regular expression describing the filename pattern +##' @return The respective filename is returned, invisibly +##' @author Henrik Bengtsson for the original versions in package \pkg{R.rsp}, +##' Dirk Eddelbuettel for the shortened ones used here +##' @examples +##' # To register this vignette engine in another package, add +##' # \code{VignetteBuilder: Rcpp} as well as \code{Suggests: Rcpp} to \code{DESCRIPTON} +##' # which uses the registration this package provides via +##' \dontrun{tools::vignetteEngine("asis", package = pkgname, pattern = "[.](pdf|html)[.]asis$", +##' weave = asisWeave, tangle = asisTangle)} +##' +##' # Use a .asis file as in the Rcpp package, for example Rcpp-FAQ.pdf.asis has these lines: +##' # %\VignetteIndexEntry{Rcpp-FAQ} +##' # %\VignetteKeywords{Rcpp, FAQ, R, Cpp} +##' # %\VignettePackage{Rcpp} +##' # %\VignetteEncoding{UTF-8} +##' # %\VignetteEngine{Rcpp::asis} +asisWeave <- function (file, ...) { + output <- tools::file_path_sans_ext(basename(file)) + if (!file.exists(output)) { + outputS <- file.path("..", "inst", "doc", output) + if (file.exists(outputS)) { + file.copy(outputS, output, overwrite = TRUE) + output <- outputS + } else { + stop("No file to process", call. = FALSE) + } + } + Sys.setFileTime(output, time = Sys.time()) + invisible(output) +} + +##' @rdname asisWeave +asisTangle <- function (file, ..., pattern = "(|[.][^.]*)[.]asis$") { + workdir <- "." + filename <- basename(file) + fullname <- gsub(pattern, "", filename) + filenameR <- sprintf("%s.R", fullname) + cat(sprintf("### This is an R script tangled from '%s'\n", filename), file = filenameR) + invisible(filenameR) +} diff --git a/R/zzz.R b/R/zzz.R index 2ed6bfd79..6dd34beff 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -1,4 +1,4 @@ -# Copyright (C) 2009 - 2016 Dirk Eddelbuettel and Romain Francois +# Copyright (C) 2009 - 2025 Dirk Eddelbuettel and Romain Francois # # This file is part of Rcpp. # @@ -20,7 +20,8 @@ .classes_map <- new.env() .onLoad <- function(libname, pkgname){ - new_dummyObject(.dummyInstancePointer) # nocov -} - + new_dummyObject(.dummyInstancePointer) # nocov start + tools::vignetteEngine("asis", package = pkgname, pattern = "[.](pdf|html)[.]asis$", + weave = asisWeave, tangle = asisTangle) # nocov end +} diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index 1ce1d1854..a26ce0a61 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -3,6 +3,16 @@ \newcommand{\ghpr}{\href{https://github.com/RcppCore/Rcpp/pull/#1}{##1}} \newcommand{\ghit}{\href{https://github.com/RcppCore/Rcpp/issues/#1}{##1}} +\section{Changes in Rcpp release version 1.1.1 (2026-01-xx)}{ + \itemize{ + \item Changes in Rcpp Documentation: + \itemize{ + \item Vignettes are now processed via a new "asis" processor adopted + from \pkg{R.rsp} (Dirk in \ghpr{1394} fixing \ghit{1393}) + } + } +} + \section{Changes in Rcpp release version 1.1.0 (2025-07-01)}{ \itemize{ \item Changes in Rcpp API: diff --git a/inst/include/Rcpp/config.h b/inst/include/Rcpp/config.h index e478be1da..9486f9e50 100644 --- a/inst/include/Rcpp/config.h +++ b/inst/include/Rcpp/config.h @@ -31,7 +31,7 @@ #define RCPP_VERSION_STRING "1.1.0" // the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it) -#define RCPP_DEV_VERSION RcppDevVersion(1,1,0,0) -#define RCPP_DEV_VERSION_STRING "1.1.0.0" +#define RCPP_DEV_VERSION RcppDevVersion(1,1,0,1) +#define RCPP_DEV_VERSION_STRING "1.1.0.1" #endif diff --git a/man/asisWeave.Rd b/man/asisWeave.Rd new file mode 100644 index 000000000..0f923e2c0 --- /dev/null +++ b/man/asisWeave.Rd @@ -0,0 +1,48 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/asis.R +\name{asisWeave} +\alias{asisWeave} +\alias{asisTangle} +\title{Process pdf vignettes \sQuote{asis}} +\usage{ +asisWeave(file, ...) + +asisTangle(file, ..., pattern = "(|[.][^.]*)[.]asis$") +} +\arguments{ +\item{file}{character Filename to be processed} + +\item{...}{dots Currently ignored} + +\item{pattern}{character A regular expression describing the filename pattern} +} +\value{ +The respective filename is returned, invisibly +} +\description{ +Simple \sQuote{asis} Vignette Processor +} +\details{ +To pass pre-made pdf vignettes through \dQuote{as is}, a simple vignette +process is added. It is derived from the more feature-complete one in the \pkg{R.rsp} +package. To use it, add files named like the pdf file plus an appended \code{.asis} +with the vignette metainformation and register the vignette processor, see the examples. +} +\examples{ +# To register this vignette engine in another package, add +# \code{VignetteBuilder: Rcpp} as well as \code{Suggests: Rcpp} to \code{DESCRIPTON} +# which uses the registration this package provides via +\dontrun{tools::vignetteEngine("asis", package = pkgname, pattern = "[.](pdf|html)[.]asis$", + weave = asisWeave, tangle = asisTangle)} + +# Use a .asis file as in the Rcpp package, for example Rcpp-FAQ.pdf.asis has these lines: +# \%\VignetteIndexEntry{Rcpp-FAQ} +# \%\VignetteKeywords{Rcpp, FAQ, R, Cpp} +# \%\VignettePackage{Rcpp} +# \%\VignetteEncoding{UTF-8} +# \%\VignetteEngine{Rcpp::asis} +} +\author{ +Henrik Bengtsson for the original versions in package \pkg{R.rsp}, +Dirk Eddelbuettel for the shortened ones used here +} diff --git a/man/compilerCheck.Rd b/man/compilerCheck.Rd index 954ac883b..b10c23d89 100644 --- a/man/compilerCheck.Rd +++ b/man/compilerCheck.Rd @@ -28,4 +28,3 @@ string, which is then compared to the given minimal version. \author{ Dirk Eddelbuettel } - diff --git a/vignettes/Rcpp-FAQ.Rnw b/vignettes/Rcpp-FAQ.Rnw deleted file mode 100644 index d924ed650..000000000 --- a/vignettes/Rcpp-FAQ.Rnw +++ /dev/null @@ -1,10 +0,0 @@ -\documentclass{article} -\usepackage{pdfpages} -%\VignetteIndexEntry{Rcpp-FAQ} -%\VignetteKeywords{Rcpp, FAQ, R, Cpp} -%\VignettePackage{Rcpp} -%\VignetteEncoding{UTF-8} - -\begin{document} -\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-FAQ.pdf} -\end{document} diff --git a/vignettes/Rcpp-FAQ.pdf b/vignettes/Rcpp-FAQ.pdf index 794aef363..bf46ff147 100644 Binary files a/vignettes/Rcpp-FAQ.pdf and b/vignettes/Rcpp-FAQ.pdf differ diff --git a/vignettes/Rcpp-FAQ.pdf.asis b/vignettes/Rcpp-FAQ.pdf.asis new file mode 100644 index 000000000..0e49d5ef2 --- /dev/null +++ b/vignettes/Rcpp-FAQ.pdf.asis @@ -0,0 +1,5 @@ +%\VignetteIndexEntry{Rcpp-FAQ} +%\VignetteKeywords{Rcpp, FAQ, R, Cpp} +%\VignettePackage{Rcpp} +%\VignetteEncoding{UTF-8} +%\VignetteEngine{Rcpp::asis} diff --git a/vignettes/Rcpp-attributes.Rnw b/vignettes/Rcpp-attributes.Rnw deleted file mode 100644 index e06336e19..000000000 --- a/vignettes/Rcpp-attributes.Rnw +++ /dev/null @@ -1,10 +0,0 @@ -\documentclass{article} -\usepackage{pdfpages} -%\VignetteIndexEntry{Rcpp-attributes} -%\VignetteKeywords{Rcpp, attributes, R, Cpp} -%\VignettePackage{Rcpp} -%\VignetteEncoding{UTF-8} - -\begin{document} -\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-attributes.pdf} -\end{document} diff --git a/vignettes/Rcpp-attributes.pdf b/vignettes/Rcpp-attributes.pdf index 67bb1ecbf..b1f7f14bc 100644 Binary files a/vignettes/Rcpp-attributes.pdf and b/vignettes/Rcpp-attributes.pdf differ diff --git a/vignettes/Rcpp-attributes.pdf.asis b/vignettes/Rcpp-attributes.pdf.asis new file mode 100644 index 000000000..24863272e --- /dev/null +++ b/vignettes/Rcpp-attributes.pdf.asis @@ -0,0 +1,5 @@ +%\VignetteIndexEntry{Rcpp-attributes} +%\VignetteKeywords{Rcpp, attributes, R, Cpp} +%\VignettePackage{Rcpp} +%\VignetteEncoding{UTF-8} +%\VignetteEngine{Rcpp::asis} diff --git a/vignettes/Rcpp-extending.Rnw b/vignettes/Rcpp-extending.Rnw deleted file mode 100644 index d4a848384..000000000 --- a/vignettes/Rcpp-extending.Rnw +++ /dev/null @@ -1,10 +0,0 @@ -\documentclass{article} -\usepackage{pdfpages} -%\VignetteIndexEntry{Rcpp-extending} -%\VignetteKeywords{Rcpp, extending, R, Cpp} -%\VignettePackage{Rcpp} -%\VignetteEncoding{UTF-8} - -\begin{document} -\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-extending.pdf} -\end{document} diff --git a/vignettes/Rcpp-extending.pdf b/vignettes/Rcpp-extending.pdf index db3d270a8..f3ca588c3 100644 Binary files a/vignettes/Rcpp-extending.pdf and b/vignettes/Rcpp-extending.pdf differ diff --git a/vignettes/Rcpp-extending.pdf.asis b/vignettes/Rcpp-extending.pdf.asis new file mode 100644 index 000000000..28f9b0836 --- /dev/null +++ b/vignettes/Rcpp-extending.pdf.asis @@ -0,0 +1,5 @@ +%\VignetteIndexEntry{Rcpp-extending} +%\VignetteKeywords{Rcpp, extending, R, Cpp} +%\VignettePackage{Rcpp} +%\VignetteEncoding{UTF-8} +%\VignetteEngine{Rcpp::asis} diff --git a/vignettes/Rcpp-introduction.Rnw b/vignettes/Rcpp-introduction.Rnw deleted file mode 100644 index d0c6a910b..000000000 --- a/vignettes/Rcpp-introduction.Rnw +++ /dev/null @@ -1,11 +0,0 @@ -\documentclass{article} -\usepackage{pdfpages} -%\VignetteIndexEntry{Rcpp-introduction} -%\VignetteKeywords{Rcpp, R, Cpp} -%\VignettePackage{Rcpp} -%\VignetteEncoding{UTF-8} - -\begin{document} -\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-introduction.pdf} -\end{document} - diff --git a/vignettes/Rcpp-introduction.pdf b/vignettes/Rcpp-introduction.pdf index 5d570de5a..7c7c2ab79 100644 Binary files a/vignettes/Rcpp-introduction.pdf and b/vignettes/Rcpp-introduction.pdf differ diff --git a/vignettes/Rcpp-introduction.pdf.asis b/vignettes/Rcpp-introduction.pdf.asis new file mode 100644 index 000000000..9cad6f0b7 --- /dev/null +++ b/vignettes/Rcpp-introduction.pdf.asis @@ -0,0 +1,5 @@ +%\VignetteIndexEntry{Rcpp-introduction} +%\VignetteKeywords{Rcpp, R, Cpp} +%\VignettePackage{Rcpp} +%\VignetteEncoding{UTF-8} +%\VignetteEngine{Rcpp::asis} diff --git a/vignettes/Rcpp-jss-2011.pdf b/vignettes/Rcpp-jss-2011.pdf index f3b5ea76d..a8e2483f1 100644 Binary files a/vignettes/Rcpp-jss-2011.pdf and b/vignettes/Rcpp-jss-2011.pdf differ diff --git a/vignettes/Rcpp-jss-2011.Rnw b/vignettes/Rcpp-jss-2011.pdf.asis similarity index 52% rename from vignettes/Rcpp-jss-2011.Rnw rename to vignettes/Rcpp-jss-2011.pdf.asis index 936b42b9e..d55537828 100644 --- a/vignettes/Rcpp-jss-2011.Rnw +++ b/vignettes/Rcpp-jss-2011.pdf.asis @@ -1,11 +1,5 @@ -\documentclass{article} -\usepackage{pdfpages} %\VignetteIndexEntry{Rcpp-JSS-2011} %\VignetteKeywords{Rcpp, foreign function interface, .Call, C++, R} %\VignettePackage{Rcpp} %\VignetteEncoding{UTF-8} - -\begin{document} -\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-jss-2011.pdf} -\end{document} - +%\VignetteEngine{Rcpp::asis} diff --git a/vignettes/Rcpp-libraries.Rnw b/vignettes/Rcpp-libraries.Rnw deleted file mode 100644 index 822b0d451..000000000 --- a/vignettes/Rcpp-libraries.Rnw +++ /dev/null @@ -1,10 +0,0 @@ -\documentclass{article} -\usepackage{pdfpages} -%\VignetteIndexEntry{Rcpp-libraries} -%\VignetteKeywords{Rcpp, Package, Library} -%\VignettePackage{Rcpp} -%\VignetteEncoding{UTF-8} - -\begin{document} -\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-libraries.pdf} -\end{document} diff --git a/vignettes/Rcpp-libraries.pdf b/vignettes/Rcpp-libraries.pdf index 3d15f0aa4..3a8767a62 100644 Binary files a/vignettes/Rcpp-libraries.pdf and b/vignettes/Rcpp-libraries.pdf differ diff --git a/vignettes/Rcpp-libraries.pdf.asis b/vignettes/Rcpp-libraries.pdf.asis new file mode 100644 index 000000000..406c437d5 --- /dev/null +++ b/vignettes/Rcpp-libraries.pdf.asis @@ -0,0 +1,5 @@ +%\VignetteIndexEntry{Rcpp-libraries} +%\VignetteKeywords{Rcpp, Package, Library} +%\VignettePackage{Rcpp} +%\VignetteEncoding{UTF-8} +%\VignetteEngine{Rcpp::asis} diff --git a/vignettes/Rcpp-modules.Rnw b/vignettes/Rcpp-modules.Rnw deleted file mode 100644 index 08656fcb6..000000000 --- a/vignettes/Rcpp-modules.Rnw +++ /dev/null @@ -1,10 +0,0 @@ -\documentclass{article} -\usepackage{pdfpages} -%\VignetteIndexEntry{Rcpp-modules} -%\VignetteKeywords{Rcpp, modules, R, Cpp} -%\VignettePackage{Rcpp} -%\VignetteEncoding{UTF-8} - -\begin{document} -\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-modules.pdf} -\end{document} diff --git a/vignettes/Rcpp-modules.pdf b/vignettes/Rcpp-modules.pdf index 6798731f3..ff4dce291 100644 Binary files a/vignettes/Rcpp-modules.pdf and b/vignettes/Rcpp-modules.pdf differ diff --git a/vignettes/Rcpp-modules.pdf.asis b/vignettes/Rcpp-modules.pdf.asis new file mode 100644 index 000000000..36d004d54 --- /dev/null +++ b/vignettes/Rcpp-modules.pdf.asis @@ -0,0 +1,5 @@ +%\VignetteIndexEntry{Rcpp-modules} +%\VignetteKeywords{Rcpp, modules, R, Cpp} +%\VignettePackage{Rcpp} +%\VignetteEncoding{UTF-8} +%\VignetteEngine{Rcpp::asis} diff --git a/vignettes/Rcpp-package.Rnw b/vignettes/Rcpp-package.Rnw deleted file mode 100644 index 732f2b38f..000000000 --- a/vignettes/Rcpp-package.Rnw +++ /dev/null @@ -1,10 +0,0 @@ -\documentclass{article} -\usepackage{pdfpages} -%\VignetteIndexEntry{Rcpp-package} -%\VignetteKeywords{Rcpp, package, R, Cpp} -%\VignettePackage{Rcpp} -%\VignetteEncoding{UTF-8} - -\begin{document} -\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-package.pdf} -\end{document} diff --git a/vignettes/Rcpp-package.pdf b/vignettes/Rcpp-package.pdf index 031b0248d..7ed748fb3 100644 Binary files a/vignettes/Rcpp-package.pdf and b/vignettes/Rcpp-package.pdf differ diff --git a/vignettes/Rcpp-package.pdf.asis b/vignettes/Rcpp-package.pdf.asis new file mode 100644 index 000000000..ba64c4df5 --- /dev/null +++ b/vignettes/Rcpp-package.pdf.asis @@ -0,0 +1,5 @@ +%\VignetteIndexEntry{Rcpp-package} +%\VignetteKeywords{Rcpp, package, R, Cpp} +%\VignettePackage{Rcpp} +%\VignetteEncoding{UTF-8} +%\VignetteEngine{Rcpp::asis} diff --git a/vignettes/Rcpp-quickref.Rnw b/vignettes/Rcpp-quickref.Rnw deleted file mode 100644 index 838f2b4be..000000000 --- a/vignettes/Rcpp-quickref.Rnw +++ /dev/null @@ -1,10 +0,0 @@ -\documentclass{article} -\usepackage{pdfpages} -%\VignetteIndexEntry{Rcpp-quickref} -%\VignetteKeywords{Rcpp, quickref, R, Cpp} -%\VignettePackage{Rcpp} -%\VignetteEncoding{UTF-8} - -\begin{document} -\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-quickref.pdf} -\end{document} diff --git a/vignettes/Rcpp-quickref.pdf b/vignettes/Rcpp-quickref.pdf index c9b68bfd8..3e26d5134 100644 Binary files a/vignettes/Rcpp-quickref.pdf and b/vignettes/Rcpp-quickref.pdf differ diff --git a/vignettes/Rcpp-quickref.pdf.asis b/vignettes/Rcpp-quickref.pdf.asis new file mode 100644 index 000000000..1edafab99 --- /dev/null +++ b/vignettes/Rcpp-quickref.pdf.asis @@ -0,0 +1,5 @@ +%\VignetteIndexEntry{Rcpp-quickref} +%\VignetteKeywords{Rcpp, quickref, R, Cpp} +%\VignettePackage{Rcpp} +%\VignetteEncoding{UTF-8} +%\VignetteEngine{Rcpp::asis} diff --git a/vignettes/Rcpp-sugar.Rnw b/vignettes/Rcpp-sugar.Rnw deleted file mode 100644 index e4ab3b13c..000000000 --- a/vignettes/Rcpp-sugar.Rnw +++ /dev/null @@ -1,10 +0,0 @@ -\documentclass{article} -\usepackage{pdfpages} -%\VignetteIndexEntry{Rcpp-sugar} -%\VignetteKeywords{Rcpp, sugar, R, Cpp} -%\VignettePackage{Rcpp} -%\VignetteEncoding{UTF-8} - -\begin{document} -\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-sugar.pdf} -\end{document} diff --git a/vignettes/Rcpp-sugar.pdf b/vignettes/Rcpp-sugar.pdf index 8d7280dfa..0122581c9 100644 Binary files a/vignettes/Rcpp-sugar.pdf and b/vignettes/Rcpp-sugar.pdf differ diff --git a/vignettes/Rcpp-sugar.pdf.asis b/vignettes/Rcpp-sugar.pdf.asis new file mode 100644 index 000000000..64c5c3871 --- /dev/null +++ b/vignettes/Rcpp-sugar.pdf.asis @@ -0,0 +1,5 @@ +%\VignetteIndexEntry{Rcpp-sugar} +%\VignetteKeywords{Rcpp, sugar, R, Cpp} +%\VignettePackage{Rcpp} +%\VignetteEncoding{UTF-8} +%\VignetteEngine{Rcpp::asis} diff --git a/vignettes/pdf/Rcpp-FAQ.pdf b/vignettes/pdf/Rcpp-FAQ.pdf deleted file mode 100644 index bf46ff147..000000000 Binary files a/vignettes/pdf/Rcpp-FAQ.pdf and /dev/null differ diff --git a/vignettes/pdf/Rcpp-attributes.pdf b/vignettes/pdf/Rcpp-attributes.pdf deleted file mode 100644 index b1f7f14bc..000000000 Binary files a/vignettes/pdf/Rcpp-attributes.pdf and /dev/null differ diff --git a/vignettes/pdf/Rcpp-extending.pdf b/vignettes/pdf/Rcpp-extending.pdf deleted file mode 100644 index f3ca588c3..000000000 Binary files a/vignettes/pdf/Rcpp-extending.pdf and /dev/null differ diff --git a/vignettes/pdf/Rcpp-introduction.pdf b/vignettes/pdf/Rcpp-introduction.pdf deleted file mode 100644 index 7c7c2ab79..000000000 Binary files a/vignettes/pdf/Rcpp-introduction.pdf and /dev/null differ diff --git a/vignettes/pdf/Rcpp-jss-2011.pdf b/vignettes/pdf/Rcpp-jss-2011.pdf deleted file mode 100644 index a8e2483f1..000000000 Binary files a/vignettes/pdf/Rcpp-jss-2011.pdf and /dev/null differ diff --git a/vignettes/pdf/Rcpp-libraries.pdf b/vignettes/pdf/Rcpp-libraries.pdf deleted file mode 100644 index 3a8767a62..000000000 Binary files a/vignettes/pdf/Rcpp-libraries.pdf and /dev/null differ diff --git a/vignettes/pdf/Rcpp-modules.pdf b/vignettes/pdf/Rcpp-modules.pdf deleted file mode 100644 index ff4dce291..000000000 Binary files a/vignettes/pdf/Rcpp-modules.pdf and /dev/null differ diff --git a/vignettes/pdf/Rcpp-package.pdf b/vignettes/pdf/Rcpp-package.pdf deleted file mode 100644 index 7ed748fb3..000000000 Binary files a/vignettes/pdf/Rcpp-package.pdf and /dev/null differ diff --git a/vignettes/pdf/Rcpp-quickref.pdf b/vignettes/pdf/Rcpp-quickref.pdf deleted file mode 100644 index 3e26d5134..000000000 Binary files a/vignettes/pdf/Rcpp-quickref.pdf and /dev/null differ diff --git a/vignettes/pdf/Rcpp-sugar.pdf b/vignettes/pdf/Rcpp-sugar.pdf deleted file mode 100644 index 0122581c9..000000000 Binary files a/vignettes/pdf/Rcpp-sugar.pdf and /dev/null differ diff --git a/vignettes/rmd/Makefile b/vignettes/rmd/Makefile index eb923a854..973e2cd5a 100644 --- a/vignettes/rmd/Makefile +++ b/vignettes/rmd/Makefile @@ -7,7 +7,7 @@ rmdvignettes := $(rmdsources:.Rmd=.pdf) %.pdf: %.Rmd Rscript -e 'rmarkdown::render("$<")' Rscript -e 'tools::compactPDF("$@", gs_quality="ebook")' - cp -vax $@ ../pdf + cp -vax $@ .. all: ${rmdvignettes} Rcpp-jss-2011.pdf @@ -19,7 +19,7 @@ Rcpp-jss-2011.pdf: Rcpp-jss-2011.tex bibtex Rcpp-jss-2011.aux Rscript -e 'tools::texi2pdf("$<", texi2dvi="pdflatex")' Rscript -e 'tools::compactPDF("$@", gs_quality="ebook")' - cp -vax $@ ../pdf + cp -vax $@ .. clean: @rm -rf *.aux *.log *.out *.toc *.tex *.pdf Rcpp-introduction_cache Rcpp-libraries_cache pinp.cls Rcpp-jss-2011.bbl Rcpp-jss-2011.blg auto