[rkward-cvs] SF.net SVN: rkward-code:[4544] trunk/rkward/packages/rkwarddev

[m-eik at users.sf.net]

Revision: 4544
          http://sourceforge.net/p/rkward/code/4544
Author:   m-eik
Date:     2013-02-20 19:04:47 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
rkwarddev: fixed rk.XML.matrix() bug

Modified Paths:
--------------
    trunk/rkward/packages/rkwarddev/DESCRIPTION
    trunk/rkward/packages/rkwarddev/R/rk.XML.matrix.R
    trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
    trunk/rkward/packages/rkwarddev/inst/NEWS.Rd
    trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
    trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd

Modified: trunk/rkward/packages/rkwarddev/DESCRIPTION
===================================================================
--- trunk/rkward/packages/rkwarddev/DESCRIPTION	2013-02-20 16:39:50 UTC (rev 4543)
+++ trunk/rkward/packages/rkwarddev/DESCRIPTION	2013-02-20 19:04:47 UTC (rev 4544)
@@ -15,7 +15,7 @@
 Authors at R: c(person(given="Meik", family="Michalke",
     email="meik.michalke at hhu.de", role=c("aut", "cre")))
 Version: 0.06-2
-Date: 2013-02-19
+Date: 2013-02-20
 Collate:
     'echo.R'
     'id.R'

Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.matrix.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.matrix.R	2013-02-20 16:39:50 UTC (rev 4543)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.matrix.R	2013-02-20 19:04:47 UTC (rev 4544)
@@ -91,7 +91,7 @@
 	
 	if(!is.null(horiz_headers)){
 		if(is.character(horiz_headers)){
-			attr.list[["horiz_headers"]] <- paste(horiz_headers, sep=";")
+			attr.list[["horiz_headers"]] <- paste(horiz_headers, collapse=";")
 		} else {
 			stop(simpleError("'horiz_headers' must be a character vector!"))
 		}
@@ -99,7 +99,7 @@
 
 	if(!is.null(vert_headers)){
 		if(is.character(vert_headers)){
-			attr.list[["vert_headers"]] <- paste(vert_headers, sep=";")
+			attr.list[["vert_headers"]] <- paste(vert_headers, collapse=";")
 		} else {
 			stop(simpleError("'vert_headers' must be a character vector!"))
 		}

Modified: trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R	2013-02-20 16:39:50 UTC (rev 4543)
+++ trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R	2013-02-20 19:04:47 UTC (rev 4544)
@@ -4,7 +4,7 @@
 #' Package: \tab rkwarddev\cr
 #' Type: \tab Package\cr
 #' Version: \tab 0.06-2\cr
-#' Date: \tab 2013-02-19\cr
+#' Date: \tab 2013-02-20\cr
 #' Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-18),rkward (>= 0.5.6)\cr
 #' Enhances: \tab rkward\cr
 #' Encoding: \tab UTF-8\cr

Modified: trunk/rkward/packages/rkwarddev/inst/NEWS.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/NEWS.Rd	2013-02-20 16:39:50 UTC (rev 4543)
+++ trunk/rkward/packages/rkwarddev/inst/NEWS.Rd	2013-02-20 19:04:47 UTC (rev 4544)
@@ -1,7 +1,7 @@
 \name{NEWS}
 \title{News for Package 'rkwarddev'}
 \encoding{UTF-8}
-\section{Changes in rkwarddev version 0.06-2 (2013-02-18)}{
+\section{Changes in rkwarddev version 0.06-2 (2013-02-20)}{
   \subsection{changed}{
     \itemize{
       \item the structure of <about> nodes will change in RKWard 0.6.1, <dependencies> will become
@@ -16,6 +16,7 @@
         releases. consequently, \code{rk.JS.vars()} and \code{rk.paste.JS()} have a new \code{"getter"} argument to set
         or overwrite this value. another new argument, \code{"guess.getter"}, can be used to turn on
         automatic guessing which getter function might be most appropriate.
+      \item \code{rk.JS.scan()} learned how to treat <optionset> and <matrix>
     }
   }
   \subsection{added}{

Modified: trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
===================================================================
(Binary files differ)

Modified: trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd	2013-02-20 16:39:50 UTC (rev 4543)
+++ trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd	2013-02-20 19:04:47 UTC (rev 4544)
@@ -9,7 +9,7 @@
 \details{
   \tabular{ll}{ Package: \tab rkwarddev\cr Type: \tab
   Package\cr Version: \tab 0.06-2\cr Date: \tab
-  2013-02-19\cr Depends: \tab R (>= 2.9.0),methods,XiMpLe
+  2013-02-20\cr Depends: \tab R (>= 2.9.0),methods,XiMpLe
   (>= 0.03-18),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