[rkward-cvs] SF.net SVN: rkward:[4172] trunk/rkward/packages/XiMpLe
m-eik at users.sourceforge.net
m-eik at users.sourceforge.net
Sun Mar 11 21:11:01 UTC 2012
Revision: 4172
http://rkward.svn.sourceforge.net/rkward/?rev=4172&view=rev
Author: m-eik
Date: 2012-03-11 21:11:01 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
XiMpLe: fixed handling of tags with attribute names that include special characters
Modified Paths:
--------------
trunk/rkward/packages/XiMpLe/ChangeLog
trunk/rkward/packages/XiMpLe/DESCRIPTION
trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R
trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R
trunk/rkward/packages/XiMpLe/inst/CITATION
trunk/rkward/packages/XiMpLe/inst/NEWS.Rd
trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd
Modified: trunk/rkward/packages/XiMpLe/ChangeLog
===================================================================
--- trunk/rkward/packages/XiMpLe/ChangeLog 2012-03-11 08:57:43 UTC (rev 4171)
+++ trunk/rkward/packages/XiMpLe/ChangeLog 2012-03-11 21:11:01 UTC (rev 4172)
@@ -1,5 +1,9 @@
ChangeLog for package XiMpLe
+changes in version 0.03-10 (2012-03-11)
+ - fixed bug in parsing of attributes, their names are now all quoted by default o not run into issues
+ if they contain R-sensitive characters (like "http-equiv")
+
changes in version 0.03-9 (2012-03-10)
- re-formatted the ChangeLog so roxyPackage can translate it into a NEWS.Rd file
Modified: trunk/rkward/packages/XiMpLe/DESCRIPTION
===================================================================
--- trunk/rkward/packages/XiMpLe/DESCRIPTION 2012-03-11 08:57:43 UTC (rev 4171)
+++ trunk/rkward/packages/XiMpLe/DESCRIPTION 2012-03-11 21:11:01 UTC (rev 4172)
@@ -17,8 +17,8 @@
URL: http://reaktanz.de/?c=hacking&s=XiMpLe
Authors at R: c(person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut", "cre")))
-Version: 0.03-9
-Date: 2012-03-10
+Version: 0.03-10
+Date: 2012-03-11
Collate:
'XiMpLe.node-class.R'
'XiMpLe.doc-class.R'
Modified: trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R
===================================================================
--- trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R 2012-03-11 08:57:43 UTC (rev 4171)
+++ trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R 2012-03-11 21:11:01 UTC (rev 4172)
@@ -179,6 +179,8 @@
stripped.tag <- gsub("[/?]*>$", "", stripped.tag, perl=TRUE)
# fill in commas, so we can evaluate this as elements of a named list
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)
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 2012-03-11 08:57:43 UTC (rev 4171)
+++ trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R 2012-03-11 21:11:01 UTC (rev 4172)
@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab XiMpLe\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.03-9\cr
-#' Date: \tab 2012-03-10\cr
+#' Version: \tab 0.03-10\cr
+#' Date: \tab 2012-03-11\cr
#' Depends: \tab R (>= 2.9.0),methods\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
Modified: trunk/rkward/packages/XiMpLe/inst/CITATION
===================================================================
--- trunk/rkward/packages/XiMpLe/inst/CITATION 2012-03-11 08:57:43 UTC (rev 4171)
+++ trunk/rkward/packages/XiMpLe/inst/CITATION 2012-03-11 21:11:01 UTC (rev 4172)
@@ -2,12 +2,12 @@
title="XiMpLe: A simple XML tree parser and generator",
author="Meik Michalke",
year="2012",
- note="(Version 0.03-9)",
+ note="(Version 0.03-10)",
url="http://reaktanz.de/?c=hacking&s=XiMpLe",
textVersion =
paste("Michalke, M. (2012). ",
- "XiMpLe: A simple XML tree parser and generator (Version 0.03-9). ",
+ "XiMpLe: A simple XML tree parser and generator (Version 0.03-10). ",
"Available from http://reaktanz.de/?c=hacking&s=XiMpLe",
sep=""),
Modified: trunk/rkward/packages/XiMpLe/inst/NEWS.Rd
===================================================================
--- trunk/rkward/packages/XiMpLe/inst/NEWS.Rd 2012-03-11 08:57:43 UTC (rev 4171)
+++ trunk/rkward/packages/XiMpLe/inst/NEWS.Rd 2012-03-11 21:11:01 UTC (rev 4172)
@@ -1,6 +1,12 @@
\name{NEWS}
\title{News for Package 'XiMpLe'}
\encoding{UTF-8}
+\section{Changes in XiMpLe version 0.03-10 (2012-03-11)}{
+ \itemize{
+ \item fixed bug in parsing of attributes, their names are now all quoted by default o not run into issues
+ if they contain R-sensitive characters (like "http-equiv")
+ }
+}
\section{Changes in XiMpLe version 0.03-9 (2012-03-10)}{
\itemize{
\item re-formatted the ChangeLog so roxyPackage can translate it into a NEWS.Rd file
Modified: trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd
===================================================================
--- trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd 2012-03-11 08:57:43 UTC (rev 4171)
+++ trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd 2012-03-11 21:11:01 UTC (rev 4172)
@@ -8,8 +8,8 @@
}
\details{
\tabular{ll}{ Package: \tab XiMpLe\cr Type: \tab
- Package\cr Version: \tab 0.03-9\cr Date: \tab
- 2012-03-10\cr Depends: \tab R (>= 2.9.0),methods\cr
+ Package\cr Version: \tab 0.03-10\cr Date: \tab
+ 2012-03-11\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 }
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