[rkward] packages/XiMpLe/R: removed leftover file and small indentation fix

m.eik michalke meik.michalke at uni-duesseldorf.de
Sun Nov 15 22:20:25 UTC 2015


Git commit 356da4a48cb0b8eab41ee42958b77738d432220d by m.eik michalke.
Committed on 15/11/2015 at 22:18.
Pushed by meikm into branch 'master'.

removed leftover file and small indentation fix

  - still struggling with indentation after newlines in comments
  - i don't use XiMpLe-internal.roxy.all.R any longer for package description

D  +0    -42   packages/XiMpLe/R/XiMpLe-internal.roxy.all.R
M  +2    -2    packages/XiMpLe/R/pasteXMLTag.R

http://commits.kde.org/rkward/356da4a48cb0b8eab41ee42958b77738d432220d

diff --git a/packages/XiMpLe/R/XiMpLe-internal.roxy.all.R b/packages/XiMpLe/R/XiMpLe-internal.roxy.all.R
deleted file mode 100644
index 950bf4e..0000000
--- a/packages/XiMpLe/R/XiMpLe-internal.roxy.all.R
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2011-2014 Meik Michalke <meik.michalke at hhu.de>
-#
-# This file is part of the R package XiMpLe.
-#
-# XiMpLe is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# XiMpLe is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with XiMpLe.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# package description files
-# this internal object can be used by the package roxyPackage to
-# automatically create/update DESCRIPTION and CITATION files
-pckg.dscrptn <- data.frame(
-    Package="XiMpLe",
-    Type="Package",
-    Title="A simple XML tree parser and generator",
-    Author="m.eik michalke",
-    AuthorsR="c(person(given=\"Meik\", family=\"Michalke\", email=\"meik.michalke at hhu.de\",
-      role=c(\"aut\", \"cre\")))",
-    Maintainer="m.eik michalke <meik.michalke at hhu.de>",
-    Depends="R (>= 2.9.0),methods",
-    Suggests="testthat",
-    Enhances="rkward",
-    Description="This package provides a simple XML tree parser/generator. It includes functions to read XML files into R objects,
-            get information out of and into nodes, and write R objects back to XML code.
-            It's not as powerful as the XML package and doesn't aim to be, but for simple XML handling
-            it could be useful. It was originally programmed for the R GUI and IDE RKWard, to make plugin development easier.
-            You can install RKWard from http://rkward.kde.org.",
-    License="GPL (>= 3)",
-    Encoding="UTF-8",
-    LazyLoad="yes",
-    URL="http://reaktanz.de/?c=hacking&s=XiMpLe",
-    stringsAsFactors=FALSE)
diff --git a/packages/XiMpLe/R/pasteXMLTag.R b/packages/XiMpLe/R/pasteXMLTag.R
index c023cb4..0b7d408 100644
--- a/packages/XiMpLe/R/pasteXMLTag.R
+++ b/packages/XiMpLe/R/pasteXMLTag.R
@@ -77,7 +77,7 @@ pasteXMLTag <- function(tag, attr=NULL, child=NULL, empty=TRUE, level=1, allow.e
   if(isTRUE(nchar(tag) == 0) | length(tag) == 0){
     if(isTRUE(tidy)){
       child <- trim(child)
-      child <- gsub("\n", new.cmmt, setMinIndent(child, level=level, indent.by=indent.by, shine=shine))
+      child <- gsub("\n", new.cmmt, trim(setMinIndent(child, level=level, indent.by=indent.by, shine=shine)))
     }
     full.tag <- paste0(child, " ")
   } else {
@@ -87,7 +87,7 @@ pasteXMLTag <- function(tag, attr=NULL, child=NULL, empty=TRUE, level=1, allow.e
       if(!is.null(child)){
         if(isTRUE(tidy)){
           child <- trim(child)
-          child <- gsub("\n", new.cmmt, setMinIndent(child, level=level, indent.by=indent.by, shine=shine))
+          child <- gsub("\n", new.cmmt, trim(setMinIndent(child, level=level, indent.by=indent.by, shine=shine)))
         }
       } else {}
       full.tag <- paste0(new.indent, "<!-- ", new.attr, new.cmmt.indent,



More information about the rkward-tracker mailing list