[rkward-cvs] SF.net SVN: rkward:[4187] trunk/rkward/packages/rkwarddev
m-eik at users.sourceforge.net
m-eik at users.sourceforge.net
Sat Mar 17 22:44:19 UTC 2012
Revision: 4187
http://rkward.svn.sourceforge.net/rkward/?rev=4187&view=rev
Author: m-eik
Date: 2012-03-17 22:44:18 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
rkwarddev: began cleaning up, using the new XML object contructors from XiMpLe, which simplifies the code
Modified Paths:
--------------
trunk/rkward/packages/rkwarddev/ChangeLog
trunk/rkward/packages/rkwarddev/DESCRIPTION
trunk/rkward/packages/rkwarddev/R/rk-internal.R
trunk/rkward/packages/rkwarddev/R/rk.XML.about.R
trunk/rkward/packages/rkwarddev/R/rk.XML.attribute.R
trunk/rkward/packages/rkwarddev/R/rk.XML.browser.R
trunk/rkward/packages/rkwarddev/R/rk.XML.cbox.R
trunk/rkward/packages/rkwarddev/R/rk.XML.code.R
trunk/rkward/packages/rkwarddev/R/rk.XML.col.R
trunk/rkward/packages/rkwarddev/R/rk.XML.component.R
trunk/rkward/packages/rkwarddev/R/rk.XML.components.R
trunk/rkward/packages/rkwarddev/R/rk.XML.connect.R
trunk/rkward/packages/rkwarddev/R/rk.XML.context.R
trunk/rkward/packages/rkwarddev/R/rk.XML.convert.R
trunk/rkward/packages/rkwarddev/R/rk.XML.copy.R
trunk/rkward/packages/rkwarddev/R/rk.XML.dialog.R
trunk/rkward/packages/rkwarddev/R/rk.XML.dropdown.R
trunk/rkward/packages/rkwarddev/R/rk.XML.embed.R
trunk/rkward/packages/rkwarddev/R/rk.XML.entry.R
trunk/rkward/packages/rkwarddev/R/rk.XML.external.R
trunk/rkward/packages/rkwarddev/R/rk.XML.formula.R
trunk/rkward/packages/rkwarddev/R/rk.XML.frame.R
trunk/rkward/packages/rkwarddev/R/rk.XML.help.R
trunk/rkward/packages/rkwarddev/R/rk.XML.hierarchy.R
trunk/rkward/packages/rkwarddev/R/rk.XML.include.R
trunk/rkward/packages/rkwarddev/R/rk.XML.input.R
trunk/rkward/packages/rkwarddev/R/rk.XML.insert.R
trunk/rkward/packages/rkwarddev/R/rk.XML.logic.R
trunk/rkward/packages/rkwarddev/R/rk.XML.menu.R
trunk/rkward/packages/rkwarddev/R/rk.XML.page.R
trunk/rkward/packages/rkwarddev/R/rk.XML.preview.R
trunk/rkward/packages/rkwarddev/R/rk.XML.radio.R
trunk/rkward/packages/rkwarddev/R/rk.XML.require.R
trunk/rkward/packages/rkwarddev/R/rk.XML.row.R
trunk/rkward/packages/rkwarddev/R/rk.XML.saveobj.R
trunk/rkward/packages/rkwarddev/R/rk.XML.set.R
trunk/rkward/packages/rkwarddev/R/rk.XML.snippet.R
trunk/rkward/packages/rkwarddev/R/rk.XML.snippets.R
trunk/rkward/packages/rkwarddev/R/rk.XML.spinbox.R
trunk/rkward/packages/rkwarddev/R/rk.XML.stretch.R
trunk/rkward/packages/rkwarddev/R/rk.XML.tabbook.R
trunk/rkward/packages/rkwarddev/R/rk.XML.text.R
trunk/rkward/packages/rkwarddev/R/rk.XML.vars.R
trunk/rkward/packages/rkwarddev/R/rk.XML.varselector.R
trunk/rkward/packages/rkwarddev/R/rk.XML.varslot.R
trunk/rkward/packages/rkwarddev/R/rk.XML.wizard.R
trunk/rkward/packages/rkwarddev/R/rk.comment.R
trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.caption.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.doc.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.link.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.related.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.section.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.setting.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.settings.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.summary.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.technical.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.title.R
trunk/rkward/packages/rkwarddev/R/rk.rkh.usage.R
trunk/rkward/packages/rkwarddev/R/rkwarddev-desc-internal.R
trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
trunk/rkward/packages/rkwarddev/inst/CITATION
trunk/rkward/packages/rkwarddev/inst/NEWS.Rd
trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
trunk/rkward/packages/rkwarddev/man/rk.XML.about.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.attribute.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.browser.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.cbox.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.code.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.col.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.component.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.components.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.connect.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.context.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.convert.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.copy.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.dialog.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.dropdown.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.embed.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.entry.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.external.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.formula.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.frame.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.help.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.hierarchy.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.include.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.input.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.insert.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.logic.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.menu.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.page.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.preview.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.radio.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.require.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.row.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.saveobj.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.set.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.snippet.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.snippets.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.spinbox.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.stretch.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.tabbook.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.text.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.vars.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.varselector.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.varslot.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.wizard.Rd
trunk/rkward/packages/rkwarddev/man/rk.comment.Rd
trunk/rkward/packages/rkwarddev/man/rk.rkh.caption.Rd
trunk/rkward/packages/rkwarddev/man/rk.rkh.link.Rd
trunk/rkward/packages/rkwarddev/man/rk.rkh.related.Rd
trunk/rkward/packages/rkwarddev/man/rk.rkh.section.Rd
trunk/rkward/packages/rkwarddev/man/rk.rkh.setting.Rd
trunk/rkward/packages/rkwarddev/man/rk.rkh.summary.Rd
trunk/rkward/packages/rkwarddev/man/rk.rkh.technical.Rd
trunk/rkward/packages/rkwarddev/man/rk.rkh.title.Rd
trunk/rkward/packages/rkwarddev/man/rk.rkh.usage.Rd
trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
Modified: trunk/rkward/packages/rkwarddev/ChangeLog
===================================================================
--- trunk/rkward/packages/rkwarddev/ChangeLog 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/ChangeLog 2012-03-17 22:44:18 UTC (rev 4187)
@@ -1,5 +1,10 @@
ChangeLog for package rkwarddev
+changes in version 0.05-3 (2012-03-17)
+ - fixed: rk.XML.text() now preserves XML tags in the text value
+ - began to use XiMpLe::XMLNode() and XiMpLe::XMLTree() constructors in functions, and to rename
+ pasteXMLNode() and pasteXMLTree() into pasteXML()
+
changes in version 0.05-2 (2012-03-10)
- added missing dependency to package methods
- fixed docs in rk.XML.plugin(), rk.XML.saveobj() and rk.plugin.skeleton()
Modified: trunk/rkward/packages/rkwarddev/DESCRIPTION
===================================================================
--- trunk/rkward/packages/rkwarddev/DESCRIPTION 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/DESCRIPTION 2012-03-17 22:44:18 UTC (rev 4187)
@@ -4,7 +4,7 @@
Author: m.eik michalke <meik.michalke at hhu.de>
Maintainer: m.eik michalke <meik.michalke at hhu.de>
Depends:
- R (>= 2.9.0),methods,XiMpLe,rkward (>= 0.5.6)
+ R (>= 2.9.0),methods,XiMpLe (>= 0.03-12),rkward (>= 0.5.6)
Enhances: rkward
Description: Provides functions to create plugin skeletons and XML structures
for RKWard.
@@ -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.05-2
-Date: 2012-03-10
+Version: 0.05-3
+Date: 2012-03-17
Collate:
'echo.R'
'id.R'
Modified: trunk/rkward/packages/rkwarddev/R/rk-internal.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk-internal.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk-internal.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -19,7 +19,8 @@
## function child.list()
# convenience function to let single children be provided without list()
-child.list <- function(children){
+# 'empty' van be used to make sure a tag is non-empty without actual value
+child.list <- function(children, empty=TRUE){
if(inherits(children, "XiMpLe.node")){
children <- list(children)
} else {
@@ -28,6 +29,8 @@
if(inherits(children[[1]], "list")){
children <- children[[1]]
} else {}
+ } else if(identical(children, list()) & !isTRUE(empty)){
+ children <- list("")
} else {}
}
return(children)
@@ -68,7 +71,7 @@
if(inherits(XML.obj, "XiMpLe.doc")){
single.tags <- trim(unlist(strsplit(pasteXMLTree(XML.obj, shine=1, indent.by=""), split="\n")))
} else if(inherits(XML.obj, "XiMpLe.node")){
- single.tags <- trim(unlist(strsplit(pasteXMLNode(XML.obj, shine=1, indent.by=""), split="\n")))
+ single.tags <- trim(unlist(strsplit(pasteXML(XML.obj, shine=1, indent.by=""), split="\n")))
} else {
xml.raw <- paste(readLines(XML.obj), collapse=" ")
single.tags <- XiMpLe:::XML.single.tags(xml.raw, drop=drop)
@@ -267,7 +270,7 @@
node.soup <- function(nodes){
the.soup <- paste(unlist(sapply(child.list(nodes), function(this.node){
if(inherits(this.node, "XiMpLe.node")){
- return(gsub("[^[:alnum:]]", "", pasteXMLNode(this.node, shine=0)))
+ return(gsub("[^[:alnum:]]", "", pasteXML(this.node, shine=0)))
} else {
stop(simpleError("Nodes must be of class XiMpLe.node!"))
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.about.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.about.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.about.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -69,7 +69,7 @@
#' c(name="heisenberg.pluginmap", url="http://eternalwondermaths.example.org/hsb"))
#' )
#'
-#' cat(pasteXMLNode(about.node, shine=2))
+#' cat(pasteXML(about.node, shine=2))
rk.XML.about <- function(name, author, about=list(desc="SHORT_DESCRIPTION", version="0.01-0", date=Sys.Date(), url="http://EXAMPLE.com", license="GPL (>= 3)", long.desc=NULL), dependencies=NULL, package=NULL, pluginmap=NULL){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.attribute.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.attribute.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.attribute.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -17,7 +17,7 @@
#' test.checkbox <- rk.XML.cbox(label="foo", value="foo1", chk=TRUE)
#' # re-set the attribute
#' test.attribute <- rk.XML.attribute(test.checkbox, value="bar2", label="bar")
-#' cat(pasteXMLNode(test.attribute))
+#' cat(pasteXML(test.attribute))
rk.XML.attribute <- function(id, value=NULL, label=NULL){
# let's see if we need to extract IDs first
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.browser.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.browser.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.browser.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -14,7 +14,7 @@
#' @seealso \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.browser <- rk.XML.browser("Browse here:")
-#' cat(pasteXMLNode(test.browser))
+#' cat(pasteXML(test.browser))
rk.XML.browser <- function(label, type="file", initial=NULL, urls=FALSE, filter=NULL, required=TRUE, id.name="auto"){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.cbox.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.cbox.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.cbox.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -16,7 +16,7 @@
#' list(
#' rk.XML.cbox(label="foo", value="foo1", chk=TRUE),
#' rk.XML.cbox(label="bar", value="bar2"))))
-#' cat(pasteXMLNode(test.checkboxes))
+#' cat(pasteXML(test.checkboxes))
rk.XML.cbox <- function(label, value="true", un.value=NULL, chk=FALSE, id.name="auto"){
if(identical(id.name, "auto")){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.code.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.code.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.code.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -7,7 +7,7 @@
#' \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.code <- rk.XML.code("some_file.js")
-#' cat(pasteXMLNode(test.code))
+#' cat(pasteXML(test.code))
rk.XML.code <- function(file){
node <- new("XiMpLe.node",
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.col.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.col.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.col.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -11,7 +11,7 @@
#' test.checkboxes <- rk.XML.row(rk.XML.col(
#' rk.XML.cbox(label="foo", val="foo1", chk=TRUE),
#' rk.XML.cbox(label="bar", val="bar2")))
-#' cat(pasteXMLNode(test.checkboxes))
+#' cat(pasteXML(test.checkboxes))
rk.XML.col <- function(..., id.name="auto"){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.component.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.component.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.component.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -15,7 +15,7 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.component <- rk.XML.component("My GUI dialog", "plugins/MyGUIdialog.xml")
-#' cat(pasteXMLNode(test.component))
+#' cat(pasteXML(test.component))
rk.XML.component <- function(label, file, id.name="auto", type="standard"){
if(identical(id.name, "auto")){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.components.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.components.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.components.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -12,7 +12,7 @@
#' @examples
#' test.component <- rk.XML.component("My GUI dialog", "plugins/MyGUIdialog.xml")
#' test.components <- rk.XML.components(test.component)
-#' cat(pasteXMLNode(test.components))
+#' cat(pasteXML(test.components))
rk.XML.components <- function(...){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.connect.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.connect.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.connect.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -27,7 +27,7 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.connect <- rk.XML.connect(governor="lgc_foobar", client="frame_bar")
-#' cat(pasteXMLNode(test.connect))
+#' cat(pasteXML(test.connect))
rk.XML.connect <- function(governor, client, get="state", set="enabled", not=FALSE, reconcile=FALSE){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.context.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.context.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.context.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -17,7 +17,7 @@
#' test.entry <- rk.XML.entry(test.component)
#' test.menu <- rk.XML.menu("Analysis", nodes=test.entry, id.name="analysis")
#' test.context <- rk.XML.context(test.menu)
-#' cat(pasteXMLNode(test.context))
+#' cat(pasteXML(test.context))
rk.XML.context <- function(..., id="x11"){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.convert.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.convert.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.convert.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -38,7 +38,7 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.convert <- rk.XML.convert(list(string="foo"), mode=c(notequals="bar"))
-#' cat(pasteXMLNode(test.convert))
+#' cat(pasteXML(test.convert))
rk.XML.convert <- function(sources, mode=c(), required=FALSE, id.name="auto"){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.copy.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.copy.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.copy.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -18,7 +18,7 @@
#' test.text <- rk.XML.text("Did you test more than 30 subjects?")
#' test.copy <- rk.XML.copy(id=test.cbox1)
#' test.wizard <- rk.XML.wizard(rk.XML.page(list(test.text, test.copy)))
-#' cat(pasteXMLNode(test.wizard))
+#' cat(pasteXML(test.wizard))
rk.XML.copy <- function(id, as=NULL){
if(length(id) > 1 | length(as) > 1){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.dialog.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.dialog.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.dialog.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -18,7 +18,7 @@
#' test.cbox1 <- rk.XML.cbox(label="Want to type?", val="true")
#' test.cbox2 <- rk.XML.cbox(label="Are you shure?", val="true")
#' test.dialog <- rk.XML.dialog(rk.XML.col(test.input, test.cbox1, test.cbox2))
-#' cat(pasteXMLNode(test.dialog))
+#' cat(pasteXML(test.dialog))
rk.XML.dialog <- function(..., label=NULL){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.dropdown.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.dropdown.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.dropdown.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -13,7 +13,7 @@
#' test.dropdown <- rk.XML.dropdown("mydrop",
#' options=list("First Option"=c(val="val1"),
#' "Second Option"=c(val="val2", chk=TRUE)))
-#' cat(pasteXMLNode(test.dropdown))
+#' cat(pasteXML(test.dropdown))
rk.XML.dropdown <- function(label, options=list(label=c(val=NULL, chk=FALSE)), id.name="auto"){
num.opt <- length(options)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.embed.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.embed.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.embed.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -10,7 +10,7 @@
#' @seealso \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.embed <- rk.XML.embed("someComponent")
-#' cat(pasteXMLNode(test.embed))
+#' cat(pasteXML(test.embed))
rk.XML.embed <- function(component, button=FALSE, label="Options", id.name="auto"){
attr.list <- list(component=component)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.entry.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.entry.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.entry.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -15,7 +15,7 @@
#' @examples
#' test.component <- rk.XML.component("My GUI dialog", "plugins/MyGUIdialog.xml")
#' test.entry <- rk.XML.entry(test.component)
-#' cat(pasteXMLNode(test.entry))
+#' cat(pasteXML(test.entry))
rk.XML.entry <- function(component, index=-1){
if(length(component) > 1){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.external.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.external.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.external.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -12,7 +12,7 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.external <- rk.XML.external(id="ext_property", default="none")
-#' cat(pasteXMLNode(test.external))
+#' cat(pasteXML(test.external))
rk.XML.external <- function(id, default=NULL){
attr.list <- list(id=id)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.formula.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.formula.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.formula.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -19,7 +19,7 @@
#' test.varslot1 <- rk.XML.varslot("Fixed factors", source=test.varselector)
#' test.varslot2 <- rk.XML.varslot("Dependent variables", source=test.varselector)
#' test.formula <- rk.XML.formula(fixed=test.varslot1, dependent=test.varslot2)
-#' cat(pasteXMLNode(test.formula))
+#' cat(pasteXML(test.formula))
rk.XML.formula <- function(fixed, dependent, id.name="auto"){
# check if these are actually varslots
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.frame.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.frame.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.frame.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -16,7 +16,7 @@
#' test.dropdown <- rk.XML.dropdown("mydrop",
#' options=list("First Option"=c(val="val1"),
#' "Second Option"=c(val="val2", chk=TRUE)))
-#' cat(pasteXMLNode(rk.XML.frame(test.dropdown, label="Some options")))
+#' cat(pasteXML(rk.XML.frame(test.dropdown, label="Some options")))
rk.XML.frame <- function(..., label=NULL, checkable=FALSE, chk=TRUE, id.name="auto"){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.help.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.help.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.help.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -7,7 +7,7 @@
#' \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.help <- rk.XML.help("some_file.rkh")
-#' cat(pasteXMLNode(test.help))
+#' cat(pasteXML(test.help))
rk.XML.help <- function(file){
node <- new("XiMpLe.node",
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.hierarchy.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.hierarchy.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.hierarchy.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -17,7 +17,7 @@
#' test.entry <- rk.XML.entry(test.component)
#' test.menu <- rk.XML.menu("Analysis", nodes=test.entry, id.name="analysis")
#' test.hierarchy <- rk.XML.hierarchy(test.menu)
-#' cat(pasteXMLNode(test.hierarchy))
+#' cat(pasteXML(test.hierarchy))
rk.XML.hierarchy <- function(...){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.include.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.include.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.include.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -7,7 +7,7 @@
#' \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.include <- rk.XML.include("../some_file.xml")
-#' cat(pasteXMLNode(test.include))
+#' cat(pasteXML(test.include))
rk.XML.include <- function(file){
node <- new("XiMpLe.node",
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.input.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.input.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.input.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -12,7 +12,7 @@
#' @export
#' @examples
#' test.input <- rk.XML.input("Type some text")
-#' cat(pasteXMLNode(test.input))
+#' cat(pasteXML(test.input))
rk.XML.input <- function(label, initial=NULL, size="medium", required=FALSE, id.name="auto"){
attr.list <- list(label=label)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.insert.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.insert.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.insert.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -17,7 +17,7 @@
#' test.snippet <- rk.XML.snippet(test.formula)
#' # now to insert the snippet
#' test.insert <- rk.XML.insert(test.snippet)
-#' cat(pasteXMLNode(test.insert))
+#' cat(pasteXML(test.insert))
rk.XML.insert <- function(snippet){
if(length(snippet) > 1){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.logic.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.logic.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.logic.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -23,12 +23,12 @@
#' test.convert <- rk.XML.convert(c(state=test.cbox1,state=test.cbox2), mode=c(and=""))
#' test.connect <- rk.XML.connect(governor=test.convert, client=test.input, set="enabled")
#' test.logic <- rk.XML.logic(test.convert, test.connect)
-#' cat(pasteXMLNode(test.logic))
+#' cat(pasteXML(test.logic))
#'
#' # with only one checkbox, you can directly query if it's checked
#' test.connect2 <- rk.XML.connect(governor=test.cbox1, client=test.input, set="enabled")
#' test.logic2 <- rk.XML.logic(test.connect2)
-#' cat(pasteXMLNode(test.logic2))
+#' cat(pasteXML(test.logic2))
rk.XML.logic <- function(...){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.menu.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.menu.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.menu.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -26,7 +26,7 @@
#' test.component <- rk.XML.component("My GUI dialog", "plugins/MyGUIdialog.xml")
#' test.entry <- rk.XML.entry(test.component)
#' test.menu <- rk.XML.menu("Analysis", test.entry, id.name="analysis")
-#' cat(pasteXMLNode(test.menu))
+#' cat(pasteXML(test.menu))
#' # manual definition of a menu path by a list:
#' test.menu <- rk.XML.menu("Analysis", list("Level 1", "Level 2", test.component))
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.page.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.page.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.page.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -20,7 +20,7 @@
#' test.text <- rk.XML.text("Did you test more than 30 subjects?")
#' test.copy <- rk.XML.copy(id=test.cbox1)
#' test.wizard <- rk.XML.wizard(rk.XML.page(test.text, test.copy))
-#' cat(pasteXMLNode(test.wizard))
+#' cat(pasteXML(test.wizard))
rk.XML.page <- function(..., id.name="auto"){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.preview.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.preview.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.preview.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -6,7 +6,7 @@
#' @seealso \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.preview <- rk.XML.preview("See a preview?")
-#' cat(pasteXMLNode(test.preview))
+#' cat(pasteXML(test.preview))
rk.XML.preview <- function(label="Preview"){
if(!identical(label, "Preview")){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.radio.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.radio.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.radio.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -13,7 +13,7 @@
#' test.radio <- rk.XML.radio("Chose one",
#' options=list("First Option"=c(val="val1"),
#' "Second Option"=c(val="val2", chk=TRUE)))
-#' cat(pasteXMLNode(test.radio))
+#' cat(pasteXML(test.radio))
rk.XML.radio <- function(label, options=list(label=c(val=NULL, chk=FALSE)), id.name="auto"){
num.opt <- length(options)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.require.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.require.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.require.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -8,7 +8,7 @@
#' @seealso \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.require <- rk.XML.require("another.pluginmap")
-#' cat(pasteXMLNode(test.require))
+#' cat(pasteXML(test.require))
rk.XML.require <- function(file){
if(length(file) > 1 | !is.character(file)){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.row.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.row.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.row.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -11,7 +11,7 @@
#' test.checkboxes <- rk.XML.row(rk.XML.col(
#' rk.XML.cbox(label="foo", val="foo1", chk=TRUE),
#' rk.XML.cbox(label="bar", val="bar2")))
-#' cat(pasteXMLNode(test.checkboxes))
+#' cat(pasteXML(test.checkboxes))
rk.XML.row <- function(..., id.name="auto"){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.saveobj.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.saveobj.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.saveobj.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -13,7 +13,7 @@
#' @seealso \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.saveobj <- rk.XML.saveobj("Save the results")
-#' cat(pasteXMLNode(test.saveobj))
+#' cat(pasteXML(test.saveobj))
rk.XML.saveobj <- function(label, chk=FALSE, checkable=TRUE, initial="auto", required=FALSE, id.name="auto"){
attr.list <- list(label=label)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.set.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.set.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.set.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -16,7 +16,7 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.set <- rk.XML.set(id="input_foo", set="required", to=TRUE)
-#' cat(pasteXMLNode(test.set))
+#' cat(pasteXML(test.set))
rk.XML.set <- function(id, set=NULL, to, check.modifiers=TRUE){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.snippet.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.snippet.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.snippet.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -16,7 +16,7 @@
#' test.formula <- rk.XML.vars("Variables", "Fixed", formula.dependent="Dependent")
#' # define the snippet
#' test.snippet <- rk.XML.snippet(test.formula)
-#' cat(pasteXMLNode(test.snippet))
+#' cat(pasteXML(test.snippet))
rk.XML.snippet <- function(..., id.name="auto"){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.snippets.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.snippets.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.snippets.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -15,7 +15,7 @@
#' # define the snippets section
#' test.snippet <- rk.XML.snippet(test.formula)
#' test.snippets <- rk.XML.snippets(test.snippet)
-#' cat(pasteXMLNode(test.snippets))
+#' cat(pasteXML(test.snippets))
rk.XML.snippets <- function(...){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.spinbox.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.spinbox.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.spinbox.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -14,7 +14,7 @@
#' @seealso \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.spinbox <- rk.XML.spinbox("Spin this:")
-#' cat(pasteXMLNode(test.spinbox))
+#' cat(pasteXML(test.spinbox))
rk.XML.spinbox <- function(label, min=NULL, max=NULL, initial=0, real=TRUE, precision=2, max.precision=8, id.name="auto"){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.stretch.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.stretch.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.stretch.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -11,7 +11,7 @@
#' @seealso
#' \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
-#' cat(pasteXMLNode(rk.XML.stretch()))
+#' cat(pasteXML(rk.XML.stretch()))
#<stretch />
rk.XML.stretch <- function(before=NULL, after=NULL){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.tabbook.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.tabbook.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.tabbook.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -20,7 +20,7 @@
#' # combine the above into a tabbook
#' test.tabbook <- rk.XML.tabbook("My Tabbook",
#' tabs=list("First Tab"=test.checkboxes, "Second Tab"=test.dropdown))
-#' cat(pasteXMLNode(test.tabbook))
+#' cat(pasteXML(test.tabbook))
rk.XML.tabbook <- function(label=NULL, tabs=list(), id.name="auto"){
tab.labels <- names(tabs)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.text.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.text.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.text.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -11,7 +11,7 @@
#' \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.text <- rk.XML.text("Added this text.")
-#' cat(pasteXMLNode(test.text))
+#' cat(pasteXML(test.text))
rk.XML.text <- function(text, type="normal", id.name="auto"){
if(identical(id.name, "auto")){
@@ -27,10 +27,18 @@
attr.list[["type"]] <- type
} else {}
- node <- new("XiMpLe.node",
- name="text",
- attributes=attr.list,
- value=text)
+ # preserve markup in the text
+ if(grepl("<(.*)>", text)){
+ textAsTree <- parseXMLTree(text, object=TRUE)
+ node <- XMLNode("text",
+ .children=slot(textAsTree, "children"),
+ attrs=attr.list)
+ } else {
+ node <- XMLNode("text",
+ text,
+ attrs=attr.list)
+ }
+
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.vars.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.vars.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.vars.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -48,7 +48,7 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.vars <- rk.XML.vars("Select some vars", "Vars go here")
-#' cat(pasteXMLNode(test.vars))
+#' cat(pasteXML(test.vars))
rk.XML.vars <- function(label, slot.text, required=FALSE, multi=FALSE, min=1, any=1, max=0,
dim=0, min.len=0, max.len=NULL, classes=NULL, types=NULL, horiz=TRUE, add.nodes=NULL,
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.varselector.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.varselector.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.varselector.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -11,7 +11,7 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' test.varselector <- rk.XML.varselector("Select some vars")
-#' cat(pasteXMLNode(test.varselector))
+#' cat(pasteXML(test.varselector))
rk.XML.varselector <- function(label=NULL, id.name="auto"){
if(identical(id.name, "auto")){
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.varslot.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.varslot.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.varslot.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -33,7 +33,7 @@
#' \dontrun{
#' test.varselector <- rk.XML.varselector("Select some vars")
#' test.varslot <- rk.XML.varslot("Vars go here", source=test.varselector)
-#' cat(pasteXMLNode(test.varslot))
+#' cat(pasteXML(test.varslot))
#' }
rk.XML.varslot <- function(label, source, required=FALSE, multi=FALSE, min=1, any=1, max=0,
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.wizard.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.wizard.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.wizard.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -19,7 +19,7 @@
#' test.text <- rk.XML.text("Did you test more than 30 subjects?")
#' test.copy <- rk.XML.copy(id=test.cbox1)
#' test.wizard <- rk.XML.wizard(rk.XML.page(list(test.text, test.copy)))
-#' cat(pasteXMLNode(test.wizard))
+#' cat(pasteXML(test.wizard))
rk.XML.wizard <- function(..., label=NULL){
nodes <- list(...)
Modified: trunk/rkward/packages/rkwarddev/R/rk.comment.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.comment.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.comment.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -5,12 +5,9 @@
#' @export
#' @examples
#' test.comment <- rk.comment("Added this text.")
-#' cat(pasteXMLNode(test.comment))
+#' cat(pasteXML(test.comment))
rk.comment <- function(text){
- node <- new("XiMpLe.node",
- name="!--",
- value=text)
-
+ node <- XMLNode(name="!--", text)
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -241,7 +241,7 @@
## create plugin.xml
if("xml" %in% create){
if(isTRUE(checkCreateFiles(plugin.xml, ow=overwrite))){
- cat(pasteXMLTree(XML.plugin, shine=1, indent.by=indent.by), file=plugin.xml)
+ cat(pasteXML(XML.plugin, shine=1, indent.by=indent.by), file=plugin.xml)
} else {}
if(isTRUE(edit)){
rk.edit.files(plugin.xml, title=plugin.fname.xml, prompt=FALSE)
@@ -261,7 +261,7 @@
## create plugin.rkh
if("rkh" %in% create){
if(isTRUE(checkCreateFiles(plugin.rkh, ow=overwrite))){
- cat(pasteXMLTree(rkh.doc, shine=1, indent.by=indent.by), file=plugin.rkh)
+ cat(pasteXML(rkh.doc, shine=1, indent.by=indent.by), file=plugin.rkh)
} else {}
if(isTRUE(edit)){
rk.edit.files(plugin.rkh, title=plugin.fname.rkh, prompt=FALSE)
@@ -300,7 +300,7 @@
require=pluginmap[["require"]],
hints=TRUE,
gen.info=gen.info)
- cat(pasteXMLTree(XML.pluginmap, shine=2, indent.by=indent.by), file=plugin.pluginmap)
+ cat(pasteXML(XML.pluginmap, shine=2, indent.by=indent.by), file=plugin.pluginmap)
# needed for "show"
pm.id.name <- pluginmap[["name"]]
} else {
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.caption.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.caption.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.caption.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -20,7 +20,7 @@
#' test.frame <- rk.XML.frame(test.dropdown, label="Some options")
#' # create the caption
#' test.caption <- rk.rkh.caption(test.frame)
-#' cat(pasteXMLNode(test.caption))
+#' cat(pasteXML(test.caption))
rk.rkh.caption <- function(id, title=NULL){
# let's see if we need to extract IDs first
@@ -30,10 +30,7 @@
attr.list[["title"]] <- title
} else {}
- node <- new("XiMpLe.node",
- name="caption",
- attributes=attr.list
- )
+ node <- XMLNode(name="caption", attrs=attr.list)
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.doc.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.doc.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.doc.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -39,7 +39,7 @@
if(!is.null(title)){
# check if this is *really* a title section
if(inherits(title, "XiMpLe.node")){
- title.node.name <- title at name
+ title.node.name <- slot(title, "name")
} else {
title.node.name <- "yougottabekiddingme"
}
@@ -54,7 +54,7 @@
} else {
# check if this is *really* a summary section
if(inherits(summary, "XiMpLe.node")){
- summary.node.name <- summary at name
+ summary.node.name <- slot(summary, "name")
} else {
summary.node.name <- "yougottabekiddingme"
}
@@ -69,7 +69,7 @@
} else {
# check if this is *really* a usage section
if(inherits(usage, "XiMpLe.node")){
- usage.node.name <- usage at name
+ usage.node.name <- slot(usage, "name")
} else {
usage.node.name <- "yougottabekiddingme"
}
@@ -80,14 +80,13 @@
}
if(is.null(sections)){
- all.children[[length(all.children)+1]] <- new("XiMpLe.node",
- name="!--",
- children=list(rk.rkh.section("EDIT OR DELETE ME", text="EDIT OR DELETE ME")))
+ all.children[[length(all.children)+1]] <- XMLNode("!--",
+ rk.rkh.section("EDIT OR DELETE ME", text="EDIT OR DELETE ME"))
} else {
for(this.section in sections){
# check if this is *really* a section
if(inherits(this.section, "XiMpLe.node")){
- this.section.node.name <- this.section at name
+ this.section.node.name <- slot(this.section, "name")
} else {
this.section.node.name <- "yougottabekiddingme"
}
@@ -104,7 +103,7 @@
} else {
# check if this is *really* a settings section
if(inherits(settings, "XiMpLe.node")){
- settings.node.name <- settings at name
+ settings.node.name <- slot(settings, "name")
} else {
settings.node.name <- "yougottabekiddingme"
}
@@ -115,13 +114,11 @@
}
if(is.null(related)){
- all.children[[length(all.children)+1]] <- new("XiMpLe.node",
- name="!--",
- children=list(rk.rkh.related( rk.rkh.link("..."))))
+ all.children[[length(all.children)+1]] <- XMLNode("!--", rk.rkh.related(rk.rkh.link("...")))
} else {
# check if this is *really* a related section
if(inherits(related, "XiMpLe.node")){
- related.node.name <- related at name
+ related.node.name <- slot(related, "name")
} else {
related.node.name <- "yougottabekiddingme"
}
@@ -136,7 +133,7 @@
} else {
# check if this is *really* a technical section
if(inherits(technical, "XiMpLe.node")){
- technical.node.name <- technical at name
+ technical.node.name <- slot(technical, "name")
} else {
technical.node.name <- "yougottabekiddingme"
}
@@ -146,14 +143,9 @@
all.children[[length(all.children)+1]] <- technical
}
- rkh.document <- new("XiMpLe.node",
- name="document",
- children=all.children,
- value="")
+ rkh.document <- XMLNode("document", .children=child.list(all.children, empty=FALSE))
- rkh.main <- new("XiMpLe.doc",
- dtd=list(doctype="rkhelp"),
- children=list(rkh.document))
+ rkh.main <- XMLTree(rkh.document, dtd=list(doctype="rkhelp"))
return(rkh.main)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.link.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.link.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.link.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -18,7 +18,7 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' package.link <- rk.rkh.link("Spice")
-#' cat(pasteXMLNode(package.link))
+#' cat(pasteXML(package.link))
rk.rkh.link <- function(href, text=NULL, type="R"){
if(identical(type, "url")){
@@ -36,10 +36,7 @@
text <- character()
} else {}
- node <- new("XiMpLe.node",
- name="link",
- attributes=list(href=link),
- value=text)
+ node <- XMLNode(name="link", text, attrs=list(href=link))
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.related.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.related.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.related.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -10,7 +10,7 @@
#' @examples
#' package.link <- rk.rkh.link("Spice")
#' plugin.related <- rk.rkh.related(package.link)
-#' cat(pasteXMLNode(plugin.related))
+#' cat(pasteXML(plugin.related))
rk.rkh.related <- function(..., text=NULL){
links <- list(...)
@@ -20,27 +20,14 @@
if(!identical(this.node at name, "link")){
stop(simpleError(paste("Invalid XML nodes for links section: ", this.node at name, sep="")))
} else {
- li.element <- new("XiMpLe.node",
- name="li",
- children=child.list(this.node),
- value="")
+ li.element <- XMLNode("li", .children=child.list(this.node, empty=FALSE))
}
return(li.element)
})
- ul <- new("XiMpLe.node",
- name="ul",
- children=child.list(li.elements),
- value="")
+ ul <- XMLNode("ul", .children=child.list(li.elements, empty=FALSE))
- if(is.null(text)){
- text <- ""
- } else {}
+ node <- XMLNode("related", text, ul)
- node <- new("XiMpLe.node",
- name="related",
- children=child.list(ul),
- value=text)
-
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.section.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.section.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.section.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -15,7 +15,7 @@
#' @examples
#' test.section <- rk.rkh.section("General background", text="Some important notes...",
#' short="Background")
-#' cat(pasteXMLNode(test.section))
+#' cat(pasteXML(test.section))
rk.rkh.section <- function(title, text=NULL, short=NULL, id.name="auto"){
if(identical(id.name, "auto")){
@@ -35,11 +35,7 @@
text <- ""
} else {}
- node <- new("XiMpLe.node",
- name="section",
- attributes=attr.list,
- value=text
- )
+ node <- XMLNode("section", text, attrs=attr.list)
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.setting.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.setting.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.setting.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -18,7 +18,7 @@
#' test.checkbox <- rk.XML.cbox(label="foo", value="foo1", chk=TRUE)
#' # explain the option
#' test.setting <- rk.rkh.setting(test.checkbox, text="Check this to do Foo.")
-#' cat(pasteXMLNode(test.setting))
+#' cat(pasteXML(test.setting))
rk.rkh.setting <- function(id, text=NULL, title=NULL){
# let's see if we need to extract IDs first
@@ -32,11 +32,7 @@
text <- ""
} else {}
- node <- new("XiMpLe.node",
- name="setting",
- attributes=attr.list,
- value=text
- )
+ node <- XMLNode("setting", text, attrs=attr.list)
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.settings.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.settings.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.settings.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -20,7 +20,7 @@
#' test.caption <- rk.rkh.caption(test.frame)
#' test.setting <- rk.rkh.setting(test.dropdown, text="Chose one of the options.")
#' test.settings <- rk.rkh.settings(list(test.caption, test.setting))
-# cat(pasteXMLNode(test.settings))
+# cat(pasteXML(test.settings))
rk.rkh.settings <- function(...){
nodes <- list(...)
@@ -35,11 +35,7 @@
stop(simpleError(paste("Invalid XML nodes for settings section: ", paste(node.names[invalid.sets], collapse=", "), sep="")))
} else {}
- node <- new("XiMpLe.node",
- name="settings",
- children=child.list(nodes),
- value=""
- )
+ node <- XMLNode("settings", .children=child.list(nodes, empty=FALSE))
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.summary.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.summary.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.summary.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -8,7 +8,7 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' plugin.summary <- rk.rkh.summary("This plugin folds space, using the spice package.")
-#' cat(pasteXMLNode(plugin.summary))
+#' cat(pasteXML(plugin.summary))
rk.rkh.summary <- function(text=NULL){
@@ -16,9 +16,7 @@
text <- ""
} else {}
- node <- new("XiMpLe.node",
- name="summary",
- value=text)
+ node <- XMLNode("summary", text)
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.technical.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.technical.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.technical.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -8,16 +8,14 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' plugin.technical <- rk.rkh.technical("<b>TODO</b>: Implement sandworm detector.")
-#' cat(pasteXMLNode(plugin.technical))
+#' cat(pasteXML(plugin.technical))
rk.rkh.technical <- function(text=NULL){
if(is.null(text)){
text <- ""
} else {}
- node <- new("XiMpLe.node",
- name="technical",
- value=text)
+ node <- XMLNode("technical", text)
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.title.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.title.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.title.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -8,13 +8,14 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' plugin.title <- rk.rkh.title("Spice")
-#' cat(pasteXMLNode(plugin.title))
+#' cat(pasteXML(plugin.title))
rk.rkh.title <- function(text=NULL){
+ if(is.null(text)){
+ text <- ""
+ } else {}
- node <- new("XiMpLe.node",
- name="title",
- value=text)
+ node <- XMLNode("title", text)
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rk.rkh.usage.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.rkh.usage.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rk.rkh.usage.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -8,16 +8,13 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @examples
#' plugin.usage <- rk.rkh.usage("First do this, then do that ...")
-#' cat(pasteXMLNode(plugin.usage))
rk.rkh.usage <- function(text=NULL){
if(is.null(text)){
text <- ""
} else {}
- node <- new("XiMpLe.node",
- name="usage",
- value=text)
+ node <- XMLNode("usage", text)
return(node)
}
Modified: trunk/rkward/packages/rkwarddev/R/rkwarddev-desc-internal.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rkwarddev-desc-internal.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rkwarddev-desc-internal.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -10,7 +10,7 @@
role=c(\"aut\", \"cre\")))",
Maintainer="m.eik michalke <meik.michalke at hhu.de>",
## revert to rkward (>= 0.5.7) later...
- Depends="R (>= 2.9.0),methods,XiMpLe,rkward (>= 0.5.6)",
+ Depends="R (>= 2.9.0),methods,XiMpLe (>= 0.03-12),rkward (>= 0.5.6)",
Enhances="rkward",
Description="Provides functions to create plugin skeletons and XML structures for RKWard.",
License="GPL (>= 3)",
Modified: trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2012-03-17 22:44:18 UTC (rev 4187)
@@ -3,9 +3,9 @@
#' \tabular{ll}{
#' Package: \tab rkwarddev\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.05-2\cr
-#' Date: \tab 2012-03-10\cr
-#' Depends: \tab R (>= 2.9.0),methods,XiMpLe,rkward (>= 0.5.6)\cr
+#' Version: \tab 0.05-3\cr
+#' Date: \tab 2012-03-17\cr
+#' Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-12),rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
#' License: \tab GPL (>= 3)\cr
Modified: trunk/rkward/packages/rkwarddev/inst/CITATION
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/CITATION 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/inst/CITATION 2012-03-17 22:44:18 UTC (rev 4187)
@@ -2,12 +2,12 @@
title="rkwarddev: A collection of tools for RKWard plugin development",
author="Meik Michalke",
year="2012",
- note="(Version 0.05-2)",
+ note="(Version 0.05-3)",
url="http://rkward.sourceforge.net",
textVersion =
paste("Michalke, M. (2012). ",
- "rkwarddev: A collection of tools for RKWard plugin development (Version 0.05-2). ",
+ "rkwarddev: A collection of tools for RKWard plugin development (Version 0.05-3). ",
"Available from http://rkward.sourceforge.net",
sep=""),
Modified: trunk/rkward/packages/rkwarddev/inst/NEWS.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/NEWS.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/inst/NEWS.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -1,6 +1,13 @@
\name{NEWS}
\title{News for Package 'rkwarddev'}
\encoding{UTF-8}
+\section{Changes in rkwarddev version 0.05-3 (2012-03-17)}{
+ \itemize{
+ \item fixed: \code{rk.XML.text()} now preserves XML tags in the text value
+ \item began to use \code{XiMpLe::XMLNode()} and \code{XiMpLe::XMLTree()} constructors in functions, and to rename
+ \code{pasteXMLNode()} and \code{pasteXMLTree()} into \code{pasteXML()}
+ }
+}
\section{Changes in rkwarddev version 0.05-2 (2012-03-10)}{
\itemize{
\item added missing dependency to package methods
Modified: trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
===================================================================
(Binary files differ)
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.about.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.about.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.about.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -81,7 +81,7 @@
c(name="heisenberg.pluginmap", url="http://eternalwondermaths.example.org/hsb"))
)
-cat(pasteXMLNode(about.node, shine=2))
+cat(pasteXML(about.node, shine=2))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.attribute.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.attribute.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.attribute.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -29,7 +29,7 @@
test.checkbox <- rk.XML.cbox(label="foo", value="foo1", chk=TRUE)
# re-set the attribute
test.attribute <- rk.XML.attribute(test.checkbox, value="bar2", label="bar")
-cat(pasteXMLNode(test.attribute))
+cat(pasteXML(test.attribute))
}
\seealso{
\code{\link[rkwarddev:rk.XML.components]{rk.XML.components}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.browser.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.browser.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.browser.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -40,7 +40,7 @@
}
\examples{
test.browser <- rk.XML.browser("Browse here:")
-cat(pasteXMLNode(test.browser))
+cat(pasteXML(test.browser))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.cbox.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.cbox.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.cbox.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -38,7 +38,7 @@
list(
rk.XML.cbox(label="foo", value="foo1", chk=TRUE),
rk.XML.cbox(label="bar", value="bar2"))))
-cat(pasteXMLNode(test.checkboxes))
+cat(pasteXML(test.checkboxes))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.code.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.code.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.code.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -16,7 +16,7 @@
}
\examples{
test.code <- rk.XML.code("some_file.js")
-cat(pasteXMLNode(test.code))
+cat(pasteXML(test.code))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.col.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.col.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.col.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -22,7 +22,7 @@
test.checkboxes <- rk.XML.row(rk.XML.col(
rk.XML.cbox(label="foo", val="foo1", chk=TRUE),
rk.XML.cbox(label="bar", val="bar2")))
-cat(pasteXMLNode(test.checkboxes))
+cat(pasteXML(test.checkboxes))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.component.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.component.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.component.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -29,7 +29,7 @@
}
\examples{
test.component <- rk.XML.component("My GUI dialog", "plugins/MyGUIdialog.xml")
-cat(pasteXMLNode(test.component))
+cat(pasteXML(test.component))
}
\seealso{
\code{\link[rkwarddev:rk.XML.components]{rk.XML.components}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.components.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.components.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.components.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -18,7 +18,7 @@
\examples{
test.component <- rk.XML.component("My GUI dialog", "plugins/MyGUIdialog.xml")
test.components <- rk.XML.components(test.component)
-cat(pasteXMLNode(test.components))
+cat(pasteXML(test.components))
}
\seealso{
\code{\link[rkwarddev:rk.XML.pluginmap]{rk.XML.pluginmap}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.connect.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.connect.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.connect.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -46,7 +46,7 @@
}
\examples{
test.connect <- rk.XML.connect(governor="lgc_foobar", client="frame_bar")
-cat(pasteXMLNode(test.connect))
+cat(pasteXML(test.connect))
}
\seealso{
\code{\link[rkwarddev:rk.XML.convert]{rk.XML.convert}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.context.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.context.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.context.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -22,7 +22,7 @@
test.entry <- rk.XML.entry(test.component)
test.menu <- rk.XML.menu("Analysis", nodes=test.entry, id.name="analysis")
test.context <- rk.XML.context(test.menu)
-cat(pasteXMLNode(test.context))
+cat(pasteXML(test.context))
}
\seealso{
\code{\link[rkwarddev:rk.XML.menu]{rk.XML.menu}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.convert.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.convert.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.convert.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -56,7 +56,7 @@
}
\examples{
test.convert <- rk.XML.convert(list(string="foo"), mode=c(notequals="bar"))
-cat(pasteXMLNode(test.convert))
+cat(pasteXML(test.convert))
}
\seealso{
\code{\link[rkwarddev:rk.XML.connect]{rk.XML.connect}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.copy.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.copy.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.copy.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -28,7 +28,7 @@
test.text <- rk.XML.text("Did you test more than 30 subjects?")
test.copy <- rk.XML.copy(id=test.cbox1)
test.wizard <- rk.XML.wizard(rk.XML.page(list(test.text, test.copy)))
-cat(pasteXMLNode(test.wizard))
+cat(pasteXML(test.wizard))
}
\seealso{
\code{\link[rkwarddev:rk.XML.plugin]{rk.XML.plugin}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.dialog.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.dialog.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.dialog.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -27,7 +27,7 @@
test.cbox1 <- rk.XML.cbox(label="Want to type?", val="true")
test.cbox2 <- rk.XML.cbox(label="Are you shure?", val="true")
test.dialog <- rk.XML.dialog(rk.XML.col(test.input, test.cbox1, test.cbox2))
-cat(pasteXMLNode(test.dialog))
+cat(pasteXML(test.dialog))
}
\seealso{
\code{\link[rkwarddev:rk.XML.plugin]{rk.XML.plugin}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.dropdown.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.dropdown.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.dropdown.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -31,7 +31,7 @@
test.dropdown <- rk.XML.dropdown("mydrop",
options=list("First Option"=c(val="val1"),
"Second Option"=c(val="val2", chk=TRUE)))
-cat(pasteXMLNode(test.dropdown))
+cat(pasteXML(test.dropdown))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.embed.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.embed.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.embed.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -29,7 +29,7 @@
}
\examples{
test.embed <- rk.XML.embed("someComponent")
-cat(pasteXMLNode(test.embed))
+cat(pasteXML(test.embed))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.entry.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.entry.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.entry.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -21,7 +21,7 @@
\examples{
test.component <- rk.XML.component("My GUI dialog", "plugins/MyGUIdialog.xml")
test.entry <- rk.XML.entry(test.component)
-cat(pasteXMLNode(test.entry))
+cat(pasteXML(test.entry))
}
\seealso{
\code{\link[rkwarddev:rk.XML.menu]{rk.XML.menu}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.external.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.external.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.external.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -18,7 +18,7 @@
}
\examples{
test.external <- rk.XML.external(id="ext_property", default="none")
-cat(pasteXMLNode(test.external))
+cat(pasteXML(test.external))
}
\seealso{
\code{\link[rkwarddev:rk.XML.convert]{rk.XML.convert}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.formula.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.formula.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.formula.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -29,7 +29,7 @@
test.varslot1 <- rk.XML.varslot("Fixed factors", source=test.varselector)
test.varslot2 <- rk.XML.varslot("Dependent variables", source=test.varselector)
test.formula <- rk.XML.formula(fixed=test.varslot1, dependent=test.varslot2)
-cat(pasteXMLNode(test.formula))
+cat(pasteXML(test.formula))
}
\seealso{
\code{\link[rkwarddev:rk.XML.varselector]{rk.XML.varselector}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.frame.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.frame.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.frame.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -34,7 +34,7 @@
test.dropdown <- rk.XML.dropdown("mydrop",
options=list("First Option"=c(val="val1"),
"Second Option"=c(val="val2", chk=TRUE)))
-cat(pasteXMLNode(rk.XML.frame(test.dropdown, label="Some options")))
+cat(pasteXML(rk.XML.frame(test.dropdown, label="Some options")))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.help.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.help.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.help.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -16,7 +16,7 @@
}
\examples{
test.help <- rk.XML.help("some_file.rkh")
-cat(pasteXMLNode(test.help))
+cat(pasteXML(test.help))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.hierarchy.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.hierarchy.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.hierarchy.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -20,7 +20,7 @@
test.entry <- rk.XML.entry(test.component)
test.menu <- rk.XML.menu("Analysis", nodes=test.entry, id.name="analysis")
test.hierarchy <- rk.XML.hierarchy(test.menu)
-cat(pasteXMLNode(test.hierarchy))
+cat(pasteXML(test.hierarchy))
}
\seealso{
\code{\link[rkwarddev:rk.XML.menu]{rk.XML.menu}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.include.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.include.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.include.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -16,7 +16,7 @@
}
\examples{
test.include <- rk.XML.include("../some_file.xml")
-cat(pasteXMLNode(test.include))
+cat(pasteXML(test.include))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.input.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.input.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.input.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -30,7 +30,7 @@
}
\examples{
test.input <- rk.XML.input("Type some text")
-cat(pasteXMLNode(test.input))
+cat(pasteXML(test.input))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.insert.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.insert.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.insert.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -23,7 +23,7 @@
test.snippet <- rk.XML.snippet(test.formula)
# now to insert the snippet
test.insert <- rk.XML.insert(test.snippet)
-cat(pasteXMLNode(test.insert))
+cat(pasteXML(test.insert))
}
\seealso{
\code{\link[rkwarddev:rk.XML.snippets]{rk.XML.snippets}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.logic.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.logic.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.logic.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -29,12 +29,12 @@
test.convert <- rk.XML.convert(c(state=test.cbox1,state=test.cbox2), mode=c(and=""))
test.connect <- rk.XML.connect(governor=test.convert, client=test.input, set="enabled")
test.logic <- rk.XML.logic(test.convert, test.connect)
-cat(pasteXMLNode(test.logic))
+cat(pasteXML(test.logic))
# with only one checkbox, you can directly query if it's checked
test.connect2 <- rk.XML.connect(governor=test.cbox1, client=test.input, set="enabled")
test.logic2 <- rk.XML.logic(test.connect2)
-cat(pasteXMLNode(test.logic2))
+cat(pasteXML(test.logic2))
}
\seealso{
\code{\link[rkwarddev:rk.XML.convert]{rk.XML.convert}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.menu.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.menu.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.menu.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -38,7 +38,7 @@
test.component <- rk.XML.component("My GUI dialog", "plugins/MyGUIdialog.xml")
test.entry <- rk.XML.entry(test.component)
test.menu <- rk.XML.menu("Analysis", test.entry, id.name="analysis")
-cat(pasteXMLNode(test.menu))
+cat(pasteXML(test.menu))
# manual definition of a menu path by a list:
test.menu <- rk.XML.menu("Analysis", list("Level 1", "Level 2", test.component))
}
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.page.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.page.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.page.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -30,7 +30,7 @@
test.text <- rk.XML.text("Did you test more than 30 subjects?")
test.copy <- rk.XML.copy(id=test.cbox1)
test.wizard <- rk.XML.wizard(rk.XML.page(test.text, test.copy))
-cat(pasteXMLNode(test.wizard))
+cat(pasteXML(test.wizard))
}
\seealso{
\code{\link[rkwarddev:rk.XML.wizard]{rk.XML.wizard}}, and
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.preview.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.preview.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.preview.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -16,7 +16,7 @@
}
\examples{
test.preview <- rk.XML.preview("See a preview?")
-cat(pasteXMLNode(test.preview))
+cat(pasteXML(test.preview))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.radio.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.radio.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.radio.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -31,7 +31,7 @@
test.radio <- rk.XML.radio("Chose one",
options=list("First Option"=c(val="val1"),
"Second Option"=c(val="val2", chk=TRUE)))
-cat(pasteXMLNode(test.radio))
+cat(pasteXML(test.radio))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.require.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.require.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.require.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -17,7 +17,7 @@
}
\examples{
test.require <- rk.XML.require("another.pluginmap")
-cat(pasteXMLNode(test.require))
+cat(pasteXML(test.require))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.row.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.row.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.row.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -22,7 +22,7 @@
test.checkboxes <- rk.XML.row(rk.XML.col(
rk.XML.cbox(label="foo", val="foo1", chk=TRUE),
rk.XML.cbox(label="bar", val="bar2")))
-cat(pasteXMLNode(test.checkboxes))
+cat(pasteXML(test.checkboxes))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.saveobj.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.saveobj.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.saveobj.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -37,7 +37,7 @@
}
\examples{
test.saveobj <- rk.XML.saveobj("Save the results")
-cat(pasteXMLNode(test.saveobj))
+cat(pasteXML(test.saveobj))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.set.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.set.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.set.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -27,7 +27,7 @@
}
\examples{
test.set <- rk.XML.set(id="input_foo", set="required", to=TRUE)
-cat(pasteXMLNode(test.set))
+cat(pasteXML(test.set))
}
\seealso{
\code{\link[rkwarddev:rk.XML.convert]{rk.XML.convert}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.snippet.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.snippet.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.snippet.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -24,7 +24,7 @@
test.formula <- rk.XML.vars("Variables", "Fixed", formula.dependent="Dependent")
# define the snippet
test.snippet <- rk.XML.snippet(test.formula)
-cat(pasteXMLNode(test.snippet))
+cat(pasteXML(test.snippet))
}
\seealso{
\code{\link[rkwarddev:rk.XML.snippets]{rk.XML.snippets}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.snippets.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.snippets.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.snippets.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -21,7 +21,7 @@
# define the snippets section
test.snippet <- rk.XML.snippet(test.formula)
test.snippets <- rk.XML.snippets(test.snippet)
-cat(pasteXMLNode(test.snippets))
+cat(pasteXML(test.snippets))
}
\seealso{
\code{\link[rkwarddev:rk.XML.plugin]{rk.XML.plugin}}
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.spinbox.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.spinbox.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.spinbox.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -43,7 +43,7 @@
}
\examples{
test.spinbox <- rk.XML.spinbox("Spin this:")
-cat(pasteXMLNode(test.spinbox))
+cat(pasteXML(test.spinbox))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.stretch.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.stretch.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.stretch.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -21,7 +21,7 @@
elements defined there.
}
\examples{
-cat(pasteXMLNode(rk.XML.stretch()))
+cat(pasteXML(rk.XML.stretch()))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.tabbook.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.tabbook.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.tabbook.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -35,7 +35,7 @@
# combine the above into a tabbook
test.tabbook <- rk.XML.tabbook("My Tabbook",
tabs=list("First Tab"=test.checkboxes, "Second Tab"=test.dropdown))
-cat(pasteXMLNode(test.tabbook))
+cat(pasteXML(test.tabbook))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.text.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.text.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.text.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -23,7 +23,7 @@
}
\examples{
test.text <- rk.XML.text("Added this text.")
-cat(pasteXMLNode(test.text))
+cat(pasteXML(test.text))
}
\seealso{
\href{help:rkwardplugins}{Introduction to Writing Plugins
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.vars.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.vars.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.vars.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -100,7 +100,7 @@
}
\examples{
test.vars <- rk.XML.vars("Select some vars", "Vars go here")
-cat(pasteXMLNode(test.vars))
+cat(pasteXML(test.vars))
}
\seealso{
\code{\link[rkwarddev:rk.XML.varslot]{rk.XML.varslot}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.varselector.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.varselector.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.varselector.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -20,7 +20,7 @@
}
\examples{
test.varselector <- rk.XML.varselector("Select some vars")
-cat(pasteXMLNode(test.varselector))
+cat(pasteXML(test.varselector))
}
\seealso{
\code{\link[rkwarddev:rk.XML.varslot]{rk.XML.varslot}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.varslot.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.varslot.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.varslot.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -69,7 +69,7 @@
\dontrun{
test.varselector <- rk.XML.varselector("Select some vars")
test.varslot <- rk.XML.varslot("Vars go here", source=test.varselector)
-cat(pasteXMLNode(test.varslot))
+cat(pasteXML(test.varslot))
}
}
\seealso{
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.wizard.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.wizard.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.wizard.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -28,7 +28,7 @@
test.text <- rk.XML.text("Did you test more than 30 subjects?")
test.copy <- rk.XML.copy(id=test.cbox1)
test.wizard <- rk.XML.wizard(rk.XML.page(list(test.text, test.copy)))
-cat(pasteXMLNode(test.wizard))
+cat(pasteXML(test.wizard))
}
\seealso{
\code{\link[rkwarddev:rk.XML.plugin]{rk.XML.plugin}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.comment.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.comment.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.comment.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -15,6 +15,6 @@
}
\examples{
test.comment <- rk.comment("Added this text.")
-cat(pasteXMLNode(test.comment))
+cat(pasteXML(test.comment))
}
Modified: trunk/rkward/packages/rkwarddev/man/rk.rkh.caption.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.rkh.caption.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.rkh.caption.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -29,7 +29,7 @@
test.frame <- rk.XML.frame(test.dropdown, label="Some options")
# create the caption
test.caption <- rk.rkh.caption(test.frame)
-cat(pasteXMLNode(test.caption))
+cat(pasteXML(test.caption))
}
\seealso{
\code{\link[rkwarddev:rk.rkh.doc]{rk.rkh.doc}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.rkh.link.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.rkh.link.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.rkh.link.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -29,7 +29,7 @@
}
\examples{
package.link <- rk.rkh.link("Spice")
-cat(pasteXMLNode(package.link))
+cat(pasteXML(package.link))
}
\seealso{
\code{\link[rkwarddev:rk.rkh.doc]{rk.rkh.doc}} and the
Modified: trunk/rkward/packages/rkwarddev/man/rk.rkh.related.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.rkh.related.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.rkh.related.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -19,7 +19,7 @@
\examples{
package.link <- rk.rkh.link("Spice")
plugin.related <- rk.rkh.related(package.link)
-cat(pasteXMLNode(plugin.related))
+cat(pasteXML(plugin.related))
}
\seealso{
\code{\link[rkwarddev:rk.rkh.doc]{rk.rkh.doc}} and the
Modified: trunk/rkward/packages/rkwarddev/man/rk.rkh.section.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.rkh.section.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.rkh.section.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -27,7 +27,7 @@
\examples{
test.section <- rk.rkh.section("General background", text="Some important notes...",
short="Background")
-cat(pasteXMLNode(test.section))
+cat(pasteXML(test.section))
}
\seealso{
\code{\link[rkwarddev:rk.rkh.doc]{rk.rkh.doc}} and the
Modified: trunk/rkward/packages/rkwarddev/man/rk.rkh.setting.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.rkh.setting.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.rkh.setting.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -28,7 +28,7 @@
test.checkbox <- rk.XML.cbox(label="foo", value="foo1", chk=TRUE)
# explain the option
test.setting <- rk.rkh.setting(test.checkbox, text="Check this to do Foo.")
-cat(pasteXMLNode(test.setting))
+cat(pasteXML(test.setting))
}
\seealso{
\code{\link[rkwarddev:rk.rkh.doc]{rk.rkh.doc}},
Modified: trunk/rkward/packages/rkwarddev/man/rk.rkh.summary.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.rkh.summary.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.rkh.summary.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -15,7 +15,7 @@
}
\examples{
plugin.summary <- rk.rkh.summary("This plugin folds space, using the spice package.")
-cat(pasteXMLNode(plugin.summary))
+cat(pasteXML(plugin.summary))
}
\seealso{
\code{\link[rkwarddev:rk.rkh.doc]{rk.rkh.doc}} and the
Modified: trunk/rkward/packages/rkwarddev/man/rk.rkh.technical.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.rkh.technical.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.rkh.technical.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -15,7 +15,7 @@
}
\examples{
plugin.technical <- rk.rkh.technical("<b>TODO</b>: Implement sandworm detector.")
-cat(pasteXMLNode(plugin.technical))
+cat(pasteXML(plugin.technical))
}
\seealso{
\code{\link[rkwarddev:rk.rkh.doc]{rk.rkh.doc}} and the
Modified: trunk/rkward/packages/rkwarddev/man/rk.rkh.title.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.rkh.title.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.rkh.title.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -15,7 +15,7 @@
}
\examples{
plugin.title <- rk.rkh.title("Spice")
-cat(pasteXMLNode(plugin.title))
+cat(pasteXML(plugin.title))
}
\seealso{
\code{\link[rkwarddev:rk.rkh.doc]{rk.rkh.doc}} and the
Modified: trunk/rkward/packages/rkwarddev/man/rk.rkh.usage.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.rkh.usage.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rk.rkh.usage.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -15,7 +15,6 @@
}
\examples{
plugin.usage <- rk.rkh.usage("First do this, then do that ...")
-cat(pasteXMLNode(plugin.usage))
}
\seealso{
\code{\link[rkwarddev:rk.rkh.doc]{rk.rkh.doc}} and the
Modified: trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2012-03-17 22:40:26 UTC (rev 4186)
+++ trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2012-03-17 22:44:18 UTC (rev 4187)
@@ -8,9 +8,9 @@
}
\details{
\tabular{ll}{ Package: \tab rkwarddev\cr Type: \tab
- Package\cr Version: \tab 0.05-2\cr Date: \tab
- 2012-03-10\cr Depends: \tab R (>=
- 2.9.0),methods,XiMpLe,rkward (>= 0.5.6)\cr Enhances: \tab
+ Package\cr Version: \tab 0.05-3\cr Date: \tab
+ 2012-03-17\cr Depends: \tab R (>= 2.9.0),methods,XiMpLe
+ (>= 0.03-12),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