Permalink
Browse files

Move vignette to 'vignettes' directory getting rid of NOTE

  • Loading branch information...
1 parent 7b2454d commit f44e984217a3645a093f1a3921a633fdfe598965 @cameronbracken committed Mar 16, 2012
View
@@ -1,3 +1,33 @@
+commit 7b2454db7cfc952425b8673045f324066e314790
+Author: cameronbracken <cameron.bracken@gmail.com>
+Date: Thu Mar 15 00:43:00 2012 -0700
+
+ Modifications for check, rebuild vignette
+
+ .Rinstignore | 1 +
+ ChangeLog | 251 ++++++++++++++++++++
+ NAMESPACE | 2 +-
+ R/pgfSweaveDriver.R | 27 +-
+ inst/doc/Sweave.sty | 33 ---
+ inst/doc/fig-normalSweave.pdf | Bin 0 -> 4622 bytes
+ inst/doc/fig-pgfSweave-hist.pgf | 234 ++++++++++++++++++
+ inst/doc/fig-pgfSweave-tikz-hist.pdf | Bin 0 -> 28468 bytes
+ inst/doc/fig-pgfSweave-tikz-hist.tikz | 97 ++++++++
+ inst/doc/figs/fig-normalSweave.pdf | Bin 12554 -> 0 bytes
+ inst/doc/figs/fig-pgfSweave-hist.pdf | Bin 16274 -> 0 bytes
+ inst/doc/figs/fig-pgfSweave-hist.pgf | 248 -------------------
+ inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 35472 -> 0 bytes
+ inst/doc/figs/fig-pgfSweave-tikz-hist.tikz | 108 ---------
+ inst/doc/pgfSweave-example-tex.in | 17 +-
+ inst/doc/pgfSweave-example.pdf | Bin 77979 -> 77314 bytes
+ inst/doc/pgfSweave.Rnw | 59 ++---
+ inst/doc/pgfSweave.pdf | Bin 289790 -> 281270 bytes
+ inst/misc/vignette-src/Makefile | 14 +-
+ inst/misc/vignette-src/Sweave.sty | 33 ---
+ .../vignette-src/pgfSweave-vignette-source.Rnw | 4 +-
+ man/pgfSweaveDriver.Rd | 15 +-
+ 22 files changed, 650 insertions(+), 493 deletions(-)
+
commit 8f00570ea40b0bba322c246e4e0c4333a96f8c50
Author: cameronbracken <cameron.bracken@gmail.com>
Date: Thu Mar 15 00:19:27 2012 -0700
@@ -1,234 +0,0 @@
-% Created by Eps2pgf 0.7.0 (build on 2008-08-24) on Thu Mar 15 00:30:59 PDT 2012
-\begin{pgfpicture}
-\pgfpathmoveto{\pgfqpoint{0cm}{0cm}}
-\pgfpathlineto{\pgfqpoint{7.62cm}{0cm}}
-\pgfpathlineto{\pgfqpoint{7.62cm}{7.62cm}}
-\pgfpathlineto{\pgfqpoint{0cm}{7.62cm}}
-\pgfpathclose
-\pgfusepath{clip}
-\begin{pgfscope}
-\begin{pgfscope}
-\end{pgfscope}
-\begin{pgfscope}
-\pgfpathmoveto{\pgfqpoint{0cm}{0cm}}
-\pgfpathlineto{\pgfqpoint{7.62cm}{0cm}}
-\pgfpathlineto{\pgfqpoint{7.62cm}{7.62cm}}
-\pgfpathlineto{\pgfqpoint{0cm}{7.62cm}}
-\pgfpathclose
-\pgfusepath{clip}
-\begin{pgfscope}
-\definecolor{eps2pgf_color}{rgb}{0,0,0}\pgfsetstrokecolor{eps2pgf_color}\pgfsetfillcolor{eps2pgf_color}
-\pgftext[x=4.327cm,y=6.529cm,rotate=0]{Histogram of rnorm(10000)}
-\end{pgfscope}
-\begin{pgfscope}
-\definecolor{eps2pgf_color}{rgb}{0,0,0}\pgfsetstrokecolor{eps2pgf_color}\pgfsetfillcolor{eps2pgf_color}
-\pgftext[x=4.32cm,y=0.772cm,rotate=0]{rnorm(10000)}
-\end{pgfscope}
-\begin{pgfscope}
-\definecolor{eps2pgf_color}{rgb}{0,0,0}\pgfsetstrokecolor{eps2pgf_color}\pgfsetfillcolor{eps2pgf_color}
-\pgftext[x=0.351cm,y=4.08cm,rotate=90]{Frequency}
-\end{pgfscope}
-\end{pgfscope}
-\begin{pgfscope}
-\pgfpathmoveto{\pgfqpoint{0cm}{0cm}}
-\pgfpathlineto{\pgfqpoint{7.62cm}{0cm}}
-\pgfpathlineto{\pgfqpoint{7.62cm}{7.62cm}}
-\pgfpathlineto{\pgfqpoint{0cm}{7.62cm}}
-\pgfpathclose
-\pgfusepath{clip}
-\pgfsetdash{}{0cm}
-\pgfsetlinewidth{0.265mm}
-\pgfsetroundcap
-\pgfsetroundjoin
-\definecolor{eps2pgf_color}{rgb}{0,0,0}\pgfsetstrokecolor{eps2pgf_color}\pgfsetfillcolor{eps2pgf_color}
-\pgfpathmoveto{\pgfqpoint{2.248cm}{2.591cm}}
-\pgfpathlineto{\pgfqpoint{6.388cm}{2.591cm}}
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{2.248cm}{2.591cm}}
-\pgfpathlineto{\pgfqpoint{2.248cm}{2.337cm}}
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{3.283cm}{2.591cm}}
-\pgfpathlineto{\pgfqpoint{3.283cm}{2.337cm}}
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{4.318cm}{2.591cm}}
-\pgfpathlineto{\pgfqpoint{4.318cm}{2.337cm}}
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{5.353cm}{2.591cm}}
-\pgfpathlineto{\pgfqpoint{5.353cm}{2.337cm}}
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{6.388cm}{2.591cm}}
-\pgfpathlineto{\pgfqpoint{6.388cm}{2.337cm}}
-\pgfusepath{stroke}
-\begin{pgfscope}
-\pgftext[x=2.25cm,y=1.825cm,rotate=0]{-4}
-\end{pgfscope}
-\begin{pgfscope}
-\pgftext[x=3.281cm,y=1.825cm,rotate=0]{-2}
-\end{pgfscope}
-\begin{pgfscope}
-\pgftext[x=4.318cm,y=1.821cm,rotate=0]{0}
-\end{pgfscope}
-\begin{pgfscope}
-\pgftext[x=5.348cm,y=1.825cm,rotate=0]{2}
-\end{pgfscope}
-\begin{pgfscope}
-\pgftext[x=6.386cm,y=1.825cm,rotate=0]{4}
-\end{pgfscope}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{2.083cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{2.083cm}{4.856cm}}
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{2.083cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{1.829cm}{2.7cm}}
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{2.083cm}{3.419cm}}
-\pgfpathlineto{\pgfqpoint{1.829cm}{3.419cm}}
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{2.083cm}{4.137cm}}
-\pgfpathlineto{\pgfqpoint{1.829cm}{4.137cm}}
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{2.083cm}{4.856cm}}
-\pgfpathlineto{\pgfqpoint{1.829cm}{4.856cm}}
-\pgfusepath{stroke}
-\begin{pgfscope}
-\pgftext[x=1.328cm,y=2.7cm,rotate=90]{0}
-\end{pgfscope}
-\begin{pgfscope}
-\pgftext[x=1.328cm,y=4.151cm,rotate=90]{1000}
-\end{pgfscope}
-\end{pgfscope}
-\begin{pgfscope}
-\pgfpathmoveto{\pgfqpoint{2.083cm}{2.591cm}}
-\pgfpathlineto{\pgfqpoint{6.553cm}{2.591cm}}
-\pgfpathlineto{\pgfqpoint{6.553cm}{5.537cm}}
-\pgfpathlineto{\pgfqpoint{2.083cm}{5.537cm}}
-\pgfpathclose
-\pgfusepath{clip}
-\pgfsetdash{}{0cm}
-\pgfsetlinewidth{0.265mm}
-\pgfsetroundcap
-\pgfsetroundjoin
-\definecolor{eps2pgf_color}{rgb}{0,0,0}\pgfsetstrokecolor{eps2pgf_color}\pgfsetfillcolor{eps2pgf_color}
-\pgfpathmoveto{\pgfqpoint{2.248cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{2.248cm}{2.704cm}}
-\pgfpathlineto{\pgfqpoint{2.507cm}{2.704cm}}
-\pgfpathlineto{\pgfqpoint{2.507cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{2.507cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{2.507cm}{2.719cm}}
-\pgfpathlineto{\pgfqpoint{2.766cm}{2.719cm}}
-\pgfpathlineto{\pgfqpoint{2.766cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{2.766cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{2.766cm}{2.775cm}}
-\pgfpathlineto{\pgfqpoint{3.024cm}{2.775cm}}
-\pgfpathlineto{\pgfqpoint{3.024cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{3.024cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{3.024cm}{2.969cm}}
-\pgfpathlineto{\pgfqpoint{3.283cm}{2.969cm}}
-\pgfpathlineto{\pgfqpoint{3.283cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{3.283cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{3.283cm}{3.364cm}}
-\pgfpathlineto{\pgfqpoint{3.542cm}{3.364cm}}
-\pgfpathlineto{\pgfqpoint{3.542cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{3.542cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{3.542cm}{4.016cm}}
-\pgfpathlineto{\pgfqpoint{3.8cm}{4.016cm}}
-\pgfpathlineto{\pgfqpoint{3.8cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{3.8cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{3.8cm}{4.887cm}}
-\pgfpathlineto{\pgfqpoint{4.059cm}{4.887cm}}
-\pgfpathlineto{\pgfqpoint{4.059cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{4.059cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{4.059cm}{5.417cm}}
-\pgfpathlineto{\pgfqpoint{4.318cm}{5.417cm}}
-\pgfpathlineto{\pgfqpoint{4.318cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{4.318cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{4.318cm}{5.428cm}}
-\pgfpathlineto{\pgfqpoint{4.577cm}{5.428cm}}
-\pgfpathlineto{\pgfqpoint{4.577cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{4.577cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{4.577cm}{4.778cm}}
-\pgfpathlineto{\pgfqpoint{4.835cm}{4.778cm}}
-\pgfpathlineto{\pgfqpoint{4.835cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{4.836cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{4.836cm}{4.024cm}}
-\pgfpathlineto{\pgfqpoint{5.094cm}{4.024cm}}
-\pgfpathlineto{\pgfqpoint{5.094cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{5.094cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{5.094cm}{3.362cm}}
-\pgfpathlineto{\pgfqpoint{5.353cm}{3.362cm}}
-\pgfpathlineto{\pgfqpoint{5.353cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{5.353cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{5.353cm}{2.941cm}}
-\pgfpathlineto{\pgfqpoint{5.611cm}{2.941cm}}
-\pgfpathlineto{\pgfqpoint{5.611cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{5.612cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{5.612cm}{2.76cm}}
-\pgfpathlineto{\pgfqpoint{5.87cm}{2.76cm}}
-\pgfpathlineto{\pgfqpoint{5.87cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{5.87cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{5.87cm}{2.724cm}}
-\pgfpathlineto{\pgfqpoint{6.129cm}{2.724cm}}
-\pgfpathlineto{\pgfqpoint{6.129cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\pgfsetdash{}{0cm}
-\pgfpathmoveto{\pgfqpoint{6.129cm}{2.7cm}}
-\pgfpathlineto{\pgfqpoint{6.129cm}{2.703cm}}
-\pgfpathlineto{\pgfqpoint{6.387cm}{2.703cm}}
-\pgfpathlineto{\pgfqpoint{6.387cm}{2.7cm}}
-\pgfpathclose
-\pgfusepath{stroke}
-\end{pgfscope}
-\end{pgfscope}
-\end{pgfpicture}
@@ -1,5 +1,7 @@
\documentclass{article}
+\usepackage[utf8]{inputenc}
+
\usepackage{tikz}
\usepackage[margin=1in]{geometry}
\title{Minimal pgfSweave Example}
@@ -1,5 +1,7 @@
\documentclass{article}
+\usepackage[utf8]{inputenc}
+
\usepackage{tikz}
\tikzset{external/system call={latex \tikzexternalcheckshellescape -halt-on-error
-interaction=batchmode -jobname "\image" "\texsource";
@@ -1,5 +1,7 @@
\documentclass{article}
+\usepackage[utf8]{inputenc}
+
\usepackage{tikz}
\tikzset{external/system call={xelatex \tikzexternalcheckshellescape -halt-on-error
-interaction=batchmode -jobname "\image" "\texsource"}}
@@ -19,7 +21,7 @@
% the Sweave package must be loaded with the noae option for compatibility
% with fontspec (otherwise cryptic errors about T1 encoding will appear):
-\usepackage[noae]{../doc/Sweave}
+\usepackage[noae]{Sweave}
\usepackage[margin=1in]{geometry}
@@ -13,7 +13,7 @@
# Internal values
-DOC_PATH=../../doc/
+DOC_PATH=../../vignettes/
EXAMPLE_PATH=../../example/
TEST_PATH=../../tests/
EXEC_PATH=../../../exec/
@@ -64,11 +64,12 @@ $(VIGNETTE_DUMMY_RNW): $(EXAMPLE_PDF) $(VIGNETTE_SOURCE_PDF)
| grep -v '^\\usetikzlibrary{external}' \
| grep -v '^\\tikzexternalize' \
| grep -v '^\\tikzsetnextfilename' \
- | grep -v '^\\tikzexternalfiledependsonfile'> tmp
+ | grep -v '^\\tikzexternalfiledependsonfile' \
+ | grep -v '^\\\tikzexternaldisable' > tmp
# Change the names of the input files
cat tmp | sed 's/pgfSweave-example\.Rnw/pgfSweave-example-Rnw.in/g' \
| sed 's/pgfSweave-example\.tex/pgfSweave-example-tex\.in/g' \
- > ../../doc/pgfSweave.Rnw
+ > $(DOC_PATH)/pgfSweave.Rnw
$(VIGNETTE_SOURCE_PDF):
echo `pwd`
@@ -87,7 +88,7 @@ cleanall:
clean:
rm -rf cache *.pdf $(RM_PATH).$(BUILD_RM_SUFFIX) \
./pgfSweave-vignette-source.tex $(DOC_PATH)/pgfSweave.tex \
- $(DOC_PATH)/pgfSweave_hans.tex tmp
+ $(DOC_PATH)/pgfSweave_hans.tex tmp $(DOC_PATH)/Rplots.pdf
(cd $(EXAMPLE_PATH) ; make cleanforbuild)
(cd $(TEST_PATH) ; make cleanforbuild)
Oops, something went wrong.

0 comments on commit f44e984

Please sign in to comment.