[rkward-cvs] SF.net SVN: rkward-code:[4646] trunk/rkward/packages/XiMpLe
m-eik at users.sf.net
m-eik at users.sf.net
Sat Mar 30 15:01:36 UTC 2013
Revision: 4646
http://sourceforge.net/p/rkward/code/4646
Author: m-eik
Date: 2013-03-30 15:01:35 +0000 (Sat, 30 Mar 2013)
Log Message:
-----------
XiMpLe: removed the note of the unfinished (and far from urgent) fix from the changelog and marked it as TODO in XiMpLe-internal.R instead. it's just a nice-to-have feature for invalid XML anyway.
Modified Paths:
--------------
trunk/rkward/packages/XiMpLe/ChangeLog
trunk/rkward/packages/XiMpLe/DESCRIPTION
trunk/rkward/packages/XiMpLe/NAMESPACE
trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R
trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R
trunk/rkward/packages/XiMpLe/R/show-methods.R
trunk/rkward/packages/XiMpLe/debian/changelog.rkward
trunk/rkward/packages/XiMpLe/inst/NEWS.Rd
trunk/rkward/packages/XiMpLe/inst/doc/XiMpLe_vignette.pdf
trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd
Modified: trunk/rkward/packages/XiMpLe/ChangeLog
===================================================================
--- trunk/rkward/packages/XiMpLe/ChangeLog 2013-03-30 13:47:12 UTC (rev 4645)
+++ trunk/rkward/packages/XiMpLe/ChangeLog 2013-03-30 15:01:35 UTC (rev 4646)
@@ -1,15 +1,10 @@
ChangeLog for package XiMpLe
-changes in version 0.03-20 (2013-03-05)
+changes in version 0.03-20 (2013-03-30)
changed:
- - CURRENTLY TURNED OFF: while parsing attributes, XiMpLe will try to force empty attributes into
- attribute="attribute". firstly, empty attributes are not valid XML.
- secondly, they break parsing, because they can't be represented in a list. only
- works if the attribute in question is the last in line. needs improvement
- and should be made optional.
- - internally replaced paste(..., sep="") calls with paste0(...). for R versions older than
- 2.15 (when paste0() was introduced), a wrapper function should kick in, so we don't need
- to change the dependencies.
+ - internally replaced paste(..., sep="") calls with paste0(...). for R
+ versions older than 2.15 (when paste0() was introduced), a wrapper function
+ should kick in, so we don't need to change the dependencies.
changes in version 0.03-19 (2013-02-24)
added:
Modified: trunk/rkward/packages/XiMpLe/DESCRIPTION
===================================================================
--- trunk/rkward/packages/XiMpLe/DESCRIPTION 2013-03-30 13:47:12 UTC (rev 4645)
+++ trunk/rkward/packages/XiMpLe/DESCRIPTION 2013-03-30 15:01:35 UTC (rev 4646)
@@ -20,11 +20,11 @@
Authors at R: c(person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut", "cre")))
Version: 0.03-20
-Date: 2013-02-26
+Date: 2013-03-30
Collate:
'XiMpLe-internal.R'
+ 'XiMpLe.node-class.R'
'XiMpLe.doc-class.R'
- 'XiMpLe.node-class.R'
'node.R'
'parseXMLTree.R'
'pasteXML-methods.R'
Modified: trunk/rkward/packages/XiMpLe/NAMESPACE
===================================================================
--- trunk/rkward/packages/XiMpLe/NAMESPACE 2013-03-30 13:47:12 UTC (rev 4645)
+++ trunk/rkward/packages/XiMpLe/NAMESPACE 2013-03-30 15:01:35 UTC (rev 4646)
@@ -2,26 +2,26 @@
exportClasses(XiMpLe.node)
export(is.XiMpLe.doc)
export(is.XiMpLe.node)
+exportMethods(node)
exportMethods("node<-")
-exportMethods(node)
exportMethods(pasteXML)
exportMethods(show)
+exportMethods(XMLAttrs)
exportMethods("XMLAttrs<-")
-exportMethods(XMLAttrs)
+exportMethods(XMLChildren)
exportMethods("XMLChildren<-")
-exportMethods(XMLChildren)
+exportMethods(XMLDecl)
exportMethods("XMLDecl<-")
-exportMethods(XMLDecl)
+exportMethods(XMLDTD)
exportMethods("XMLDTD<-")
-exportMethods(XMLDTD)
+exportMethods(XMLFile)
exportMethods("XMLFile<-")
-exportMethods(XMLFile)
+exportMethods(XMLName)
exportMethods("XMLName<-")
-exportMethods(XMLName)
+exportMethods(XMLScan)
exportMethods("XMLScan<-")
-exportMethods(XMLScan)
+exportMethods(XMLValue)
exportMethods("XMLValue<-")
-exportMethods(XMLValue)
export(parseXMLTree)
export(pasteXMLNode)
export(pasteXMLTag)
Modified: trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R
===================================================================
--- trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R 2013-03-30 13:47:12 UTC (rev 4645)
+++ trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R 2013-03-30 15:01:35 UTC (rev 4646)
@@ -238,10 +238,13 @@
separated.tag <- gsub("=[[:space:]]*\"([^\"]*)\"[[:space:]]+([^[:space:]=]+)", "=\"\\1\", \\2", stripped.tag, perl=TRUE)
# to be on the safe side, escape all list names, in case there's unexpected special characters in them
separated.tag <- gsub("( ,)?([^[:space:],\"]*)=\"", "\\1\"\\2\"=\"", separated.tag, perl=TRUE)
- # empty attributes are not valid, force them into atrribute="attribute"
- # does only work partially it the empty attribute is the last in line
- # and still causes *problems* in matching string in the value of other attributes!
+ ###################################################################################
+ ## TODO:
+ ## empty attributes are not valid, force them into atrribute="attribute"
+ ## does only work partially it the empty attribute is the last in line
+ ## and still causes *problems* in matching string in the value of other attributes!
# separated.tag <- gsub("(, |\\A)([^[:space:],\"=][[:alnum:]]*)", "\\1\"\\2\"=\"\\2\"", separated.tag, perl=TRUE)
+ ###################################################################################
parsed.list <- eval(parse(text=paste("list(", separated.tag, ")")))
}
if(XML.declaration(tag)){
Modified: trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R
===================================================================
--- trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R 2013-03-30 13:47:12 UTC (rev 4645)
+++ trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R 2013-03-30 15:01:35 UTC (rev 4646)
@@ -4,7 +4,7 @@
#' Package: \tab XiMpLe\cr
#' Type: \tab Package\cr
#' Version: \tab 0.03-20\cr
-#' Date: \tab 2013-02-26\cr
+#' Date: \tab 2013-03-30\cr
#' Depends: \tab R (>= 2.9.0),methods\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
Modified: trunk/rkward/packages/XiMpLe/R/show-methods.R
===================================================================
--- trunk/rkward/packages/XiMpLe/R/show-methods.R 2013-03-30 13:47:12 UTC (rev 4645)
+++ trunk/rkward/packages/XiMpLe/R/show-methods.R 2013-03-30 15:01:35 UTC (rev 4646)
@@ -20,6 +20,7 @@
#' @rdname show-methods
#' @include XiMpLe.node-class.R
#' @include XiMpLe.doc-class.R
+#' @export
setMethod("show", signature(object="XiMpLe.XML"), function(object){
cat(pasteXML(object))
})
Modified: trunk/rkward/packages/XiMpLe/debian/changelog.rkward
===================================================================
--- trunk/rkward/packages/XiMpLe/debian/changelog.rkward 2013-03-30 13:47:12 UTC (rev 4645)
+++ trunk/rkward/packages/XiMpLe/debian/changelog.rkward 2013-03-30 15:01:35 UTC (rev 4646)
@@ -1,3 +1,9 @@
+r-other-rkward-ximple (0.03-20-1) unstable; urgency=low
+
+ * new upstream release
+
+ -- m.eik michalke <meik.michalke at hhu.de> Thu, 07 Mar 2013 18:21:29 +0000
+
r-other-rkward-ximple (0.03-19-1) unstable; urgency=low
* new upstream release
Modified: trunk/rkward/packages/XiMpLe/inst/NEWS.Rd
===================================================================
--- trunk/rkward/packages/XiMpLe/inst/NEWS.Rd 2013-03-30 13:47:12 UTC (rev 4645)
+++ trunk/rkward/packages/XiMpLe/inst/NEWS.Rd 2013-03-30 15:01:35 UTC (rev 4646)
@@ -1,14 +1,12 @@
\name{NEWS}
\title{News for Package 'XiMpLe'}
\encoding{UTF-8}
-\section{Changes in XiMpLe version 0.03-20 (2013-02-26)}{
+\section{Changes in XiMpLe version 0.03-20 (2013-03-30)}{
\subsection{changed}{
\itemize{
- \item CURRENTLY TURNED OFF: while parsing attributes, XiMpLe will try to force empty attributes into
- attribute=\code{"attribute"}. firstly, empty attributes are not valid XML.
- secondly, they break parsing, because they can't be represented in a list. only
- works if the attribute in question is the last in line. needs improvement
- and should be made optional.
+ \item internally replaced paste(..., sep=\code{""}) calls with paste0(...). for R
+ versions older than 2.15 (when \code{paste0()} was introduced), a wrapper function
+ should kick in, so we don't need to change the dependencies.
}
}
}
Modified: trunk/rkward/packages/XiMpLe/inst/doc/XiMpLe_vignette.pdf
===================================================================
(Binary files differ)
Modified: trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd
===================================================================
--- trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd 2013-03-30 13:47:12 UTC (rev 4645)
+++ trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd 2013-03-30 15:01:35 UTC (rev 4646)
@@ -9,7 +9,7 @@
\details{
\tabular{ll}{ Package: \tab XiMpLe\cr Type: \tab
Package\cr Version: \tab 0.03-20\cr Date: \tab
- 2013-02-26\cr Depends: \tab R (>= 2.9.0),methods\cr
+ 2013-03-30\cr Depends: \tab R (>= 2.9.0),methods\cr
Enhances: \tab rkward\cr Encoding: \tab UTF-8\cr License:
\tab GPL (>= 3)\cr LazyLoad: \tab yes\cr URL: \tab
http://reaktanz.de/?c=hacking&s=XiMpLe\cr }
More information about the rkward-tracker
mailing list