[Distr-commits] r300 - branches/distr-2.1/pkg/distr/inst/doc branches/distr-2.1/pkg/distr/man branches/distr-2.1/pkg/distrDoc/inst/doc pkg/distr/chm pkg/distr/inst/doc pkg/distr/man pkg/distrDoc/chm pkg/distrDoc/inst/doc

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Fri Oct 10 17:50:45 CEST 2008


Author: ruckdeschel
Date: 2008-10-10 17:50:45 +0200 (Fri, 10 Oct 2008)
New Revision: 300

Modified:
   branches/distr-2.1/pkg/distr/inst/doc/Rplots.pdf
   branches/distr-2.1/pkg/distr/inst/doc/newDistributions.pdf
   branches/distr-2.1/pkg/distr/man/0distr-package.Rd
   branches/distr-2.1/pkg/distrDoc/inst/doc/distr.Rnw
   pkg/distr/chm/0distr-package.html
   pkg/distr/chm/Distr.chm
   pkg/distr/inst/doc/Rplots.pdf
   pkg/distr/inst/doc/newDistributions.pdf
   pkg/distr/man/0distr-package.Rd
   pkg/distrDoc/chm/00Index.html
   pkg/distrDoc/inst/doc/distr.Rnw
Log:
minor polishing in vignettes and in 0distr-package.Rd

Modified: branches/distr-2.1/pkg/distr/inst/doc/Rplots.pdf
===================================================================
--- branches/distr-2.1/pkg/distr/inst/doc/Rplots.pdf	2008-10-10 15:18:36 UTC (rev 299)
+++ branches/distr-2.1/pkg/distr/inst/doc/Rplots.pdf	2008-10-10 15:50:45 UTC (rev 300)
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20081010165407)
-/ModDate (D:20081010165407)
+/CreationDate (D:20081010174101)
+/ModDate (D:20081010174101)
 /Title (R Graphics Output)
 /Producer (R 2.8.0)
 /Creator (R)
@@ -298,7 +298,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
@@ -335,7 +335,7 @@
 72.93 128.67 l
 73.03 129.93 l
 73.13 131.22 l
-73.23 132.51 l
+73.23 132.52 l
 73.34 133.83 l
 73.44 135.17 l
 73.54 136.52 l
@@ -365,7 +365,7 @@
 75.96 174.31 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
@@ -373,7 +373,7 @@
 76.77 189.14 l
 76.87 191.06 l
 76.97 193.01 l
-77.08 194.96 l
+77.08 194.97 l
 77.18 196.94 l
 77.28 198.93 l
 77.38 200.93 l
@@ -384,7 +384,7 @@
 77.88 211.18 l
 77.99 213.27 l
 78.09 215.38 l
-78.19 217.49 l
+78.19 217.50 l
 78.29 219.63 l
 78.39 221.77 l
 78.49 223.93 l
@@ -399,7 +399,7 @@
 79.40 243.87 l
 79.50 246.13 l
 79.60 248.41 l
-79.70 250.69 l
+79.70 250.70 l
 79.81 252.99 l
 79.91 255.29 l
 80.01 257.60 l
@@ -435,14 +435,14 @@
 83.04 328.28 l
 83.14 330.60 l
 83.24 332.92 l
-83.34 335.22 l
+83.34 335.23 l
 83.44 337.53 l
 83.55 339.82 l
 83.65 342.10 l
 83.75 344.37 l
 83.85 346.63 l
 83.95 348.88 l
-84.05 351.12 l
+84.05 351.11 l
 84.15 353.34 l
 84.25 355.55 l
 84.35 357.75 l
@@ -456,7 +456,7 @@
 85.16 374.78 l
 85.26 376.84 l
 85.37 378.87 l
-85.47 380.89 l
+85.47 380.88 l
 85.57 382.88 l
 85.67 384.85 l
 85.77 386.81 l
@@ -466,7 +466,7 @@
 86.17 394.40 l
 86.28 396.24 l
 86.38 398.05 l
-86.48 399.85 l
+86.48 399.84 l
 86.58 401.61 l
 86.68 403.35 l
 86.78 405.07 l
