Skip to content

Commit 15dee28

Browse files
eddelbuetteleddelbuettel
authored
Merge pull request #1005 from RcppCore/feature/vignettes_premade
Feature/vignettes premade (closes #1004)
2 parents 3a3e878 + 4d2be5b commit 15dee28

35 files changed

+1252
-1085
lines changed

‎.Rbuildignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ docker
2424
^GRTAGS
2525
^GTAGS
2626
^local
27-
vignettes/Makefile
27+
vignettes/Makefile
28+
vignettes/rmd

‎ChangeLog

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
2019-10-26 Dirk Eddelbuettel <[email protected]>
2+
3+
* vignettes/Rcpp-package.Rnw: Another wrapper
4+
* vignettes/Rcpp-jss-2011.Rnw: Idem
5+
6+
* vignettes/Makefile: Refinements
7+
* vignettes/rmd/Makefile: Idem
8+
9+
* cleanup: Removed bashism, added invocation of make clean
10+
11+
2019-10-23 Dirk Eddelbuettel <[email protected]>
12+
13+
* vignettes/Rcpp-*.Rnw: Wrappers around pdf/*pdf
14+
* vignettes/Makefile: Added
15+
16+
2019-10-21 Dirk Eddelbuettel <[email protected]>
17+
18+
* vignettes/rmd/*: Moved from parent directory
19+
* vignettes/pdf/*: New target directory
20+
121
2019-10-20 Dirk Eddelbuettel <[email protected]>
222

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

‎cleanup

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

33
#cd inst/doc && rm -f index.html *.tex *.bbl *.blg *.aux *.out *.log && cd -
44

@@ -30,7 +30,10 @@ rm -f confdefs.h config.log config.status \
3030
vignettes/*.toc vignettes/*.tpt vignettes/*.xwm
3131

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

3535
find . -name \*~ -exec rm {} \;
3636
find . -name \*.flc -exec rm {} \;
37+
38+
(cd vignettes/ && make clean && cd -) >/dev/null
39+
(cd vignettes/rmd/ && make clean && cd -) >/dev/null

‎inst/NEWS.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
\item Compilation can be sped up by toggling \code{RCPP_NO_RTTI} which
1313
implies \code{RCPP_NO_MODULES} (Dirk in \ghpr{998} fixing \ghit{998}).
1414
\item \code{XPtr} tags are now preserved in \code{as<>} (Stephen Wade
15-
in \phpr{1003} fixing \ghpr{986})
15+
in \ghpr{1003} fixing \ghit{986})
1616
}
1717
\item Changes in Rcpp Modules:
1818
\itemize{

‎vignettes/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Rcpp-*.log
77
Rcpp-*.tex
88
Rcpp-*.pdf
99
unitTests-results/
10+
rmd/figures/bootstrap.pdf

‎vignettes/Makefile

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,40 @@
11

2+
## No GNUmake for R so replacing efficient wildcard ops with explicit enumeration
3+
## Remove spaces between ': =' and '$ ( ... )' to re-activate
24

3-
rmdsources := $(wildcard *.Rmd)
4-
rmdvignettes := $(rmdsources:.Rmd=.pdf)
5+
##rnwsources : = $ ( wildcard *.Rnw )
6+
##rnwvignettes : = $ ( rnwsources:.Rnw=.pdf )
57

6-
%.pdf: %.Rmd
7-
Rscript -e 'rmarkdown::render("$<")'
8-
Rscript -e 'tools::compactPDF("$@", gs_quality="ebook")'
8+
rnwsources = Rcpp-attributes.Rnw \
9+
Rcpp-extending.Rnw \
10+
Rcpp-FAQ.Rnw \
11+
Rcpp-introduction.Rnw \
12+
Rcpp-jss-2011.Rnw \
13+
Rcpp-modules.Rnw \
14+
Rcpp-package.Rnw \
15+
Rcpp-quickref.Rnw \
16+
Rcpp-sugar.Rnw
917

10-
all: ${rmdvignettes} Rcpp-jss-2011.pdf
18+
rnwvignettes = Rcpp-attributes.pdf \
19+
Rcpp-extending.pdf \
20+
Rcpp-FAQ.pdf \
21+
Rcpp-introduction.pdf \
22+
Rcpp-jss-2011.pdf \
23+
Rcpp-modules.pdf \
24+
Rcpp-package.pdf \
25+
Rcpp-quickref.pdf \
26+
Rcpp-sugar.pdf
1127

12-
Rcpp-jss-2011.pdf: Rcpp-jss-2011.Rnw
28+
%.tex: %.Rnw
1329
Rscript -e 'Sweave("$<")'
30+
31+
%.pdf: %.tex
32+
Rscript -e 'tools::texi2pdf("$<", texi2dvi="pdflatex")'
33+
Rscript -e 'tools::texi2pdf("$<", texi2dvi="pdflatex")'
1434
Rscript -e 'tools::compactPDF("$@", gs_quality="ebook")'
35+
36+
all: ${rnwvignettes}
37+
@rm -f *.aux *.log *.tex
38+
39+
clean:
40+
@rm -f *.aux *.log *.tex

‎vignettes/Rcpp-FAQ.Rnw

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
\documentclass{article}
2+
\usepackage{pdfpages}
3+
%\VignetteIndexEntry{Rcpp-FAQ}
4+
%\VignetteKeywords{Rcpp, FAQ, R, Cpp}
5+
%\VignettePackage{Rcpp}
6+
%\VignetteEncoding{UTF-8}
7+
8+
\begin{document}
9+
\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-FAQ.pdf}
10+
\end{document}

‎vignettes/Rcpp-attributes.Rnw

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
\documentclass{article}
2+
\usepackage{pdfpages}
3+
%\VignetteIndexEntry{Rcpp-attributes}
4+
%\VignetteKeywords{Rcpp, attributes, R, Cpp}
5+
%\VignettePackage{Rcpp}
6+
%\VignetteEncoding{UTF-8}
7+
8+
\begin{document}
9+
\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-attributes.pdf}
10+
\end{document}

‎vignettes/Rcpp-extending.Rnw

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
\documentclass{article}
2+
\usepackage{pdfpages}
3+
%\VignetteIndexEntry{Rcpp-extending}
4+
%\VignetteKeywords{Rcpp, extending, R, Cpp}
5+
%\VignettePackage{Rcpp}
6+
%\VignetteEncoding{UTF-8}
7+
8+
\begin{document}
9+
\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-extending.pdf}
10+
\end{document}

‎vignettes/Rcpp-introduction.Rnw

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
\documentclass{article}
2+
\usepackage{pdfpages}
3+
%\VignetteIndexEntry{Rcpp-introduction}
4+
%\VignetteKeywords{Rcpp, R, Cpp}
5+
%\VignettePackage{Rcpp}
6+
%\VignetteEncoding{UTF-8}
7+
8+
\begin{document}
9+
\includepdf[pages=-, fitpaper=true]{pdf/Rcpp-introduction.pdf}
10+
\end{document}
11+

0 commit comments

Comments
 (0)