[Distr-commits] r499 - branches/distr-2.2/pkg/SweaveListingUtils/R branches/distr-2.2/pkg/SweaveListingUtils/chm branches/distr-2.2/pkg/SweaveListingUtils/man pkg/distr/chm pkg/distr/inst/doc

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Thu Jul 2 02:38:15 CEST 2009 

Author: ruckdeschel
Date: 2009-07-02 02:38:13 +0200 (Thu, 02 Jul 2009)
New Revision: 499

Modified:
   branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R
   branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingPreparations.html
   branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
   branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingPreparations.Rd
   pkg/distr/chm/Distr.chm
   pkg/distr/inst/doc/Rplots.pdf
Log:
neues Argument withSchunkDef in SweaveListingPreparations

Modified: branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R	2009-07-01 23:24:02 UTC (rev 498)
+++ branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R	2009-07-02 00:38:13 UTC (rev 499)
@@ -141,6 +141,7 @@
 SweaveListingPreparations <- function(
    withOwnFileSection = FALSE,
    withVerbatim = FALSE,
+   withSchunkDef = TRUE,
    gin = TRUE,
    ae = TRUE,
    LineLength = 80,
@@ -208,7 +209,8 @@
     "\\RequirePackage[T1]{fontenc}\n",
     "\\RequirePackage{ae}\n}{}%\n", sep ="")
 
