[Rcpp-commits] r2511 - in pkg/Rcpp: . inst/doc

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Wed Nov 24 03:20:27 CET 2010


Author: edd
Date: 2010-11-24 03:20:23 +0100 (Wed, 24 Nov 2010)
New Revision: 2511

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/doc/Makefile
Log:
call Rscript with --vanilla as I set options("prompt") and options("width") etc


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2010-11-23 18:35:40 UTC (rev 2510)
+++ pkg/Rcpp/ChangeLog	2010-11-24 02:20:23 UTC (rev 2511)
@@ -1,67 +1,74 @@
+2010-11-23  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/doc/Makefile: Call Rscript with --vanilla to skip user settings
+
 2010-11-23  Romain Francois <romain at r-enthusiasts.com>
 
-    * R/00_classes.R: C++Class gains a docstring slot to host self documentation
-    
-    * R/Module.R: calling an exposed C++ more efficiently by using the xp directly 
-    rather than traversing the map internally
-    
-    * R/00_classes.R: C++Function gains a docstring slot to host self documentation
-    of the internal function. And a "signature" slot to host the C++ signature of
-    the function
-    
-    * R/01_show.R: updated show( C++Function ) to display the docstring and
-    the signature. updated show( C++Class ) to display the docstring.
-    
-    * inst/include/Rcpp/module/Module_generated_CppFunction.h: self documentation
-    for exposed C++ functions and extraction of the signature
-    
-    * inst/include/Rcpp/module/Module_generated_function.h: idem
+	* R/00_classes.R: C++Class gains a docstring slot to host self
+	documentation
 
+	* R/Module.R: calling an exposed C++ more efficiently by using the xp
+	directly rather than traversing the map internally
+
+	* R/00_classes.R: C++Function gains a docstring slot to host self
+	documentation of the internal function. And a "signature" slot to
+	host the C++ signature of the function
+
+	* R/01_show.R: updated show( C++Function ) to display the docstring
+	and the signature. updated show( C++Class ) to display the docstring.
+
+	* inst/include/Rcpp/module/Module_generated_CppFunction.h: self
+	documentation for exposed C++ functions and extraction of the
+	signature
+
+	* inst/include/Rcpp/module/Module_generated_function.h: idem
+
 2010-11-22  Romain Francois <romain at r-enthusiasts.com>
 
-    * R/00_classes.R: C++OverloadedMethods gains an "info" class methods, factored
-    out from Module.R
-    
-    * R/01_show.R: more information printed in show( C++Class )
+	* R/00_classes.R: C++OverloadedMethods gains an "info" class methods,
+	factored out from Module.R
 
-    * inst/include/Rcpp/Module/Module_generated_get_signature.h: templates to
-    grab method signatures
-    
-    * inst/include/Rcpp/Module.h: CppMethod gains a signature method that returns
-    the signature of the method.
-    
-    * R/00_classes.R: C++OverloadedMethods gains a "signatures" field that 
-    contains the signature of each overload
-    
-    * R/Module.R: registered method gain an automatically generated self description
-    that contains the method(s) signature(s) and the docstring that is declared
-    in .method
-    
-    * inst/include/Rcpp/Module/Module_generated_CppMethod.h: implement signature
+	* R/01_show.R: more information printed in show( C++Class )
 
-    * inst/include/Rcpp/Module/Module_generated_Pointer_CppMethod.h: idem
+	* inst/include/Rcpp/Module/Module_generated_get_signature.h:
+	templates to grab method signatures
 
+	* inst/include/Rcpp/Module.h: CppMethod gains a signature method that
+	returns the signature of the method.
+
+	* R/00_classes.R: C++OverloadedMethods gains a "signatures" field
+	that contains the signature of each overload
+
+	* R/Module.R: registered method gain an automatically generated self
+	description that contains the method(s) signature(s) and the
+	docstring that is declared in .method
+
+	* inst/include/Rcpp/Module/Module_generated_CppMethod.h: implement
+	signature
+
+	* inst/include/Rcpp/Module/Module_generated_Pointer_CppMethod.h: idem
+
 2010-11-21  Romain Francois <romain at r-enthusiasts.com>
 
 	* R/Module.R: internal version of cpp_hasDefaultConstructor
