[rkward-cvs] SF.net SVN: rkward:[4073] trunk/rkward/packages/rkwarddev
m-eik at users.sourceforge.net
m-eik at users.sourceforge.net
Mon Dec 5 22:02:36 UTC 2011
Revision: 4073
http://rkward.svn.sourceforge.net/rkward/?rev=4073&view=rev
Author: m-eik
Date: 2011-12-05 22:02:36 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
rkwarddev: supports logic scripting for real now
Modified Paths:
--------------
trunk/rkward/packages/rkwarddev/ChangeLog
trunk/rkward/packages/rkwarddev/DESCRIPTION
trunk/rkward/packages/rkwarddev/R/rk.XML.logic.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.XML.logic.Rd
trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
Modified: trunk/rkward/packages/rkwarddev/ChangeLog
===================================================================
--- trunk/rkward/packages/rkwarddev/ChangeLog 2011-12-04 13:22:37 UTC (rev 4072)
+++ trunk/rkward/packages/rkwarddev/ChangeLog 2011-12-05 22:02:36 UTC (rev 4073)
@@ -1,5 +1,8 @@
ChangeLog for package rkwarddev
+## 0.04-10 (2011-12-05)
+ - when using rk.comment() for logic scripting, its contents will automatically be placed inside a <script> node now
+
## 0.04-9 (2011-12-03)
- left over stuff from JS printout() function is now added to doPrintout()
Modified: trunk/rkward/packages/rkwarddev/DESCRIPTION
===================================================================
--- trunk/rkward/packages/rkwarddev/DESCRIPTION 2011-12-04 13:22:37 UTC (rev 4072)
+++ trunk/rkward/packages/rkwarddev/DESCRIPTION 2011-12-05 22:02:36 UTC (rev 4073)
@@ -6,16 +6,16 @@
Depends:
R (>= 2.9.0),XiMpLe,rkward (>= 0.5.6)
Enhances: rkward
-Description: Provides functions to create plugin skeletons and XML
- structures for RKWard.
+Description: Provides functions to create plugin skeletons and XML structures
+ for RKWard.
License: GPL (>= 3)
Encoding: UTF-8
LazyLoad: yes
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-9
-Date: 2011-12-03
+Version: 0.04-10
+Date: 2011-12-05
Collate:
'echo.R'
'id.R'
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.logic.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.logic.R 2011-12-04 13:22:37 UTC (rev 4072)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.logic.R 2011-12-05 22:02:36 UTC (rev 4073)
@@ -1,6 +1,9 @@
#' Create XML logic section for RKWard plugins
#'
#' This function will create a logic section with "convert", "connect", "include", "insert", "external" and "set" nodes.
+#' You can also include JavaScript code to use the locig scripting features of RKWard, if you place it in a comment
+#' with \code{\link[rkwarddev:rk.comment]{rk.comment}}: Its contents will automatically be placed inside a
+#' \code{<script><![CDATA[ ]]></script>} node.
#'
#' @param ... Objects of class \code{XiMpLe.node}.
#' @return An object of class \code{XiMpLe.node}.
@@ -34,6 +37,11 @@
nodes <- sapply(child.list(nodes), function(this.node){
if(identical(this.node at name, "!--")){
this.node at name <- "![CDATA["
+ this.node <- new("XiMpLe.node",
+ name="script",
+ children=child.list(this.node),
+ value=""
+ )
} else {}
return(this.node)
})
@@ -43,7 +51,7 @@
this.node at name
})
- invalid.sets <- !node.names %in% c("connect", "convert","include","insert","external","set","![CDATA[")
+ invalid.sets <- !node.names %in% c("connect", "convert","include","insert","external","set","script")
if(any(invalid.sets)){
stop(simpleError(paste("Invalid XML nodes for logic section: ", paste(node.names[invalid.sets], collapse=", "), sep="")))
} else {}
Modified: trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2011-12-04 13:22:37 UTC (rev 4072)
+++ trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2011-12-05 22:02:36 UTC (rev 4073)
@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab rkwarddev\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.04-9\cr
-#' Date: \tab 2011-12-03\cr
+#' Version: \tab 0.04-10\cr
+#' Date: \tab 2011-12-05\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-04 13:22:37 UTC (rev 4072)
+++ trunk/rkward/packages/rkwarddev/inst/CITATION 2011-12-05 22:02:36 UTC (rev 4073)
@@ -2,12 +2,12 @@
title="rkwarddev: A collection of tools for RKWard plugin development",
author="Meik Michalke",
year="2011",
- note="(Version 0.04-9)",
+ note="(Version 0.04-10)",
url="http://rkward.sourceforge.net",
textVersion =
paste("Michalke, M. (2011). ",
- "rkwarddev: A collection of tools for RKWard plugin development (Version 0.04-9). ",
+ "rkwarddev: A collection of tools for RKWard plugin development (Version 0.04-10). ",
"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.XML.logic.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.logic.Rd 2011-12-04 13:22:37 UTC (rev 4072)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.logic.Rd 2011-12-05 22:02:36 UTC (rev 4073)
@@ -13,7 +13,12 @@
\description{
This function will create a logic section with "convert",
"connect", "include", "insert", "external" and "set"
- nodes.
+ nodes. You can also include JavaScript code to use the
+ locig scripting features of RKWard, if you place it in a
+ comment with
+ \code{\link[rkwarddev:rk.comment]{rk.comment}}: Its
+ contents will automatically be placed inside a
+ \code{<script><![CDATA[ ]]></script>} node.
}
\examples{
# define an input field and two checkboxes
Modified: trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2011-12-04 13:22:37 UTC (rev 4072)
+++ trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2011-12-05 22:02:36 UTC (rev 4073)
@@ -11,8 +11,8 @@
}
\details{
\tabular{ll}{ Package: \tab rkwarddev\cr Type: \tab
- Package\cr Version: \tab 0.04-9\cr Date: \tab
- 2011-12-03\cr Depends: \tab R (>= 2.9.0),XiMpLe,rkward
+ Package\cr Version: \tab 0.04-10\cr Date: \tab
+ 2011-12-05\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