[Pgfsweave-commits] r19 - in pkg: . R exec man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Sep 14 08:10:23 CEST 2010
Author: cameronbracken
Date: 2010-09-14 08:10:23 +0200 (Tue, 14 Sep 2010)
New Revision: 19
Modified:
pkg/DESCRIPTION
pkg/NEWS
pkg/R/pgfSweaveDriver.R
pkg/exec/pgfsweave-script.R
pkg/man/pgfSweaveDriver.Rd
Log:
Merge branch 'master' into r-forge-local
Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION 2010-09-08 16:13:10 UTC (rev 18)
+++ pkg/DESCRIPTION 2010-09-14 06:10:23 UTC (rev 19)
@@ -1,8 +1,8 @@
Package: pgfSweave
Type: Package
Title: Quality speedy graphics compilation with Sweave
-Version: 1.0.8
-Date: 2010-09-6
+Version: 1.0.9
+Date: 2010-09-14
Author: Cameron Bracken <cameron.bracken at gmail.com> and Charlie Sharpsteen <source at sharpsteen.net>
Maintainer: Cameron Bracken <cameron.bracken at gmail.com>
Depends: stashR, filehash, tikzDevice, cacheSweave, getopt
Modified: pkg/NEWS
===================================================================
--- pkg/NEWS 2010-09-08 16:13:10 UTC (rev 18)
+++ pkg/NEWS 2010-09-14 06:10:23 UTC (rev 19)
@@ -1,10 +1,16 @@
Please see the README.md file for development info
--------------------------
+Version 1.0.9 - 2010-09-14
+--------------------------
+* Nicer printing of options in pgfsweave-script.R
+
+--------------------------
Version 1.0.8 - 2010-09-06
--------------------------
* New code chunk option `sanitize', a boolean value which accesses the tikz()
option of the same name (Requested by Yihui Xie)
+* Updated documentation
--------------------------
Version 1.0.7 - 2010-08-17
Modified: pkg/R/pgfSweaveDriver.R
===================================================================
--- pkg/R/pgfSweaveDriver.R 2010-09-08 16:13:10 UTC (rev 18)
+++ pkg/R/pgfSweaveDriver.R 2010-09-14 06:10:23 UTC (rev 19)
@@ -119,8 +119,8 @@
output=NULL, quiet=FALSE, debug=FALSE, echo=TRUE,
eval=TRUE, split=FALSE, stylepath=TRUE,
pdf=FALSE, eps=FALSE, cache=FALSE, pgf=FALSE,
- tikz=TRUE, external=FALSE, tex.driver="pdflatex",
- sanitize = FALSE)
+ tikz=TRUE, external=FALSE, sanitize = FALSE,
+ tex.driver="pdflatex")
{
out <- utils::RweaveLatexSetup(file, syntax, output=output, quiet=quiet,
Modified: pkg/exec/pgfsweave-script.R
===================================================================
--- pkg/exec/pgfsweave-script.R 2010-09-08 16:13:10 UTC (rev 18)
+++ pkg/exec/pgfsweave-script.R 2010-09-14 06:10:23 UTC (rev 19)
@@ -41,6 +41,7 @@
opt <- try(getopt(optspec),silent=TRUE)
if(class(opt) == 'try-error') opt <- list()
+opt[names(opt)=="ARGS"] <- NULL
if( !is.null(opt$help )) { cat(usage); q(status=1) }
if( !is.null(opt$version )) { cat(ver,'\n'); q(status=1) }
@@ -65,8 +66,11 @@
suppressPackageStartupMessages(library(tikzDevice))
suppressPackageStartupMessages(library(pgfSweave))
-cat('pgfsweave-script.R: using options:\n')
-print(opt)
+cat('pgfsweave-script.R: pgfSweave version',ver,'\n')
+for(i in seq_along(opt))
+ cat(names(opt)[i],':',rep(' ',max(nchar(names(opt))) - nchar(names(opt)[i])),
+ ' ',opt[[i]],'\n',sep='')
+cat('\n')
if(opt[['graphics-only']]){
# In the first case run through pgfSweave but no not compile document or
Modified: pkg/man/pgfSweaveDriver.Rd
===================================================================
--- pkg/man/pgfSweaveDriver.Rd 2010-09-08 16:13:10 UTC (rev 18)
+++ pkg/man/pgfSweaveDriver.Rd 2010-09-14 06:10:23 UTC (rev 19)
@@ -13,7 +13,7 @@
output = NULL, quiet = FALSE, debug = FALSE, echo = TRUE,
eval = TRUE, split = FALSE, stylepath = TRUE, pdf = FALSE,
eps = FALSE, cache = FALSE, pgf = FALSE, tikz = TRUE,
- external=FALSE, tex.driver = "pdflatex")
+ external=FALSE, sanitize = FALSE, tex.driver = "pdflatex")
}
\arguments{
\item{file}{A connection or a character string giving the name of the Sweave file to load.}
@@ -31,6 +31,7 @@
\item{tikz}{Set default for option \code{tikz}, see details below.}
\item{pgf}{Set default for option \code{pgf}, see details below.}
\item{external}{Set default for option \code{external}, see details below.}
+ \item{sanitize}{Set default for option \code{sanitize}, see details below.}
\item{tex.driver}{Set default for option \code{tex.driver}, see details below.}
}
\details{
@@ -40,12 +41,14 @@
This function provides new options for use in code chunks
\describe{
- \item{external}{ Use the graphics externalization feature of the TeX package pgf. Once a graphic is created, a code chunk is not evaluated again until changes are made. Essentially the graphic is ``cached'' (defaults to \code{FALSE}).}
+ \item{\code{external}}{ Use the graphics externalization feature of the TeX package pgf. Once a graphic is created, a code chunk is not evaluated again until changes are made. Essentially the graphic is ``cached'' (defaults to \code{FALSE}).}
\item{\code{tikz}}{ Generate a TikZ commands in a \code{.tikz} file with the \pkg{tikzDevice} package for inclusion with \\\code{input\{graphic.tikz\}} this takes the place of an \\\code{includegraphics} statement. This will cause the font in the graphic to match that of the main document. (defaults to \code{TRUE}). We recommend using this option over the \code{pgf} option for both speed and text consistancy (the \code{pgf}) option will strip text formatting such as boldface.}
\item{\code{pgf}}{ Generate an eps file and use the eps2pgf utility to generate a pgf graphic for inclusion with \\\code{input{graphic.pgf}} thi takes the place of an \\\code{includegraphics} statement. The \code{-m directcopy} option is used so that LaTeX code can be directly used in titles (see the eps2pgf manual, \url{http://sourceforge.net/projects/eps2pgf/}). This also causes the font in the graphic to match that of the main document. (defaults to \code{FALSE})}
+ \item{\code{sanitize}}{ Access to the \pkg{tikzDevice} option of the same name, see \code{\link[tikzDevice]{tikzDevice}} for more info.}
+
\item{\code{tex.driver}}{ A character string giving the LaTeX driver to use for compiling external graphics (defaults to ``pdflatex'') }
}
More information about the Pgfsweave-commits
mailing list