[Pgfsweave-commits] r6 - in pkg: . exec inst/doc/figs src

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Tue Nov 17 09:12:58 CET 2009 

Author: cameronbracken
Date: 2009-11-17 09:12:58 +0100 (Tue, 17 Nov 2009)
New Revision: 6

Added:
   pkg/exec/install-script.R
   pkg/src/dummy.c
Modified:
   pkg/ChangeLog
   pkg/DESCRIPTION
   pkg/NEWS
   pkg/README
   pkg/exec/pgfsweave
   pkg/exec/pgfsweave-script.R
   pkg/inst/doc/figs/fig-normalSweave.pdf
   pkg/src/Makevars
Log:
Conflicts:
	ChangeLog
	DESCRIPTION
	NEWS
	README
	exec/pgfsweave
	exec/pgfsweave-script.R
	inst/doc/figs/fig-normalSweave.pdf
	inst/doc/figs/fig-pgfSweave-hist.pdf
	inst/doc/figs/fig-pgfSweave-tikz-hist.pdf
	inst/doc/pgfSweave-example.pdf
	inst/doc/pgfSweave.pdf
	src/Makevars

Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2009-11-15 07:07:46 UTC (rev 5)
+++ pkg/ChangeLog	2009-11-17 08:12:58 UTC (rev 6)
@@ -1,3 +1,17 @@
+commit 5f42a284cef2fed990b9298d66bbe842be4630e8
+Author: cameronbracken <cameron.bracken at gmail.com>
+Date:   Tue Nov 17 00:44:07 2009 -0700
+
+    New install script for pgfsweave-script.R, which takes into account if windows is being used and acts accordingly
+    
+    Added dummy c file to avoid check warning
+
+ exec/install-script.R |   55 +++++++++++++++++++++++++++++++++++++++++++++++++
+ src/Makevars          |   14 +-----------
+ src/Makevars.win      |   22 -------------------
+ src/dummy.c           |    5 ++++
+ 4 files changed, 61 insertions(+), 35 deletions(-)
+
 commit 1fdc9eaff9008e1cf894430621fe47cfea10bd8e
 Author: cameronbracken <cameron.bracken at gmail.com>
 Date:   Sat Nov 14 23:57:56 2009 -0700

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2009-11-15 07:07:46 UTC (rev 5)
+++ pkg/DESCRIPTION	2009-11-17 08:12:58 UTC (rev 6)
@@ -5,7 +5,7 @@
 Date: 2009-04-30
 Author: Cameron Bracken <cameron.bracken at gmail.com> and Charlie Sharpsteen <source at sharpsteen.net>
 Maintainer: Cameron Bracken <cameron.bracken at gmail.com> 
