[Distr-commits] r523 - in branches/distr-2.2/pkg: SweaveListingUtils/chm SweaveListingUtils/man distr/chm distrDoc/chm distrTeach/chm startupmsg/chm
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Aug 11 02:14:42 CEST 2009
Author: ruckdeschel
Date: 2009-08-11 02:14:42 +0200 (Tue, 11 Aug 2009)
New Revision: 523
Modified:
branches/distr-2.2/pkg/SweaveListingUtils/chm/0SweaveListingUtils-package.html
branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingPreparations.html
branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.hhp
branches/distr-2.2/pkg/SweaveListingUtils/chm/lstset.html
branches/distr-2.2/pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd
branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingPreparations.Rd
branches/distr-2.2/pkg/SweaveListingUtils/man/library.Rd
branches/distr-2.2/pkg/SweaveListingUtils/man/lstset.Rd
branches/distr-2.2/pkg/distr/chm/00Index.html
branches/distr-2.2/pkg/distr/chm/Distr.chm
branches/distr-2.2/pkg/distr/chm/Distr.hhp
branches/distr-2.2/pkg/distr/chm/Distr.toc
branches/distr-2.2/pkg/distrDoc/chm/00Index.html
branches/distr-2.2/pkg/distrDoc/chm/distrDoc.chm
branches/distr-2.2/pkg/distrDoc/chm/distrDoc.hhp
branches/distr-2.2/pkg/distrDoc/chm/distrDoc.toc
branches/distr-2.2/pkg/distrTeach/chm/distrTeach.chm
branches/distr-2.2/pkg/distrTeach/chm/distrTeach.hhp
branches/distr-2.2/pkg/startupmsg/chm/startupmsg.chm
branches/distr-2.2/pkg/startupmsg/chm/startupmsg.hhp
Log:
small changes in .Rd files to SweaveListingUtils
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/0SweaveListingUtils-package.html
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/chm/0SweaveListingUtils-package.html 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/SweaveListingUtils/chm/0SweaveListingUtils-package.html 2009-08-11 00:14:42 UTC (rev 523)
@@ -1,10 +1,10 @@
<html><head><title>Package SweaveListingUtils</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="Rchm.css">
-</head>
-<body>
+</head><body>
-<table width="100%"><tr><td>SweaveListingUtils-package(SweaveListingUtils)</td><td align="right">R Documentation</td></tr></table><object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<table width="100%"><tr><td>SweaveListingUtils-package(SweaveListingUtils)</td><td align="right">R Documentation</td></tr></table>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
<param name="keyword" value="R: SweaveListingUtils-package">
<param name="keyword" value="R: SweaveListingUtils">
<param name="keyword" value=" Package SweaveListingUtils">
@@ -21,34 +21,48 @@
provides utilities for defining <font face="Courier New,Courier" color="#666666"><b>R</b></font> / ‘<span class="file">Rd</span>’ as TeX-package-‘<span class="file">listings</span>’
"language" and including <font face="Courier New,Courier" color="#666666"><b>R</b></font> / ‘<span class="file">.Rd</span>’ source file (sniplets) copied
from an url, by default from svn server at R-forge in its most recent version,
-thereby avoiding inconsistencies between vignette and documented source code
+thereby avoiding inconsistencies between vignette and documented source code
</p>
<h3>Details</h3>
<p>
+
+</p>
<table summary="Rd table">
<tr>
- <td align="left">Package: </td> <td align="left"> SweaveListingUtils</td>
+ <td align="left">
+Package: </td><td align="left"> SweaveListingUtils</td>
</tr>
<tr>
- <td align="left"> Version: </td> <td align="left"> 0.3</td>
+ <td align="left">
+Version: </td><td align="left"> 0.4</td>
</tr>
<tr>
- <td align="left"> Date: </td> <td align="left"> 2009-03-19</td>
+ <td align="left">
+Date: </td><td align="left"> 2009-08-10</td>
</tr>
<tr>
- <td align="left"> Depends: </td> <td align="left"> R(>= 2.0.0), startupmsg</td>
+ <td align="left">
+Depends: </td><td align="left"> R(>= 2.0.0), startupmsg</td>
</tr>
<tr>
- <td align="left"> LazyLoad: </td> <td align="left"> yes</td>
+ <td align="left">
+LazyLoad: </td><td align="left"> yes</td>
</tr>
<tr>
- <td align="left"> License: </td> <td align="left"> LGPL-3</td>
+ <td align="left">
+License: </td><td align="left"> LGPL-3</td>
</tr>
-</table>
+<tr>
+ <td align="left">
+</td>
+</tr>
+</table><p>
+
+</p>
<p>
TeX-package ‘<span class="file">listings</span>’, confer <a href="http://www.ctan.org/tex-archive/macros/latex/contrib/listings/">http://www.ctan.org/tex-archive/macros/latex/contrib/listings/</a>,
<a href="http://www.ctan.org/tex-archive/macros/latex/contrib/listings/listings.pdf">http://www.ctan.org/tex-archive/macros/latex/contrib/listings/listings.pdf</a>
@@ -59,7 +73,7 @@
for <font face="Courier New,Courier" color="#666666"><b>R</b></font>. We enhance this definition and also introduce a corresponding
"language" definition file to typeset ‘<span class="file">.Rd</span>’ code
(file ‘<span class="file">Rdlistings.sty</span>’ in the ‘<span class="file">TeX</span>’ subfolder of this package,
-which is according to Duncan Murdoch's ``Parsing Rd Files'' as of Nov. 4 2008.).
+which is according to Duncan Murdoch's “Parsing Rd Files” as of Nov. 4 2008.).
</p>
<p>
In recent versions ‘<span class="file">listings</span>’ also cooperates with TeX package
@@ -77,7 +91,7 @@
<p>
For a corresponding TeX preamble combining Sweave and ‘<span class="file">listings</span>’,
we provide command <br>
-<code><a href="SweaveListingPreparations.html">SweaveListingPreparations</a></code>.
+<code><a href="../../SweaveListingUtils/html/SweaveListingPreparations.html">SweaveListingPreparations</a></code>.
</p>
<p>
As for the <font face="Courier New,Courier" color="#666666"><b>R</b></font> language definition, we allow for different keywordstyles
@@ -88,20 +102,33 @@
More specifically, whenever in some <font face="Courier New,Courier" color="#666666"><b>R</b></font> code sniplet in some Sweave chunk, there
is some <code>library</code> or <code>require</code> command, the corresponding symbols
found by <code>ls()</code> afterwords in some <code>search()</code> entry position, are
-registered as <code><comma-separated keywordlist></code> (printed as 5 items per line)
-as a new "higher order" group of keywords by a corresponding
+registered as <PRE><comma-separated keywordlist></PRE> (printed as 5 items per line)
+as a new "higher order" group of keywords by corresponding
<pre>
- \lstdefinelanguage{R}%
- {morekeywords=[<order number>]{ <comma-separated keywordlist> },%
+ \lstdefinestyle{RstyleO<numi>}% RstyleO<numi> is the current order of Rstyle
+ {style = RstyleO<numi-1>,
+ morekeywords=[<order number>]{ <comma-separated keywordlist> },%
sensitive=true,%
keywordstyle=[<order number>]<keywordstyle as format string>,%
+ % [ possibly more
+ morekeywords=[<order number + 1>]{ <comma-separated keywordlist> },%
+ sensitive=true,%
+ keywordstyle=[<order number + 1>]<keywordstyle as format string>,%
+ % .... ]
}
+ \lstdefinestyle{Rstyle}{style = RstyleO<numi>}
</pre>
-TeX directive in the automatically generated ‘<span class="file">.tex</span>’ file
-where <code><order number></code> is incremented (resp. gets looked up from
+TeX directives in the automatically generated ‘<span class="file">.tex</span>’ file
+where <PRE><order number></PRE> is incremented (resp. gets looked up from
the global, non-exported variable <code>.alreadyDefinedPkgs</code> in the package
name space) at each instance of
-a <code>library</code> or <code>require</code> command.
+a <code>library</code> or <code>require</code> command; an analogue incrementation
+present in <PRE><numi></PRE> is done for subsequent (incremental)
+redefinitions of style <PRE>Rstyle</PRE>,
+which is controlled by the again non-exported global variable
+<code>.numberofRequires</code>. <PRE><order number></PRE> and <PRE><numi></PRE> will
+in general differ, as in one call to <code>require</code>/<code>library</code>, several
+packages may be registered at once.
</p>
<p>
To this end commands
@@ -116,9 +143,11 @@
the svn server at R-forge in its most recent version), this can be
useful to stay consistent with the current version of the code without
having to update vignettes all the time. To this end, besides referencing
-by line numbers, <code><a href="lstinputSourceFromRForge.html">lstinputSourceFromRForge</a></code> also offers
+by line numbers, <code><a href="../../SweaveListingUtils/html/lstinputSourceFromRForge.html">lstinputSourceFromRForge</a></code> also offers
referencing by matching regular expressions.
</p>
+<p>
+</p>
<h3>Functions</h3>
@@ -171,8 +200,15 @@
<EM>Maintainer:</EM> Peter Ruckdeschel <a href="mailto:Peter.Ruckdeschel at itwm.fraunhofer.de">Peter.Ruckdeschel at itwm.fraunhofer.de</a>
</p>
+<script Language="JScript">
+function findlink(pkg, fn) {
+var Y, link;
+Y = location.href.lastIndexOf("\\") + 1;
+link = location.href.substring(0, Y);
+link = link + "../../" + pkg + "/chtml/" + pkg + ".chm::/" + fn;
+location.href = link;
+}
+</script>
-
<hr><div align="center">[Package <em>SweaveListingUtils</em> version 0.4 <a href="00Index.html">Index</a>]</div>
-
</body></html>
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingPreparations.html
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingPreparations.html 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingPreparations.html 2009-08-11 00:14:42 UTC (rev 523)
@@ -1,10 +1,10 @@
<html><head><title>SweaveListingPreparations</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="Rchm.css">
-</head>
-<body>
+</head><body>
-<table width="100%"><tr><td>SweaveListingPreparations(SweaveListingUtils)</td><td align="right">R Documentation</td></tr></table><object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<table width="100%"><tr><td>SweaveListingPreparations(SweaveListingUtils)</td><td align="right">R Documentation</td></tr></table>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
<param name="keyword" value="R: SweaveListingPreparations">
<param name="keyword" value=" SweaveListingPreparations">
</object>
@@ -17,8 +17,7 @@
<p>
helping tool for writing the corresponding TeX preamble commands
-to integrate Sweave and package listings
-</p>
+to integrate Sweave and package listings</p>
<h3>Usage</h3>
@@ -130,14 +129,16 @@
location of a local library in which the described package resides</td></tr>
</table>
+
<h3>Details</h3>
<p>
<code>SweaveListingPreparations</code>
writes a corresponding preamble to the ‘<span class="file">.Rnw</span>’-file for the simultaneous use
-of Sweave and package listings; note that the lines
+of Sweave and package listings; note that so far, even if you do not want to
+use the default style file ‘<span class="file">Sweave.sty</span>’, the lines
<pre>
-\usepackage{Sweave}
+%\usepackage{Sweave}
\SweaveOpts{keep.source=TRUE}
</pre>
still have to appear in the ‘<span class="file">.Rnw</span>’ file — before the corresponding
@@ -154,7 +155,7 @@
defines commands <code>\code</code>, <code>\file</code>, <code>\pkg</code> and sets
the corresponding package version.<br>
The default values are taken from
-<a href="SweaveListingOptions.html">SweaveListingOptions</a>.
+<a href="../../SweaveListingUtils/html/SweaveListingOptions.html">SweaveListingOptions</a>.
The output to stdout can be captured in an ‘<span class="file">.Rnw</span>’ file as
<pre>
<< lstPreamble, results=tex, echo=FALSE>>=
@@ -168,15 +169,16 @@
by <code>require</code> or <code>library</code> without adding extra arguments
to these commands (and hence displaying the actual <font face="Courier New,Courier" color="#666666"><b>R</b></font> code),
you have to set up a global formatting matrix
-<code>.tobeDefinedPkgs</code> by <code><a href="setToBeDefinedPkgs.html">setToBeDefinedPkgs</a></code>.
+<code>.tobeDefinedPkgs</code> by <code><a href="../../SweaveListingUtils/html/setToBeDefinedPkgs.html">setToBeDefinedPkgs</a></code>.
</p>
<h3>Value</h3>
-<p>
-<code>invisible()</code></p>
+<p><code>invisible()</code>
+</p>
+
<h3>Acknowledgement</h3>
<p>
@@ -187,9 +189,7 @@
<h3>Author(s)</h3>
-<p>
-Peter Ruckdeschel <a href="mailto:Peter.Ruckdeschel at itwm.fraunhofer.de">Peter.Ruckdeschel at itwm.fraunhofer.de</a>
-</p>
+<p>Peter Ruckdeschel <a href="mailto:Peter.Ruckdeschel at itwm.fraunhofer.de">Peter.Ruckdeschel at itwm.fraunhofer.de</a></p>
<h3>Examples</h3>
@@ -199,8 +199,15 @@
SweaveListingPreparations(pkv="2.1")
</pre>
+<script Language="JScript">
+function findlink(pkg, fn) {
+var Y, link;
+Y = location.href.lastIndexOf("\\") + 1;
+link = location.href.substring(0, Y);
+link = link + "../../" + pkg + "/chtml/" + pkg + ".chm::/" + fn;
+location.href = link;
+}
+</script>
-
<hr><div align="center">[Package <em>SweaveListingUtils</em> version 0.4 <a href="00Index.html">Index</a>]</div>
-
</body></html>
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.hhp
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.hhp 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.hhp 2009-08-11 00:14:42 UTC (rev 523)
@@ -12,19 +12,6 @@
[FILES]
00Index.html
-0SweaveListingUtils-package.html
-SweaveListingMASK.html
-SweaveListingOptions.html
-SweaveListingPreparations.html
-changeKeywordstyles.html
-copySourceFromRForge.html
+
isBaseOrRecommended.html
-library.html
-lstinputSourceFromRForge.html
-lstset.html
-lstsetLanguage.html
-readPackageVersion.html
-readSourceFromRForge.html
setBaseOrRecommended.html
-setToBeDefinedPkgs.html
-taglist.html
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/lstset.html
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/chm/lstset.html 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/SweaveListingUtils/chm/lstset.html 2009-08-11 00:14:42 UTC (rev 523)
@@ -1,10 +1,10 @@
<html><head><title>lstset and friends</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="Rchm.css">
-</head>
-<body>
+</head><body>
-<table width="100%"><tr><td>lstset(SweaveListingUtils)</td><td align="right">R Documentation</td></tr></table><object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<table width="100%"><tr><td>lstset(SweaveListingUtils)</td><td align="right">R Documentation</td></tr></table>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
<param name="keyword" value="R: lstset">
<param name="keyword" value="R: lstsetRd">
<param name="keyword" value="R: lstsetR">
@@ -21,24 +21,28 @@
<h3>Description</h3>
<p>
-Functions for defining how listings prints R and Rd source code
-</p>
+Functions for defining how listings prints R and Rd source code</p>
<h3>Usage</h3>
<pre>
-lstset(taglist, LineLength = getOption("width"), startS = "\\lstset{")
-lstsetR(Rset = NULL, LineLength = getOption("width"), add = getSweaveListingOption("addRset"),
- startS = "\\lstset{")
-lstsetRd(Rdset = NULL, LineLength = getOption("width"), add = getSweaveListingOption("addRdset"),
- startS = "\\lstset{")
-lstsetRin(Rinset = NULL, LineLength = getOption("width"), add = getSweaveListingOption("addRinset"),
- startS = "\\lstdefinestyle{Rinstyle}{")
-lstsetRout(Routset = NULL, LineLength = getOption("width"), add = getSweaveListingOption("addRoutset"),
- startS = "\\lstdefinestyle{Routstyle}{")
-lstsetRcode(Rcodeset = NULL, LineLength = getOption("width"), add = getSweaveListingOption("addRcodeset"),
- startS = "\\lstdefinestyle{Rcodestyle}{")
+lstset(taglist, LineLength = getOption("width"), startS = "\\lstset\{")
+lstsetR(Rset = NULL, LineLength = getOption("width"),
+ add = getSweaveListingOption("addRset"),
+ startS = "\\lstset\{")
+lstsetRd(Rdset = NULL, LineLength = getOption("width"),
+ add = getSweaveListingOption("addRdset"),
+ startS = "\\lstset\{")
+lstsetRin(Rinset = NULL, LineLength = getOption("width"),
+ add = getSweaveListingOption("addRinset"),
+ startS = "\\lstdefinestyle\{Rinstyle\}\{")
+lstsetRout(Routset = NULL, LineLength = getOption("width"),
+ add = getSweaveListingOption("addRoutset"),
+ startS = "\\lstdefinestyle\{Routstyle\}\{")
+lstsetRcode(Rcodeset = NULL, LineLength = getOption("width"),
+ add = getSweaveListingOption("addRcodeset"),
+ startS = "\\lstdefinestyle\{Rcodestyle\}\{")
</pre>
@@ -85,15 +89,16 @@
<code>Rset</code> resp. <code>Rdset</code> will be appended to default value
lists <code>getSweaveListingOption("Rset")</code> resp.
<code>getSweaveListingOption("Rdset")</code> (see below),
-overwriting respective entries of the default value lists.</td></tr>
+overwriting respective entries of the default value lists.</td></tr>
<tr valign="top"><td><code>startS</code></td>
<td>
-character; defaults to <code>"\\lstset{"</code>; what to do
+character; defaults to <code>"\\lstset\{"</code>; what to do
by default we use <code>\lstset</code>; an alternative is
to use <code>\lstdefinestyle</code> which amounts to
-<code>"\\lstdefinestyle{"</code>.</td></tr>
+<code>"\\lstdefinestyle\{"</code>.</td></tr>
</table>
+
<h3>Details</h3>
<p>
@@ -109,9 +114,9 @@
both <code>lstsetR</code> and <code>lstsetRd</code> use particular default values to
define R resp. Rd output format. More
specifically for R code, it uses
-<a href="SweaveListingOptions.html">getSweaveListingOption("Rset")</a>,
+<a href="../../SweaveListingUtils/html/SweaveListingOptions.html">getSweaveListingOption("Rset")</a>,
and for Rd code, it
-<a href="SweaveListingOptions.html">getSweaveListingOption("Rdset")</a>;
+<a href="../../SweaveListingUtils/html/SweaveListingOptions.html">getSweaveListingOption("Rdset")</a>;
<code>lstsetRin</code>, <code>lstsetRout</code>, and <code>lstsetRcode</code>
are corresponding specialized commands for 'listings' environments
<code>Sinput</code>, <code>Soutput</code>, and <code>Scode</code>, respectively.
@@ -131,26 +136,33 @@
<h3>Value</h3>
<p>
-<code>invisible()</code></p>
+<code>invisible()</code>
+</p>
+
<h3>Author(s)</h3>
-<p>
-Peter Ruckdeschel <a href="mailto:Peter.Ruckdeschel at itwm.fraunhofer.de">Peter.Ruckdeschel at itwm.fraunhofer.de</a>
-</p>
+<p>Peter Ruckdeschel <a href="mailto:Peter.Ruckdeschel at itwm.fraunhofer.de">Peter.Ruckdeschel at itwm.fraunhofer.de</a></p>
<h3>Examples</h3>
<pre>
lstset(taglist(A="H", b=2, 3),30)
-lstset(taglist(A="H", b=2, 3),30, startS = "\\lstdefinestyle{Rstyle}{")
+lstset(taglist(A="H", b=2, 3),30, startS = "\\lstdefinestyle{Rstyle}\{")
lstsetR()
lstsetRd()
</pre>
+<script Language="JScript">
+function findlink(pkg, fn) {
+var Y, link;
+Y = location.href.lastIndexOf("\\") + 1;
+link = location.href.substring(0, Y);
+link = link + "../../" + pkg + "/chtml/" + pkg + ".chm::/" + fn;
+location.href = link;
+}
+</script>
-
<hr><div align="center">[Package <em>SweaveListingUtils</em> version 0.4 <a href="00Index.html">Index</a>]</div>
-
</body></html>
Modified: branches/distr-2.2/pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd 2009-08-11 00:14:42 UTC (rev 523)
@@ -15,8 +15,8 @@
\details{
\tabular{ll}{
Package: \tab SweaveListingUtils\cr
-Version: \tab 0.3\cr
-Date: \tab 2009-03-19\cr
+Version: \tab 0.4\cr
+Date: \tab 2009-08-10\cr
Depends: \tab R(>= 2.0.0), startupmsg\cr
LazyLoad: \tab yes\cr
License: \tab LGPL-3\cr
@@ -53,20 +53,33 @@
More specifically, whenever in some \R code sniplet in some Sweave chunk, there
is some \code{library} or \code{require} command, the corresponding symbols
found by \code{ls()} afterwords in some \code{search()} entry position, are
-registered as \code{<comma-separated keywordlist>} (printed as 5 items per line)
-as a new "higher order" group of keywords by a corresponding
+registered as \verb{<comma-separated keywordlist>} (printed as 5 items per line)
+as a new "higher order" group of keywords by corresponding
\preformatted{
- \\lstdefinelanguage{R}\%
- {morekeywords=[<order number>]{ <comma-separated keywordlist> },\%
+ \\lstdefinestyle{RstyleO<numi>}\% RstyleO<numi> is the current order of Rstyle
+ {style = RstyleO<numi-1>,
+ morekeywords=[<order number>]{ <comma-separated keywordlist> },\%
sensitive=true,\%
keywordstyle=[<order number>]<keywordstyle as format string>,\%
+ \% [ possibly more
+ morekeywords=[<order number + 1>]{ <comma-separated keywordlist> },\%
+ sensitive=true,\%
+ keywordstyle=[<order number + 1>]<keywordstyle as format string>,\%
+ \% .... ]
}
+ \\lstdefinestyle{Rstyle}{style = RstyleO<numi>}
}
-TeX directive in the automatically generated \file{.tex} file
-where \code{<order number>} is incremented (resp. gets looked up from
+TeX directives in the automatically generated \file{.tex} file
+where \verb{<order number>} is incremented (resp. gets looked up from
the global, non-exported variable \code{.alreadyDefinedPkgs} in the package
name space) at each instance of
-a \code{library} or \code{require} command.
+a \code{library} or \code{require} command; an analogue incrementation
+present in \verb{<numi>} is done for subsequent (incremental)
+redefinitions of style \verb{Rstyle},
+which is controlled by the again non-exported global variable
+\code{.numberofRequires}. \verb{<order number>} and \verb{<numi>} will
+in general differ, as in one call to \code{require}/\code{library}, several
+packages may be registered at once.
To this end commands
\code{\link[SweaveListingUtils]{library}} and
Modified: branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingPreparations.Rd
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingPreparations.Rd 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/SweaveListingUtils/man/SweaveListingPreparations.Rd 2009-08-11 00:14:42 UTC (rev 523)
@@ -75,10 +75,11 @@
\details{
\code{SweaveListingPreparations}
writes a corresponding preamble to the \file{.Rnw}-file for the simultaneous use
-of Sweave and package listings; note that the lines
+of Sweave and package listings; note that so far, even if you do not want to
+use the default style file \file{Sweave.sty}, the lines
\preformatted{
-\usepackage{Sweave}
-\SweaveOpts{keep.source=TRUE}
+\%\\usepackage{Sweave}
+\\SweaveOpts{keep.source=TRUE}
}
still have to appear in the \file{.Rnw} file --- before the corresponding
\code{SweaveListingPreparations}-chunk.\cr
Modified: branches/distr-2.2/pkg/SweaveListingUtils/man/library.Rd
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/man/library.Rd 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/SweaveListingUtils/man/library.Rd 2009-08-11 00:14:42 UTC (rev 523)
@@ -152,6 +152,7 @@
by \code{getSweaveListingOption}). New entries in the global variable
\code{.tobeDefinedPkgs} may be appended by \code{\link{setToBeDefinedPkgs}}.\cr
+
The masked versions work as follows: first the call is written to an
object and split into a \pkg{base}-package-part and into the extra arguments
mentioned above. Then we call \code{base::<fct>} where \code{<fct>} is either
@@ -182,6 +183,11 @@
unloadNamespace("SweaveListingUtils")
@
}
+or, if you want to keep the namespace of \pkg{SweaveListingUtils} loaded
+\preformatted{
+<<cleanup2, echo=FALSE>>=
+SweaveListingUtils(inSweave = FALSE)
+@
}
\value{
as the unmasked versions.
Modified: branches/distr-2.2/pkg/SweaveListingUtils/man/lstset.Rd
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/man/lstset.Rd 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/SweaveListingUtils/man/lstset.Rd 2009-08-11 00:14:42 UTC (rev 523)
@@ -11,16 +11,21 @@
Functions for defining how listings prints R and Rd source code}
\usage{
lstset(taglist, LineLength = getOption("width"), startS = "\\\\lstset\{")
-lstsetR(Rset = NULL, LineLength = getOption("width"), add = getSweaveListingOption("addRset"),
+lstsetR(Rset = NULL, LineLength = getOption("width"),
+ add = getSweaveListingOption("addRset"),
startS = "\\\\lstset\{")
-lstsetRd(Rdset = NULL, LineLength = getOption("width"), add = getSweaveListingOption("addRdset"),
+lstsetRd(Rdset = NULL, LineLength = getOption("width"),
+ add = getSweaveListingOption("addRdset"),
startS = "\\\\lstset\{")
-lstsetRin(Rinset = NULL, LineLength = getOption("width"), add = getSweaveListingOption("addRinset"),
- startS = "\\\\lstdefinestyle\{Rinstyle\}\{")
-lstsetRout(Routset = NULL, LineLength = getOption("width"), add = getSweaveListingOption("addRoutset"),
- startS = "\\\\lstdefinestyle\{Routstyle\}\{")
-lstsetRcode(Rcodeset = NULL, LineLength = getOption("width"), add = getSweaveListingOption("addRcodeset"),
- startS = "\\\\lstdefinestyle\{Rcodestyle\}\{")
+lstsetRin(Rinset = NULL, LineLength = getOption("width"),
+ add = getSweaveListingOption("addRinset"),
+ startS = "\\\\lstdefinestyle\{Rinstyle\}\{")
+lstsetRout(Routset = NULL, LineLength = getOption("width"),
+ add = getSweaveListingOption("addRoutset"),
+ startS = "\\\\lstdefinestyle\{Routstyle\}\{")
+lstsetRcode(Rcodeset = NULL, LineLength = getOption("width"),
+ add = getSweaveListingOption("addRcodeset"),
+ startS = "\\\\lstdefinestyle\{Rcodestyle\}\{")
}
\arguments{
Modified: branches/distr-2.2/pkg/distr/chm/00Index.html
===================================================================
--- branches/distr-2.2/pkg/distr/chm/00Index.html 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/distr/chm/00Index.html 2009-08-11 00:14:42 UTC (rev 523)
@@ -826,21 +826,21 @@
<table width="100%">
<tr><td width="25%"><a href="lambda-methods.html">lambda</a></td>
-<td>Methods for Function lambda in Package 'distr'</td></tr>
+<td>Methods for Function lambda in Package 'distr'</td></tr>
<tr><td width="25%"><a href="lambda-methods.html">lambda,Pois-method</a></td>
-<td>Methods for Function lambda in Package 'distr'</td></tr>
+<td>Methods for Function lambda in Package 'distr'</td></tr>
<tr><td width="25%"><a href="lambda-methods.html">lambda,PoisParameter-method</a></td>
-<td>Methods for Function lambda in Package 'distr'</td></tr>
+<td>Methods for Function lambda in Package 'distr'</td></tr>
<tr><td width="25%"><a href="lambda-methods.html">lambda-methods</a></td>
-<td>Methods for Function lambda in Package 'distr'</td></tr>
+<td>Methods for Function lambda in Package 'distr'</td></tr>
<tr><td width="25%"><a href="lambda-methods.html">lambda<-</a></td>
-<td>Methods for Function lambda in Package 'distr'</td></tr>
+<td>Methods for Function lambda in Package 'distr'</td></tr>
<tr><td width="25%"><a href="lambda-methods.html">lambda<-,Pois-method</a></td>
-<td>Methods for Function lambda in Package 'distr'</td></tr>
+<td>Methods for Function lambda in Package 'distr'</td></tr>
<tr><td width="25%"><a href="lambda-methods.html">lambda<-,PoisParameter-method</a></td>
-<td>Methods for Function lambda in Package 'distr'</td></tr>
+<td>Methods for Function lambda in Package 'distr'</td></tr>
<tr><td width="25%"><a href="lambda-methods.html">lambda<--methods</a></td>
-<td>Methods for Function lambda in Package 'distr'</td></tr>
+<td>Methods for Function lambda in Package 'distr'</td></tr>
<tr><td width="25%"><a href="DExp-class.html">Laplace</a></td>
<td>Class "DExp"</td></tr>
<tr><td width="25%"><a href="Lattice-class.html">Lattice</a></td>
Modified: branches/distr-2.2/pkg/distr/chm/Distr.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/distr/chm/Distr.hhp
===================================================================
--- branches/distr-2.2/pkg/distr/chm/Distr.hhp 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/distr/chm/Distr.hhp 2009-08-11 00:14:42 UTC (rev 523)
@@ -12,152 +12,9 @@
[FILES]
00Index.html
-0distr-package.html
-Arcsine-class.html
-Beta-class.html
-BetaParameter-class.html
-Binom-class.html
-BinomParameter-class.html
-Cauchy-class.html
-CauchyParameter-class.html
-Chisq-class.html
-ChisqParameter-class.html
-CompoundDistribution-class.html
-CompoundDistribution.html
-ContDistribution-class.html
-ContDistribution.html
-ConvPow.html
-DExp-class.html
-Dirac-class.html
-DiracParameter-class.html
-DiscreteDistribution-class.html
-DiscreteDistribution.html
-DistrList-class.html
-DistrList.html
-DistrSymmList-class.html
-DistrSymmList.html
-Distribution-class.html
-DistributionSymmetry-class.html
-EllipticalSymmetry-class.html
-EllipticalSymmetry.html
-EuclideanSpace-class.html
-Exp-class.html
+
ExpOrGammaOrChisq-class.html
-ExpParameter-class.html
-FParameter-class.html
-Fd-class.html
-GammaParameter-class.html
-Gammad-class.html
-Geom-class.html
-GeomParameter-class.html
-Huberize-methods.html
-Hyper-class.html
-HyperParameter-class.html
Integer-class.html
-Lattice-class.html
-LatticeDistribution-class.html
-LatticeDistribution.html
-Length-methods.html
-Lnorm-class.html
-LnormParameter-class.html
-Logis-class.html
-LogisParameter-class.html
-MakeAbscontDistribution.html
-Math-methods.html
-Max-methods.html
-Min-methods.html
-MinMaximum-methods.html
-Naturals-class.html
-Nbinom-class.html
-NbinomParameter-class.html
-NoSymmetry-class.html
-NoSymmetry.html
-Norm-class.html
-NormParameter-class.html
-OptionalParameter-class.html
-Parameter-class.html
-Pois-class.html
-PoisParameter-class.html
-PosDefSymmMatrix-class.html
-PosDefSymmMatrix.html
-Reals-class.html
-RtoDPQ.LC.html
-RtoDPQ.d.html
-RtoDPQ.html
-SphericalSymmetry-class.html
-SphericalSymmetry.html
-Symmetry-class.html
-TParameter-class.html
-Td-class.html
-Truncate-methods.html
-UniNormParameter-class.html
-Unif-class.html
-UnifParameter-class.html
-UnivarDistrList-class.html
-UnivarDistrList.html
-UnivarLebDecDistribution-class.html
-UnivarLebDecDistribution.html
-UnivarMixingDistribution-class.html
-UnivarMixingDistribution.html
-UnivariateDistribution-class.html
-Weibull-class.html
-WeibullParameter-class.html
-d-methods.html
-decomposePM-methods.html
-df-methods.html
-df1-methods.html
-df2-methods.html
-dim-methods.html
-dimension-methods.html
-distrARITH.html
-distrMASK.html
-distroptions.html
-flat.LCD.html
-flat.mix.html
-gap-methods.html
-getLabel.html
-getLow.html
-img-methods.html
internalClassUnions-class.html
internals.html
-k-methods.html
-lambda-methods.html
-liesIn-methods.html
-liesInSupport.html
-location-methods.html
-m-methods.html
-mean-methods.html
-meanlog-methods.html
-n-methods.html
-name-methods.html
-ncp-methods.html
-operators-methods.html
-options.html
-p-methods.html
-p.l-methods.html
-param-methods.html
-pivot-methods.html
-plot-methods.html
-print-methods.html
-prob-methods.html
-q-methods.html
-q.r-methods.html
-r-methods.html
-rSpace-class.html
-rate-methods.html
-scale-methods.html
-sd-methods.html
-sdlog-methods.html
-shape-methods.html
-shape1-methods.html
-shape2-methods.html
showobj-methods.html
-simplifyD-methods.html
-simplifyr-methods.html
-size-methods.html
-solve-methods.html
-sqrt-methods.html
-standardMethods.html
-support-methods.html
-versionmanagement.html
-width-methods.html
Modified: branches/distr-2.2/pkg/distr/chm/Distr.toc
===================================================================
--- branches/distr-2.2/pkg/distr/chm/Distr.toc 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/distr/chm/Distr.toc 2009-08-11 00:14:42 UTC (rev 523)
@@ -3799,7 +3799,7 @@
<param name="Local" value="k-methods.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
-<param name="Name" value="Methods for Function lambda in Package 'distr'">
+<param name="Name" value="Methods for Function lambda in Package 'distr'">
<param name="Local" value="lambda-methods.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
Modified: branches/distr-2.2/pkg/distrDoc/chm/00Index.html
===================================================================
--- branches/distr-2.2/pkg/distrDoc/chm/00Index.html 2009-08-10 11:39:35 UTC (rev 522)
+++ branches/distr-2.2/pkg/distrDoc/chm/00Index.html 2009-08-11 00:14:42 UTC (rev 523)
@@ -14,8 +14,10 @@
<table width="100%">
<tr><td width="25%"><a href="0distrDoc-package.html">distrDoc-package</a></td>
-<td>distrDoc - documentation for packages distr, distrEx, distrMod, distrTeach, distrSim, distrTEst</td></tr>
+<td>distrDoc - documentation for packages distr, distrEx, distrMod,
+distrTeach, distrSim, distrTEst</td></tr>
<tr><td width="25%"><a href="0distrDoc-package.html">distrDoc</a></td>
-<td>distrDoc - documentation for packages distr, distrEx, distrMod, distrTeach, distrSim, distrTEst</td></tr>
+<td>distrDoc - documentation for packages distr, distrEx, distrMod,
+distrTeach, distrSim, distrTEst</td></tr>
</table>
</body></html>
Modified: branches/distr-2.2/pkg/distrDoc/chm/distrDoc.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/distrDoc/chm/distrDoc.hhp
===================================================================
--- branches/distr-2.2/pkg/distrDoc/chm/distrDoc.hhp 2009-08-10 11:39:35 UTC (rev 522)
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/distr -r 523
More information about the Distr-commits
mailing list