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

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Thu Apr 8 21:09:42 CEST 2010 

Author: cameronbracken
Date: 2010-04-08 21:09:40 +0200 (Thu, 08 Apr 2010)
New Revision: 15

Added:
   pkg/.gitattributes
Modified:
   pkg/ChangeLog
   pkg/DESCRIPTION
   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/src/Makevars
Log:
Merge branch 'master' into r-forge-local

Conflicts:
	ChangeLog
	inst/doc/figs/fig-normalSweave.pdf
	inst/doc/pgfSweave-example.pdf
	inst/doc/pgfSweave.pdf

Added: pkg/.gitattributes
===================================================================
--- pkg/.gitattributes	                        (rev 0)
+++ pkg/.gitattributes	2010-04-08 19:09:40 UTC (rev 15)
@@ -0,0 +1 @@
+*.pdf binary

Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2010-04-07 00:31:51 UTC (rev 14)
+++ pkg/ChangeLog	2010-04-08 19:09:40 UTC (rev 15)
@@ -1,9 +1,48 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 commit 82cc2fd18794b91439e84120172991ec230a9b36
 Merge: d790e2d 09fc61a
 Author: cameronbracken <cameronbracken at edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
 Date:   Sat Dec 5 19:01:42 2009 +0000
 =======
+=======
+commit a6c2600e7df9b9137c0ef1c0caf6d002df33e36e
+Author: cameronbracken <cameron.bracken at gmail.com>
+Date:   Tue Apr 6 18:29:32 2010 -0600
+
+    Revert Makevars to use GNU make conditional, list GNU make as SystemRequirement
+
+ DESCRIPTION  |    3 ++-
+ src/Makevars |    4 ++++
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 0c7ffb21a7b856e6a484004fb7bb211254a9a830
+Author: cameronbracken <cameron.bracken at gmail.com>
+Date:   Sun Apr 4 14:44:14 2010 -0600
+
+    Add removed example file
+
+ inst/example/pgfSweave-example.tex |   44 ++++++++++++++++++++++++++++++++++++
+ 1 files changed, 44 insertions(+), 0 deletions(-)
+
+commit c2811c2a1cd9af4cad36391c7f1b2913071543d1
+Author: cameronbracken <cameron.bracken at gmail.com>
+Date:   Sun Apr 4 14:42:36 2010 -0600
+
+    Version 1.0.5
+
+ ChangeLog                                 |   60 +++++++++++++++++++++++++++++
+ DESCRIPTION                               |    2 +-
+ NEWS                                      |    3 +-
+ inst/doc/figs/fig-normalSweave.pdf        |  Bin 3071 -> 3056 bytes
+ inst/doc/figs/fig-pgfSweave-hist.pdf      |  Bin 17644 -> 17639 bytes
+ inst/doc/figs/fig-pgfSweave-tikz-hist.pdf |  Bin 28919 -> 28915 bytes
+ inst/doc/pgfSweave-example.pdf            |  Bin 88546 -> 88353 bytes
+ inst/doc/pgfSweave.Rnw                    |    3 +-
+ inst/doc/pgfSweave.pdf                    |  Bin 290456 -> 293971 bytes
+ 9 files changed, 64 insertions(+), 4 deletions(-)
+
+>>>>>>> master
 commit 481238dfd60acd0d34d94e4ab0d982dd28dc67be
 Author: cameronbracken <cameron.bracken at gmail.com>
 Date:   Sun Apr 4 14:19:59 2010 -0600

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-04-07 00:31:51 UTC (rev 14)
+++ pkg/DESCRIPTION	2010-04-08 19:09:40 UTC (rev 15)
@@ -8,7 +8,7 @@
 Depends: stashR, filehash, tikzDevice, cacheSweave, getopt
 Imports: digest, tools, utils
 SystemRequirement: pgf (>=2.00) (http://sourceforge.net/projects/pgf/) for the 
-      vignette and for externalization. GNU make.
+      vignette and for externalization.
 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 

Modified: pkg/inst/doc/figs/fig-normalSweave.pdf
===================================================================
--- pkg/inst/doc/figs/fig-normalSweave.pdf	2010-04-07 00:31:51 UTC (rev 14)
+++ pkg/inst/doc/figs/fig-normalSweave.pdf	2010-04-08 19:09:40 UTC (rev 15)
@@ -3,12 +3,17 @@
 1 0 obj
 <<
 <<<<<<< HEAD
+<<<<<<< HEAD
 /CreationDate (D:20091225122637)
 /ModDate (D:20091225122637)
 =======
 /CreationDate (D:20100404143804)
 /ModDate (D:20100404143804)
 >>>>>>> master
+=======
+/CreationDate (D:20100408125908)
+/ModDate (D:20100408125908)
+>>>>>>> master
 /Title (R Graphics Output)
 /Producer (R 2.11.0)
 /Creator (R)
@@ -96,6 +101,7 @@
 /F2 1 Tf 12.00 0.00 -0.00 12.00 177.73 47.52 Tm (4) Tj
 ET
 <<<<<<< HEAD
+<<<<<<< HEAD
 59.04 76.53 m 59.04 154.96 l S
 59.04 76.53 m 51.84 76.53 l S
 59.04 96.14 m 51.84 96.14 l S
@@ -110,11 +116,20 @@
 59.04 136.27 m 51.84 136.27 l S
 59.04 156.18 m 51.84 156.18 l S
 >>>>>>> master
+=======
+59.04 76.53 m 59.04 156.34 l S
+59.04 76.53 m 51.84 76.53 l S
+59.04 96.49 m 51.84 96.49 l S
+59.04 116.44 m 51.84 116.44 l S
+59.04 136.39 m 51.84 136.39 l S
+59.04 156.34 m 51.84 156.34 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
+<<<<<<< HEAD
 /F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 102.41 Tm (1000) Tj
 ET
 BT
@@ -125,7 +140,13 @@
 BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 142.83 Tm (2000) Tj
 >>>>>>> master
+=======
+/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 103.09 Tm (1000) Tj
 ET
+BT
+/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 143.00 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
@@ -153,20 +174,20 @@
 174.16 76.53 6.90 0.16 re S
 =======
 63.73 76.53 7.33 0.08 re S
-71.07 76.53 7.33 0.52 re S
-78.40 76.53 7.33 1.59 re S
-85.73 76.53 7.33 6.65 re S
-93.07 76.53 7.33 18.20 re S
-100.40 76.53 7.33 35.48 re S
-107.73 76.53 7.33 60.57 re S
-115.07 76.53 7.33 77.33 re S
-122.40 76.53 7.33 74.67 re S
-129.73 76.53 7.33 61.60 re S
-137.07 76.53 7.33 36.24 re S
-144.40 76.53 7.33 16.61 re S
-151.73 76.53 7.33 6.69 re S
-159.07 76.53 7.33 1.71 re S
-166.40 76.53 7.33 0.24 re S
+71.07 76.53 7.33 0.72 re S
+78.40 76.53 7.33 2.15 re S
+85.73 76.53 7.33 6.03 re S
+93.07 76.53 7.33 17.16 re S
+100.40 76.53 7.33 36.59 re S
+107.73 76.53 7.33 58.30 re S
+115.07 76.53 7.33 76.62 re S
+122.40 76.53 7.33 77.33 re S
+129.73 76.53 7.33 59.54 re S
+137.07 76.53 7.33 37.95 re S
+144.40 76.53 7.33 16.48 re S
+151.73 76.53 7.33 7.66 re S
+159.07 76.53 7.33 1.80 re S
+166.40 76.53 7.33 0.60 re S
 173.73 76.53 7.33 0.04 re S
 >>>>>>> master
 Q
@@ -193,7 +214,7 @@
 <<
 /ProcSet [/PDF /Text]
 /Font <</F2 9 0 R /F3 10 0 R >>
-/ExtGState << >>
+/ExtGState << /GSais 11 0 R >>
 >>
 endobj
 8 0 obj
@@ -219,8 +240,14 @@
 /BaseFont /Helvetica-Bold
 /Encoding 8 0 R
 >> endobj
+11 0 obj
+<<
+/Type /ExtGState
+/AIS false
+>>
+endobj
 xref
-0 11
+0 12
 0000000000 65535 f 
 0000000021 00000 n 
 0000000164 00000 n 
@@ -239,20 +266,31 @@
 0000000213 00000 n 
 0000000293 00000 n 
 0000002108 00000 n 
+<<<<<<< HEAD
 0000002303 00000 n 
 0000002560 00000 n 
 0000002656 00000 n 
 >>>>>>> master
+=======
+0000002317 00000 n 
+0000002574 00000 n 
+0000002670 00000 n 
+0000002772 00000 n 
+>>>>>>> master
 trailer
 <<
-/Size 11
+/Size 12
 /Info 1 0 R
 /Root 2 0 R
 >>
 startxref
 <<<<<<< HEAD
+<<<<<<< HEAD
 2777
 =======
 2758
 >>>>>>> master
+=======
+2822
+>>>>>>> master
 %%EOF

Modified: pkg/inst/doc/figs/fig-pgfSweave-hist.pdf
===================================================================
--- pkg/inst/doc/figs/fig-pgfSweave-hist.pdf	2010-04-07 00:31:51 UTC (rev 14)
+++ pkg/inst/doc/figs/fig-pgfSweave-hist.pdf	2010-04-08 19:09:40 UTC (rev 15)
@@ -4,25 +4,25 @@
 << /S /GoTo /D [5 0 R  /Fit ] >>
 endobj
 26 0 obj <<
-/Length 1081      
+/Length 1085      
 /Filter /FlateDecode
 >>
 stream
-xÚµWMo7½ï¯ÐÑ>Œ*ꃒ®š¹-º@i…“8),vý÷¥f´3úic§1ì±öé‘ÔQW°[&Ø/ §`ÀW2ŽoÂá‘h&>néÁ•w†}#bÒ_`	È…¨gà.¶ÑÝbR ŸØáwv¸g1ýççÿíx[<}8ëCÅ…CNrãt”	)lüËÇ7¡0œ¹–M™é«Óá§×ŽyîQ";}d‰s¦œÞ³·W¿~þûŸ‡Û§?Ãõ¤”ºzøÿ뫧û‡§ð‡0ýÐ ®ßÞ~>mK-Q¼c¾œEÈTNûʽäO;©ž#Ü#å)ÒjÙèN”Ęe_ÖWUòÒj§bv $W”Ÿ^q­ ÒϪ¦\Úž<0Ü
-z‘›i#/Qc–÷úÚ©«§_>Üßü[++ù•²´Ò©˜=þCð–½›mßG’5 6``oâã¯üMR6Y©Ð1K«Òhc|@Ê,-´]Aòý[áuÏlÅ(¥Æ=3çˆ
-´­™ÙŠõÍ eŒå*Wp`¨,wFX[®àÀ°yÅ{©‹Ä2ž£tL;n¤|V¡‘Ük:o›e[gJbÌ	9é¦~¤*Óê¦böXkpšK¥^ ÁYnŒjH”Bƒ¬5”¤JCZÝ
- ‚ãìBÿ
-1³<Âì?™¶•!qeV!šrP’êz°¬o*f[Êp:ä/Ø
-Pd¢ìp/Îœ|3š½¨HµŒ´ÀK»A‰ç=¼Dr¬#qr͹¨HµŽ´ÀFGVˆ"4Jf‘^*«Â‹eE8ÕV“]3àN#Ýt+Ø5£ûÒ	]Z±®Õ|(o
-³
-í®:
-ÃJ]¹¹ZPEÕÌjražu	kÍÁÒ¥¸™6{›(‰±ÒJNµ³iuS1{ìh a©à»‰Èl{*ΔYFì:J2W{RÊéUΚhÙ¥å¨'1hL~™o äÞ,íÚö]-E–î9ˆÌœ¹H¯GPOÜ׃ñ©i@VÈAˁ.šA8%diY!·Úêù(Q/.QJÓGAZVÈ@xàgçNiiXyçå
-G*òM½Ž[A—Ö.8Ò²BhZµÆyÕ”ùT¿@Ú<´C…Oå9HTjñIÙì„Ç|!T<RCꌂ¡.TúÅåÚ‘î£ã@--Ô.¢ÂŧÕ8Ö‰}øB¨†
-Ÿ
-)‰—ÓÒpíAË:ÔÒBဣ±~Ù{E(«;è8PÃ
-H_¸¬Žÿ]Þüï£Â4´âû„£þBy»¸¤B.”ÐAǁ"M€óe 
-u\á`viG5»‡µ´P¡Þa—È‚Ô}t¨¡…Eí–ÛiûòÕEûZZ軤j-˜:ÔÐBϨõpÞ;õ
-h¨¥…]×î¨W±ÞôÁ2ÌÒ9ÜÏÏÿ >äG
+xÚµWËnÜ6ÝÏWpi/ÄòòÍm€¦EvƒÐEšEá$N‚ȆÝEÿ¾‡G"E‘#VäÃs‡¼¼¤»g‚ýv <#¦¸’ñýn<<±Fâ㮂7ìßø&~Gvd¹Òê	øšëÛ×Ù¤ >±ÃŸìðÀbü;NÏíxMœõYÅ…·Œ¼äÆë(“RØø›¿ß…á`-×±!3}u:üòÚ³Àƒ•–>²Ä9SNïÙÛ›ß?ÿóíñþùïñvPJÝ<~Œÿë›ç‡Ççñ/a	üà…nߝÞ~=­©–Î3Êác[yÜ“g°’ê%ƒå¤"-–•îDIŒIöe}¥ÑF^Êv(F;êHr…úŠkE‘~V5äÒöä‘áN`"WÓJ^¢$Æ$ïõ­W7Ïž¾x¸ûo«¬äo”¥L‡bôøS6Á[ön²}Iι¸‰½‰/ùL:Á­š9$¥­‹áÉcæ\0Ï>wŒÎjWj»g<—(
+—[-XÛŒ¤áÞ„P¦¸€C¾
+N†Ø1ÜêÏçdcöTöË
+Y¦=7R¾¨ÅîZÌjYw˜™’S)ºêiÛ8æì†bô¸Õ4š®ÐWVv5$J¡AVÝ¡ m»ÃœÝ
+$qšY}h^"‚¤åÖ‡)@2­›Bâ$Ê$CT $U­`Np(†kF`=Í‹AFs2¶»gN¾²îhi«#%xi=†Õ52°í¼¡¾ŒÄÉeTcCÚʘó«TdMÁÊÒa)«dl
+gŒLìF½½ê%»fHE[œqØ4ÃI©à8fØ4#
+”q…ÝŠ¶
+U<M<™ÒpAۆˆ›‰)«B£vÚzÜÒæE'·FM:TÝjZUE¢$Æþ-9›šHÙ
+Å象–2ø«Dd¶-gÊ$#^«J2W{RÊᦍES×IYL›JfÆÜk:BG»:òÑEɲÕòS÷1cMq•YAô5Ì|uZyÅ®¸Nárîdììù†/@«ý”Ær‡j`çÆð©yùÊ"ì:shf­»	¶CT¬±>d¢¥×˜V -¬¢f9ˆcÑjšüâø|ÂÜ{AjÖ˜ø~r.Ýœ—‹è.ØR±ò‹-.,^Š9i>Ó´vÃìÐÆ%"nPãvò‰o
+aŒ0-¸ª¦…OœèïzNŸ<ZIÙ‚/„ªhcá÷uo­šÓ_ný
+¸ª¦_¤ׄ×ɧBhO²÷CÕ´±ð©°—H¤ôUàûS·à¡*ÚXøĪ¡Ô&cÒ %¨öÕ´1GQÒÎ*=·Øå+kíªiŇ[¾CÉ
+Ü…\Øûa*Ö˜ƒž#mš'È:.*»…öÃT´±@]<wÜìw
+²ÒùÚ
+TÓÆ
+juH3¿f¦nͧìÃôü¼Cìü
 endstream
 endobj
 5 0 obj <<
@@ -196,19 +196,19 @@
 >> endobj
 37 0 obj <<
 /Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(pdfTeX-1.40.10)/Keywords()
-/CreationDate (D:20100404143807-06'00')
-/ModDate (D:20100404143807-06'00')
+/CreationDate (D:20100408125913-06'00')
+/ModDate (D:20100408125913-06'00')
 /Trapped /False
 /PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)
 >> endobj
 xref
 0 38
 0000000006 65535 f 
-0000001512 00000 n 
-0000001601 00000 n 
-0000001621 00000 n 
+0000001516 00000 n 
+0000001605 00000 n 
+0000001625 00000 n 
 0000000015 00000 n 
-0000001224 00000 n 
+0000001228 00000 n 
 0000000007 00000 f 
 0000000008 00000 f 
 0000000009 00000 f 
@@ -228,24 +228,24 @@
 0000000023 00000 f 
 0000000024 00000 f 
 0000000030 00000 f 
-0000001391 00000 n 
+0000001395 00000 n 
 0000000063 00000 n 
-0000001335 00000 n 
-0000015953 00000 n 
-0000016093 00000 n 
+0000001339 00000 n 
+0000015957 00000 n 
+0000016097 00000 n 
 0000000000 00000 f 
-0000001674 00000 n 
-0000002135 00000 n 
-0000015658 00000 n 
-0000016151 00000 n 
-0000016226 00000 n 
-0000016262 00000 n 
-0000016404 00000 n 
+0000001678 00000 n 
+0000002139 00000 n 
+0000015662 00000 n 
+0000016155 00000 n 
+0000016230 00000 n 
+0000016266 00000 n 
+0000016408 00000 n 
 trailer
 << /Size 38
 /Root 36 0 R
 /Info 37 0 R
-/ID [<5ED20C437A99E8152BA3085491CD89CD> <5ED20C437A99E8152BA3085491CD89CD>] >>
+/ID [<29EB6CF22C9AF3EC07E966D6B052621F> <29EB6CF22C9AF3EC07E966D6B052621F>] >>
 startxref
-16722
+16726
 %%EOF

Modified: pkg/inst/doc/figs/fig-pgfSweave-tikz-hist.pdf
===================================================================
--- pkg/inst/doc/figs/fig-pgfSweave-tikz-hist.pdf	2010-04-07 00:31:51 UTC (rev 14)
+++ pkg/inst/doc/figs/fig-pgfSweave-tikz-hist.pdf	2010-04-08 19:09:40 UTC (rev 15)
@@ -4,23 +4,19 @@
 << /S /GoTo /D [5 0 R  /Fit ] >>
 endobj
 27 0 obj <<
-/Length 1154      
+/Length 1201      
 /Filter /FlateDecode
 >>
 stream
-xÚÍXMÛ6½ûWð¸{Ãá7oi‹&Enn
-ôÐöl³Þánã´(úï;”h‰")˵ˆ ¯$??Ï<=‘á9FÞî Œ TqÂ(8GüîÙá‡ápÄÎ*ò7	0¾ |á“W_ó²>Ç7ï‡7ŒbXü÷Å%MãÆ’d7½Y€Ã7xªS1äd·ïU}±Œ?’Ý󐱷îû·ç«ÓqÞGã¢×†rଡBÛà7PNΪÓë¿ò¬“ŒÁIÂ)mB¸¯»WoÀGæšI$9‡_ÉOwßýöùÏ—ã齿ï„w/á,ïNÏ/'ÿ3SþáÜÿrx·ûö0¦Ì‚aÂ}¢'Þ]—ÜÞ~|H·Zæpr  ((c‰cì?9æµÏM¨Ñ¯Ô®È½Yë®Ì¾“yåw“þí–ÄX¨Ñ}ȳ]êǵžà×&(4¡êId„Þ“7÷8lN>ýõáùáŸÜŽ=³#Jï&íƒÿ§™ä]8ü>6üb_Û”¤\N4£Îp!(‡ƒ]J9¡Óâ´9ÁósRÚ
-á-JešËYül ¸¤B(1Ï0¡-R”~ÏžÂÕ)®šj
-FСn3½¹ú(AµÐC¬Ï´ÈýLëd>½fœlzE¹Ý¤w{µ±
-§¬ldµXä%"#µ€çÌ8™QnS€VxÑÈà
-Ǫ¸d™’¸ÀŠ2;ãäu6*nkƒÒÔb%jdƒí%¿hC¤$6ðrµI9¹
-Qñµ6,—é(m±4Kj‘:TÏ‚s0
-[=ƒ L8PØ Ðj–`$ ÀIÈ^¥&´E
-lEqIŸ'ˆX‹ðã%¸ú1_»ƒRs*™ÞÜÇáÍ+‹g§Y½¹”Ȩ—•9§ìðƒân’¼oå‚åT	hæ†3â’	¡÷@±%Æ(5&ÅÍL #·ã­\ñä°íXòáL靀e+’P53åiG?µ¤Y»‚ÖÔYåúyX–¬ÓzM[î§*»A³Ÿ”ãÌ9Ü÷ 
-Fߢֱ±’?U¸þæêU¦ð« Â‰¬T/ÆàžÌam«bsÑõvÑE¿‚ª•~²84¥uvœk.É·‹.sø5ÐpêxT3n¹ª`®» ûÀTâE{m®X¿f;‹s]à$¯a™ê‚{»è2…_±Í ÌrÑ`ØrfÐLx…}»ô2‰_ArlëDbˤŒÅ¥vÎÅWøÔ—iü:
-¡¸h;½Òqë¿ ç7Páû?G¤RWаià¸xˆ^©@Ž£Œ8¿
-Ã
-”iü:ú`rXñŒ;AçÐ\~ÉÞ ¾Hâ×@ ¶ŠE‘Šaj°£_€sñþõe¿ŽZMUÚBÏ?JÕÑB~A÷-~&›é¼Œâƒ“ØôûlÆ(à^‡/ ¹ú’¾A}™Å_ªX”iÂÆ?®ö0Ó^°7H/“ø+P…ãGÚ¡¶X|#5çKh&¾¤ê‡×sü2xÊ
+xÚÍXËnã6Ýû+¸LæðòÍ]èL1;·ºh»¤§E˜t<-Šþ}/)Z¢H=\‹(8’|t|ïÑ!yIŠ‘aäÝðÈA'Œ‚säÁï>‘Þ‡¨pV‘¿H€ñá„;o~?=~ñõ—Èúœ¾<|è¾0ŠañßW—4eŒKžÉnø2‡_ ð4MŐߓÝ!ªúÏ2þ@v/]ÆhÝwï.WçÓ,|HÆ%¯
+åÀ	XC…¶Áo œ\Tç×~6ä%Ø^2j'ûNiÂ}uܽy–8ê4×äøHéÂ9þB~¼ûö×ϼžÎüý^Xq÷úÎòîüòzö?1Å€á^ÀýÏÇ÷»oŽ}Ê"&<dzÒÓí³Ç;ôt«e;!‚‚‚Î1–9Æþ•cNP+ñŒÑ„êýÊíJŒŽÍZweô›Â“$?èßnIŠå€C^¬Øç~\ë	öpm‚R@&=IŒŽ=y{ÝæüñÓŸ_þ.íÑ;’ôý ½³ãÿ4’¼‡ß†Â†?ŒµMIʵáD3êBUTKÍ3ô9/N›\0<;'¥ÝÇ%€”r¿$ ½´[Ô£-R(N³ÎŒSôh‹u“ŽúêWf…s/è050½¹À)AµÐ])ž̉Ñâ`ÞËr8ÅNr÷ƒÞíÍò ¯‘VSiù’‰‘[ÀKFœÂ‚$·© †JÓÈàØoÝ’‰‘YÀª2žSÊ2Þ©më ö,ÁZ
+À>lùâH¸P2ªn0æ”.$Åmm°aŠ­l°a2‹6$JfCUƜ҆¤øZæ¯t”Æa§%ÅZ.u¨»=Zá•[&Øé‚2á@
+`ƒæ‰Q‚l 'mê“|”a@[¤¨×jÜŽRôh‹}£ŽR\ÝÔ×n»BÇÔœJ¦7/˜q¤,ž1œfÓ»ˆDIŒéú:æÔ[© x?H>´rg/© ™N/šÐ¢ŠÍ¹ÐG™2aPÜÌøœ\4s!Äã¸4\ðáB‰NÀ¼Y¨)32åùÖi(lÙ’u­q+ËàFÕ:­gÐ|oó4Én°«ÊJò
+æ¤áqùƇոŸûzþ4Eö7°:‡_NE1†QíÔ44Ö\2oW\%ð+.ñ¤q±É¥Ž)à3`!¹"o]åðk ÁIDi{B¿·Ý5Ù7Øig—A\bXˆj¶6FOƒ…îš|»î:‡_°ƒ;§L,LP%³sp¡}Š»ú‰4~	Ô]†! P#¹œAKù5{ƒú*‰_AYÊ•U¶yyÍ2Wâk¾oñêg¤tcM3—«À-Ó`)¾ân^¦ðËà\l…tQžÐTX&ÄZÊ®ét×Yü:
+ÀB¥Tq‚•q&Ÿ†Kýü
+P§ñë¨
+•ºµÈðÞo-å×tßâMd®s5aÃeW5®9™Ó`©½"o^åð« ÎSÎÚ$ÑQFó9´T^Ñ·H¯²ø+PE
+“2nYÁຄk\—Ì …úš¾A}Å_…:‡…çyônzi¯Ø½ôîóÿ xlâ¥
 endstream
 endobj
 5 0 obj <<
@@ -315,19 +311,19 @@
 >> endobj
 42 0 obj <<
 /Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(pdfTeX-1.40.10)/Keywords()
-/CreationDate (D:20100404143808-06'00')
-/ModDate (D:20100404143808-06'00')
+/CreationDate (D:20100408125914-06'00')
+/ModDate (D:20100408125914-06'00')
 /Trapped /False
 /PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)
 >> endobj
 xref
 0 43
 0000000006 65535 f 
-0000001599 00000 n 
-0000001688 00000 n 
-0000001708 00000 n 
+0000001646 00000 n 
+0000001735 00000 n 
+0000001755 00000 n 
 0000000015 00000 n 
-0000001297 00000 n 
+0000001344 00000 n 
 0000000007 00000 f 
 0000000008 00000 f 
 0000000009 00000 f 
@@ -348,28 +344,28 @@
 0000000024 00000 f 
 0000000025 00000 f 
 0000000032 00000 f 
-0000001466 00000 n 
+0000001513 00000 n 
 0000000063 00000 n 
-0000001411 00000 n 
-0000026988 00000 n 
-0000027129 00000 n 
-0000027269 00000 n 
+0000001458 00000 n 
+0000027035 00000 n 
+0000027176 00000 n 
+0000027316 00000 n 
 0000000000 00000 f 
-0000001761 00000 n 
-0000002222 00000 n 
-0000002664 00000 n 
-0000014215 00000 n 
-0000014484 00000 n 
-0000026702 00000 n 
-0000027327 00000 n 
-0000027402 00000 n 
-0000027438 00000 n 
-0000027580 00000 n 
+0000001808 00000 n 
+0000002269 00000 n 
+0000002711 00000 n 
+0000014262 00000 n 
+0000014531 00000 n 
+0000026749 00000 n 
+0000027374 00000 n 
+0000027449 00000 n 
+0000027485 00000 n 
+0000027627 00000 n 
 trailer
 << /Size 43
 /Root 41 0 R
 /Info 42 0 R
-/ID [<9E2A86B4E3B89BBD23CFC99AF4036C86> <9E2A86B4E3B89BBD23CFC99AF4036C86>] >>
+/ID [<1D363A128B7713CB6F58C2F95E62E216> <1D363A128B7713CB6F58C2F95E62E216>] >>
 startxref
-27898
+27945
 %%EOF

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2010-04-07 00:31:51 UTC (rev 14)
+++ pkg/src/Makevars	2010-04-08 19:09:40 UTC (rev 15)
@@ -3,8 +3,4 @@
 all : cmdScript  $(SHLIB)
 
 cmdScript :
-ifdef R_HOME
 	${R_HOME}/bin/Rscript ../exec/install-script.R
-else
-	(R_HOME=`R RHOME`; ${R_HOME}/bin/Rscript ../exec/install-script.R)
-endif
\ No newline at end of file

More information about the Pgfsweave-commits mailing list