[Pgfsweave-commits] r31 - in pkg: . R exec inst inst/doc inst/doc/figs inst/example inst/misc/vignette-src inst/vignettes man src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Mar 20 07:51:39 CET 2012
Author: cameronbracken
Date: 2012-03-20 07:51:38 +0100 (Tue, 20 Mar 2012)
New Revision: 31
Added:
pkg/.Rinstignore
pkg/inst/misc/vignette-src/fig-pgfSweave-hist.eps
pkg/inst/misc/vignette-src/fig-pgfSweave-hist.pgf
pkg/inst/misc/vignette-src/fig-pgfSweave-tikz-hist.tikz
pkg/inst/vignettes/
pkg/inst/vignettes/fig-normalSweave.pdf
pkg/inst/vignettes/fig-pgfSweave-hist.pgf
pkg/inst/vignettes/fig-pgfSweave-tikz-hist.pdf
pkg/inst/vignettes/fig-pgfSweave-tikz-hist.tikz
pkg/inst/vignettes/pgfSweave-example-Rnw.in
pkg/inst/vignettes/pgfSweave-example-tex.in
pkg/inst/vignettes/pgfSweave-example.pdf
pkg/inst/vignettes/pgfSweave-vignette-source.pdf
pkg/inst/vignettes/pgfSweave.Rnw
pkg/inst/vignettes/pgfSweave.pdf
pkg/inst/vignettes/pgfSweave_hans.Rnw
pkg/inst/vignettes/pgfSweave_hans.pdf
Removed:
pkg/inst/doc/Sweave.sty
pkg/inst/doc/figs/fig-normalSweave.pdf
pkg/inst/doc/figs/fig-pgfSweave-hist.pdf
pkg/inst/doc/figs/fig-pgfSweave-tikz-hist.pdf
pkg/inst/doc/pgfSweave-example-Rnw.in
pkg/inst/doc/pgfSweave-example-tex.in
pkg/inst/doc/pgfSweave-example.pdf
pkg/inst/doc/pgfSweave.Rnw
pkg/inst/doc/pgfSweave.pdf
pkg/inst/doc/pgfSweave_hans.Rnw
pkg/inst/doc/pgfSweave_hans.pdf
pkg/inst/misc/vignette-src/Sweave.sty
pkg/src/Makevars
pkg/src/dummy.c
Modified:
pkg/ChangeLog
pkg/DESCRIPTION
pkg/NAMESPACE
pkg/NEWS
pkg/R/cacheSweaveUnexportedFunctions.R
pkg/R/pgfSweave.R
pkg/R/pgfSweaveDriver.R
pkg/R/utilities.R
pkg/R/zzz.R
pkg/README.md
pkg/exec/install-script.R
pkg/exec/pgfsweave
pkg/exec/pgfsweave-script.R
pkg/inst/example/Makefile
pkg/inst/example/pgfSweave-example.Rnw
pkg/inst/example/pgfSweave-latex-example.Rnw
pkg/inst/example/pgfSweave-xelatex-example.Rnw
pkg/inst/misc/vignette-src/Makefile
pkg/inst/misc/vignette-src/pgfSweave-vignette-source.Rnw
pkg/man/pgfSweave.Rd
pkg/man/pgfSweaveDriver.Rd
Log:
Merge branch 'master' into r-forge-local
Conflicts:
ChangeLog
DESCRIPTION
NAMESPACE
NEWS
R/pgfSweave.R
R/pgfSweaveDriver.R
R/utilities.R
R/zzz.R
exec/pgfsweave-script.R
inst/doc/figs/fig-normalSweave.pdf
inst/doc/figs/fig-pgfSweave-hist.pdf
inst/doc/pgfSweave.pdf
inst/example/Makefile
inst/example/pgfSweave-latex-example.Rnw
inst/example/pgfSweave-xelatex-example.Rnw
inst/misc/vignette-src/Makefile
inst/misc/vignette-src/pgfSweave-vignette-source.Rnw
inst/vignettes/fig-pgfSweave-tikz-hist.pdf
inst/vignettes/pgfSweave-example-tex.in
inst/vignettes/pgfSweave-example.pdf
inst/vignettes/pgfSweave.Rnw
man/pgfSweave.Rd
man/pgfSweaveDriver.Rd
Added: pkg/.Rinstignore
===================================================================
--- pkg/.Rinstignore (rev 0)
+++ pkg/.Rinstignore 2012-03-20 06:51:38 UTC (rev 31)
@@ -0,0 +1 @@
+doc/fig*[.]pdf$
Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog 2011-04-05 22:51:50 UTC (rev 30)
+++ pkg/ChangeLog 2012-03-20 06:51:38 UTC (rev 31)
@@ -1,387 +1,247 @@
-commit e1b1d11fee5419f1747636461a5af7f46248826f
-Merge: 629df4f 5536f8f
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Apr 5 16:26:46 2011 -0600
+commit aa66d58c756608718e34787527f290aa59c2c78d
+Author: cameronbracken <cameronbracken at edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
+Date: Tue Apr 5 22:51:50 2011 +0000
- Merge branch 'rel-patch2'
+ Version 1.2.1
+
+ git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/pgfsweave/pkg@30 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
-commit 629df4f8c9925ccf1a970d10552153ff26123ced
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Apr 5 16:26:06 2011 -0600
-
- Only try to call make if the makefile exists
-
- R/pgfSweave.R | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-commit 5536f8f46e781bb2e8193dcbcbf2265b20612e34
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Apr 5 16:15:56 2011 -0600
-
- Apply rel2.patch
-
- R/pgfSweaveDriver.R | 23 +++++++++++++++++++++--
- 1 files changed, 21 insertions(+), 2 deletions(-)
-
-commit d6159fa723942cc7ad361290114e555404430d2f
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Apr 5 16:05:14 2011 -0600
-
- Slightly change message for re-run external chunks
-
- R/pgfSweaveDriver.R | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit edc5f628bb174fe19ae84884194863d7a1a41557
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Apr 5 15:50:57 2011 -0600
-
- Update NEWS
-
- NEWS | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-commit ff49d90675be7118283af2120c93499cf9c164cf
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Apr 5 15:48:58 2011 -0600
-
- XeLaTeX example, see the warning in the file for directions on how to get around the bug in pgf
-
- inst/example/pgfSweave-xelatex-example.Rnw | 72 ++++++++++++++++++++++++++++
- 1 files changed, 72 insertions(+), 0 deletions(-)
-
-commit 2d57ccae18b14134aead7851da22cf8fade8d34a
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Apr 5 14:55:03 2011 -0600
-
- Fix the internal caching layer so that external graphics are now properly recreated only when the chunk has changed; also fixes the external library dependency feature
-
- R/pgfSweaveDriver.R | 21 +++++++++++----------
- R/utilities.R | 2 +-
- 2 files changed, 12 insertions(+), 11 deletions(-)
-
-commit 5fc6321fe08d009b07dc89314ab1f8dda0cb7d6f
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Apr 5 13:24:53 2011 -0600
-
- Add chunk options 'width' and 'height' to the chunk digest; when chages are made to these options but not the chunk code itself, still regenerate the graphic
-
- R/utilities.R | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 7aa7eb28373f601b1d65d09e7b1c2b543c1d3a5a
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Mon Apr 4 14:45:24 2011 -0600
-
- Add encoding to vignette for R 2.13
-
- ChangeLog | 52 ++++++
- inst/doc/figs/fig-normalSweave.pdf | Bin 12749 -> 12524 bytes
- inst/doc/figs/fig-pgfSweave-hist.pgf | 186 +++++++++++---------
- inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 28614 -> 28559 bytes
- inst/doc/figs/fig-pgfSweave-tikz-hist.tikz | 70 ++++----
- inst/doc/pgfSweave-example-tex.in | 10 +-
- inst/doc/pgfSweave-example.pdf | Bin 78284 -> 76347 bytes
- inst/doc/pgfSweave.Rnw | 2 +
- inst/doc/pgfSweave.pdf | Bin 327561 -> 288573 bytes
- .../vignette-src/pgfSweave-vignette-source.Rnw | 2 +
- 10 files changed, 190 insertions(+), 132 deletions(-)
-
-commit 354e7f790cbf28be8fee88dbc4ee61a349770182
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Mon Apr 4 14:44:32 2011 -0600
-
- Update News
-
- NEWS | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-commit 69700eb5e3bfbef6d743d1d719a5b663c799bc00
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Sun Apr 3 21:02:43 2011 -0600
-
- Remove null device code since it can cause problems with grid graphics
-
- R/pgfSweaveDriver.R | 5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-commit 1db2157b7f913a011f23c9ac8912b7b265ce983c
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Sun Apr 3 17:21:07 2011 -0600
-
- Bump version number, recompile vignette to only depend on PGF 2.00
-
- ChangeLog | 51 ++++++
- DESCRIPTION | 2 +-
- inst/doc/figs/fig-normalSweave.pdf | Bin 2960 -> 12749 bytes
- inst/doc/figs/fig-pgfSweave-hist.pgf | 188 +++++++++-----------
- inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 28559 -> 28614 bytes
- inst/doc/figs/fig-pgfSweave-tikz-hist.tikz | 74 ++++----
- inst/doc/pgfSweave-example-tex.in | 2 -
- inst/doc/pgfSweave-example.pdf | Bin 78061 -> 78284 bytes
+ ChangeLog | 159 +++++++++++++++++
+ DESCRIPTION | 4 +-
+ NEWS | 14 ++
+ R/pgfSweave.R | 30 +++-
+ R/pgfSweaveDriver.R | 60 +++++---
+ R/utilities.R | 2 +-
+ R/zzz.R | 9 +-
+ inst/doc/figs/fig-normalSweave.pdf | Bin 3083 -> 2839 bytes
+ inst/doc/figs/fig-pgfSweave-hist.pgf | 180 +++++++++-----------
+ inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 28532 -> 28507 bytes
+ inst/doc/figs/fig-pgfSweave-tikz-hist.tikz | 99 +++++++++++
+ inst/doc/pgfSweave-example.pdf | Bin 78081 -> 78304 bytes
inst/doc/pgfSweave.Rnw | 21 +--
- inst/doc/pgfSweave.pdf | Bin 281287 -> 327561 bytes
- inst/misc/vignette-src/Makefile | 5 +-
- .../vignette-src/pgfSweave-vignette-source.Rnw | 10 +-
- 12 files changed, 191 insertions(+), 162 deletions(-)
+ inst/doc/pgfSweave.pdf | Bin 281248 -> 279712 bytes
+ inst/doc/pgfSweave_hans.pdf | Bin 236197 -> 236197 bytes
+ inst/example/pgfSweave-xelatex-example.Rnw | 72 ++++++++
+ inst/misc/vignette-src/Makefile | 6 +-
+ .../vignette-src/pgfSweave-vignette-source.Rnw | 12 +-
+ 18 files changed, 515 insertions(+), 153 deletions(-)
-commit 21154a3acba563ecd2cb2586bb02dfad7acf0acb
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Sun Apr 3 17:20:13 2011 -0600
+commit 4fa53701f9a33ca6df711a36922ca088e5a508d7
+Author: cameronbracken <cameronbracken at edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
+Date: Wed Mar 23 23:50:37 2011 +0000
- Allow package to be installed if PGF 2.10 is not available but issue
- message at startup.
+ Re-add pgf file and rebuild for release
+
+ git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/pgfsweave/pkg@29 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
- R/zzz.R | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
+ ChangeLog | 51 ++++++
+ inst/doc/figs/fig-normalSweave.pdf | Bin 2960 -> 3083 bytes
+ inst/doc/figs/fig-pgfSweave-hist.pgf | 248 +++++++++++++++++++++++++++++
+ inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 28559 -> 28532 bytes
+ inst/doc/pgfSweave-example.pdf | Bin 78061 -> 78081 bytes
+ inst/doc/pgfSweave.pdf | Bin 281287 -> 281248 bytes
+ inst/doc/pgfSweave_hans.pdf | Bin 236197 -> 236197 bytes
+ 7 files changed, 299 insertions(+), 0 deletions(-)
-commit 1443cf949766b3dcd598a6d94ef799e1abc74c6d
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Sun Apr 3 17:17:55 2011 -0600
+commit ecf77eedf08b388d78d22bf43e1b4ee30712e798
+Author: cameronbracken <cameronbracken at edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
+Date: Wed Mar 23 23:39:05 2011 +0000
- Dont include \tikzexternalfiledependsonfile command because it caused
- figures to get recompiled every time. Only put in list and make command
- the first time.
+ Version 1.2
+
+ git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/pgfsweave/pkg@28 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
- R/pgfSweaveDriver.R | 23 ++++++++++++++---------
- 1 files changed, 14 insertions(+), 9 deletions(-)
-
-commit 103005f9ced1a9e07599f5625a1bd6456441473c
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Sun Apr 3 17:16:20 2011 -0600
-
- Do not run (pdf)latex initially when makefile exists
-
- R/pgfSweave.R | 22 ++-
- inst/doc/figs/fig-pgfSweave-hist.pgf | 255 ++++++++++++++++++++++++++++
- inst/doc/figs/fig-pgfSweave-tikz-hist.tikz | 110 ++++++++++++
- 3 files changed, 381 insertions(+), 6 deletions(-)
-
-commit 224c98c100ecaeb90085b30e5978e3736f97e6f1
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Wed Mar 23 17:32:21 2011 -0600
-
- Fix bug where code was chached when cache=F and explicitly turn off
- externalizaton when external is not TRUE so that custom commands (such
- as xelatex) can be used.
-
- R/pgfSweaveDriver.R | 14 +++++++++++++-
- inst/tests/tidy.Rnw | 2 +-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-commit 52c8ea46d491ce1917c57c979ab8860f0b9c85a8
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Wed Mar 23 16:25:58 2011 -0600
-
- Re-add vignette files
-
- inst/doc/figs/fig-pgfSweave-hist.pdf | Bin 0 -> 16274 bytes
- inst/doc/pgfSweave.pdf | Bin 0 -> 281287 bytes
- 2 files changed, 0 insertions(+), 0 deletions(-)
-
-commit 027c008b4685f03fdd3076f3d0cdd233d2eecc37
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Wed Mar 23 16:23:40 2011 -0600
-
- Rebuild vignette
-
- inst/doc/pgfSweave_hans.pdf | Bin 236197 -> 236197 bytes
- 1 files changed, 0 insertions(+), 0 deletions(-)
-
-commit 40afcea9f28aaee1e02d43ba10efae7381a05cd1
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Wed Mar 16 15:56:15 2011 -0600
-
- Update documentation and improve command line script
-
- ChangeLog | 14 ++
+ ChangeLog | 101 +++++++++++++++
DESCRIPTION | 2 +-
NEWS | 3 +
R/pgfSweave.R | 9 +-
+ R/pgfSweaveDriver.R | 16 ++-
exec/pgfsweave-script.R | 136 +++++++------------
- inst/doc/figs/fig-normalSweave.pdf | Bin 3083 -> 2960 bytes
- inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 28559 -> 28559 bytes
+ inst/doc/figs/fig-normalSweave.pdf | Bin 3056 -> 2960 bytes
+ inst/doc/figs/fig-pgfSweave-hist.pdf | Bin 0 -> 16274 bytes
+ inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 28512 -> 28559 bytes
inst/doc/pgfSweave-example.pdf | Bin 78117 -> 78061 bytes
- inst/doc/pgfSweave.Rnw | 80 +++++++-----
- inst/doc/pgfSweave_hans.pdf | Bin 236093 -> 236197 bytes
+ inst/doc/pgfSweave.Rnw | 84 ++++++++-----
+ inst/doc/pgfSweave.pdf | Bin 288991 -> 281287 bytes
+ inst/doc/pgfSweave_hans.Rnw | 2 +-
+ inst/doc/pgfSweave_hans.pdf | Bin 0 -> 236197 bytes
+ inst/example/caching.Rnw | 2 +-
+ inst/misc/vignette-src/Makefile | 14 ++-
.../vignette-src/pgfSweave-vignette-source.Rnw | 80 +++++++-----
+ inst/tests/tidy.Rnw | 2 +-
man/pgfSweave.Rd | 12 +-
- 12 files changed, 179 insertions(+), 157 deletions(-)
+ 19 files changed, 295 insertions(+), 168 deletions(-)
-commit 881f0fae6aff0dbe021007f6166401df6f030777
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Feb 22 13:36:26 2011 -0700
+commit 295a7ef164f1d7b5ee6c344ffdb5faeddd313f46
+Author: cameronbracken <cameronbracken at edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
+Date: Tue Feb 22 19:15:17 2011 +0000
- Actually build both vignettes correctly
+ Squashed commit of the following:
+
+ commit d38f61ceb6549a73e070ee20befeafb3027902ae
+ Author: cameronbracken <cameron.bracken at gmail.com>
+ Date: Tue Feb 22 12:11:52 2011 -0700
+
+ Update PGF version check to 2.10
+
+ commit 0bad74ef4c42e0a33e6dd2e94510c4722524bff9
+ Author: cameronbracken <cameron.bracken at gmail.com>
+ Date: Tue Feb 22 11:59:02 2011 -0700
+
+ Use the correct options function in the driver
+
+ commit 2ec6cea4fa2c3e1d7531238f27566c0ac24ef78d
+ Author: cameronbracken <cameron.bracken at gmail.com>
+ Date: Mon Feb 21 17:13:58 2011 -0700
+
+ Remove everything from the tex.driver option
+
+ commit 844d9a9d6c95b966a1bdaf3f2e732ad99058d9b2
+ Author: cameronbracken <cameron.bracken at gmail.com>
+ Date: Mon Feb 21 17:09:21 2011 -0700
+
+ Update to the documentation and vignette with recent changes, new
+ example of using tikz externalization library to generate eps graphics
+
+ commit 4d07efb597e262913c5112aa712686da9278f043
+ Author: cameronbracken <cameron.bracken at gmail.com>
+ Date: Tue Feb 8 14:07:39 2011 -0700
+
+ Redefine Houtput environment to use \raggedright to avoid the extra space added by flushleft
+
+ commit b83eeceb5b7db4c388ddb92140cb5a0c07895a86
+ Author: cameronbracken <cameron.bracken at gmail.com>
+ Date: Fri Jan 21 10:27:33 2011 -0700
+
+ Greatly reduce package load time (from 5 to 1 second) by using import
+ instead of depends
+
+ commit 916336bf42692191836e42a2f4e8b378854121d5
+ Author: cameronbracken <cameron.bracken at gmail.com>
+ Date: Tue Jan 18 17:33:58 2011 -0700
+
+ First cut using the tikz external library, also generate highlighted
+ output in a special environment. See full commit message for details
+
+ - Use the tikz external library with the `list and make` option. This
+ option allows for externalized graphic dependency checking and
+ parallel compilation of external graphics
+
+ - The tikz external library with this option uses a slightly
+ different workflow, namely:
+
+ 1. Run (pdf)latex once to generate a makefile with graphic
+ dependencies
+ 2. Run make to externalize graphics
+ 3. Run (pdf)latex again
+
+ - pgfSweave() and pgfSweave-script.R have been updated accordingly
+ and now have a new option to specify the number of processors
+ - All the old externalization command stuff has been removed, so no
+ more .sh file!
+ - Instead of the \pgfrealjobname command added, the \tikzexternalize
+ command is added automatically in addition to the
+ - Also use the \tikzexternalfiledependsonfile feature to add
+ dependency on the .tikz file
+
+ - Externalized graphics now have another layer of crude caching on their
+ own, this was attempted before but now works correctly. A digest of
+ the entire chunk is computed and stored in a stashR database for the
+ chunk (if cache is already TRUE, then the existing db is used). If
+ anything changes in the code chunk at all, including white space, the
+ graphic is updated, otherwise the figure is not regenerated. This
+ also helps a bit for plain pdf and eps output.
+
+ - Highlighted output is now output in a `Houtput` environment just like
+ the regular Sweave echo'd output. This environment is defined by
+ default to be a `flushleft` environment so that graphics can be
+ centered with \centering or something similar. This environment can also
+ be redefined by the user with \renewenvironment
+
+ - Move some functions around and add some more comments
+
+ git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/pgfsweave/pkg@27 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
- ChangeLog | 19 +++++++++++++++++++
- inst/doc/figs/fig-normalSweave.pdf | Bin 2965 -> 3083 bytes
- inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 28550 -> 28559 bytes
- inst/doc/pgfSweave-example.pdf | Bin 78117 -> 78117 bytes
- inst/doc/pgfSweave_hans.pdf | Bin 236093 -> 236093 bytes
- inst/misc/vignette-src/Makefile | 4 ++--
- 6 files changed, 21 insertions(+), 2 deletions(-)
-
-commit e61e2260041fa50209ff553e70a44d3733d99b8f
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Feb 22 13:31:47 2011 -0700
-
- Fix automatic building of Hans' vignette
-
- ChangeLog | 68 +++++++++++++++++++++++++++++
- R/pgfSweaveDriver.R | 2 +-
- inst/doc/figs/fig-normalSweave.pdf | Bin 3056 -> 2965 bytes
- inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 28512 -> 28550 bytes
- inst/doc/pgfSweave-example.pdf | Bin 78117 -> 78117 bytes
- inst/doc/pgfSweave.Rnw | 4 +-
- inst/doc/pgfSweave.pdf | Bin 288991 -> 0 bytes
- inst/doc/pgfSweave_hans.Rnw | 2 +-
- inst/doc/pgfSweave_hans.pdf | Bin 0 -> 236093 bytes
- inst/example/caching.Rnw | 2 +-
- inst/misc/vignette-src/Makefile | 12 ++++-
- 11 files changed, 82 insertions(+), 8 deletions(-)
-
-commit d7c4386fbd6101d874ca024ab8a27650ba6e9dfe
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Feb 22 13:13:32 2011 -0700
-
- Fix options call
-
- R/pgfSweaveDriver.R | 2 +-
- inst/doc/pgfSweave.pdf | Bin 288991 -> 288991 bytes
- 2 files changed, 1 insertions(+), 1 deletions(-)
-
-commit d38f61ceb6549a73e070ee20befeafb3027902ae
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Feb 22 12:11:52 2011 -0700
-
- Update PGF version check to 2.10
-
- R/zzz.R | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-commit 0bad74ef4c42e0a33e6dd2e94510c4722524bff9
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Feb 22 11:59:02 2011 -0700
-
- Use the correct options function in the driver
-
- R/pgfSweaveDriver.R | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 2ec6cea4fa2c3e1d7531238f27566c0ac24ef78d
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Mon Feb 21 17:13:58 2011 -0700
-
- Remove everything from the tex.driver option
-
- R/pgfSweaveDriver.R | 47 +-------------------
- .../vignette-src/pgfSweave-vignette-source.Rnw | 2 +-
- man/pgfSweaveDriver.Rd | 6 +--
- 3 files changed, 3 insertions(+), 52 deletions(-)
-
-commit 844d9a9d6c95b966a1bdaf3f2e732ad99058d9b2
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Mon Feb 21 17:09:21 2011 -0700
-
- Update to the documentation and vignette with recent changes, new
- example of using tikz externalization library to generate eps graphics
-
- ChangeLog | 106 +++++++++++++++
- DESCRIPTION | 10 +-
- NEWS | 26 ++++-
+ ChangeLog | 106 ++++++++
+ DESCRIPTION | 16 +-
+ NAMESPACE | 3 +
+ NEWS | 26 ++-
+ R/cacheSweaveUnexportedFunctions.R | 73 ++++++-
+ R/pgfSweave.R | 41 ++--
+ R/pgfSweaveDriver.R | 255 +++++++-------------
+ R/utilities.R | 205 ++--------------
+ R/zzz.R | 12 +-
README.md | 4 +-
+ exec/pgfsweave-script.R | 46 ++--
inst/doc/figs/fig-normalSweave.pdf | Bin 2965 -> 3056 bytes
inst/doc/figs/fig-pgfSweave-hist.pdf | Bin 16286 -> 0 bytes
inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 26912 -> 28512 bytes
inst/doc/pgfSweave-example-Rnw.in | 8 +-
- inst/doc/pgfSweave-example-tex.in | 32 +++--
+ inst/doc/pgfSweave-example-tex.in | 32 ++-
inst/doc/pgfSweave-example.pdf | Bin 78139 -> 78117 bytes
- inst/doc/pgfSweave.Rnw | 135 +++++++++++++++-----
+ inst/doc/pgfSweave.Rnw | 135 ++++++++---
inst/doc/pgfSweave.pdf | Bin 278812 -> 288991 bytes
inst/doc/pgfSweave_hans.pdf | Bin 236105 -> 0 bytes
inst/example/Makefile | 10 +-
- inst/example/pgfSweave-example.Rnw | 2 +
- inst/example/pgfSweave-latex-example.Rnw | 50 +++++++
+ inst/example/pgfSweave-example.Rnw | 8 +-
+ inst/example/pgfSweave-latex-example.Rnw | 50 ++++
inst/misc/vignette-src/Makefile | 11 +-
- .../vignette-src/pgfSweave-vignette-source.Rnw | 89 +++++++++++---
+ .../vignette-src/pgfSweave-vignette-source.Rnw | 89 ++++++--
inst/tests/Makefile | 2 +-
- man/pgfSweave.Rd | 29 +++--
- 20 files changed, 424 insertions(+), 90 deletions(-)
+ man/pgfSweave.Rd | 29 ++-
+ man/pgfSweaveDriver.Rd | 6 +-
+ 28 files changed, 674 insertions(+), 493 deletions(-)
-commit 4d07efb597e262913c5112aa712686da9278f043
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Feb 8 14:07:39 2011 -0700
+commit 8bc0e8fa8a3e92f821d35cd90228172e4b179a67
+Merge: 4fb8675 40a152d
+Author: cameronbracken <cameronbracken at edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
+Date: Mon Jan 17 00:02:51 2011 +0000
- Redefine Houtput environment to use \raggedright to avoid the extra space added by flushleft
-
- R/pgfSweaveDriver.R | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit b83eeceb5b7db4c388ddb92140cb5a0c07895a86
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Fri Jan 21 10:27:33 2011 -0700
-
- Greatly reduce package load time (from 5 to 1 second) by using import
- instead of depends
-
- DESCRIPTION | 6 +++---
- NAMESPACE | 3 +++
- R/pgfSweaveDriver.R | 18 +++++++++++-------
- exec/pgfsweave-script.R | 4 ----
- 4 files changed, 17 insertions(+), 14 deletions(-)
-
-commit 916336bf42692191836e42a2f4e8b378854121d5
-Author: cameronbracken <cameron.bracken at gmail.com>
-Date: Tue Jan 18 17:33:58 2011 -0700
-
- First cut using the tikz external library, also generate highlighted
- output in a special environment. See full commit message for details
+ Version 1.1.3 RC1 (missing files)
- - Use the tikz external library with the `list and make` option. This
- option allows for externalized graphic dependency checking and
- parallel compilation of external graphics
+ Merge branch 'master' into r-forge-local
- - The tikz external library with this option uses a slightly
- different workflow, namely:
+ Conflicts:
+ inst/example/pgfSweave-example.tex
- 1. Run (pdf)latex once to generate a makefile with graphic
- dependencies
- 2. Run make to externalize graphics
- 3. Run (pdf)latex again
+ git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/pgfsweave/pkg@26 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
+
+commit 4fb8675e9b95034fabab767ac0a17eaec0b687e8
+Author: cameronbracken <cameronbracken at edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
+Date: Sun Jan 16 23:59:41 2011 +0000
+
+ Version 1.1.3 RC1
- - pgfSweave() and pgfSweave-script.R have been updated accordingly
- and now have a new option to specify the number of processors
- - All the old externalization command stuff has been removed, so no
- more .sh file!
- - Instead of the \pgfrealjobname command added, the \tikzexternalize
- command is added automatically in addition to the
- - Also use the \tikzexternalfiledependsonfile feature to add
- dependency on the .tikz file
-
- - Externalized graphics now have another layer of crude caching on their
- own, this was attempted before but now works correctly. A digest of
- the entire chunk is computed and stored in a stashR database for the
- chunk (if cache is already TRUE, then the existing db is used). If
- anything changes in the code chunk at all, including white space, the
- graphic is updated, otherwise the figure is not regenerated. This
- also helps a bit for plain pdf and eps output.
-
- - Highlighted output is now output in a `Houtput` environment just like
- the regular Sweave echo'd output. This environment is defined by
- default to be a `flushleft` environment so that graphics can be
- centered with \centering or something similar. This environment can also
- be redefined by the user with \renewenvironment
-
- - Move some functions around and add some more comments
+ git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/pgfsweave/pkg@25 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
- R/cacheSweaveUnexportedFunctions.R | 73 +++++++++++++-
- R/pgfSweave.R | 41 ++++----
- R/pgfSweaveDriver.R | 194 +++++++++++++++-------------------
- R/utilities.R | 205 ++++--------------------------------
- exec/pgfsweave-script.R | 42 +++++---
- inst/example/pgfSweave-example.Rnw | 6 +-
- 6 files changed, 227 insertions(+), 334 deletions(-)
+ ChangeLog | 363 ++++++++++++++++
+ DESCRIPTION | 10 +-
+ NEWS | 15 +-
+ R/pgfSweaveDriver.R | 452 +++++++++++---------
+ R/utilities.R | 282 +++++++------
+ R/zzz.R | 86 ++--
+ README.md | 110 +-----
+ inst/doc/figs/fig-normalSweave.pdf | Bin 3139 -> 2965 bytes
+ inst/doc/figs/fig-pgfSweave-hist.pdf | Bin 16297 -> 16286 bytes
+ inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 26936 -> 26912 bytes
+ inst/doc/pgfSweave-example-Rnw.in | 12 +-
+ inst/doc/pgfSweave-example-tex.in | 18 +-
+ inst/doc/pgfSweave-example.pdf | Bin 27626 -> 78139 bytes
+ inst/doc/pgfSweave.Rnw | 141 ++++---
+ inst/doc/pgfSweave.pdf | Bin 258644 -> 278812 bytes
+ inst/doc/pgfSweave_hans.Rnw | 379 ++++++++++++++++
+ inst/doc/pgfSweave_hans.pdf | Bin 0 -> 236105 bytes
+ inst/example/Makefile | 5 +-
+ inst/example/caching.Rnw | 148 +++++++
+ inst/example/pgfSweave-example.Rnw | 10 +-
+ inst/misc/test-for-pgf.tex | 2 +-
+ inst/misc/vignette-src/Makefile | 17 +-
+ .../vignette-src/pgfSweave-vignette-source.Rnw | 101 +++--
+ inst/tests/Makefile | 11 +
+ inst/tests/tidy.Rnw | 22 +
+ inst/tests/tidy2.Rnw | 110 +++++
+ man/pgfSweaveDriver.Rd | 4 +-
+ 27 files changed, 1688 insertions(+), 610 deletions(-)
commit 40a152d1531f4f62c101c92ef6afcd3630f148cd
Author: cameronbracken <cameron.bracken at gmail.com>
@@ -730,6 +590,18 @@
inst/example/pgfSweave-example.tex | 424 ------------------------------------
7 files changed, 21 insertions(+), 453 deletions(-)
+commit c53d2384e63c25a69080f328b72a11242ef7c11e
+Author: cameronbracken <cameronbracken at edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
+Date: Sat Dec 18 00:12:34 2010 +0000
+
+ Update NEWS and version number
+
+ git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/pgfsweave/pkg@24 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
+
+ DESCRIPTION | 4 ++--
+ NEWS | 13 +++++++++++++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
commit 93accdf3f78829c601e0a35ee111086c71562646
Author: cameronbracken <cameron.bracken at gmail.com>
Date: Fri Dec 17 17:11:05 2010 -0700
@@ -740,6 +612,31 @@
NEWS | 13 +++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
+commit b399d2ad5ec7a19dd8bff8ee13f8cd7041e61622
+Author: cameronbracken <cameronbracken at edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
+Date: Sat Dec 18 00:05:08 2010 +0000
+
+ Various bug fixes and maintainence
+
+ git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/pgfsweave/pkg@23 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
+
+ ChangeLog | 55 ++++++++++++++++++++
+ DESCRIPTION | 4 +-
+ R/pgfSweaveDriver.R | 5 +-
+ exec/install-script.R | 36 ++++++++-----
+ inst/doc/figs/fig-normalSweave.pdf | Bin 2960 -> 3139 bytes
+ inst/doc/figs/fig-pgfSweave-hist.pdf | Bin 16275 -> 16297 bytes
+ inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 26946 -> 26936 bytes
+ inst/doc/pgfSweave-example.pdf | Bin 76205 -> 27626 bytes
+ inst/doc/pgfSweave.Rnw | 11 +++--
+ inst/doc/pgfSweave.pdf | Bin 270239 -> 258644 bytes
+ inst/example/pgfSweave-example.Rnw | 2 +-
+ inst/example/pgfSweave-example.tex | 1 +
+ .../vignette-src/pgfSweave-vignette-source.Rnw | 11 +++--
+ man/pgfSweaveDriver.Rd | 2 +-
+ src/Makevars | 2 +-
+ 15 files changed, 100 insertions(+), 29 deletions(-)
+
commit d79d82577d58f2af5c367081ef4d6675c3435982
Author: cameronbracken <cameron.bracken at gmail.com>
Date: Fri Dec 17 16:50:53 2010 -0700
@@ -796,6 +693,34 @@
man/pgfSweaveDriver.Rd | 2 +-
10 files changed, 85 insertions(+), 438 deletions(-)
+commit d5875d8cc311c4d80213750953d2c093a0a91e37
+Author: cameronbracken <cameronbracken at edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
+Date: Mon Nov 29 11:41:13 2010 +0000
+
+ hmm
+
+ git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/pgfsweave/pkg@22 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
+
+ ChangeLog | 1084 +++++---------------
+ DESCRIPTION | 23 +-
+ NEWS | 21 +
+ R/pgfSweaveDriver.R | 416 +++++----
+ R/utilities.R | 184 ++++
+ README.md | 30 +-
+ inst/doc/figs/fig-normalSweave.pdf | Bin 4570 -> 2960 bytes
+ inst/doc/figs/fig-pgfSweave-hist.pdf | Bin 16299 -> 16275 bytes
+ inst/doc/figs/fig-pgfSweave-tikz-hist.pdf | Bin 26930 -> 26946 bytes
+ inst/doc/pgfSweave-example-Rnw.in | 23 +-
+ inst/doc/pgfSweave-example-tex.in | 401 +++++++-
+ inst/doc/pgfSweave-example.pdf | Bin 82948 -> 76205 bytes
+ inst/doc/pgfSweave.Rnw | 519 +++++++++-
+ inst/doc/pgfSweave.pdf | Bin 260616 -> 270239 bytes
+ inst/example/pgfSweave-example.Rnw | 23 +-
+ inst/example/pgfSweave-example.tex | 401 +++++++-
+ .../vignette-src/pgfSweave-vignette-source.Rnw | 116 ++-
+ man/pgfSweaveDriver.Rd | 10 +-
+ 18 files changed, 2123 insertions(+), 1128 deletions(-)
+
commit 185ce5677556e845293214973b45cd42c26977a5
Author: cameronbracken <cameron.bracken at gmail.com>
Date: Mon Nov 29 04:36:59 2010 -0700
@@ -959,6 +884,21 @@
DESCRIPTION | 2 +-
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/pgfsweave -r 31
More information about the Pgfsweave-commits
mailing list