@@ -476,7 +476,7 @@
 87.19 411.66 l
 87.29 413.24 l
 87.39 414.79 l
-87.49 416.31 l
+87.49 416.32 l
 87.59 417.81 l
 87.69 419.27 l
 87.79 420.70 l
@@ -529,7 +529,7 @@
 92.54 448.49 l
 92.64 448.18 l
 92.75 447.83 l
-92.85 447.44 l
+92.85 447.45 l
 92.95 447.02 l
 93.05 446.56 l
 93.15 446.06 l
@@ -556,7 +556,7 @@
 95.27 427.34 l
 95.37 426.08 l
 95.48 424.79 l
-95.58 423.47 l
+95.58 423.46 l
 95.68 422.11 l
 95.78 420.73 l
 95.88 419.32 l
@@ -576,7 +576,7 @@
 97.30 396.72 l
 97.40 394.92 l
 97.50 393.10 l
-97.60 391.26 l
+97.60 391.25 l
 97.70 389.39 l
 97.80 387.51 l
 97.90 385.60 l
@@ -592,7 +592,7 @@
 98.91 365.56 l
 99.01 363.46 l
 99.11 361.36 l
-99.22 359.23 l
+99.22 359.24 l
 99.32 357.10 l
 99.42 354.96 l
 99.52 352.80 l
@@ -615,7 +615,7 @@
 101.24 314.79 l
 101.34 312.50 l
 101.44 310.21 l
-101.54 307.93 l
+101.54 307.92 l
 101.64 305.63 l
 101.74 303.34 l
 101.84 301.05 l
@@ -642,17 +642,17 @@
 103.97 253.51 l
 104.07 251.30 l
 104.17 249.11 l
-104.27 246.92 l
+104.27 246.93 l
 104.37 244.75 l
 104.47 242.58 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
 105.18 227.71 l
-105.28 225.63 l
+105.28 225.62 l
 105.38 223.55 l
 105.48 221.50 l
 105.59 219.45 l
@@ -660,14 +660,14 @@
 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
 106.49 201.63 l
-106.60 199.72 l
+106.60 199.71 l
 106.70 197.82 l
-106.80 195.94 l
+106.80 195.93 l
 106.90 194.07 l
 107.00 192.21 l
 107.10 190.37 l
@@ -700,7 +700,7 @@
 109.83 146.68 l
 109.93 145.29 l
 110.03 143.91 l
-110.13 142.56 l
+110.13 142.55 l
 110.24 141.21 l
 110.34 139.89 l
 110.44 138.58 l

Modified: branches/distr-2.1/pkg/distr/inst/doc/newDistributions.pdf
===================================================================
(Binary files differ)