-	
+
 	* src/Module.cpp: implementation (Class__has_default_constructor)
-	
+
 	* inst/include/Rcpp/Module.h: support (class_.has_default_constructor)
-	
+
 	* inst/include/Rcpp/module/Module_generated_class_constructor.h: new interface
 	for exposing constructors, the init_ disappears and the template arguments
 	are directly applied to the .constructor function
-	
+
 	* inst/include/Rcpp/module/Module_generated_Constructor.h: removed init_*
-	
+
 	* inst/include/Rcpp/module/Module_generated_method.h: .method gains a docstring
 	argument to allow self documentation of exposed methods
-	
+
 	* inst/include/Rcpp/module/Module_generated_PointerMethod.h: idem
-	
+
 	* R/Module.R: grab method docstrings
-	
+
 2010-11-20  John M Chambers  <jmc at r-project.org>
 
 	* R/Module.R: now checks for the existence of a default constructor

Modified: pkg/Rcpp/inst/doc/Makefile
===================================================================
--- pkg/Rcpp/inst/doc/Makefile	2010-11-23 18:35:40 UTC (rev 2510)
+++ pkg/Rcpp/inst/doc/Makefile	2010-11-24 02:20:23 UTC (rev 2511)
@@ -27,14 +27,14 @@
 
 Rcpp-unitTests.pdf:
 	rm -fr unitTests-results/*
-	Rscript unitTests/Rcpp-unitTests.R
+	Rscript --vanilla unitTests/Rcpp-unitTests.R
 	R CMD Sweave Rcpp-unitTests.Rnw
-	Rscript -e "tools::texi2dvi( 'Rcpp-unitTests.tex', pdf = TRUE, clean = TRUE )"
+	Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-unitTests.tex', pdf = TRUE, clean = TRUE )"
 	rm -fr Rcpp-unitTests.tex
 
 Rcpp-api.pdf: Rcpp-api.Rnw
 	R CMD Sweave Rcpp-api.Rnw
-	Rscript -e "tools::texi2dvi( 'Rcpp-api.tex', pdf = TRUE, clean = TRUE ) "
+	Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-api.tex', pdf = TRUE, clean = TRUE ) "
 	rm -fr Rcpp-api.tex
 
 Rcpp-introduction.pdf: Rcpp-introduction.Rnw
@@ -51,8 +51,8 @@
 
 Rcpp-modules.pdf: Rcpp-modules/Rcpp-modules.Rnw
 	cp -f Rcpp-modules/Rcpp-modules.Rnw .
-	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-modules.Rnw', driver = driver ); "
-	Rscript -e "tools::texi2dvi( 'Rcpp-modules.tex', pdf = TRUE, clean = FALSE )"
+	Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-modules.Rnw', driver = driver ); "
+	Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-modules.tex', pdf = TRUE, clean = FALSE )"
 	bibtex Rcpp-modules
 ifneq (,$(findstring edd,$(whoami)))
 	pdflatex Rcpp-modules.tex
@@ -65,26 +65,26 @@
 
 Rcpp-package.pdf : Rcpp-package/Rcpp-package.Rnw
 	cp -f Rcpp-package/Rcpp-package.Rnw .
-	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-package.Rnw', driver = driver ); "
+	Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-package.Rnw', driver = driver ); "
 ifneq (,$(findstring edd,$(whoami)))
 	pdflatex Rcpp-package
 else
-	Rscript -e "tools::texi2dvi( 'Rcpp-package.tex', pdf = TRUE, clean = FALSE )"
+	Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-package.tex', pdf = TRUE, clean = FALSE )"
 endif
 	bibtex Rcpp-package
 ifneq (,$(findstring edd,$(whoami)))
 	pdflatex Rcpp-package
 	pdflatex Rcpp-package
 else
-	Rscript -e "tools::texi2dvi( 'Rcpp-package.tex', pdf = TRUE, clean = TRUE )"
+	Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-package.tex', pdf = TRUE, clean = TRUE )"
 endif
 	rm -fr Rcpp-package.tex Rcpp-package.bbl Rcpp-package.blg Rcpp-package.aux Rcpp-package.out Rcpp-package.log
 	cp -f Rcpp-package/Rcpp-package-fake.Rnw Rcpp-package.Rnw
 
 Rcpp-FAQ.pdf : Rcpp-FAQ/Rcpp-FAQ.Rnw
 	cp -f Rcpp-FAQ/Rcpp-FAQ.Rnw .
-	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-FAQ.Rnw', driver = driver ); "
-	Rscript -e "tools::texi2dvi( 'Rcpp-FAQ.tex', pdf = TRUE, clean = FALSE )"
+	Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-FAQ.Rnw', driver = driver ); "
+	Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-FAQ.tex', pdf = TRUE, clean = FALSE )"
 	bibtex Rcpp-FAQ
 ifneq (,$(findstring edd,$(whoami)))
 	pdflatex Rcpp-FAQ
@@ -97,8 +97,8 @@
 
 Rcpp-extending.pdf : Rcpp-extending/Rcpp-extending.Rnw
 	cp -f Rcpp-extending/Rcpp-extending.Rnw .
-	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-extending.Rnw', driver = driver ); "
-	Rscript -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = FALSE )"
+	Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-extending.Rnw', driver = driver ); "
+	Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-extending.tex', pdf = TRUE, clean = FALSE )"
 	bibtex Rcpp-extending
 ifneq (,$(findstring edd,$(whoami)))
 	pdflatex Rcpp-extending
@@ -111,8 +111,8 @@
 
 Rcpp-sugar.pdf : Rcpp-sugar/Rcpp-sugar.Rnw
 	cp -f Rcpp-sugar/Rcpp-sugar.Rnw .
-	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-sugar.Rnw', driver = driver ); "
-	Rscript -e "tools::texi2dvi( 'Rcpp-sugar.tex', pdf = TRUE, clean = FALSE )"
+	Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-sugar.Rnw', driver = driver ); "
+	Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-sugar.tex', pdf = TRUE, clean = FALSE )"
 	bibtex Rcpp-sugar
 ifneq (,$(findstring edd,$(whoami)))
 	pdflatex Rcpp-sugar
@@ -126,9 +126,9 @@
 
 Rcpp-quickref.pdf : Rcpp-quickref/Rcpp-quickref.Rnw
 	cp -f Rcpp-quickref/Rcpp-quickref.Rnw .
-	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-quickref.Rnw', driver = driver ); "
-	Rscript -e "tex <- readLines('Rcpp-quickref.tex'); tex <- gsub( 'begin{minipage}{0.9', 'begin{minipage}{0.42', tex, fixed = TRUE ) ; writeLines( tex, 'Rcpp-quickref.tex' )  "
-	Rscript -e "tools::texi2dvi( 'Rcpp-quickref.tex', pdf = TRUE, clean = FALSE )"
+	Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'Rcpp-quickref.Rnw', driver = driver ); "
+	Rscript --vanilla -e "tex <- readLines('Rcpp-quickref.tex'); tex <- gsub( 'begin{minipage}{0.9', 'begin{minipage}{0.42', tex, fixed = TRUE ) ; writeLines( tex, 'Rcpp-quickref.tex' )  "
+	Rscript --vanilla -e "tools::texi2dvi( 'Rcpp-quickref.tex', pdf = TRUE, clean = FALSE )"
 ifneq (,$(findstring edd,$(whoami)))
 	pdflatex Rcpp-quickref
 	pdflatex Rcpp-quickref



More information about the Rcpp-commits mailing list