[Distr-commits] r521 - branches/distr-2.2/pkg/SweaveListingUtils/R branches/distr-2.2/pkg/SweaveListingUtils/chm branches/distr-2.2/pkg/SweaveListingUtils/inst/doc branches/distr-2.2/pkg/SweaveListingUtils/man branches/distr-2.2/pkg/distr/R branches/distr-2.2/pkg/distr/chm branches/distr-2.2/pkg/distr/inst/doc branches/distr-2.2/pkg/distrDoc/chm branches/distr-2.2/pkg/distrEx/chm branches/distr-2.2/pkg/distrEx/src branches/distr-2.2/pkg/distrMod/chm pkg/SweaveListingUtils pkg/SweaveListingUtils/R pkg/SweaveListingUtils/chm pkg/SweaveListingUtils/inst/doc pkg/SweaveListingUtils/man pkg/distr pkg/distr/R pkg/distr/chm pkg/distr/inst/doc pkg/distrDoc/chm pkg/distrEx/chm
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Aug 9 21:42:14 CEST 2009
Author: ruckdeschel
Date: 2009-08-09 21:42:13 +0200 (Sun, 09 Aug 2009)
New Revision: 521
Modified:
branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingOptions.R
branches/distr-2.2/pkg/SweaveListingUtils/R/keywordsStyle.R
branches/distr-2.2/pkg/SweaveListingUtils/chm/00Index.html
branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingOptions.html
branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.toc
branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingOptions.Rd
branches/distr-2.2/pkg/distr/R/internalUtils_LCD.R
branches/distr-2.2/pkg/distr/chm/Distr.chm
branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf
branches/distr-2.2/pkg/distr/inst/doc/newDistributions.pdf
branches/distr-2.2/pkg/distrDoc/chm/distrDoc.chm
branches/distr-2.2/pkg/distrEx/chm/distrEx.chm
branches/distr-2.2/pkg/distrEx/src/distrEx.dll
branches/distr-2.2/pkg/distrMod/chm/MCEstimator.html
branches/distr-2.2/pkg/distrMod/chm/MDEstimator.html
branches/distr-2.2/pkg/distrMod/chm/distrMod.chm
pkg/SweaveListingUtils/DESCRIPTION
pkg/SweaveListingUtils/R/SweaveListingOptions.R
pkg/SweaveListingUtils/R/keywordsStyle.R
pkg/SweaveListingUtils/chm/00Index.html
pkg/SweaveListingUtils/chm/SweaveListingOptions.html
pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
pkg/SweaveListingUtils/chm/SweaveListingUtils.toc
pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
pkg/SweaveListingUtils/man/SweaveListingOptions.Rd
pkg/distr/DESCRIPTION
pkg/distr/R/internalUtils_LCD.R
pkg/distr/chm/00Index.html
pkg/distr/chm/Distr.chm
pkg/distr/inst/doc/Rplots.pdf
pkg/distr/inst/doc/newDistributions.pdf
pkg/distrDoc/chm/distrDoc.chm
pkg/distrEx/chm/distrEx.chm
Log:
distr: fixed buglet in .qmixfun
SweaveListingUtils: fixed buglets in keywordstyles (caused error in vignette to distr)
renewed vignettes
Modified: branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingOptions.R
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingOptions.R 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingOptions.R 2009-08-09 19:42:13 UTC (rev 521)
@@ -34,9 +34,10 @@
Rbcolor = c(0,0.6,0.6),
Routcolor = c(0.461,0.039,0.102),
Rcommentcolor = c(0.101,0.043,0.432),
-pkv = "2.0.2",
+pkv = "2.1.4",
pkg = "distr",
Keywordstyle = "{\\bf}",
+Recomd.Keywordstyle = "{\\bf\\color{RRecomdcolor}}",
interm.Keywordstyle = "{\\bf\\color{Rbcolor}}",
overwrite = FALSE,
intermediate = TRUE,
Modified: branches/distr-2.2/pkg/SweaveListingUtils/R/keywordsStyle.R
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/R/keywordsStyle.R 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/SweaveListingUtils/R/keywordsStyle.R 2009-08-09 19:42:13 UTC (rev 521)
@@ -27,7 +27,8 @@
if(missing(defkws))
defkwsI <- setBaseOrRecommended(pkgs = pkgs[idxNIn])
else{
- defkwsI <- if(length(idxNIn)) defkws[idxNIn] else defkws
+ defkwsI <- if(length(idxNIn)<=length(defkws)) defkws[idxNIn] else defkws
+ defkwsI <- defkwsI[!is.na(defkwsI)]
defkwsI <- rep(defkwsI, length.out = length(idxNIn))
defkwsI <- setBaseOrRecommended(pkgs = pkgs[idxNIn], kws = defkwsI)
}
@@ -40,8 +41,6 @@
}
lstsetLanguage <- function(pkgs, posIdx, keywordstyles, overwrite = FALSE){
- if(is.null(.numberofRequires)) .numberofRequires <<- 1
- else .numberofRequires <<- .numberofRequires + 1
genKWL <- function(pkg, kwd, kws, withcomma = TRUE){
if (!overwrite)
kwd <- kwd[!kwd%in%.keywordsR]
@@ -93,14 +92,16 @@
pkgs <- .packages()[posIdx]
lP <- length(posIdx)
if(missing(keywordstyles)){
- keywordstyles <- getSweaveListingOption("Keywordstyle")
- keywordstyles <- rep(keywordstyles, length.out = lP)
- keywordstyles <- setBaseOrRecommended(pkgs = pkgs,
- kws = keywordstyles)
+# keywordstyles <- getSweaveListingOption("Keywordstyle")
+# keywordstyles <- rep(keywordstyles, length.out = lP)
+ keywordstyles <- setBaseOrRecommended(pkgs = pkgs)# ,
+# kws = keywordstyles)
}else
keywordstyles <- rep(keywordstyles, length.out = lP)
if(lP) {
+ if(is.null(.numberofRequires)) .numberofRequires <<- 1
+ else .numberofRequires <<- .numberofRequires + 1
withcomma <- TRUE
pos1 <- 0
for(i in 1: lP){
@@ -127,8 +128,6 @@
}
changeKeywordstyles <- function(pkgs, keywordstyles){
- if(is.null(.numberofRequires)) .numberofRequires <<- 1
- else .numberofRequires <<- .numberofRequires + 1
setkws <- function(num, kws){
cat("%\n\\lstdefinestyle{RstyleO",.numberofRequires+1,"}{style=RstyleO",
.numberofRequires,",%\n", sep="")
@@ -158,9 +157,12 @@
keywordstyles <- getSweaveListingOption("Keywordstyle")
keywordstyles <- rep(keywordstyles, length.out = lP)
- if(lP) for(i in 1: lP)
- setkws(num = numIdx[i],
- kws = keywordstyles[i])
+ if(lP){
+ if(is.null(.numberofRequires)) .numberofRequires <<- 1
+ else .numberofRequires <<- .numberofRequires + 1
+ for(i in 1: lP)
+ setkws(num = numIdx[i], kws = keywordstyles[i])
+ }
return(invisible())
}
@@ -212,7 +214,7 @@
rerg <- suppressPackageStartupMessages(do.call(fct, args=mc))
pnew <- .packages()
pdiff <- pnew[! pnew %in% pold]
- pint <- pdiff[!pdiff == pkg]
+ pint <- pdiff[!pdiff %in% pkg]
#
if(is.null(interm.keywordstyles) && length(pint))
interm.keywordstyles <- lookUpKeywordStyles(pkgs = pint,
@@ -253,10 +255,13 @@
setBaseOrRecommended <- function(pkgs,kws){
idxRec <- as.logical(isBaseOrRecommended(pkgs = pkgs))
- if(missing(kws))
+ if(missing(kws)) {
kws <- rep(getSweaveListingOption("Keywordstyle"),
length.out = length(pkgs))
- else
+ if(length(idxRec))
+ kws[idxRec] <- rep(getSweaveListingOption("Recomd.Keywordstyle"),
+ length.out = length(idxRec))
+ }else
kws <- rep(kws, length.out = length(pkgs))
if(any(idxRec)){
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/00Index.html
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/chm/00Index.html 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/SweaveListingUtils/chm/00Index.html 2009-08-09 19:42:13 UTC (rev 521)
@@ -79,6 +79,8 @@
<td>readPkgVersion</td></tr>
<tr><td width="25%"><a href="readSourceFromRForge.html">readSourceFromRForge</a></td>
<td>readSourceFromRForge</td></tr>
+<tr><td width="25%"><a href="SweaveListingOptions.html">Recomd.Keywordstyle</a></td>
+<td>Function to change the global options of the package 'SweaveListingUtils'</td></tr>
<tr><td width="25%"><a href="library.html">require</a></td>
<td>Loading Packages with registering symbols for TeX package 'listing'</td></tr>
<tr><td width="25%"><a href="SweaveListingOptions.html">Rin</a></td>
@@ -87,6 +89,8 @@
<td>Function to change the global options of the package 'SweaveListingUtils'</td></tr>
<tr><td width="25%"><a href="SweaveListingOptions.html">Routcolor</a></td>
<td>Function to change the global options of the package 'SweaveListingUtils'</td></tr>
+<tr><td width="25%"><a href="SweaveListingOptions.html">RRecomdcolor</a></td>
+<td>Function to change the global options of the package 'SweaveListingUtils'</td></tr>
<tr><td width="25%"><a href="SweaveListingOptions.html">Rset</a></td>
<td>Function to change the global options of the package 'SweaveListingUtils'</td></tr>
<tr><td width="25%"><a href="setToBeDefinedPkgs.html">setToBeDefinedPkgs</a></td>
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingOptions.html
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingOptions.html 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingOptions.html 2009-08-09 19:42:13 UTC (rev 521)
@@ -16,10 +16,12 @@
<param name="keyword" value="R: Rcolor">
<param name="keyword" value="R: Rbcolor">
<param name="keyword" value="R: Routcolor">
+<param name="keyword" value="R: RRecomdcolor">
<param name="keyword" value="R: Rcommentcolor">
<param name="keyword" value="R: pkg">
<param name="keyword" value="R: pkv">
<param name="keyword" value="R: Keywordstyle">
+<param name="keyword" value="R: Recomd.Keywordstyle">
<param name="keyword" value="R: interm.Keywordstyle">
<param name="keyword" value="R: intermediate">
<param name="keyword" value="R: overwrite">
@@ -132,8 +134,11 @@
shall they show Sweave-behaviour? defaults to <code>FALSE</code></dd>
<dt>Keywordstyle:</dt><dd>default setting for <font face="Courier New,Courier" color="#666666"><b>R</b></font>-symbols as character;
defaults to <code>"{\\bf}"</code></dd>
-<dt>interm.Keywordstyle:</dt><dd>default setting for package name as character;
+<dt>interm.Keywordstyle:</dt><dd>default setting for <font face="Courier New,Courier" color="#666666"><b>R</b></font>-symbols in an intermediate package as character;
defaults to <code>"{\\bf\\color{Rbcolor}}"</code></dd>
+<dt>Recomd.Keywordstyle:</dt><dd>default setting for <font face="Courier New,Courier" color="#666666"><b>R</b></font>-symbols in package <span class="pkg">base</span> or
+another recommended package as character;
+defaults to <code>"{\\bf\\color{Recomdcolor}}"</code></dd>
<dt>intermediate:</dt><dd>default setting: shall symbols from automatically loaded
intermediate packages also be registered for listings-printing?
defaults to <code>TRUE</code></dd>
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.toc
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.toc 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.toc 2009-08-09 19:42:13 UTC (rev 521)
@@ -142,6 +142,10 @@
<param name="Local" value="readSourceFromRForge.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
+<param name="Name" value="Recomd.Keywordstyle">
+<param name="Local" value="SweaveListingOptions.html">
+</OBJECT>
+<LI> <OBJECT type="text/sitemap">
<param name="Name" value="require">
<param name="Local" value="library.html">
</OBJECT>
@@ -158,6 +162,10 @@
<param name="Local" value="SweaveListingOptions.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
+<param name="Name" value="RRecomdcolor">
+<param name="Local" value="SweaveListingOptions.html">
+</OBJECT>
+<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Rset">
<param name="Local" value="SweaveListingOptions.html">
</OBJECT>
Modified: branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2009-08-09 19:42:13 UTC (rev 521)
@@ -119,21 +119,21 @@
\begin{abstract}
% -------------------------------------------------------------------------------
In this vignette, we give short examples how to use package
-\pkg{SweaveListingUtils} in a vignette.
+\pkg{SweaveListingUtils}.
% -------------------------------------------------------------------------------
\end{abstract}
%
% -------------------------------------------------------------------------------
\section[What package SweaveListingUtils is for]{What package {\tt SweaveListingUtils} is for}
% -------------------------------------------------------------------------------
-Package \pkg{SweaveListingUtils}
-provides utilities for combining {\tt Sweave}, confer \citet{Lei:02a,Lei:02b,Lei:03}.
-with functionality of \TeX-package-\file{listings}, confer \citet{H:M:07}.
+Package \pkg{SweaveListingUtils}
+provides utilities for combining {\tt Sweave}, confer \citet{Lei:02a,Lei:02b,Lei:03},
+with functionality of \TeX-package-\file{listings}, confer \citet{H:M:07}.
In particular, we define {\sf R} / {\tt Rd} as \TeX-package-\file{listings}
-"language" and functionality to include {\sf R} / {\tt Rd} source file
-(sniplets) copied from an url, by default from the {\tt svn} server at
-\href{http://r-forge.r-project.org/}{R-forge}, confer \citet{RForge} in
-its most recent version, thereby avoiding inconsistencies between vignette and
+"language" and functionality to include {\sf R} / {\tt Rd} source file
+(sniplets) copied from an url, by default from the {\tt svn} server at
+\href{http://r-forge.r-project.org/}{R-forge}, confer \citet{RForge} in
+its most recent version, thereby avoiding inconsistencies between vignette and
documented source code.
In this respect it supports (and to some extent enhances) {\tt Sweave}.
%
Modified: branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingOptions.Rd
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingOptions.Rd 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingOptions.Rd 2009-08-09 19:42:13 UTC (rev 521)
@@ -10,10 +10,12 @@
\alias{Rcolor}
\alias{Rbcolor}
\alias{Routcolor}
+\alias{RRecomdcolor}
\alias{Rcommentcolor}
\alias{pkg}
\alias{pkv}
\alias{Keywordstyle}
+\alias{Recomd.Keywordstyle}
\alias{interm.Keywordstyle}
\alias{intermediate}
\alias{overwrite}
@@ -103,8 +105,11 @@
shall they show Sweave-behaviour? defaults to \code{FALSE}}
\item{Keywordstyle:}{default setting for \R-symbols as character;
defaults to \code{"{\\\\bf}"}}
-\item{interm.Keywordstyle:}{default setting for package name as character;
+\item{interm.Keywordstyle:}{default setting for \R-symbols in an intermediate package as character;
defaults to \code{"{\\\\bf\\\\color{Rbcolor}}"}}
+\item{Recomd.Keywordstyle:}{default setting for \R-symbols in package \pkg{base} or
+ another recommended package as character;
+ defaults to \code{"{\\\\bf\\\\color{Recomdcolor}}"}}
\item{intermediate:}{default setting: shall symbols from automatically loaded
intermediate packages also be registered for listings-printing?
defaults to \code{TRUE}}
Modified: branches/distr-2.2/pkg/distr/R/internalUtils_LCD.R
===================================================================
--- branches/distr-2.2/pkg/distr/R/internalUtils_LCD.R 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/distr/R/internalUtils_LCD.R 2009-08-09 19:42:13 UTC (rev 521)
@@ -153,8 +153,8 @@
loup <- .loupmixfun(mixDistr)
n <- getdistrOption("DefaultNrGridPoints")
- up <- min(loup$qu,1000)#getdistrOption("LARGE")
- lo <- max(loup$ql,-1000)#getdistrOption("LARGE")
+ up <- if(is.finite(loup$qu)) loup$qu else 1000 #min(loup$qu,1000)#getdistrOption("LARGE")
+ lo <- if(is.finite(loup$ql)) loup$ql else -1000 #max(loup$ql,-1000)#getdistrOption("LARGE")
h <- (up-lo)/n
suppsA <- NULL
Modified: branches/distr-2.2/pkg/distr/chm/Distr.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf
===================================================================
--- branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/distr/inst/doc/Rplots.pdf 2009-08-09 19:42:13 UTC (rev 521)
@@ -2,8 +2,8 @@
%âãÏÓ\r
1 0 obj
<<
-/CreationDate (D:20090703232757)
-/ModDate (D:20090703232757)
+/CreationDate (D:20090809210541)
+/ModDate (D:20090809210541)
/Title (R Graphics Output)
/Producer (R 2.10.0)
/Creator (R)
@@ -47,7 +47,7 @@
38.97 172.78 m 148.04 172.78 l S
38.97 227.22 m 148.04 227.22 l S
38.97 281.66 m 148.04 281.66 l S
-38.97 336.10 m 148.04 336.10 l S
+38.97 336.09 m 148.04 336.09 l S
38.97 390.53 m 148.04 390.53 l S
38.97 444.97 m 148.04 444.97 l S
0.000 0.000 0.000 RG
@@ -275,7 +275,7 @@
65.15 74.45 l
65.25 74.75 l
65.35 75.05 l
-65.45 75.36 l
+65.45 75.37 l
65.55 75.68 l
65.65 76.01 l
65.75 76.34 l
@@ -344,14 +344,14 @@
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
72.83 127.42 l
72.93 128.67 l
73.03 129.93 l
-73.13 131.22 l
+73.13 131.21 l
73.23 132.51 l
73.34 133.83 l
73.44 135.17 l
@@ -361,13 +361,13 @@
73.84 140.68 l
73.94 142.11 l
74.04 143.55 l
-74.14 145.01 l
+74.14 145.00 l
74.25 146.48 l
74.35 147.98 l
74.45 149.49 l
74.55 151.02 l
74.65 152.57 l
-74.75 154.13 l
+74.75 154.14 l
74.85 155.72 l
74.95 157.32 l
75.05 158.94 l
@@ -375,7 +375,7 @@
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
@@ -386,7 +386,7 @@
76.37 181.59 l
76.47 183.45 l
76.57 185.33 l
-76.67 187.23 l
+76.67 187.22 l
76.77 189.14 l
76.87 191.06 l
76.97 193.01 l
@@ -401,13 +401,13 @@
77.88 211.18 l
77.99 213.27 l
78.09 215.38 l
-78.19 217.50 l
+78.19 217.49 l
78.29 219.63 l
78.39 221.77 l
78.49 223.93 l
78.59 226.10 l
78.69 228.28 l
-78.79 230.47 l
+78.79 230.48 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.90 l
@@ -431,7 +431,7 @@
80.92 278.66 l
81.02 281.02 l
81.12 283.39 l
-81.22 285.76 l
+81.22 285.75 l
81.32 288.13 l
81.42 290.50 l
81.52 292.87 l
@@ -443,12 +443,12 @@
82.13 307.11 l
82.23 309.48 l
82.33 311.84 l
-82.43 314.20 l
+82.43 314.21 l
82.54 316.56 l
82.64 318.92 l
82.74 321.26 l
82.84 323.61 l
-82.94 325.94 l
+82.94 325.95 l
83.04 328.28 l
83.14 330.60 l
83.24 332.92 l
@@ -468,9 +468,9 @@
84.66 364.26 l
84.76 366.40 l
84.86 368.52 l
-84.96 370.63 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
@@ -579,7 +579,7 @@
95.88 419.32 l
95.98 417.88 l
96.08 416.41 l
-96.18 414.91 l
+96.18 414.92 l
96.28 413.39 l
96.39 411.84 l
96.49 410.26 l
@@ -603,7 +603,7 @@
98.31 377.79 l
98.41 375.79 l
98.51 373.78 l
-98.61 371.75 l
+98.61 371.74 l
98.71 369.70 l
98.81 367.63 l
98.91 365.56 l
@@ -636,7 +636,7 @@
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
@@ -655,13 +655,13 @@
103.56 262.39 l
103.66 260.16 l
103.77 257.93 l
-103.87 255.71 l
+103.87 255.72 l
103.97 253.51 l
104.07 251.30 l
104.17 249.11 l
104.27 246.93 l
104.37 244.75 l
-104.47 242.59 l
+104.47 242.58 l
104.57 240.43 l
104.68 238.28 l
104.78 236.14 l
@@ -669,7 +669,7 @@
104.98 231.90 l
105.08 229.80 l
105.18 227.71 l
-105.28 225.62 l
+105.28 225.63 l
105.38 223.56 l
105.48 221.50 l
105.59 219.45 l
@@ -684,7 +684,7 @@
106.49 201.63 l
106.60 199.72 l
106.70 197.82 l
-106.80 195.93 l
+106.80 195.94 l
106.90 194.07 l
107.00 192.21 l
107.10 190.37 l
@@ -700,7 +700,7 @@
108.11 172.83 l
108.21 171.16 l
108.31 169.51 l
-108.42 167.88 l
+108.42 167.87 l
108.52 166.26 l
108.62 164.65 l
108.72 163.06 l
@@ -724,7 +724,7 @@
110.54 137.28 l
110.64 136.00 l
110.74 134.74 l
-110.84 133.49 l
+110.84 133.50 l
110.94 132.27 l
111.04 131.05 l
111.15 129.85 l
@@ -734,7 +734,7 @@
111.55 125.21 l
111.65 124.09 l
111.75 122.99 l
-111.85 121.89 l
+111.85 121.90 l
111.95 120.82 l
112.06 119.76 l
112.16 118.71 l
@@ -1093,7 +1093,7 @@
38.97 172.78 m 34.21 172.78 l S
38.97 227.22 m 34.21 227.22 l S
38.97 281.66 m 34.21 281.66 l S
-38.97 336.10 m 34.21 336.10 l S
+38.97 336.09 m 34.21 336.09 l S
38.97 390.53 m 34.21 390.53 l S
38.97 444.97 m 34.21 444.97 l S
BT
Modified: branches/distr-2.2/pkg/distr/inst/doc/newDistributions.pdf
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/distrDoc/chm/distrDoc.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/distrEx/chm/distrEx.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/distrEx/src/distrEx.dll
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/distrMod/chm/MCEstimator.html
===================================================================
--- branches/distr-2.2/pkg/distrMod/chm/MCEstimator.html 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/distrMod/chm/MCEstimator.html 2009-08-09 19:42:13 UTC (rev 521)
@@ -104,7 +104,7 @@
<h3>Note</h3>
<p>
-The criterion function gets called together with a parameter <code>thetaPar</code>
+The criterion function may be called together with a parameter <code>thetaPar</code>
which is the current parameter value under consideration, i.e.; the value
under which the model distribution is considered. Hence, if desired,
particular criterion functions could make use of this information, by, say
Modified: branches/distr-2.2/pkg/distrMod/chm/MDEstimator.html
===================================================================
--- branches/distr-2.2/pkg/distrMod/chm/MDEstimator.html 2009-08-04 05:14:21 UTC (rev 520)
+++ branches/distr-2.2/pkg/distrMod/chm/MDEstimator.html 2009-08-09 19:42:13 UTC (rev 521)
@@ -104,7 +104,7 @@
<h3>Note</h3>
<p>
-The distance function gets called together with a parameter <code>thetaPar</code>
+The distance function may be called together with a parameter <code>thetaPar</code>
which is the current parameter value under consideration, i.e.; the value
under which the model distribution is considered. Hence, if desired,
particular distance functions could make use of this information, by, say
Modified: branches/distr-2.2/pkg/distrMod/chm/distrMod.chm
===================================================================
(Binary files differ)
Modified: pkg/SweaveListingUtils/DESCRIPTION
===================================================================
--- pkg/SweaveListingUtils/DESCRIPTION 2009-08-04 05:14:21 UTC (rev 520)
+++ pkg/SweaveListingUtils/DESCRIPTION 2009-08-09 19:42:13 UTC (rev 521)
@@ -1,6 +1,6 @@
Package: SweaveListingUtils
Title: Utilities for Sweave together with TeX listings package
-Version: 0.3.3
+Version: 0.3.4
Depends: R(>= 2.0.0), startupmsg
Suggests: distr
Imports: stats
@@ -13,6 +13,6 @@
vignette and documented source code
Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
License: LGPL-3
-Date: 2009-07-29
+Date: 2009-08-09
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
Modified: pkg/SweaveListingUtils/R/SweaveListingOptions.R
===================================================================
--- pkg/SweaveListingUtils/R/SweaveListingOptions.R 2009-08-04 05:14:21 UTC (rev 520)
+++ pkg/SweaveListingUtils/R/SweaveListingOptions.R 2009-08-09 19:42:13 UTC (rev 521)
@@ -37,6 +37,7 @@
pkv = "2.0.2",
pkg = "distr",
Keywordstyle = "{\\bf}",
+Recomd.Keywordstyle = "{\\bf\\color{RRecomdcolor}}",
interm.Keywordstyle = "{\\bf\\color{Rbcolor}}",
overwrite = FALSE,
intermediate = TRUE,
Modified: pkg/SweaveListingUtils/R/keywordsStyle.R
===================================================================
--- pkg/SweaveListingUtils/R/keywordsStyle.R 2009-08-04 05:14:21 UTC (rev 520)
+++ pkg/SweaveListingUtils/R/keywordsStyle.R 2009-08-09 19:42:13 UTC (rev 521)
@@ -27,7 +27,8 @@
if(missing(defkws))
defkwsI <- setBaseOrRecommended(pkgs = pkgs[idxNIn])
else{
- defkwsI <- if(length(idxNIn)) defkws[idxNIn] else defkws
+ defkwsI <- if(length(idxNIn)<=length(defkws)) defkws[idxNIn] else defkws
+ defkwsI <- defkwsI[!is.na(defkwsI)]
defkwsI <- rep(defkwsI, length.out = length(idxNIn))
defkwsI <- setBaseOrRecommended(pkgs = pkgs[idxNIn], kws = defkwsI)
}
@@ -40,8 +41,6 @@
}
lstsetLanguage <- function(pkgs, posIdx, keywordstyles, overwrite = FALSE){
- if(is.null(.numberofRequires)) .numberofRequires <<- 1
- else .numberofRequires <<- .numberofRequires + 1
genKWL <- function(pkg, kwd, kws, withcomma = TRUE){
if (!overwrite)
kwd <- kwd[!kwd%in%.keywordsR]
@@ -93,14 +92,16 @@
pkgs <- .packages()[posIdx]
lP <- length(posIdx)
if(missing(keywordstyles)){
- keywordstyles <- getSweaveListingOption("Keywordstyle")
- keywordstyles <- rep(keywordstyles, length.out = lP)
- keywordstyles <- setBaseOrRecommended(pkgs = pkgs,
- kws = keywordstyles)
+# keywordstyles <- getSweaveListingOption("Keywordstyle")
+# keywordstyles <- rep(keywordstyles, length.out = lP)
+ keywordstyles <- setBaseOrRecommended(pkgs = pkgs)# ,
+# kws = keywordstyles)
}else
keywordstyles <- rep(keywordstyles, length.out = lP)
if(lP) {
+ if(is.null(.numberofRequires)) .numberofRequires <<- 1
+ else .numberofRequires <<- .numberofRequires + 1
withcomma <- TRUE
pos1 <- 0
for(i in 1: lP){
@@ -127,8 +128,6 @@
}
changeKeywordstyles <- function(pkgs, keywordstyles){
- if(is.null(.numberofRequires)) .numberofRequires <<- 1
- else .numberofRequires <<- .numberofRequires + 1
setkws <- function(num, kws){
cat("%\n\\lstdefinestyle{RstyleO",.numberofRequires+1,"}{style=RstyleO",
.numberofRequires,",%\n", sep="")
@@ -158,9 +157,12 @@
keywordstyles <- getSweaveListingOption("Keywordstyle")
keywordstyles <- rep(keywordstyles, length.out = lP)
- if(lP) for(i in 1: lP)
- setkws(num = numIdx[i],
- kws = keywordstyles[i])
+ if(lP){
+ if(is.null(.numberofRequires)) .numberofRequires <<- 1
+ else .numberofRequires <<- .numberofRequires + 1
+ for(i in 1: lP)
+ setkws(num = numIdx[i], kws = keywordstyles[i])
+ }
return(invisible())
}
@@ -212,7 +214,7 @@
rerg <- suppressPackageStartupMessages(do.call(fct, args=mc))
pnew <- .packages()
pdiff <- pnew[! pnew %in% pold]
- pint <- pdiff[!pdiff == pkg]
+ pint <- pdiff[!pdiff %in% pkg]
#
if(is.null(interm.keywordstyles) && length(pint))
interm.keywordstyles <- lookUpKeywordStyles(pkgs = pint,
@@ -253,10 +255,13 @@
setBaseOrRecommended <- function(pkgs,kws){
idxRec <- as.logical(isBaseOrRecommended(pkgs = pkgs))
- if(missing(kws))
+ if(missing(kws)) {
kws <- rep(getSweaveListingOption("Keywordstyle"),
length.out = length(pkgs))
- else
+ if(length(idxRec))
+ kws[idxRec] <- rep(getSweaveListingOption("Recomd.Keywordstyle"),
+ length.out = length(idxRec))
+ }else
kws <- rep(kws, length.out = length(pkgs))
if(any(idxRec)){
Modified: pkg/SweaveListingUtils/chm/00Index.html
===================================================================
--- pkg/SweaveListingUtils/chm/00Index.html 2009-08-04 05:14:21 UTC (rev 520)
+++ pkg/SweaveListingUtils/chm/00Index.html 2009-08-09 19:42:13 UTC (rev 521)
@@ -10,7 +10,7 @@
<param name="keyword" value=".. contents">
</object>
-<h2>Help pages for package ‘SweaveListingUtils’ version 0.3.3</h2>
+<h2>Help pages for package ‘SweaveListingUtils’ version 0.3.4</h2>
<table width="100%">
<tr><td width="25%"><a href="0SweaveListingUtils-package.html">SweaveListingUtils-package</a></td>
@@ -79,6 +79,8 @@
<td>readPkgVersion</td></tr>
<tr><td width="25%"><a href="readSourceFromRForge.html">readSourceFromRForge</a></td>
<td>readSourceFromRForge</td></tr>
+<tr><td width="25%"><a href="SweaveListingOptions.html">Recomd.Keywordstyle</a></td>
+<td>Function to change the global options of the package 'SweaveListingUtils'</td></tr>
<tr><td width="25%"><a href="library.html">require</a></td>
<td>Loading Packages with registering symbols for TeX package 'listing'</td></tr>
<tr><td width="25%"><a href="SweaveListingOptions.html">Rin</a></td>
@@ -87,6 +89,8 @@
<td>Function to change the global options of the package 'SweaveListingUtils'</td></tr>
<tr><td width="25%"><a href="SweaveListingOptions.html">Routcolor</a></td>
<td>Function to change the global options of the package 'SweaveListingUtils'</td></tr>
+<tr><td width="25%"><a href="SweaveListingOptions.html">RRecomdcolor</a></td>
+<td>Function to change the global options of the package 'SweaveListingUtils'</td></tr>
<tr><td width="25%"><a href="SweaveListingOptions.html">Rset</a></td>
<td>Function to change the global options of the package 'SweaveListingUtils'</td></tr>
<tr><td width="25%"><a href="setToBeDefinedPkgs.html">setToBeDefinedPkgs</a></td>
Modified: pkg/SweaveListingUtils/chm/SweaveListingOptions.html
===================================================================
--- pkg/SweaveListingUtils/chm/SweaveListingOptions.html 2009-08-04 05:14:21 UTC (rev 520)
+++ pkg/SweaveListingUtils/chm/SweaveListingOptions.html 2009-08-09 19:42:13 UTC (rev 521)
@@ -16,10 +16,12 @@
<param name="keyword" value="R: Rcolor">
<param name="keyword" value="R: Rbcolor">
<param name="keyword" value="R: Routcolor">
+<param name="keyword" value="R: RRecomdcolor">
<param name="keyword" value="R: Rcommentcolor">
<param name="keyword" value="R: pkg">
<param name="keyword" value="R: pkv">
<param name="keyword" value="R: Keywordstyle">
+<param name="keyword" value="R: Recomd.Keywordstyle">
<param name="keyword" value="R: interm.Keywordstyle">
<param name="keyword" value="R: intermediate">
<param name="keyword" value="R: overwrite">
@@ -132,8 +134,11 @@
shall they show Sweave-behaviour? defaults to <code>FALSE</code></dd>
<dt>Keywordstyle:</dt><dd>default setting for <font face="Courier New,Courier" color="#666666"><b>R</b></font>-symbols as character;
defaults to <code>"{\\bf}"</code></dd>
-<dt>interm.Keywordstyle:</dt><dd>default setting for package name as character;
+<dt>interm.Keywordstyle:</dt><dd>default setting for <font face="Courier New,Courier" color="#666666"><b>R</b></font>-symbols in an intermediate package as character;
defaults to <code>"{\\bf\\color{Rbcolor}}"</code></dd>
+<dt>Recomd.Keywordstyle:</dt><dd>default setting for <font face="Courier New,Courier" color="#666666"><b>R</b></font>-symbols in package <span class="pkg">base</span> or
+another recommended package as character;
+defaults to <code>"{\\bf\\color{Recomdcolor}}"</code></dd>
<dt>intermediate:</dt><dd>default setting: shall symbols from automatically loaded
intermediate packages also be registered for listings-printing?
defaults to <code>TRUE</code></dd>
@@ -199,6 +204,6 @@
</script>
-<hr><div align="center">[Package <em>SweaveListingUtils</em> version 0.3.2 <a href="00Index.html">Index</a>]</div>
+<hr><div align="center">[Package <em>SweaveListingUtils</em> version 0.3.4 <a href="00Index.html">Index</a>]</div>
</body></html>
Modified: pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
===================================================================
(Binary files differ)
Modified: pkg/SweaveListingUtils/chm/SweaveListingUtils.toc
===================================================================
--- pkg/SweaveListingUtils/chm/SweaveListingUtils.toc 2009-08-04 05:14:21 UTC (rev 520)
+++ pkg/SweaveListingUtils/chm/SweaveListingUtils.toc 2009-08-09 19:42:13 UTC (rev 521)
@@ -142,6 +142,10 @@
<param name="Local" value="readSourceFromRForge.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
+<param name="Name" value="Recomd.Keywordstyle">
+<param name="Local" value="SweaveListingOptions.html">
+</OBJECT>
+<LI> <OBJECT type="text/sitemap">
<param name="Name" value="require">
<param name="Local" value="library.html">
</OBJECT>
@@ -158,6 +162,10 @@
<param name="Local" value="SweaveListingOptions.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
+<param name="Name" value="RRecomdcolor">
+<param name="Local" value="SweaveListingOptions.html">
+</OBJECT>
+<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Rset">
<param name="Local" value="SweaveListingOptions.html">
</OBJECT>
Modified: pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
===================================================================
--- pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2009-08-04 05:14:21 UTC (rev 520)
+++ pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2009-08-09 19:42:13 UTC (rev 521)
@@ -119,7 +119,7 @@
\begin{abstract}
% -------------------------------------------------------------------------------
In this vignette, we give short examples how to use package
-\pkg{SweaveListingUtils} in a vignette.
+\pkg{SweaveListingUtils}.
% -------------------------------------------------------------------------------
\end{abstract}
%
@@ -127,7 +127,7 @@
\section[What package SweaveListingUtils is for]{What package {\tt SweaveListingUtils} is for}
% -------------------------------------------------------------------------------
Package \pkg{SweaveListingUtils}
-provides utilities for combining {\tt Sweave}, confer \citet{Lei:02a,Lei:02b,Lei:03}.
+provides utilities for combining {\tt Sweave}, confer \citet{Lei:02a,Lei:02b,Lei:03},
with functionality of \TeX-package-\file{listings}, confer \citet{H:M:07}.
In particular, we define {\sf R} / {\tt Rd} as \TeX-package-\file{listings}
"language" and functionality to include {\sf R} / {\tt Rd} source file
Modified: pkg/SweaveListingUtils/man/SweaveListingOptions.Rd
===================================================================
--- pkg/SweaveListingUtils/man/SweaveListingOptions.Rd 2009-08-04 05:14:21 UTC (rev 520)
+++ pkg/SweaveListingUtils/man/SweaveListingOptions.Rd 2009-08-09 19:42:13 UTC (rev 521)
@@ -10,10 +10,12 @@
\alias{Rcolor}
\alias{Rbcolor}
\alias{Routcolor}
+\alias{RRecomdcolor}
\alias{Rcommentcolor}
\alias{pkg}
\alias{pkv}
\alias{Keywordstyle}
+\alias{Recomd.Keywordstyle}
\alias{interm.Keywordstyle}
\alias{intermediate}
\alias{overwrite}
@@ -103,8 +105,11 @@
shall they show Sweave-behaviour? defaults to \code{FALSE}}
\item{Keywordstyle:}{default setting for \R-symbols as character;
defaults to \code{"{\\\\bf}"}}
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/distr -r 521
More information about the Distr-commits
mailing list