-cat("\\newenvironment{Schunk}{}{}\n\n")
+if(withSchunkDef)
+   cat("\\newenvironment{Schunk}{}{}\n\n")
 
 cat("\\newcommand{\\Sconcordance}[1]{% \n",
   "\\ifx\\pdfoutput\\undefined% \n",

Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingPreparations.html
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingPreparations.html	2009-07-01 23:24:02 UTC (rev 498)
+++ branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingPreparations.html	2009-07-02 00:38:13 UTC (rev 499)
@@ -27,6 +27,7 @@
 SweaveListingPreparations(
    withOwnFileSection = FALSE,  
    withVerbatim = FALSE, 
+   withSchunkDef = TRUE, 
    gin = TRUE,
    ae = TRUE,
    LineLength = 80,
@@ -42,76 +43,6 @@
 </pre>
 
 
-<h3>Arguments</h3>
-
-<table summary="R argblock">
-<tr valign="top"><td><code>withOwnFileSection</code></td>
-<td>
-logical: Does one want to use an own definition file/
-section to define <code>Sinput</code>, <code>Soutput</code>,
-<code>Scode</code> environments; if <code>TRUE</code> you should write some
-<KBD>\include</KBD> directive to include your own
-definitions / or write them in your &lsquo;<span class="file">.Rnw</span>&rsquo; file.
-</td></tr>
-<tr valign="top"><td><code>withVerbatim</code></td>
-<td>
-logical of length 3 (filled by recycling if of shorter length)
-either named ("Sinput", "Soutput", "Scode") or taken in
-order (Sinput, Soutput, Scode):
-Should we use Verbatim from TeX package 'fancyvrb'
-(i.e. the original
-<KBD>"\DefineVerbatimEnvironment{Sinput}{Verbatim}"</KBD> by
-Fritz Leisch) or just TeX package 'listings'
-(i.e. we define our own <code>Sinput</code> environment
-based on 'listings' command 'lstnewenvironment';
-this option is due to a suggestion by
-Andrew Ellis (thank you!).</td></tr>
-<tr valign="top"><td><code>gin</code></td>
-<td>
-logical: shall we use <code>gin</code></td></tr>
-<tr valign="top"><td><code>ae</code></td>
-<td>
-logical: shall we use <code>ae</code></td></tr>
-<tr valign="top"><td><code>LineLength</code></td>
-<td>
-numeric; defaults to 80</td></tr>
-<tr valign="top"><td><code>Rset</code></td>
-<td>
-list or taglist; defaults to global option  <code>"Rset"</code></td></tr>
-<tr valign="top"><td><code>Rdset</code></td>
-<td>
-list or taglist; defaults to global option  <code>"Rdset"</code></td></tr>
-<tr valign="top"><td><code>Rcolor</code></td>
-<td>
-numeric of length 3; defaults to global option  <code>"Rcolor"</code>;
-rgb coordinates of the color in which to print R-code</td></tr>
-<tr valign="top"><td><code>Rbcolor</code></td>
-<td>
-numeric of length 3; defaults to global option  <code>"Rbcolor"</code>;
-rgb coordinates of the color in which to print <font face="Courier New,Courier" color="#666666"><b>R</b></font> keywords
-induced by intermediate packages.</td></tr>
-<tr valign="top"><td><code>Rout</code></td>
-<td>
-numeric of length 3; defaults to global option  <code>"Rout"</code>;
-rgb coordinates of the color in which to print R output</td></tr>
-<tr valign="top"><td><code>Rcomment</code></td>
-<td>
-numeric of length 3; defaults to global option <code>"Rcomment"</code>;
-rgb coordinates of the color in which to print comments
-in R-code</td></tr>
-<tr valign="top"><td><code>pkg</code></td>
-<td>
-character; name of the packageto be described (e.g. in a vignette);
-defaults to global option <code>"pkg"</code></td></tr>
-<tr valign="top"><td><code>pkv</code></td>
-<td>
-character; package version to be described (e.g. in a vignette);
-defaults to global option <code>"pkv"</code></td></tr>
-<tr valign="top"><td><code>lib.loc</code></td>
-<td>
-location of a local library in which the described package resides</td></tr>
-</table>
-
 <h3>Details</h3>
 
 <p>

Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
===================================================================
(Binary files differ)

Modified: branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingPreparations.Rd
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingPreparations.Rd	2009-07-01 23:24:02 UTC (rev 498)
+++ branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingPreparations.Rd	2009-07-02 00:38:13 UTC (rev 499)
@@ -9,6 +9,7 @@
 SweaveListingPreparations(
    withOwnFileSection = FALSE,  % suggestion by Andrew Ellis!
    withVerbatim = FALSE, % suggestion by Andrew Ellis!
+   withSchunkDef = TRUE, % needed in some papers
    gin = TRUE,
    ae = TRUE,
    LineLength = 80,
@@ -40,6 +41,7 @@
                        based on 'listings' command 'lstnewenvironment';
                        this option is due to a suggestion by
                        Andrew Ellis (thank you!).}
+  \item{withSchunkDef}{logical: should environment \code{Schunk} be defined?)
   \item{gin}{logical: shall we use \code{gin}}
   \item{ae}{logical: shall we use \code{ae}}
   \item{LineLength}{numeric; defaults to 80}

Modified: pkg/distr/chm/Distr.chm
===================================================================
(Binary files differ)

Modified: pkg/distr/inst/doc/Rplots.pdf
===================================================================
--- pkg/distr/inst/doc/Rplots.pdf	2009-07-01 23:24:02 UTC (rev 498)
+++ pkg/distr/inst/doc/Rplots.pdf	2009-07-02 00:38:13 UTC (rev 499)
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20090630152709)
-/ModDate (D:20090630152709)
+/CreationDate (D:20090702020420)
+/ModDate (D:20090702020420)
 /Title (R Graphics Output)
 /Producer (R 2.10.0)
 /Creator (R)
@@ -169,7 +169,7 @@
 54.43 64.20 l
 54.53 64.21 l
 54.63 64.22 l
-54.73 64.23 l
+54.73 64.24 l
 54.83 64.25 l
 54.94 64.26 l
 55.04 64.28 l
@@ -315,7 +315,7 @@
 69.19 93.26 l
 69.29 93.95 l
 69.39 94.66 l
-69.49 95.37 l
+69.49 95.38 l
 69.59 96.11 l
 69.70 96.85 l
 69.80 97.61 l
@@ -344,7 +344,7 @@
 72.12 119.17 l
 72.22 120.30 l
 72.32 121.44 l
-72.43 122.61 l
+72.43 122.60 l
 72.53 123.78 l
 72.63 124.98 l
 72.73 126.19 l
@@ -352,14 +352,14 @@
 72.93 128.67 l
 73.03 129.93 l
 73.13 131.22 l
-73.23 132.52 l
+73.23 132.51 l
 73.34 133.83 l
 73.44 135.17 l
 73.54 136.52 l
 73.64 137.89 l
 73.74 139.28 l
 73.84 140.68 l
-73.94 142.10 l
+73.94 142.11 l
 74.04 143.55 l
 74.14 145.01 l
 74.25 146.48 l
@@ -375,14 +375,14 @@
 75.26 162.23 l
 75.36 163.91 l
 75.46 165.60 l
-75.56 167.31 l
+75.56 167.30 l
 75.66 169.03 l
 75.76 170.77 l
 75.86 172.53 l
 75.96 174.31 l
-76.06 176.10 l
+76.06 176.11 l
 76.17 177.92 l
-76.27 179.74 l
+76.27 179.75 l
 76.37 181.59 l
 76.47 183.45 l
 76.57 185.33 l
@@ -390,7 +390,7 @@
 76.77 189.14 l
 76.87 191.06 l
 76.97 193.01 l
-77.08 194.97 l
+77.08 194.96 l
 77.18 196.94 l
 77.28 198.93 l
 77.38 200.93 l
@@ -407,7 +407,7 @@
 78.49 223.93 l
 78.59 226.10 l
 78.69 228.28 l
-78.79 230.48 l
+78.79 230.47 l
 78.90 232.68 l
 79.00 234.90 l
 79.10 237.12 l
@@ -420,7 +420,7 @@
 79.81 252.99 l
 79.91 255.29 l
 80.01 257.60 l
-80.11 259.92 l
+80.11 259.91 l
 80.21 262.24 l
 80.31 264.57 l
 80.41 266.91 l
@@ -445,10 +445,10 @@
 82.33 311.84 l
 82.43 314.20 l
 82.54 316.56 l
-82.64 318.91 l
+82.64 318.92 l
 82.74 321.26 l
 82.84 323.61 l
-82.94 325.95 l
+82.94 325.94 l
 83.04 328.28 l
 83.14 330.60 l
 83.24 332.92 l
@@ -470,7 +470,7 @@
 84.86 368.52 l
 84.96 370.62 l
 85.06 372.71 l
-85.16 374.78 l
+85.16 374.79 l
 85.26 376.84 l
 85.37 378.87 l
 85.47 380.89 l
@@ -485,7 +485,7 @@
 86.38 398.05 l
 86.48 399.85 l
 86.58 401.61 l
-86.68 403.35 l
+86.68 403.36 l
 86.78 405.07 l
 86.88 406.76 l
 86.98 408.42 l
@@ -493,7 +493,7 @@
 87.19 411.66 l
 87.29 413.24 l
 87.39 414.79 l
-87.49 416.32 l
+87.49 416.31 l
 87.59 417.81 l
 87.69 419.27 l
 87.79 420.70 l
@@ -579,7 +579,7 @@
 95.88 419.32 l
 95.98 417.88 l
 96.08 416.41 l
-96.18 414.92 l
+96.18 414.91 l
 96.28 413.39 l
 96.39 411.84 l
 96.49 410.26 l
@@ -606,7 +606,7 @@
 98.61 371.75 l
 98.71 369.70 l
 98.81 367.63 l
-98.91 365.55 l
+98.91 365.56 l
 99.01 363.46 l
 99.11 361.36 l
 99.22 359.24 l
@@ -636,35 +636,35 @@
 101.64 305.63 l
 101.74 303.34 l
 101.84 301.05 l
-101.95 298.75 l
+101.95 298.76 l
 102.05 296.46 l
 102.15 294.17 l
 102.25 291.88 l
 102.35 289.59 l
 102.45 287.30 l
 102.55 285.02 l
-102.65 282.73 l
+102.65 282.74 l
 102.75 280.46 l
 102.86 278.18 l
 102.96 275.91 l
 103.06 273.64 l
 103.16 271.38 l
 103.26 269.12 l
-103.36 266.87 l
+103.36 266.88 l
 103.46 264.63 l
 103.56 262.39 l
 103.66 260.16 l
 103.77 257.93 l
 103.87 255.72 l
 103.97 253.51 l
-104.07 251.31 l
+104.07 251.30 l
 104.17 249.11 l
 104.27 246.93 l
 104.37 244.75 l
-104.47 242.58 l
+104.47 242.59 l
 104.57 240.43 l
 104.68 238.28 l
-104.78 236.14 l
+104.78 236.15 l
 104.88 234.02 l
 104.98 231.90 l
 105.08 229.80 l
@@ -677,7 +677,7 @@
 105.79 215.40 l
 105.89 213.39 l
 105.99 211.40 l
-106.09 209.41 l
+106.09 209.42 l
 106.19 207.45 l
 106.29 205.49 l
 106.39 203.55 l
@@ -701,9 +701,9 @@
 108.21 171.16 l
 108.31 169.51 l
 108.42 167.88 l
-108.52 166.26 l
+108.52 166.25 l
 108.62 164.65 l
-108.72 163.06 l
+108.72 163.07 l
 108.82 161.49 l
 108.92 159.94 l
 109.02 158.40 l
@@ -716,15 +716,15 @@
 109.73 148.09 l
 109.83 146.68 l
 109.93 145.29 l
-110.03 143.92 l
-110.13 142.55 l
+110.03 143.91 l
+110.13 142.56 l
 110.24 141.21 l
 110.34 139.89 l
 110.44 138.58 l
 110.54 137.28 l
 110.64 136.00 l
 110.74 134.74 l
-110.84 133.50 l
+110.84 133.49 l
 110.94 132.26 l
 111.04 131.05 l
 111.15 129.85 l
@@ -733,8 +733,8 @@
 111.45 126.35 l
 111.55 125.21 l
 111.65 124.09 l
-111.75 122.98 l
-111.85 121.90 l
+111.75 122.99 l
+111.85 121.89 l
 111.95 120.82 l
 112.06 119.76 l
 112.16 118.71 l
@@ -861,7 +861,7 @@
 124.39 66.88 l
 124.49 66.80 l
 124.59 66.72 l
-124.69 66.64 l
+124.69 66.63 l
 124.79 66.56 l
 124.89 66.48 l
 125.00 66.40 l

More information about the Distr-commits mailing list