Skip to content

Commit 386563b

Browse files
committed
refresh look of vignettes by using Bitstream Charter, and microtype package (cf http://www.khirevich.com/latex)
add vignettes/notyet to .Rbuildignore
1 parent be95af2 commit 386563b

File tree

10 files changed

+59
-20
lines changed

10 files changed

+59
-20
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ vignettes/jss.bst
99
^\.Rproj\.user$
1010
inst/include/Rcpp/preprocessor
1111
inst/include/Rcpp/sugar/functions/impl
12+
vignettes/notyet

ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44
which again caused problems for the Windows builds at R-Forge and
55
win-builder. Unit tests comprise the same functionality and pass.
66

7+
* vignettes/Rcpp-attributes.Rnw: Refresh look by using Bitstream
8+
Charter, and microtype package (cf http://www.khirevich.com/latex)
9+
* vignettes/Rcpp-extending.Rnw: Idem
10+
* vignettes/Rcpp-FAQ.Rnw: Idem
11+
* vignettes/Rcpp-modules.Rnw: Idem
12+
* vignettes/Rcpp-package.Rnw: Idem
13+
* vignettes/Rcpp-quickref.Rnw: Idem
14+
* vignettes/Rcpp-sugar.Rnw: Idem
15+
716
2013-09-20 Dirk Eddelbuettel <edd@debian.org>
817

918
* R/Module.R: More ':::' cleanups to make R CMD check happy

inst/NEWS.Rd

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,11 @@
7474
\item Changes in Rcpp documentation:
7575
\itemize{
7676
\item The vignettes have been moved from \code{inst/doc/} to the
77-
\code{vignettes} directory which is now preferred
77+
\code{vignettes} directory which is now preferred.
7878
\item The unitTest vignette has been disabled as no longer builds
79-
when called from \code{R CMD check};
79+
when called from \code{R CMD check}.
80+
\item The appearance of the vignettes has been refreshed by
81+
switching to the Bistream Charter font, and microtype package.
8082
}
8183
\item Deprecation of \code{RCPP_FUNCTION_*}:
8284
\itemize{

vignettes/Rcpp-FAQ.Rnw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
urlcolor=link
1717
}
1818

19+
\usepackage{microtype} %% cf http://www.khirevich.com/latex/microtype/
20+
\usepackage[T1]{fontenc} %% cf http://www.khirevich.com/latex/font/
21+
\usepackage[bitstream-charter]{mathdesign} %% cf http://www.khirevich.com/latex/font/
22+
1923
\newcommand{\proglang}[1]{\textsf{#1}}
2024
\newcommand{\pkg}[1]{{\fontseries{b}\selectfont #1}}
2125
\newcommand{\code}[1]{\texttt{#1}}

vignettes/Rcpp-attributes.Rnw

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
\usepackage[USletter]{vmargin}
55
\setmargrb{1.25in}{1.25in}{1.25in}{1.25in}
66

7-
87
\usepackage{textcomp}
98
\usepackage{color, alltt}
109
\usepackage[authoryear,round,longnamesfirst]{natbib}
@@ -18,6 +17,10 @@
1817
urlcolor=link
1918
}
2019

20+
\usepackage{microtype} %% cf http://www.khirevich.com/latex/microtype/
21+
\usepackage[T1]{fontenc} %% cf http://www.khirevich.com/latex/font/
22+
\usepackage[bitstream-charter]{mathdesign} %% cf http://www.khirevich.com/latex/font/
23+
2124
\newcommand{\proglang}[1]{\textsf{#1}}
2225
\newcommand{\pkg}[1]{{\fontseries{b}\selectfont #1}}
2326
\newcommand{\code}[1]{\texttt{#1}}

vignettes/Rcpp-extending.Rnw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
urlcolor=link
1717
}
1818

19+
\usepackage{microtype} %% cf http://www.khirevich.com/latex/microtype/
20+
\usepackage[T1]{fontenc} %% cf http://www.khirevich.com/latex/font/
21+
\usepackage[bitstream-charter]{mathdesign} %% cf http://www.khirevich.com/latex/font/
22+
1923
\newcommand{\proglang}[1]{\textsf{#1}}
2024
\newcommand{\pkg}[1]{{\fontseries{b}\selectfont #1}}
2125

vignettes/Rcpp-modules.Rnw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
urlcolor=link
1717
}
1818

19+
\usepackage{microtype} %% cf http://www.khirevich.com/latex/microtype/
20+
\usepackage[T1]{fontenc} %% cf http://www.khirevich.com/latex/font/
21+
\usepackage[bitstream-charter]{mathdesign} %% cf http://www.khirevich.com/latex/font/
22+
1923
\newcommand{\code}[1]{\texttt{#1}}
2024
\newcommand{\proglang}[1]{\textsf{#1}}
2125
\newcommand{\pkg}[1]{{\fontseries{b}\selectfont #1}}

vignettes/Rcpp-package.Rnw

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
urlcolor=link
1717
}
1818

19+
\usepackage{microtype} %% cf http://www.khirevich.com/latex/microtype/
20+
\usepackage[T1]{fontenc} %% cf http://www.khirevich.com/latex/font/
21+
\usepackage[bitstream-charter]{mathdesign} %% cf http://www.khirevich.com/latex/font/
22+
1923
\newcommand{\proglang}[1]{\textsf{#1}}
2024
\newcommand{\pkg}[1]{{\fontseries{b}\selectfont #1}}
2125

@@ -146,12 +150,12 @@ package, and it also includes the different components needed for using
146150

147151
\subsection{\proglang{C++} code}
148152

149-
If the \texttt{attributes} argument is set to
153+
If the \texttt{attributes} argument is set to
150154
\texttt{TRUE}\footnote{Setting \texttt{attributes} to \texttt{TRUE} is the default. This document
151-
does not cover the behavior of \texttt{Rcpp.package.skeleton} when \texttt{attributes} is set
152-
to \texttt{FALSE} as we try to encourage package developpers to use
153-
attributes. },
154-
the following \proglang{C++} file is included in the \texttt{src/} directory:
155+
does not cover the behavior of \texttt{Rcpp.package.skeleton} when \texttt{attributes} is set
156+
to \texttt{FALSE} as we try to encourage package developpers to use
157+
attributes. },
158+
the following \proglang{C++} file is included in the \texttt{src/} directory:
155159

156160
<<lang=cpp>>=
157161
#include <Rcpp.h>
@@ -169,14 +173,14 @@ List rcpp_hello_world() {
169173
@
170174

171175
The file defines the simple \texttt{rcpp\_hello\_world} function that
172-
uses a few \pkg{Rcpp} classes and returns a \texttt{List}.
176+
uses a few \pkg{Rcpp} classes and returns a \texttt{List}.
173177

174178
This function is preceded by the \texttt{Rcpp::export} attribute to automatically
175-
handle argument conversion because \proglang{R} has to be taught how to
176-
e.g. handle the \texttt{List} class.
179+
handle argument conversion because \proglang{R} has to be taught how to
180+
e.g. handle the \texttt{List} class.
177181

178182
\Sexpr{link("Rcpp.package.skeleton")} then invokes \Sexpr{link("compileAttributes")}
179-
on the package, which generates the \texttt{RcppExports.cpp} file:
183+
on the package, which generates the \texttt{RcppExports.cpp} file:
180184

181185
<<lang=cpp>>=
182186
// This file was generated by Rcpp::compileAttributes
@@ -203,16 +207,16 @@ END_RCPP
203207
@
204208

205209
This file defines a function with the appropriate calling convention, suitable for
206-
\Sexpr{link(".Call")}. It needs to be regenerated each time functions
207-
exposed by attributes are modified. This is the task of the
210+
\Sexpr{link(".Call")}. It needs to be regenerated each time functions
211+
exposed by attributes are modified. This is the task of the
208212
\Sexpr{link("compileAttributes")} function. A discussion on attributes is
209-
beyond the scope of this document and more information is available
210-
in the attributes vignette \citep{CRAN:Rcpp:Attributes}.
213+
beyond the scope of this document and more information is available
214+
in the attributes vignette \citep{CRAN:Rcpp:Attributes}.
211215

212216
\subsection{\proglang{R} code}
213217

214-
The \Sexpr{link("compileAttributes")} also generates \proglang{R} code
215-
that uses the \proglang{C++} function.
218+
The \Sexpr{link("compileAttributes")} also generates \proglang{R} code
219+
that uses the \proglang{C++} function.
216220

217221
<<lang=cpp>>=
218222
# This file was generated by Rcpp::compileAttributes
@@ -224,7 +228,7 @@ rcpp_hello_world <- function() {
224228
@
225229

226230
This is also a generated file so it should not be modified manually, rather
227-
regenerated as needed by \Sexpr{link("compileAttributes")}.
231+
regenerated as needed by \Sexpr{link("compileAttributes")}.
228232

229233
\subsection{\texttt{DESCRIPTION}}
230234

@@ -411,7 +415,7 @@ rcpp_hello_world()
411415

412416
This document does not cover the use of the \texttt{module} argument
413417
of \Sexpr{link("Rcpp.package.skeleton")}. It is covered
414-
in the modules vignette \citep{CRAN:Rcpp:Modules}.
418+
in the modules vignette \citep{CRAN:Rcpp:Modules}.
415419

416420
\section{Further examples}
417421

vignettes/Rcpp-quickref.Rnw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717

1818
\usepackage[colorlinks]{hyperref}
1919

20+
\usepackage{microtype} %% cf http://www.khirevich.com/latex/microtype/
21+
\usepackage[T1]{fontenc} %% cf http://www.khirevich.com/latex/font/
22+
\usepackage[bitstream-charter]{mathdesign} %% cf http://www.khirevich.com/latex/font/
23+
2024
\newcommand{\pkg}[1]{{\fontseries{b}\selectfont #1}}
2125

2226
<<echo=FALSE,print=FALSE>>=

vignettes/Rcpp-sugar.Rnw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
urlcolor=link
1717
}
1818

19+
\usepackage{microtype} %% cf http://www.khirevich.com/latex/microtype/
20+
\usepackage[T1]{fontenc} %% cf http://www.khirevich.com/latex/font/
21+
\usepackage[bitstream-charter]{mathdesign} %% cf http://www.khirevich.com/latex/font/
22+
1923
\newcommand{\proglang}[1]{\textsf{#1}}
2024
\newcommand{\pkg}[1]{{\fontseries{b}\selectfont #1}}
2125
\newcommand{\sugar}{\textsl{Rcpp sugar}}

0 commit comments

Comments
 (0)