-Depends: utils, stashR, filehash, tikzDevice, cacheSweave
+Depends: utils, stashR, filehash, tikzDevice, cacheSweave, getopt
 Imports: digest, tools
 SystemRequirement: pgf (>=2.00) (http://sourceforge.net/projects/pgf/) for the vignette.
 Description:  The pgfSweave package provides capabilities for 'caching' graphics generated with Sweave.  Using pgfSweave, figure labels are converted to LaTeX strings so not only do they match the style of the document but math can be put in labels. pgfSweave provides a new driver for Sweave (pgfSweaveDriver) and new chunk options tikz, pgf and external on top of the cache option provided by cacheSweave. This package is built upon cacheSweave and therefore also Sweave.

Modified: pkg/NEWS
===================================================================
--- pkg/NEWS	2009-11-15 07:07:46 UTC (rev 5)
+++ pkg/NEWS	2009-11-17 08:12:58 UTC (rev 6)
@@ -1,7 +1,17 @@
-$Id$
-
 Please see the README directory for development info
 
+--------------------------
+Version 1.0 - 2009-10-14
+--------------------------
+* The new package tikzDevice is now used by default instead of eps2pgf.  The 
+  pgf option is still available but the use of tikzDevice is reccommended.
+* Updates to the vignette
+* ChangeLog now generated by git when vignette is compiled
+* Fixes to get pgfsweave-script.R to run on windows (Thanks Yihui, for the 
+  report)
+* Caching is now more aggressive, sometime manual removal of images is 
+  required, this is still preferable to the old mechanism which could be too
+  conservative and recompile graphics when not needed
 
 --------------------------
 Version 0.7.2 - 2009-06-22
@@ -14,14 +24,6 @@
   http://github.com/cameronbracken/pgfSweave/
 
 --------------------------
-Version 1.0 - 2009-09-21
---------------------------
-* The new package tikzDevice is now used by default instead of eps2pgf.  The 
-  pgf option is still available but the use of tikzDevice is reccommended.
-* Updates to the vignette
-* Scrapped ChangeLog
-
---------------------------
 Version 0.7.1 - 2009-04-30
 --------------------------
 * A new R script is available in the exec directory for compiling from the 

Modified: pkg/README
===================================================================
--- pkg/README	2009-11-15 07:07:46 UTC (rev 5)
+++ pkg/README	2009-11-17 08:12:58 UTC (rev 6)
@@ -11,7 +11,6 @@
 
 
 TODO:
-    * Add more examples to the vignette
     
     * More extensive testing with plain latex and with windows.
       

Added: pkg/exec/install-script.R
===================================================================
--- pkg/exec/install-script.R	                        (rev 0)
+++ pkg/exec/install-script.R	2009-11-17 08:12:58 UTC (rev 6)
@@ -0,0 +1,55 @@
+#!/usr/bin/env Rscript
+
+options(warn=-1)
+bindir <- paste(R.home(),"/bin",sep='')
+bin_script <- file.path(bindir,'pgfsweave')
+x <- file.remove(bin_script)
+
+rel_script <- "../exec/pgfsweave-script.R"
+abs_script <- file.path(Sys.getenv('R_PACKAGE_DIR'),
+	'exec','pgfsweave-script.R')
+
+script <- readLines(rel_script)
+win_shebang <- paste("#!",file.path(bindir,'Rscript'),sep='')
+win_script <- c( win_shebang, script)
+
+success <- FALSE
+
+if( .Platform$OS.type == 'windows' ){
+	
+	tf <- tempfile()
+	writeLines( win_script, tf )
+	if(file.copy(tf,bin_script))
+		success <- TRUE
+	
+}else{
+	if(file.symlink(abs_script,bin_script))
+		success <- TRUE
+		
+}
+
+if(success){
+	
+	cat('\n***********************\n')
+	cat( 'Installing custom script in:\n\n')
+	cat( R.home(),'/bin/\n\n',sep='')
+	cat( 'For usage instructions:\n\n')
+	cat( 'R CMD pgfsweave --help\n')
+	if(.Platform$OS.type == 'windows'){
+		cat( '\nNote for windows users:\n')
+		cat( '  You must have Rtools installed and have\n')
+		cat( '  ',R.home(),'/bin in your PATH.\n',sep='')
+	}
+	cat('***********************\n\n')
+	
+}else{
+	
+	cat('\n***********************\n')
+	cat('Failed to install custom pgfsweave script:\n')
+	cat('  Thats ok! You can manually install it wherever you want!\n')
+	cat('***********************\n')
+	
+}
+	
+
+#R_HOME=`Rscript -e "cat(R.home())"`
\ No newline at end of file

Modified: pkg/exec/pgfsweave
===================================================================
--- pkg/exec/pgfsweave	2009-11-15 07:07:46 UTC (rev 5)
+++ pkg/exec/pgfsweave	2009-11-17 08:12:58 UTC (rev 6)
@@ -19,8 +19,8 @@
                             graphics only ; ignored if --pgfsweave-only is
                             used
 
-Package repositories: 
-http://www.rforge.net/pgfSweave/ (for scm)
+Package repository: 
+http://github.com/cameronbracken/pgfSweave (scm)
 http://r-forge.r-project.org/projects/pgfsweave/ (for precompiled packages)
 "
 

Modified: pkg/exec/pgfsweave-script.R
===================================================================
--- pkg/exec/pgfsweave-script.R	2009-11-15 07:07:46 UTC (rev 5)
+++ pkg/exec/pgfsweave-script.R	2009-11-17 08:12:58 UTC (rev 6)
@@ -15,7 +15,7 @@
                             used
 
 Package repositories: 
-http://www.rforge.net/pgfSweave/ (for scm)
+http://github.com/cameronbracken/pgfSweave (scm)
 http://r-forge.r-project.org/projects/pgfsweave/ (for precompiled packages)
 "
 

Modified: pkg/inst/doc/figs/fig-normalSweave.pdf
===================================================================
--- pkg/inst/doc/figs/fig-normalSweave.pdf	2009-11-15 07:07:46 UTC (rev 5)
+++ pkg/inst/doc/figs/fig-normalSweave.pdf	2009-11-17 08:12:58 UTC (rev 6)
@@ -2,6 +2,7 @@
 %âãÏÓ\r
 1 0 obj
 <<
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 /CreationDate (D:20091114171148)
 /ModDate (D:20091114171148)
@@ -9,6 +10,10 @@
 /CreationDate (D:20091115000133)
 /ModDate (D:20091115000133)
 >>>>>>> Stashed changes
+=======
+/CreationDate (D:20091117005705)
+/ModDate (D:20091117005705)
+>>>>>>> master
 /Title (R Graphics Output)
 /Producer (R 2.10.0)
 /Creator (R)
@@ -52,6 +57,7 @@
 1 J
 1 j
 10.00 M
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 84.44 73.44 m 167.26 73.44 l S
 84.44 73.44 m 84.44 66.24 l S
@@ -106,10 +112,41 @@
 59.04 136.45 m 51.84 136.45 l S
 59.04 156.42 m 51.84 156.42 l S
 >>>>>>> Stashed changes
+=======
+63.73 73.44 m 181.07 73.44 l S
+63.73 73.44 m 63.73 66.24 l S
+93.07 73.44 m 93.07 66.24 l S
+122.40 73.44 m 122.40 66.24 l S
+151.73 73.44 m 151.73 66.24 l S
+181.07 73.44 m 181.07 66.24 l S
 BT
+0.000 0.000 0.000 rg
+/F2 1 Tf 12.00 0.00 -0.00 12.00 56.89 47.52 Tm (-4) Tj
+ET
+BT
+/F2 1 Tf 12.00 0.00 -0.00 12.00 86.23 47.52 Tm (-2) Tj
+ET
+BT
+/F2 1 Tf 12.00 0.00 -0.00 12.00 119.06 47.52 Tm (0) Tj
+ET
+BT
+/F2 1 Tf 12.00 0.00 -0.00 12.00 148.40 47.52 Tm (2) Tj
+ET
+BT
+/F2 1 Tf 12.00 0.00 -0.00 12.00 177.73 47.52 Tm (4) Tj
+ET
+59.04 76.53 m 59.04 156.55 l S
+59.04 76.53 m 51.84 76.53 l S
+59.04 96.54 m 51.84 96.54 l S
+59.04 116.54 m 51.84 116.54 l S
+59.04 136.54 m 51.84 136.54 l S
+59.04 156.55 m 51.84 156.55 l S
+>>>>>>> master
+BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 73.20 Tm (0) Tj
 ET
 BT
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 /F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 101.66 Tm (1000) Tj
 ET
@@ -121,7 +158,13 @@
 BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 143.08 Tm (2000) Tj
 >>>>>>> Stashed changes
+=======
+/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 103.20 Tm (1000) Tj
 ET
+BT
+/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 143.20 Tm (2000) Tj
+>>>>>>> master
+ET
 Q q 59.04 73.44 126.72 83.52 re W n
 0.000 0.000 0.000 RG
 0.75 w
@@ -129,6 +172,7 @@
 1 J
 1 j
 10.00 M
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 63.73 76.53 6.90 0.23 re S
 70.64 76.53 6.90 1.46 re S
@@ -166,15 +210,37 @@
 167.26 76.53 6.90 0.48 re S
 174.16 76.53 6.90 0.20 re S
 >>>>>>> Stashed changes
+=======
+63.73 76.53 7.33 0.08 re S
+71.07 76.53 7.33 0.36 re S
+78.40 76.53 7.33 1.56 re S
+85.73 76.53 7.33 6.52 re S
+93.07 76.53 7.33 16.80 re S
+100.40 76.53 7.33 37.53 re S
+107.73 76.53 7.33 58.93 re S
+115.07 76.53 7.33 73.77 re S
+122.40 76.53 7.33 77.33 re S
+129.73 76.53 7.33 60.29 re S
+137.07 76.53 7.33 37.01 re S
+144.40 76.53 7.33 19.24 re S
+151.73 76.53 7.33 7.92 re S
+159.07 76.53 7.33 2.20 re S
+166.40 76.53 7.33 0.28 re S
+173.73 76.53 7.33 0.24 re S
+>>>>>>> master
 Q
 endstream
 endobj
 7 0 obj
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 1690
 =======
 1781
 >>>>>>> Stashed changes
+=======
+1754
+>>>>>>> master
 endobj
 3 0 obj
 <<
@@ -221,6 +287,7 @@
 0000000000 65535 f 
 0000000021 00000 n 
 0000000164 00000 n 
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 0000002056 00000 n 
 0000002139 00000 n 
@@ -240,6 +307,16 @@
 0000002579 00000 n 
 0000002675 00000 n 
 >>>>>>> Stashed changes
+=======
+0000002120 00000 n 
+0000002203 00000 n 
+0000000213 00000 n 
+0000000293 00000 n 
+0000002100 00000 n 
+0000002295 00000 n 
+0000002552 00000 n 
+0000002648 00000 n 
+>>>>>>> master
 trailer
 <<
 /Size 11
@@ -247,9 +324,13 @@
 /Root 2 0 R
 >>
 startxref
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 2686
 =======
 2777
 >>>>>>> Stashed changes
+=======
+2750
+>>>>>>> master
 %%EOF

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2009-11-15 07:07:46 UTC (rev 5)
+++ pkg/src/Makevars	2009-11-17 08:12:58 UTC (rev 6)
@@ -3,16 +3,4 @@
 all : cmdScript  $(SHLIB)
 
 cmdScript :
-	@echo "*******************************************"
-	@echo "Installing custom script in:"
-	@echo
-	@echo '$(R_HOME)/bin/'
-	@echo
-	@echo "For usage instructions:"
-	@echo 
-	@echo "R CMD pgfsweave --help"
-	@echo "*******************************************"
-	@echo
-	@chmod 755 ../exec/pgfsweave-script.R
-	@touch $(R_HOME)/bin/pgfsweave; rm $(R_HOME)/bin/pgfsweave
-	@ln -s $(R_PACKAGE_DIR)/exec/pgfsweave-script.R $(R_HOME)/bin/pgfsweave
+	Rscript ../exec/install-script.R
\ No newline at end of file

Added: pkg/src/dummy.c
===================================================================
--- pkg/src/dummy.c	                        (rev 0)
+++ pkg/src/dummy.c	2009-11-17 08:12:58 UTC (rev 6)
@@ -0,0 +1,5 @@
+
+//Dummy file to avoid check warning about no source code
+void dummy(){
+	return;
+}

More information about the Pgfsweave-commits mailing list