[rkward-cvs] SF.net SVN: rkward:[4125] trunk/rkward/packages/rkwarddev
m-eik at users.sourceforge.net
m-eik at users.sourceforge.net
Wed Dec 14 18:22:15 UTC 2011
Revision: 4125
http://rkward.svn.sourceforge.net/rkward/?rev=4125&view=rev
Author: m-eik
Date: 2011-12-14 18:22:14 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
rkwarddev: more degrees of freedom for rk.header()s in rk.JS.doc()
Modified Paths:
--------------
trunk/rkward/packages/rkwarddev/ChangeLog
trunk/rkward/packages/rkwarddev/DESCRIPTION
trunk/rkward/packages/rkwarddev/R/rk.JS.doc.R
trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
trunk/rkward/packages/rkwarddev/inst/CITATION
trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
trunk/rkward/packages/rkwarddev/man/rk.JS.doc.Rd
trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
Modified: trunk/rkward/packages/rkwarddev/ChangeLog
===================================================================
--- trunk/rkward/packages/rkwarddev/ChangeLog 2011-12-14 16:47:34 UTC (rev 4124)
+++ trunk/rkward/packages/rkwarddev/ChangeLog 2011-12-14 18:22:14 UTC (rev 4125)
@@ -1,5 +1,10 @@
ChangeLog for package rkwarddev
+## 0.05-0 (2011-12-14)
+ - "result.header" now doesn't add quotes by itself in rk.JS.doc(), so you can have R objects pasted.
+ previous scripts need to be adapted accordingly! the headers can also be deactivated by setting to FALSE or ""
+ - worked on the vignette
+
## 0.04-13 (2011-12-12)
- set default value of checked checkboxes to "true" in rk.XML.cbox()
- rk.XML.connect() now correctly supports 'governor="<ID>.<modifier>.not"'
Modified: trunk/rkward/packages/rkwarddev/DESCRIPTION
===================================================================
--- trunk/rkward/packages/rkwarddev/DESCRIPTION 2011-12-14 16:47:34 UTC (rev 4124)
+++ trunk/rkward/packages/rkwarddev/DESCRIPTION 2011-12-14 18:22:14 UTC (rev 4125)
@@ -14,8 +14,8 @@
URL: http://rkward.sourceforge.net
Authors at R: c(person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut", "cre")))
-Version: 0.04-13
-Date: 2011-12-12
+Version: 0.05-0
+Date: 2011-12-14
Collate:
'echo.R'
'id.R'
Modified: trunk/rkward/packages/rkwarddev/R/rk.JS.doc.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.JS.doc.R 2011-12-14 16:47:34 UTC (rev 4124)
+++ trunk/rkward/packages/rkwarddev/R/rk.JS.doc.R 2011-12-14 18:22:14 UTC (rev 4125)
@@ -5,7 +5,8 @@
#' @param require A character vector with names of R packages that the dialog depends on.
#' @param variables A character string to be included to read in all needed variables from the dialog.
#' Refer to \code{\link{rk.JS.scan}} for a function to create this from an existing plugin XML file.
-#' @param results.header A character string to headline the printed results.
+#' @param results.header A character string to headline the printed results. Include escapes quotes (\\") if needed.
+#' Set to \code{FALSE} or \code{""} if you need more control and want to define the header section in \code{printout}.
#' @param preprocess A character string to be included in the \code{preprocess()} function. This string will be
#' pasted as-is, after \code{require} has been evaluated.
#' @param calculate A character string to be included in the \code{calculate()} function. This string will be
@@ -72,7 +73,9 @@
if(is.null(doPrintout)){
paste(
indent(2, by=indent.by), "// printout the results\n",
- indent(2, by=indent.by), echo(id("rk.header(\"", results.header, "\", level=1)\n")),
+ if(is.character(results.header) && !identical(results.header, "")){
+ paste(indent(2, by=indent.by), echo(id("rk.header(", results.header, ", level=1)\n")), sep="")
+ } else {},
"\n",
ifelse(is.null(printout), echo("rk.print(\"\")\n"), paste("\n", printout, sep="")),
"\n",
@@ -101,7 +104,9 @@
indent(2, by=indent.by), "// read in variables from dialog\n",
paste(variables, collapse=""), "\n\n", sep="")),
indent(2, by=indent.by), "// create the plot\n",
- rk.paste.JS(ite("full", echo(id("rk.header(\"", results.header,"\", level=1)\n")))),
+ if(is.character(results.header) && !identical(results.header, "")){
+ rk.paste.JS(ite("full", echo(id("rk.header(", results.header,", level=1)\n"))))
+ } else {},
"\n\n",
doPrintout,
if(!is.null(printout)){
Modified: trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2011-12-14 16:47:34 UTC (rev 4124)
+++ trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2011-12-14 18:22:14 UTC (rev 4125)
@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab rkwarddev\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.04-13\cr
-#' Date: \tab 2011-12-12\cr
+#' Version: \tab 0.05-0\cr
+#' Date: \tab 2011-12-14\cr
#' Depends: \tab R (>= 2.9.0),XiMpLe,rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
Modified: trunk/rkward/packages/rkwarddev/inst/CITATION
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/CITATION 2011-12-14 16:47:34 UTC (rev 4124)
+++ trunk/rkward/packages/rkwarddev/inst/CITATION 2011-12-14 18:22:14 UTC (rev 4125)
@@ -2,12 +2,12 @@
title="rkwarddev: A collection of tools for RKWard plugin development",
author="Meik Michalke",
year="2011",
- note="(Version 0.04-13)",
+ note="(Version 0.05-0)",
url="http://rkward.sourceforge.net",
textVersion =
paste("Michalke, M. (2011). ",
- "rkwarddev: A collection of tools for RKWard plugin development (Version 0.04-13). ",
+ "rkwarddev: A collection of tools for RKWard plugin development (Version 0.05-0). ",
"Available from http://rkward.sourceforge.net",
sep=""),
Modified: trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
===================================================================
(Binary files differ)
Modified: trunk/rkward/packages/rkwarddev/man/rk.JS.doc.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.JS.doc.Rd 2011-12-14 16:47:34 UTC (rev 4124)
+++ trunk/rkward/packages/rkwarddev/man/rk.JS.doc.Rd 2011-12-14 18:22:14 UTC (rev 4125)
@@ -18,7 +18,10 @@
from an existing plugin XML file.}
\item{results.header}{A character string to headline the
- printed results.}
+ printed results. Include escapes quotes (\\") if needed.
+ Set to \code{FALSE} or \code{""} if you need more control
+ and want to define the header section in
+ \code{printout}.}
\item{preprocess}{A character string to be included in
the \code{preprocess()} function. This string will be
Modified: trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2011-12-14 16:47:34 UTC (rev 4124)
+++ trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2011-12-14 18:22:14 UTC (rev 4125)
@@ -11,8 +11,8 @@
}
\details{
\tabular{ll}{ Package: \tab rkwarddev\cr Type: \tab
- Package\cr Version: \tab 0.04-13\cr Date: \tab
- 2011-12-12\cr Depends: \tab R (>= 2.9.0),XiMpLe,rkward
+ Package\cr Version: \tab 0.05-0\cr Date: \tab
+ 2011-12-14\cr Depends: \tab R (>= 2.9.0),XiMpLe,rkward
(>= 0.5.6)\cr Enhances: \tab rkward\cr Encoding: \tab
UTF-8\cr License: \tab GPL (>= 3)\cr LazyLoad: \tab
yes\cr URL: \tab http://rkward.sourceforge.net\cr }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list