[rkward] packages/rkwarddev: fixing some minor bugs that showed up during R CMD check runs, and preparing the release of rkwarddev 0.07-1
m.eik michalke
meik.michalke at uni-duesseldorf.de
Fri Mar 13 20:34:16 UTC 2015
Git commit cb091fac0c92619614be34d9e90573cd70e978d3 by m.eik michalke.
Committed on 13/03/2015 at 20:32.
Pushed by meikm into branch 'master'.
fixing some minor bugs that showed up during R CMD check runs, and preparing the release of rkwarddev 0.07-1
M +6 -4 packages/rkwarddev/ChangeLog
M +5 -6 packages/rkwarddev/DESCRIPTION
M +1 -1 packages/rkwarddev/R/i18n.R
M +1 -1 packages/rkwarddev/R/rk.XML.pluginmap.R
M +1 -1 packages/rkwarddev/R/rk.rkh.label.R
M +1 -1 packages/rkwarddev/R/rkwarddev-package.R
M +6 -0 packages/rkwarddev/debian/changelog
M +3 -3 packages/rkwarddev/debian/control
M +2 -2 packages/rkwarddev/debian/copyright
M +1 -1 packages/rkwarddev/debian/rules
M +6 -4 packages/rkwarddev/inst/NEWS.Rd
M +- -- packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
M +1 -1 packages/rkwarddev/man/i18n.Rd
M +1 -1 packages/rkwarddev/man/rk.XML.pluginmap.Rd
M +1 -1 packages/rkwarddev/man/rkwarddev-package.Rd
M +6 -0 packages/rkwarddev/tests/generate_test_standards.R
M +- -- packages/rkwarddev/tests/testthat/XML_test_standards.RData
M +10 -0 packages/rkwarddev/tests/testthat/test_XML_generation.R
http://commits.kde.org/rkward/cb091fac0c92619614be34d9e90573cd70e978d3
diff --git a/packages/rkwarddev/ChangeLog b/packages/rkwarddev/ChangeLog
index c37b580..78b9dc4 100644
--- a/packages/rkwarddev/ChangeLog
+++ b/packages/rkwarddev/ChangeLog
@@ -1,6 +1,6 @@
ChangeLog for package rkwarddev
-changes in version 0.07-1 (2015-02-04)
+changes in version 0.07-1 (2015-03-13)
fixed:
- rk.XML.optionset() does now allow to re-use objects defined in the same
function call (i.e., refer to optioncolumns in the logic section)
@@ -22,6 +22,7 @@ fixed:
- rk.plugin.component() called XMLAttrs() with too many arguments
- rk.XML.values() and rk.XML.vars() do now handle all combinations of
"horiz" and "add.nodes" properly
+ - fixed wrong link to rk.plugin.skeleton() in documentation of rk.XML.pluginmap()
added:
- all "help" values can now be a list of character strings or XiMpLe nodes,
to have more control over the markup
@@ -49,8 +50,8 @@ added:
"var" should be used or omitted for rk.JS.var objects
- rk.XML.matrix() now also accepts the arguments "min_rows" and
"min_columns"
- - <dropdown>, <radio> and <select> have gained "string.quoted" as
- a valid property/modifier
+ - <dropdown>, <radio> and <select> have gained "string.quoted" as a valid
+ property/modifier
- new function rk.XML.i18n() to define translatable labels in logic sections
- new function rk.rkh.label() for extracting labels from plugin elements
changed:
@@ -79,7 +80,8 @@ changed:
top level child node of plugin XML code, with a warning
- rk.plugin.skeleton() has a new logical switch called "internal", to set
some defaults for plugins to be distributed with RKWard itself
- - the "pluginmap" argument of rk.plugin.skeleton() now also accepts "namespace"
+ - the "pluginmap" argument of rk.plugin.skeleton() now also accepts
+ "namespace"
removed:
- the functions rk.set.language() rk.get.language() were no longer useful
and therefore removed
diff --git a/packages/rkwarddev/DESCRIPTION b/packages/rkwarddev/DESCRIPTION
index f470064..22d4e5a 100644
--- a/packages/rkwarddev/DESCRIPTION
+++ b/packages/rkwarddev/DESCRIPTION
@@ -1,23 +1,22 @@
Package: rkwarddev
Type: Package
Title: A collection of tools for RKWard plugin development
-Author: m.eik michalke
+Author: m.eik michalke [aut, cre]
Maintainer: m.eik michalke <meik.michalke at hhu.de>
Depends:
R (>= 2.9.0),methods,XiMpLe (>= 0.03-21),rkward (>= 0.5.7)
Suggests:
testthat
Enhances: rkward
-Description: Provides functions to create plugin skeletons and XML
- structures for RKWard.
+Description: Provides functions to create plugin skeletons and XML structures
+ for RKWard.
License: GPL (>= 3)
Encoding: UTF-8
LazyLoad: yes
URL: http://rkward.sourceforge.net
-Authors at R: c(person(given="m.eik", family="michalke",
- email="meik.michalke at hhu.de", role=c("aut", "cre")))
+Authors at R: c(person(given="m.eik", family="michalke", email="meik.michalke at hhu.de", role=c("aut", "cre")))
Version: 0.07-1
-Date: 2015-02-04
+Date: 2015-03-13
Collate:
'00_class_01_rk.JS.arr.R'
'00_class_02_rk.JS.var.R'
diff --git a/packages/rkwarddev/R/i18n.R b/packages/rkwarddev/R/i18n.R
index f5dfb0d..c1ea14f 100644
--- a/packages/rkwarddev/R/i18n.R
+++ b/packages/rkwarddev/R/i18n.R
@@ -23,7 +23,7 @@
#' will return one of \code{i18n()}, \code{i18nc()}, \code{i18np()}, or \code{i18ncp()}.
#'
#' @param msgid Either a character string, the message to be translated (if applicable, its singular form),
-#' or an object of class \code{\link[noquote]{noquote}}, which will be pasted as a \code{noquote()} function call.
+#' or an object of class \code{\link[base:noquote]{noquote}}, which will be pasted as a \code{noquote()} function call.
#' @param ... Either character string which will be pasted unquoted to be used in conjunctions with
#' placeholders in msgid, or XiMpLe.node objects of which the JavaScript variable name will be
#' used.
diff --git a/packages/rkwarddev/R/rk.XML.pluginmap.R b/packages/rkwarddev/R/rk.XML.pluginmap.R
index a56da9f..f5feaad 100644
--- a/packages/rkwarddev/R/rk.XML.pluginmap.R
+++ b/packages/rkwarddev/R/rk.XML.pluginmap.R
@@ -46,7 +46,7 @@
#' @param dependencies An object of class \code{XiMpLe.node} to be pasted as the \code{<dependencies>} section,
#' See \code{\link[rkwarddev:rk.XML.dependencies]{rk.XML.dependencies}} for details. Skipped if \code{NULL}.
#' @param namespace Character string, the namespace attribute of the \code{<document>} node, defaults to the plugin name (which you probably shouldn't touch...).
-#' RKWard's internal plugins should use the namespace \code{rkward}. This is taken care of by \code{\link[rkwarddev::rk.plugin.skeleton]{rk.plugin.skeleton}}
+#' RKWard's internal plugins should use the namespace \code{rkward}. This is taken care of by \code{\link[rkwarddev:rk.plugin.skeleton]{rk.plugin.skeleton}}
#' if you set \code{internal=TRUE}.
#' @param priority Character string, the priority attribute of the \code{<document>} node. Must be either "hidden", "low", "medium", or "high",
#' defaults to "medium".
diff --git a/packages/rkwarddev/R/rk.rkh.label.R b/packages/rkwarddev/R/rk.rkh.label.R
index 6cabe15..a9f2832 100644
--- a/packages/rkwarddev/R/rk.rkh.label.R
+++ b/packages/rkwarddev/R/rk.rkh.label.R
@@ -34,7 +34,7 @@
rk.rkh.label <- function(id, i18n=NULL){
# check for additional i18n info
- attr.list <- check.i18n(i18n=i18n, attrs=list(id=id))
+ attr.list <- check.i18n(i18n=i18n, attrs=list(id=check.ID(id)))
node <- check.i18n(
i18n=i18n,
diff --git a/packages/rkwarddev/R/rkwarddev-package.R b/packages/rkwarddev/R/rkwarddev-package.R
index 55b0f3f..c049a33 100644
--- a/packages/rkwarddev/R/rkwarddev-package.R
+++ b/packages/rkwarddev/R/rkwarddev-package.R
@@ -4,7 +4,7 @@
#' Package: \tab rkwarddev\cr
#' Type: \tab Package\cr
#' Version: \tab 0.07-1\cr
-#' Date: \tab 2015-02-04\cr
+#' Date: \tab 2015-03-13\cr
#' Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-21),rkward (>= 0.5.7)\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
diff --git a/packages/rkwarddev/debian/changelog b/packages/rkwarddev/debian/changelog
index 5d15971..a2c205b 100644
--- a/packages/rkwarddev/debian/changelog
+++ b/packages/rkwarddev/debian/changelog
@@ -1,3 +1,9 @@
+r-other-rkward-rkwarddev (0.07-1-1) unstable; urgency=low
+
+ * new upstream release
+
+ -- m.eik michalke <meik.michalke at hhu.de> Fri, 13 Mar 2015 20:12:35 +0100
+
r-other-rkward-rkwarddev (0.06-5-1) unstable; urgency=low
* new upstream release
diff --git a/packages/rkwarddev/debian/control b/packages/rkwarddev/debian/control
index cf4b682..0afeff7 100644
--- a/packages/rkwarddev/debian/control
+++ b/packages/rkwarddev/debian/control
@@ -5,7 +5,7 @@ Maintainer: m.eik michalke <meik.michalke at hhu.de>
Build-Depends-Indep: debhelper (>> 7.0.0), r-base-dev (>= 3.0.0), cdbs, r-cran-ximple (>= 0.03-21) | r-other-reaktanz-ximple (>=
0.03-21) | r-other-rkward-ximple (>= 0.03-21), rkward (>= 0.5.7)
Standards-Version: 3.9.3.1
-Homepage: http://rkward.kde.org
+Homepage: http://rkward.sourceforge.net
Package: r-other-rkward-rkwarddev
Architecture: all
@@ -13,5 +13,5 @@ Section: math
Depends: r-base (>= 3.0.0), r-cran-ximple (>= 0.03-21) | r-other-reaktanz-ximple (>= 0.03-21) | r-other-rkward-ximple (>= 0.03-21),
rkward (>= 0.5.7)
Description: GNU R package: Provides functions to create plugin skeletons and XML structures for RKWard.
-Homepage: http://rkward.kde.org
-Suggests:
+Homepage: http://rkward.sourceforge.net
+Suggests: r-cran-testthat
diff --git a/packages/rkwarddev/debian/copyright b/packages/rkwarddev/debian/copyright
index 45daf10..067c370 100644
--- a/packages/rkwarddev/debian/copyright
+++ b/packages/rkwarddev/debian/copyright
@@ -1,4 +1,4 @@
-The R library rkwarddev was originally written and is maintained by Meik Michalke <meik.michalke at hhu.de>.
+The R library rkwarddev was originally written and is maintained by m.eik michalke <meik.michalke at hhu.de>.
This Debian package was put together by m.eik michalke <meik.michalke at hhu.de>.
@@ -6,7 +6,7 @@ The package was renamed from its upstream name 'rkwarddev' to
'r-other-rkward-rkwarddev' in harmony with the R packaging policy to indicate
that the package is external to the CRAN or BioC repositories.
-rkwarddev Copyright (C) 2014 Meik Michalke, released under the
+rkwarddev Copyright (C) 2015 m.eik michalke, released under the
GNU General Public License (GPL) version 3 or (at your option) any later version.
This software is distributed in the hope that it will be useful, but
diff --git a/packages/rkwarddev/debian/rules b/packages/rkwarddev/debian/rules
index 167e39a..6187288 100755
--- a/packages/rkwarddev/debian/rules
+++ b/packages/rkwarddev/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# -*- makefile -*-
# debian/rules file for the Debian/GNU Linux r-other-rkward-rkwarddev package
-# Copyright 2014 by m.eik michalke <meik.michalke at hhu.de>
+# Copyright 2015 by m.eik michalke <meik.michalke at hhu.de>
debRreposname := other-rkward
diff --git a/packages/rkwarddev/inst/NEWS.Rd b/packages/rkwarddev/inst/NEWS.Rd
index 9af3f54..2a9b67e 100644
--- a/packages/rkwarddev/inst/NEWS.Rd
+++ b/packages/rkwarddev/inst/NEWS.Rd
@@ -1,7 +1,7 @@
\name{NEWS}
\title{News for Package 'rkwarddev'}
\encoding{UTF-8}
-\section{Changes in rkwarddev version 0.07-1 (2015-02-04)}{
+\section{Changes in rkwarddev version 0.07-1 (2015-03-13)}{
\subsection{fixed}{
\itemize{
\item \code{rk.XML.optionset()} does now allow to re-use objects defined in the same
@@ -24,6 +24,7 @@
\item \code{rk.plugin.component()} called \code{XMLAttrs()} with too many arguments
\item \code{rk.XML.values()} and \code{rk.XML.vars()} do now handle all combinations of
\code{"horiz"} and \code{"add.nodes"} properly
+ \item fixed wrong link to \code{rk.plugin.skeleton()} in documentation of \code{rk.XML.pluginmap()}
}
}
\subsection{added}{
@@ -54,8 +55,8 @@
\code{"var"} should be used or omitted for rk.JS.var objects
\item \code{rk.XML.matrix()} now also accepts the arguments \code{"min_rows"} and
\code{"min_columns"}
- \item <dropdown>, <radio> and <select> have gained \code{"string.quoted"} as
- a valid property/modifier
+ \item <dropdown>, <radio> and <select> have gained \code{"string.quoted"} as a valid
+ property/modifier
\item new function \code{rk.XML.i18n()} to define translatable labels in logic sections
\item new function \code{rk.rkh.label()} for extracting labels from plugin elements
}
@@ -87,7 +88,8 @@
top level child node of plugin XML code, with a warning
\item \code{rk.plugin.skeleton()} has a new logical switch called \code{"internal"}, to set
some defaults for plugins to be distributed with RKWard itself
- \item the \code{"pluginmap"} argument of \code{rk.plugin.skeleton()} now also accepts \code{"namespace"}
+ \item the \code{"pluginmap"} argument of \code{rk.plugin.skeleton()} now also accepts
+ \code{"namespace"}
}
}
\subsection{removed}{
diff --git a/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf b/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
index 6c0c47d..b05ad60 100644
Binary files a/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf and b/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf differ
diff --git a/packages/rkwarddev/man/i18n.Rd b/packages/rkwarddev/man/i18n.Rd
index d5d2ab0..768aec7 100644
--- a/packages/rkwarddev/man/i18n.Rd
+++ b/packages/rkwarddev/man/i18n.Rd
@@ -9,7 +9,7 @@ i18n(msgid, ..., context = NULL, plural = NULL, newline = "")
\arguments{
\item{msgid}{Either a character string, the message to be translated (if applicable,
its singular form),
-or an object of class \code{\link[noquote]{noquote}},
+or an object of class \code{\link[base:noquote]{noquote}},
which will be pasted as a \code{noquote()} function call.}
\item{...}{Either character string which will be pasted unquoted to be used in conjunctions with
diff --git a/packages/rkwarddev/man/rk.XML.pluginmap.Rd b/packages/rkwarddev/man/rk.XML.pluginmap.Rd
index bead0da..535315d 100644
--- a/packages/rkwarddev/man/rk.XML.pluginmap.Rd
+++ b/packages/rkwarddev/man/rk.XML.pluginmap.Rd
@@ -60,7 +60,7 @@ See \code{\link[rkwarddev:rk.XML.dependencies]{rk.XML.dependencies}} for details
\item{namespace}{Character string, the namespace attribute of the \code{<document>} node,
defaults to the plugin name (which you probably shouldn't touch...).
-RKWard's internal plugins should use the namespace \code{rkward}. This is taken care of by \code{\link[rkwarddev::rk.plugin.skeleton]{rk.plugin.skeleton}}
+RKWard's internal plugins should use the namespace \code{rkward}. This is taken care of by \code{\link[rkwarddev:rk.plugin.skeleton]{rk.plugin.skeleton}}
if you set \code{internal=TRUE}.}
\item{priority}{Character string,
diff --git a/packages/rkwarddev/man/rkwarddev-package.Rd b/packages/rkwarddev/man/rkwarddev-package.Rd
index b54932d..640bf4c 100644
--- a/packages/rkwarddev/man/rkwarddev-package.Rd
+++ b/packages/rkwarddev/man/rkwarddev-package.Rd
@@ -12,7 +12,7 @@ A collection of tools for RKWard plugin development.
Package: \tab rkwarddev\cr
Type: \tab Package\cr
Version: \tab 0.07-1\cr
-Date: \tab 2015-02-04\cr
+Date: \tab 2015-03-13\cr
Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-21),rkward (>= 0.5.7)\cr
Enhances: \tab rkward\cr
Encoding: \tab UTF-8\cr
diff --git a/packages/rkwarddev/tests/generate_test_standards.R b/packages/rkwarddev/tests/generate_test_standards.R
index 9887142..efa2b4c 100644
--- a/packages/rkwarddev/tests/generate_test_standards.R
+++ b/packages/rkwarddev/tests/generate_test_standards.R
@@ -173,6 +173,9 @@ XMLTestNodes <- function(file=NULL, compress="xz", compression_level=-9){
)
)
)
+ i18n <- rk.XML.i18n(
+ label="an i18n label"
+ )
include <- rk.XML.include(
"../include_file.xml"
)
@@ -519,6 +522,8 @@ XMLTestNodes <- function(file=NULL, compress="xz", compression_level=-9){
# )
# rk.rkh.doc <- rk.rkh.doc(
# )
+# rk.rkh.label(
+# )
# rk.rkh.link <- rk.rkh.link(
# )
# rk.rkh.related <- rk.rkh.related(
@@ -574,6 +579,7 @@ XMLTestNodes <- function(file=NULL, compress="xz", compression_level=-9){
frame=frame,
help=help,
hierarchy=hierarchy,
+ i18n=i18n,
include=include,
input=input,
insert=insert,
diff --git a/packages/rkwarddev/tests/testthat/XML_test_standards.RData b/packages/rkwarddev/tests/testthat/XML_test_standards.RData
index 2741a39..e563bf4 100644
Binary files a/packages/rkwarddev/tests/testthat/XML_test_standards.RData and b/packages/rkwarddev/tests/testthat/XML_test_standards.RData differ
diff --git a/packages/rkwarddev/tests/testthat/test_XML_generation.R b/packages/rkwarddev/tests/testthat/test_XML_generation.R
index 490909b..6648667 100644
--- a/packages/rkwarddev/tests/testthat/test_XML_generation.R
+++ b/packages/rkwarddev/tests/testthat/test_XML_generation.R
@@ -338,6 +338,16 @@ test_that("rk.XML.hierarchy", {
)
})
+test_that("rk.XML.i18n", {
+ thisNode <- rk.XML.i18n(
+ label="an i18n label"
+ )
+ load("XML_test_standards.RData")
+ expect_that(
+ thisNode, equals(XML_test_standards[["i18n"]])
+ )
+})
+
test_that("rk.XML.include", {
thisNode <- rk.XML.include(
"../include_file.xml"
More information about the rkward-tracker
mailing list