Modified: branches/distr-2.1/pkg/distr/man/0distr-package.Rd
===================================================================
--- branches/distr-2.1/pkg/distr/man/0distr-package.Rd	2008-10-10 15:18:36 UTC (rev 299)
+++ branches/distr-2.1/pkg/distr/man/0distr-package.Rd	2008-10-10 15:50:45 UTC (rev 300)
@@ -43,8 +43,8 @@
 \details{
 \tabular{ll}{
 Package: \tab distr\cr
-Version: \tab 2.0 \cr
-Date: \tab 2008-05-08 \cr
+Version: \tab 2.1.0 \cr
+Date: \tab 2008-10-10 \cr
 Depends: \tab R(>= 2.2.0), methods, graphics, startupmsg\cr
 Imports: \tab stats\cr
 LazyLoad: \tab yes\cr
@@ -264,6 +264,11 @@
 and may be called by 
 \code{require("distrDoc");vignette("distr")}
 
+a small vignette on how to generate new distributions with packages \pkg{distr}
+and  \pkg{distrEx} is included and may be called by 
+\code{vignette("newDistributions")}
+
+
 %a more detailed manual for \pkg{distr}, \pkg{distrSim}, \pkg{distrTEst}, and \pkg{distrEx} may be downloaded from  
 %\url{http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf}
 

Modified: branches/distr-2.1/pkg/distrDoc/inst/doc/distr.Rnw
===================================================================
--- branches/distr-2.1/pkg/distrDoc/inst/doc/distr.Rnw	2008-10-10 15:18:36 UTC (rev 299)
+++ branches/distr-2.1/pkg/distrDoc/inst/doc/distr.Rnw	2008-10-10 15:50:45 UTC (rev 300)
@@ -4,9 +4,13 @@
 %\VignettePackage{distr}
 %
 \documentclass[11pt]{article}
-\usepackage{geometry}\usepackage{color}
+\usepackage{geometry}
 \usepackage{ifpdf}
+\usepackage{color}
 \definecolor{darkblue}{rgb}{0.0,0.0,0.75}
+\definecolor{Rcolor}{rgb}{0,0.5,0.5}
+\definecolor{Rout}{rgb}{0.461,0.039,0.102}
+\definecolor{Rcomment}{rgb}{0.101,0.043,0.432}
 \usepackage{amssymb}
 \usepackage[%
 baseurl={http://www.bioconductor.org},%
@@ -19,7 +23,6 @@
 pagecolor=darkblue,raiselinks,plainpages,pdftex]{hyperref}
 %
 \usepackage{Sweave}
-\RequirePackage{color}
 \RequirePackage{listings}  
 %
 \lstset{fancyvrb=true,language=R,basicstyle=\color{Rcolor}\small,
@@ -27,9 +30,6 @@
         literate={<-}{{$\leftarrow$}}2,
         morekeywords=[2]{Norm,Pois,lambda,p,d,r,distroptions}}
 %\newcommand{\ttR}[1]{{\color{Rcolor}\tt #1\color{normal}}}
-\definecolor{Rcolor}{rgb}{0,0.5,0.5}
-\definecolor{Rout}{rgb}{0.461,0.039,0.102}
-\definecolor{Rcomment}{rgb}{0.101,0.043,0.432}
 %
 \DefineVerbatimEnvironment{Sinput}{Verbatim}{formatcom=\color{Rcolor}\lstset{fancyvrb=true}}
 \DefineVerbatimEnvironment{Soutput}{Verbatim}{formatcom=\color{Rout}\lstset{fancyvrb=false}}
@@ -43,8 +43,8 @@
 \newcommand{\code}[1]{{\tt\color{Rcolor} #1}}
 %\newcommand{\code}[1]{\lstinline[escapechar=`]{#1}}
 \newcommand{\pkg}[1]{{\tt "#1"}}
-\newcommand{\pkgversion}{{\tt 2.0}}
-\newcommand{\pkgExversion}{{\tt 2.0}}
+\newcommand{\pkgversion}{{\tt 2.0.1}}
+\newcommand{\pkgExversion}{{\tt 2.0.1}}
 \newcommand{\Reals}{\mathbb{R}}
 \newcommand{\R}{\mathbb{R}}
 \newcommand{\N}{\mathbb{N}}
@@ -1108,10 +1108,10 @@
 and so on. More important, you may also 
 override the automatically chosen $x$-region by passing an \code{xlim} argument:
 <<cauchy1, eval = TRUE, fig = TRUE>>=
-  plot(Cauchy(),withSweave = TRUE)
+  plot(Cauchy())
 @
 <<cauchy2, eval = TRUE, fig = TRUE>>=
-  plot(Cauchy(),xlim=c(-4,4),withSweave = TRUE)
+  plot(Cauchy(),xlim=c(-4,4))
 @
 
 Moreover you may control optional main, inner titles and subtitles with 
@@ -1161,8 +1161,7 @@
 \end{figure}
 \begin{figure}[p]
 <<plotex2, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
-plot(Binom(size = 4, prob = 0.3), do.points = FALSE, verticals = FALSE,
-     withSweave = TRUE)
+plot(Binom(size = 4, prob = 0.3), do.points = FALSE, verticals = FALSE)
 @
 \end{figure}
 
@@ -1175,8 +1174,7 @@
 
 \begin{figure}[p]
 <<plotex4, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
-plot(Binom(size = 4, prob = 0.3), cex.points = 1.2, pch = 20, lwd = 2,
-     withSweave = TRUE)
+plot(Binom(size = 4, prob = 0.3), cex.points = 1.2, pch = 20, lwd = 2)
 @
 \end{figure}
 
@@ -1184,15 +1182,13 @@
 <<plotex5, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
 B <- Binom(size = 4, prob = 0.3)
 plot(B, col="red", col.points = "green", main = TRUE, col.main="blue",
-     col.sub = "orange", sub = TRUE, cex.sub = 0.6, col.inner = "brown",
-     withSweave = TRUE)
+     col.sub = "orange", sub = TRUE, cex.sub = 0.6, col.inner = "brown")
 @
 \end{figure}
 
 \begin{figure}[p]
 <<plotex6, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
-plot(Nbinom(size = 4,prob = 0.3), cex.points = 1.2, pch.u = 20, pch.a = 10,
-     withSweave = TRUE)
+plot(Nbinom(size = 4,prob = 0.3), cex.points = 1.2, pch.u = 20, pch.a = 10)
 @
 \end{figure}
 
@@ -1204,14 +1200,13 @@
 
 \begin{figure}[p]
 <<plotex8, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
-plot(Norm(), lwd=3, col = "red", ngrid = 200, lty = 3, las = 2,
-     withSweave = TRUE)
+plot(Norm(), lwd=3, col = "red", ngrid = 200, lty = 3, las = 2)
 @
 \end{figure}
 
 \begin{figure}[p]
 <<plotex9, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
-plot(Norm(), main = "my Distribution: \%A",
+plot(Norm(), panel.first = grid(), main = "my Distribution: \%A",
      inner = list(expression(paste(lambda, "-density of \%C(\%P)")), "CDF",
                   "Pseudo-inverse with param's \%N"),
      sub = "this plot was correctly generated on \%D",

Modified: pkg/distr/chm/0distr-package.html
===================================================================
--- pkg/distr/chm/0distr-package.html	2008-10-10 15:18:36 UTC (rev 299)
+++ pkg/distr/chm/0distr-package.html	2008-10-10 15:50:45 UTC (rev 300)
@@ -64,10 +64,10 @@
   <td align="left">Package: </td>  <td align="left"> distr</td>
 </tr>
 <tr>
-  <td align="left"> Version: </td>  <td align="left"> 2.0 </td>
+  <td align="left"> Version: </td>  <td align="left"> 2.0.1 </td>
 </tr>
 <tr>
-  <td align="left"> Date: </td>  <td align="left"> 2008-05-08 </td>
+  <td align="left"> Date: </td>  <td align="left"> 2008-10-10 </td>
 </tr>
 <tr>
   <td align="left"> Depends: </td>  <td align="left"> R(&gt;= 2.2.0), methods, graphics, startupmsg</td>
@@ -369,6 +369,11 @@
 <code>require("distrDoc");vignette("distr")</code>
 </p>
 <p>
+a small vignette on how to generate new distributions with packages <span class="pkg">distr</span>
+and  <span class="pkg">distrEx</span> is included and may be called by 
+<code>vignette("newDistributions")</code>
+</p>
+<p>
 a homepage to this package is available under<br>
 <a href="http://distr.r-forge.r-project.org/">http://distr.r-forge.r-project.org/</a>
 </p>
@@ -395,6 +400,6 @@
 </script>
 
 
-<hr><div align="center">[Package <em>distr</em> version 2.0 <a href="00Index.html">Index]</a></div>
+<hr><div align="center">[Package <em>distr</em> version 2.0.1 <a href="00Index.html">Index]</a></div>
 
 </body></html>

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

Modified: pkg/distr/inst/doc/Rplots.pdf
===================================================================
--- pkg/distr/inst/doc/Rplots.pdf	2008-10-10 15:18:36 UTC (rev 299)
+++ pkg/distr/inst/doc/Rplots.pdf	2008-10-10 15:50:45 UTC (rev 300)
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20081010165407)
-/ModDate (D:20081010165407)
+/CreationDate (D:20081010174101)
+/ModDate (D:20081010174101)
 /Title (R Graphics Output)
 /Producer (R 2.8.0)
 /Creator (R)
@@ -298,7 +298,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
@@ -335,7 +335,7 @@
 72.93 128.67 l
 73.03 129.93 l
 73.13 131.22 l
-73.23 132.51 l
+73.23 132.52 l
 73.34 133.83 l
 73.44 135.17 l
 73.54 136.52 l
@@ -365,7 +365,7 @@
 75.96 174.31 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
@@ -373,7 +373,7 @@
 76.77 189.14 l
 76.87 191.06 l
 76.97 193.01 l
-77.08 194.96 l
+77.08 194.97 l
 77.18 196.94 l
 77.28 198.93 l
 77.38 200.93 l
@@ -384,7 +384,7 @@
 77.88 211.18 l
 77.99 213.27 l
 78.09 215.38 l
-78.19 217.49 l
+78.19 217.50 l
 78.29 219.63 l
 78.39 221.77 l
 78.49 223.93 l
@@ -399,7 +399,7 @@
 79.40 243.87 l
 79.50 246.13 l
 79.60 248.41 l
-79.70 250.69 l
+79.70 250.70 l
 79.81 252.99 l
 79.91 255.29 l
 80.01 257.60 l
@@ -435,14 +435,14 @@
 83.04 328.28 l
 83.14 330.60 l
 83.24 332.92 l
-83.34 335.22 l
+83.34 335.23 l
 83.44 337.53 l
 83.55 339.82 l
 83.65 342.10 l
 83.75 344.37 l
 83.85 346.63 l
 83.95 348.88 l
-84.05 351.12 l
+84.05 351.11 l
 84.15 353.34 l
 84.25 355.55 l
 84.35 357.75 l
@@ -456,7 +456,7 @@
 85.16 374.78 l
 85.26 376.84 l
 85.37 378.87 l
-85.47 380.89 l
+85.47 380.88 l
 85.57 382.88 l
 85.67 384.85 l
 85.77 386.81 l
@@ -466,7 +466,7 @@
 86.17 394.40 l
 86.28 396.24 l
 86.38 398.05 l
-86.48 399.85 l
+86.48 399.84 l
 86.58 401.61 l
 86.68 403.35 l
 86.78 405.07 l
@@ -476,7 +476,7 @@
 87.19 411.66 l
 87.29 413.24 l
 87.39 414.79 l
-87.49 416.31 l
+87.49 416.32 l
 87.59 417.81 l
 87.69 419.27 l
 87.79 420.70 l
@@ -529,7 +529,7 @@
 92.54 448.49 l
 92.64 448.18 l
 92.75 447.83 l
-92.85 447.44 l
+92.85 447.45 l
 92.95 447.02 l
 93.05 446.56 l
 93.15 446.06 l
@@ -556,7 +556,7 @@
 95.27 427.34 l
 95.37 426.08 l
 95.48 424.79 l
-95.58 423.47 l
+95.58 423.46 l
 95.68 422.11 l
 95.78 420.73 l
 95.88 419.32 l
@@ -576,7 +576,7 @@
 97.30 396.72 l
 97.40 394.92 l
 97.50 393.10 l
-97.60 391.26 l
+97.60 391.25 l
 97.70 389.39 l
 97.80 387.51 l
 97.90 385.60 l
@@ -592,7 +592,7 @@
 98.91 365.56 l
 99.01 363.46 l
 99.11 361.36 l
-99.22 359.23 l
+99.22 359.24 l
 99.32 357.10 l
 99.42 354.96 l
 99.52 352.80 l
@@ -615,7 +615,7 @@
 101.24 314.79 l
 101.34 312.50 l
 101.44 310.21 l
-101.54 307.93 l
+101.54 307.92 l
 101.64 305.63 l
 101.74 303.34 l
 101.84 301.05 l
@@ -642,17 +642,17 @@
 103.97 253.51 l
 104.07 251.30 l
 104.17 249.11 l
-104.27 246.92 l
+104.27 246.93 l
 104.37 244.75 l
 104.47 242.58 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
 105.18 227.71 l
-105.28 225.63 l
+105.28 225.62 l
 105.38 223.55 l
 105.48 221.50 l
 105.59 219.45 l
@@ -660,14 +660,14 @@
 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
 106.49 201.63 l
-106.60 199.72 l
+106.60 199.71 l
 106.70 197.82 l
-106.80 195.94 l
+106.80 195.93 l
 106.90 194.07 l
 107.00 192.21 l
 107.10 190.37 l
@@ -700,7 +700,7 @@
 109.83 146.68 l
 109.93 145.29 l
 110.03 143.91 l
-110.13 142.56 l
+110.13 142.55 l
 110.24 141.21 l
 110.34 139.89 l
 110.44 138.58 l

Modified: pkg/distr/inst/doc/newDistributions.pdf
===================================================================
(Binary files differ)

Modified: pkg/distr/man/0distr-package.Rd
===================================================================
--- pkg/distr/man/0distr-package.Rd	2008-10-10 15:18:36 UTC (rev 299)
+++ pkg/distr/man/0distr-package.Rd	2008-10-10 15:50:45 UTC (rev 300)
@@ -43,8 +43,8 @@
 \details{
 \tabular{ll}{
 Package: \tab distr\cr
-Version: \tab 2.0 \cr
-Date: \tab 2008-05-08 \cr
+Version: \tab 2.0.1 \cr
+Date: \tab 2008-10-10 \cr
 Depends: \tab R(>= 2.2.0), methods, graphics, startupmsg\cr
 Imports: \tab stats\cr
 LazyLoad: \tab yes\cr
@@ -264,6 +264,11 @@
 and may be called by 
 \code{require("distrDoc");vignette("distr")}
 
+a small vignette on how to generate new distributions with packages \pkg{distr}
+and  \pkg{distrEx} is included and may be called by 
+\code{vignette("newDistributions")}
+
+
 %a more detailed manual for \pkg{distr}, \pkg{distrSim}, \pkg{distrTEst}, and \pkg{distrEx} may be downloaded from  
 %\url{http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf}
 

Modified: pkg/distrDoc/chm/00Index.html
===================================================================
--- pkg/distrDoc/chm/00Index.html	2008-10-10 15:18:36 UTC (rev 299)
+++ pkg/distrDoc/chm/00Index.html	2008-10-10 15:50:45 UTC (rev 300)
@@ -10,7 +10,7 @@
 <param name="keyword" value=".. contents">
 </object>
 
-<h2>Help pages for package &lsquo;distrDoc&rsquo; version 2.0</h2>
+<h2>Help pages for package &lsquo;distrDoc&rsquo; version 2.0.1</h2>
 
 
 <table width="100%">

Modified: pkg/distrDoc/inst/doc/distr.Rnw
===================================================================
--- pkg/distrDoc/inst/doc/distr.Rnw	2008-10-10 15:18:36 UTC (rev 299)
+++ pkg/distrDoc/inst/doc/distr.Rnw	2008-10-10 15:50:45 UTC (rev 300)
@@ -4,9 +4,13 @@
 %\VignettePackage{distr}
 %
 \documentclass[11pt]{article}
-\usepackage{geometry}\usepackage{color}
+\usepackage{geometry}
 \usepackage{ifpdf}
+\usepackage{color}
 \definecolor{darkblue}{rgb}{0.0,0.0,0.75}
+\definecolor{Rcolor}{rgb}{0,0.5,0.5}
+\definecolor{Rout}{rgb}{0.461,0.039,0.102}
+\definecolor{Rcomment}{rgb}{0.101,0.043,0.432}
 \usepackage{amssymb}
 \usepackage[%
 baseurl={http://www.bioconductor.org},%
@@ -19,7 +23,6 @@
 pagecolor=darkblue,raiselinks,plainpages,pdftex]{hyperref}
 %
 \usepackage{Sweave}
-\RequirePackage{color}
 \RequirePackage{listings}  
 %
 \lstset{fancyvrb=true,language=R,basicstyle=\color{Rcolor}\small,
@@ -27,9 +30,6 @@
         literate={<-}{{$\leftarrow$}}2,
         morekeywords=[2]{Norm,Pois,lambda,p,d,r,distroptions}}
 %\newcommand{\ttR}[1]{{\color{Rcolor}\tt #1\color{normal}}}
-\definecolor{Rcolor}{rgb}{0,0.5,0.5}
-\definecolor{Rout}{rgb}{0.461,0.039,0.102}
-\definecolor{Rcomment}{rgb}{0.101,0.043,0.432}
 %
 \DefineVerbatimEnvironment{Sinput}{Verbatim}{formatcom=\color{Rcolor}\lstset{fancyvrb=true}}
 \DefineVerbatimEnvironment{Soutput}{Verbatim}{formatcom=\color{Rout}\lstset{fancyvrb=false}}
@@ -43,8 +43,8 @@
 \newcommand{\code}[1]{{\tt\color{Rcolor} #1}}
 %\newcommand{\code}[1]{\lstinline[escapechar=`]{#1}}
 \newcommand{\pkg}[1]{{\tt "#1"}}
-\newcommand{\pkgversion}{{\tt 2.0}}
-\newcommand{\pkgExversion}{{\tt 2.0}}
+\newcommand{\pkgversion}{{\tt 2.0.1}}
+\newcommand{\pkgExversion}{{\tt 2.0.1}}
 \newcommand{\Reals}{\mathbb{R}}
 \newcommand{\R}{\mathbb{R}}
 \newcommand{\N}{\mathbb{N}}
@@ -1108,10 +1108,10 @@
 and so on. More important, you may also 
 override the automatically chosen $x$-region by passing an \code{xlim} argument:
 <<cauchy1, eval = TRUE, fig = TRUE>>=
-  plot(Cauchy(),withSweave = TRUE)
+  plot(Cauchy())
 @
 <<cauchy2, eval = TRUE, fig = TRUE>>=
-  plot(Cauchy(),xlim=c(-4,4),withSweave = TRUE)
+  plot(Cauchy(),xlim=c(-4,4))
 @
 
 Moreover you may control optional main, inner titles and subtitles with 
@@ -1161,8 +1161,7 @@
 \end{figure}
 \begin{figure}[p]
 <<plotex2, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
-plot(Binom(size = 4, prob = 0.3), do.points = FALSE, verticals = FALSE,
-     withSweave = TRUE)
+plot(Binom(size = 4, prob = 0.3), do.points = FALSE, verticals = FALSE)
 @
 \end{figure}
 
@@ -1175,8 +1174,7 @@
 
 \begin{figure}[p]
 <<plotex4, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
-plot(Binom(size = 4, prob = 0.3), cex.points = 1.2, pch = 20, lwd = 2,
-     withSweave = TRUE)
+plot(Binom(size = 4, prob = 0.3), cex.points = 1.2, pch = 20, lwd = 2)
 @
 \end{figure}
 
@@ -1184,15 +1182,13 @@
 <<plotex5, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
 B <- Binom(size = 4, prob = 0.3)
 plot(B, col="red", col.points = "green", main = TRUE, col.main="blue",
-     col.sub = "orange", sub = TRUE, cex.sub = 0.6, col.inner = "brown",
-     withSweave = TRUE)
+     col.sub = "orange", sub = TRUE, cex.sub = 0.6, col.inner = "brown")
 @
 \end{figure}
 
 \begin{figure}[p]
 <<plotex6, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
-plot(Nbinom(size = 4,prob = 0.3), cex.points = 1.2, pch.u = 20, pch.a = 10,
-     withSweave = TRUE)
+plot(Nbinom(size = 4,prob = 0.3), cex.points = 1.2, pch.u = 20, pch.a = 10)
 @
 \end{figure}
 
@@ -1204,14 +1200,13 @@
 
 \begin{figure}[p]
 <<plotex8, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
-plot(Norm(), lwd=3, col = "red", ngrid = 200, lty = 3, las = 2,
-     withSweave = TRUE)
+plot(Norm(), lwd=3, col = "red", ngrid = 200, lty = 3, las = 2)
 @
 \end{figure}
 
 \begin{figure}[p]
 <<plotex9, eval = TRUE, fig = TRUE, width=8.0,height=4.5>>=
-plot(Norm(), main = "my Distribution: \%A",
+plot(Norm(), panel.first = grid(), main = "my Distribution: \%A",
      inner = list(expression(paste(lambda, "-density of \%C(\%P)")), "CDF",
                   "Pseudo-inverse with param's \%N"),
      sub = "this plot was correctly generated on \%D",



More information about the Distr-commits mailing list