[rkward] packages/rkwarddev: fixed level handling in rk.JS.header()

[m.eik michalke]

Git commit 6b2d9f2284e41af74f2f13cf70da69dc6d50605e by m.eik michalke.
Committed on 28/06/2015 at 17:15.
Pushed by meikm into branch 'master'.

fixed level handling in rk.JS.header()

M  +7    -4    packages/rkwarddev/ChangeLog
M  +1    -1    packages/rkwarddev/DESCRIPTION
M  +3    -4    packages/rkwarddev/R/rk.JS.header.R
M  +1    -1    packages/rkwarddev/R/rkwarddev-package.R
M  +10   -4    packages/rkwarddev/inst/NEWS.Rd
M  +-    --    packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
M  +1    -1    packages/rkwarddev/man/rkwarddev-package.Rd

http://commits.kde.org/rkward/6b2d9f2284e41af74f2f13cf70da69dc6d50605e

diff --git a/packages/rkwarddev/ChangeLog b/packages/rkwarddev/ChangeLog
index 2d365ba..e912d6f 100644
--- a/packages/rkwarddev/ChangeLog
+++ b/packages/rkwarddev/ChangeLog
@@ -1,10 +1,13 @@
 ChangeLog for package rkwarddev
 
-changes in version 0.07-3 (2015-06-27)
+changes in version 0.07-3 (2015-06-28)
+fixed:
+  - rk.JS.header() now produces usable level options
 added:
-  - new slot "opt.sep" in class rk.JS.arr and new option "opt.sep" in rk.paste.JS()
-    and rk.JS.array() for array objects, to manipulate the character string
-    separating the previous options from the ones defined in the array
+  - new slot "opt.sep" in classes rk.JS.arr and rk.JS.opt, as well as new
+    option "opt.sep" in rk.paste.JS(), rk.JS.array() and rk.JS.options(), to
+    manipulate the character string separating the previous options from the ones
+    defined by these objects
 
 changes in version 0.07-2 (2015-03-14)
 fixed:
diff --git a/packages/rkwarddev/DESCRIPTION b/packages/rkwarddev/DESCRIPTION
index 11de1bd..68846a4 100644
--- a/packages/rkwarddev/DESCRIPTION
+++ b/packages/rkwarddev/DESCRIPTION
@@ -16,7 +16,7 @@ LazyLoad: yes
 URL: https://rkward.kde.org
 Authors at R: c(person(given="m.eik", family="michalke", email="meik.michalke at hhu.de", role=c("aut", "cre")))
 Version: 0.07-3
-Date: 2015-06-27
+Date: 2015-06-28
 Collate:
     '00_class_01_rk.JS.arr.R'
     '00_class_02_rk.JS.var.R'
diff --git a/packages/rkwarddev/R/rk.JS.header.R b/packages/rkwarddev/R/rk.JS.header.R
index 5098c87..c876615 100644
--- a/packages/rkwarddev/R/rk.JS.header.R
+++ b/packages/rkwarddev/R/rk.JS.header.R
@@ -72,13 +72,12 @@ rk.JS.header <- function(title, ..., level=NULL, guess.getter=FALSE, .add=list()
     addToHeaderChar <- paste0(".", addToHeaderChar)
   } else {}
 
-  if(!is.null(level)){
-    addToHeaderChar <- paste0(addToHeaderChar, ".level(", level, ")")
-  } else {} 
-
   result <- paste0(
     "new Header(",
     force.i18n(title),
+    if(!is.null(level)){
+      paste0(", ", level)
+    },
     ")",
     addToHeaderChar,
     ".print();\n"
diff --git a/packages/rkwarddev/R/rkwarddev-package.R b/packages/rkwarddev/R/rkwarddev-package.R
index 4dc9037..3feb42b 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-3\cr
-#' Date: \tab 2015-06-27\cr
+#' Date: \tab 2015-06-28\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/inst/NEWS.Rd b/packages/rkwarddev/inst/NEWS.Rd
index 18e3664..7b94152 100644
--- a/packages/rkwarddev/inst/NEWS.Rd
+++ b/packages/rkwarddev/inst/NEWS.Rd
@@ -1,12 +1,18 @@
 \name{NEWS}
 \title{News for Package 'rkwarddev'}
 \encoding{UTF-8}
-\section{Changes in rkwarddev version 0.07-3 (2015-06-27)}{
+\section{Changes in rkwarddev version 0.07-3 (2015-06-28)}{
+  \subsection{fixed}{
+    \itemize{
+      \item \code{rk.JS.header()} now produces usable level options
+    }
+  }
   \subsection{added}{
     \itemize{
-      \item new slot \code{"opt.sep"} in class rk.JS.arr and new option \code{"opt.sep"} in \code{rk.paste.JS()}
-        and \code{rk.JS.array()} for array objects, to manipulate the character string
-        separating the previous options from the ones defined in the array
+      \item new slot \code{"opt.sep"} in classes rk.JS.arr and rk.JS.opt, as well as new
+        option \code{"opt.sep"} in \code{rk.paste.JS()}, \code{rk.JS.array()} and \code{rk.JS.options()}, to
+        manipulate the character string separating the previous options from the ones
+        defined by these objects
     }
   }
 }
diff --git a/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf b/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
index 08726dd..d8f20ea 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/rkwarddev-package.Rd b/packages/rkwarddev/man/rkwarddev-package.Rd
index 98e5ae2..be3e9e4 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-3\cr
-Date: \tab 2015-06-27\cr
+Date: \tab 2015-06-28\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