[Sciviews-commits] r174 - in pkg: svDialogs svDialogs/inst svGUI svGUI/inst svIDE svIDE/inst svMisc svMisc/inst svSocket svSocket/R svSocket/inst svSweave svSweave/inst svTools svTools/R svTools/inst svUnit svUnit/inst svWidgets svWidgets/inst tcltk2 tcltk2/inst

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Tue Aug 11 00:00:32 CEST 2009


Author: phgrosjean
Date: 2009-08-11 00:00:31 +0200 (Tue, 11 Aug 2009)
New Revision: 174

Added:
   pkg/svWidgets/COPYING
   pkg/svWidgets/NEWS
Modified:
   pkg/svDialogs/DESCRIPTION
   pkg/svDialogs/inst/CITATION
   pkg/svGUI/DESCRIPTION
   pkg/svGUI/NEWS
   pkg/svGUI/TODO
   pkg/svGUI/inst/CITATION
   pkg/svIDE/DESCRIPTION
   pkg/svIDE/NEWS
   pkg/svIDE/inst/CITATION
   pkg/svMisc/DESCRIPTION
   pkg/svMisc/inst/CITATION
   pkg/svSocket/DESCRIPTION
   pkg/svSocket/NEWS
   pkg/svSocket/R/getServerObj.R
   pkg/svSocket/TODO
   pkg/svSocket/inst/CITATION
   pkg/svSweave/DESCRIPTION
   pkg/svSweave/NEWS
   pkg/svSweave/inst/CITATION
   pkg/svTools/DESCRIPTION
   pkg/svTools/NAMESPACE
   pkg/svTools/NEWS
   pkg/svTools/R/zzz.R
   pkg/svTools/inst/CITATION
   pkg/svUnit/DESCRIPTION
   pkg/svUnit/NEWS
   pkg/svUnit/TODO
   pkg/svUnit/inst/CITATION
   pkg/svWidgets/DESCRIPTION
   pkg/svWidgets/TODO
   pkg/svWidgets/inst/CITATION
   pkg/tcltk2/DESCRIPTION
   pkg/tcltk2/NEWS
   pkg/tcltk2/TODO
   pkg/tcltk2/inst/.DS_Store
   pkg/tcltk2/inst/CITATION
Log:
Clean up of DESCRIPTION, NAMESPACE, NEWS, TODO, etc.

Modified: pkg/svDialogs/DESCRIPTION
===================================================================
--- pkg/svDialogs/DESCRIPTION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svDialogs/DESCRIPTION	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,11 +1,14 @@
 Package: svDialogs
+Type: Package
 Title: SciViews GUI API - Dialog boxes
-Depends: R (>= 2.6.0), tcltk
-Imports: svMisc
-Description: Rapidly construct dialog boxes for your GUI, including an automatic function assistant
+Depends: R (>= 2.6.0)
+Imports: tcltk, svMisc
+Description: Rapidly construct dialog boxes for your GUI, including an automatic
+  function assistant
 Version: 0.9-40
 Date: 2009-03-28
 Author: Philippe Grosjean
 Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: GPL (>= 2)
-URL: http://www.sciviews.org/SciViews-R
\ No newline at end of file
+LazyLoad: yes
+URL: http://www.sciviews.org/SciViews-R

Modified: pkg/svDialogs/inst/CITATION
===================================================================
--- pkg/svDialogs/inst/CITATION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svDialogs/inst/CITATION	2009-08-10 22:00:31 UTC (rev 174)
@@ -3,15 +3,15 @@
 citEntry(entry="Manual",
          title = "SciViews-R: A GUI API for R",
          author = "Philippe Grosjean",
-         organization = "UMH",
+         organization = "UMons",
          address      = "Mons, Belgium",
          year         = version$year,
          url          = "http://www.sciviews.org/SciViews-R",
-         
-         textVersion = 
-         paste("Grosjean, Ph. (", version$year, "). ", 
+
+         textVersion =
+         paste("Grosjean, Ph. (", version$year, "). ",
                "SciViews: A GUI API for R. ",
-               "UMH, Mons, Belgium. ",
+               "UMons, Mons, Belgium. ",
                "URL http://www.sciviews.org/SciViews-R.",
                sep="")
          )

Modified: pkg/svGUI/DESCRIPTION
===================================================================
--- pkg/svGUI/DESCRIPTION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svGUI/DESCRIPTION	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,11 +1,15 @@
 Package: svGUI
+Type: Package
 Title: SciViews GUI API - Functions to manage GUI client
-Depends: R (>= 2.6.0), svMisc, svSocket
-Description: Functions to manage the GUI client, like Komodo with the SciViews-K extension
+Depends: R (>= 2.6.0)
+Imports: svMisc, svSocket
+SystemRequirements: Komodo Edit (http://www.openkomodo.com), SciViews-K (http://www.sciviews.org/SciViews-K)
+Description: Functions to manage the GUI client, like Komodo with the
+  SciViews-K extension
 Version: 0.9-44
 Date: 2009-01-22
 Author: Philippe Grosjean
 Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: GPL (>= 2)
+LazyLoad: yes
 URL: http://www.sciviews.org/SciViews-R
-SystemRequirements: Komodo Edit (http://www.openkomodo.com), SciViews-K (http://www.sciviews.org/SciViews-K)

Modified: pkg/svGUI/NEWS
===================================================================
--- pkg/svGUI/NEWS	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svGUI/NEWS	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,21 +1,31 @@
 = svGUI News
 
 == Changes in svGUI 0.9-44
+
 * Preparation for CRAN submission: polishing the package
 
+
 == Changes in svGUI 0.9-43
+
 * Made compatible with R 2.6.x (previous version was compatible with R 2.7.0).
 
+
 == Changes in svGUI 0.9-42
+
 * koCmd() is now more robust and do not issue a warning or an error if the
 Komodo server is not available (but the error message is returned by the
 function with a 'try-error' class, so that it can be processed by the caller)
 
+
 == Changes in svGUI 0.9-41
+
 * Correction of a bug in the first example of koCmd()
+
 * guiInstall() now creates a hook to koCmd(): .koCmd() in TempEnv environment
 
+
 == Changes in svGUI 0.9-40
+
 This is the first version distributed on R-forge. It is completely refactored
 from older versions (on CRAN since 2003) to make it run with SciViews-K and
 Komodo Edit (Tinn-R is also supported, but not SciViews-R Console any more).

Modified: pkg/svGUI/TODO
===================================================================
--- pkg/svGUI/TODO	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svGUI/TODO	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,7 +1,7 @@
 = svGUI To Do list
 
 * A ko() function to manipulate komodo from the command line
-(+ correct installation under Mac OS X)
+  (+ correct installation under Mac OS X)
 
 * The svGUI-package.Rd man page
 

Modified: pkg/svGUI/inst/CITATION
===================================================================
--- pkg/svGUI/inst/CITATION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svGUI/inst/CITATION	2009-08-10 22:00:31 UTC (rev 174)
@@ -3,20 +3,20 @@
 citEntry(entry="Manual",
          title = "SciViews-R: A GUI API for R",
          author = "Philippe Grosjean",
-         organization = "UMH",
+         organization = "UMons",
          address      = "Mons, Belgium",
          year         = version$year,
          url          = "http://www.sciviews.org/SciViews-R",
-         
-         textVersion = 
-         paste("Grosjean, Ph. (", version$year, "). ", 
+
+         textVersion =
+         paste("Grosjean, Ph. (", version$year, "). ",
                "SciViews: A GUI API for R. ",
-               "UMH, Mons, Belgium. ",
+               "UMons, Mons, Belgium. ",
                "URL http://www.sciviews.org/SciViews-R.",
                sep="")
          )
 
 citFooter("We have invested a lot of time and effort in creating SciViews-R,",
           "please cite it when using it together with R.",
-		  "See also", sQuote("citation()"),
-		  "for citing R.")
+	  "See also", sQuote("citation()"),
+	  "for citing R.")

Modified: pkg/svIDE/DESCRIPTION
===================================================================
--- pkg/svIDE/DESCRIPTION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svIDE/DESCRIPTION	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,11 +1,13 @@
 Package: svIDE
+Type: Package
 Title: SciViews GUI API - IDE and code editor functions
-Imports: utils
-Depends: R (>= 2.6.0), tcltk, svMisc
+Depends: R (>= 2.6.0)
+Imports: utils, tcltk, svMisc
 Description: Function for the GUI API to interact with external IDE/code editors
 Version: 0.9-46
 Date: 2009-08-10
 Author: Philippe Grosjean
 Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: GPL (>= 2)
+LazyLoad: yes
 URL: http://www.sciviews.org/SciViews-R

Modified: pkg/svIDE/NEWS
===================================================================
--- pkg/svIDE/NEWS	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svIDE/NEWS	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,25 +1,30 @@
 = svIDE News
 
 == Changes in svIDE 0.9-46
+
 * the trXXX() functions for Tinn-R are eliminated (they are now in their own
   tinnr package).
-  
 
+
 == Changes in svIDE 0.9-45
+
 * svIDE is no longer linker to Tinn-R (there is now a separate tinn-r package).
   The trXXX() functions are left here in case someone still uses them.
 
 
 == Changes in svIDE 0.9-44
+
 * Made compatible with R 2.6.x (was R 2.7.0 in previous version).
 
 
 == Changes in svIDE 0.9-43
+
 * trObjSearch() and trObjList() andre reworked in order to return results
   similar to the old functions of the same name in svIDE < 0.9-40.
 
 
 == Changes in svIDE 0.9-42
+
 * getKeywords() is simplified by using lsf.str().
 
 * guiDDEInstall now uses .Tcl.args() instead of .Tcl.callback to install
@@ -33,6 +38,7 @@
 
 
 == Changes in svIDE 0.9-41
+
 * One bug corrected in trObjSearch(): incorrect output of the results in a
   character vector.
 
@@ -40,6 +46,7 @@
 
 
 == Changes in svIDE 0.9-40
+
 This is the first version distributed on R-forge. It is completely refactored
 from older versions (on CRAN since 2003) to make it run with SciViews-K and
 Komodo Edit (Tinn-R is also supported, but not SciViews-R Console any more).

Modified: pkg/svIDE/inst/CITATION
===================================================================
--- pkg/svIDE/inst/CITATION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svIDE/inst/CITATION	2009-08-10 22:00:31 UTC (rev 174)
@@ -3,15 +3,15 @@
 citEntry(entry="Manual",
          title = "SciViews-R: A GUI API for R",
          author = "Philippe Grosjean",
-         organization = "UMH",
+         organization = "UMons",
          address      = "Mons, Belgium",
          year         = version$year,
          url          = "http://www.sciviews.org/SciViews-R",
-         
-         textVersion = 
-         paste("Grosjean, Ph. (", version$year, "). ", 
+
+         textVersion =
+         paste("Grosjean, Ph. (", version$year, "). ",
                "SciViews: A GUI API for R. ",
-               "UMH, Mons, Belgium. ",
+               "UMons, Mons, Belgium. ",
                "URL http://www.sciviews.org/SciViews-R.",
                sep="")
          )

Modified: pkg/svMisc/DESCRIPTION
===================================================================
--- pkg/svMisc/DESCRIPTION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svMisc/DESCRIPTION	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,4 +1,5 @@
 Package: svMisc
+Type: Package
 Title: SciViews GUI API - Miscellaneous functions
 Imports: utils, methods
 Depends: R (>= 2.6.0)
@@ -8,4 +9,5 @@
 Author: Philippe Grosjean, Romain Francois & Kamil Barton
 Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: GPL (>= 2)
+LazyLoad: yes
 URL: http://www.sciviews.org/SciViews-R

Modified: pkg/svMisc/inst/CITATION
===================================================================
--- pkg/svMisc/inst/CITATION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svMisc/inst/CITATION	2009-08-10 22:00:31 UTC (rev 174)
@@ -3,15 +3,15 @@
 citEntry(entry="Manual",
          title = "SciViews-R: A GUI API for R",
          author = "Philippe Grosjean",
-         organization = "UMH",
+         organization = "UMons",
          address      = "Mons, Belgium",
          year         = version$year,
          url          = "http://www.sciviews.org/SciViews-R",
-         
-         textVersion = 
-         paste("Grosjean, Ph. (", version$year, "). ", 
+
+         textVersion =
+         paste("Grosjean, Ph. (", version$year, "). ",
                "SciViews: A GUI API for R. ",
-               "UMH, Mons, Belgium. ",
+               "UMons, Mons, Belgium. ",
                "URL http://www.sciviews.org/SciViews-R.",
                sep="")
          )

Modified: pkg/svSocket/DESCRIPTION
===================================================================
--- pkg/svSocket/DESCRIPTION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svSocket/DESCRIPTION	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,10 +1,13 @@
 Package: svSocket
+Type: Package
 Title: SciViews GUI API - R Socket Server
-Depends: R (>= 2.6.0), tcltk, svMisc
+Depends: R (>= 2.6.0)
+Imports: tcltk
 Description: Implements a simple socket server allowing to connect GUI clients to R
 Version: 0.9-45
 Date: 2009-07-15
 Author: Philippe Grosjean
 Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: GPL (>= 2)
+LazyLoad: yes
 URL: http://www.sciviews.org/SciViews-R

Modified: pkg/svSocket/NEWS
===================================================================
--- pkg/svSocket/NEWS	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svSocket/NEWS	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,11 +1,18 @@
 = svSocket News
 
+== Changes in svSocket 0.9-45
+
+* Bug correction in evalServer()
+
+
 == Changes in svSocket 0.9-44
+
 * Added function evalServer() for R interprocess communication using this R
   socket server mechanism
 
 
 == Changes in svSocket 0.9-43
+
 * Example added in processSocket(), implementing a simple REPL
 
 * A new function, sendSocketServer() is added to send and evaluate commands from
@@ -13,10 +20,12 @@
 
 
 == Changes in svSocket 0.9-43
+
 * Polishing package for CRAN submission
 
 
 == Changes in svSocket 0.9-42
+
 * Made compatible with R 2.6.x (previous package was R >= 2.7.0).
 
 

Modified: pkg/svSocket/R/getServerObj.R
===================================================================
--- pkg/svSocket/R/getServerObj.R	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svSocket/R/getServerObj.R	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,5 +1,5 @@
 getServerObj <-
-function (x, envir = parent.frame(), server.envir = .GlobalEnv, con = NULL,
+function (x, local = TRUE, server.envir = .GlobalEnv, con = NULL,
 host = "localhost", port = 8888, ...)
 {
 	# Copy an R object from the server to the client
@@ -25,18 +25,18 @@
 	# Source the content of objdump, locally, or in .GlobalEnv on the client R
 	objcon <- textConnection(objdump)
 	on.exit(close(objcon))
-	res <- eval(source(objcon, local = TRUE, echo = FALSE,
+	res <- eval(source(objcon, local = local, echo = FALSE,
 		verbose = FALSE), envir = envir)
 }
 
 setServerObj <-
-function (x, envir = .GlobalEnv, server.envir = .GlobalEnv, con = NULL,
+function (x, envir = .GlobalEnv, con = NULL,
 host = "localhost", port = 8888, ...)
 {
 	# Copy an R object from the client to the server
 	objname <- as.character(substitute(x))
 	# Get a dump of the local object
-	objdump <- suppressWarnings(dump(objname, file = "", envir = server.envir))
+	objdump <- suppressWarnings(dump(objname, file = "", envir = envir))
 
 	servenv <- deparse(substitute(server.envir))
 	if (is.null(con)) {
@@ -59,5 +59,5 @@
 	# Source the content of objdump, locally, or in .GlobalEnv on the client R
 	objcon <- textConnection(objdump)
 	on.exit(close(objcon))
-	source(objcon, local = local, echo = FALSE, verbose = FALSE)
+	source(objcon, local = FALSE, echo = FALSE, verbose = FALSE)
 }
\ No newline at end of file

Modified: pkg/svSocket/TODO
===================================================================
--- pkg/svSocket/TODO	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svSocket/TODO	2009-08-10 22:00:31 UTC (rev 174)
@@ -3,15 +3,15 @@
 * svSocket-package.Rd man page
 
 * Easy redefinition of options(width = ...) to adjust width of output to the
-GUI client R console
+  GUI client R console
 
 * Make use of a config file for the server + parSocketServer() to change (some!)
-parameters of the server
+  parameters of the server
 
 * Translation of all messages in the package
 
 * Delete SocketClient_xxxx on disconnection + make sure they are all deleted
-on server stopping and on package detaching (in .Last.lib())
+  on server stopping and on package detaching (in .Last.lib())
 
 * Parse error => rework message a little bit + line number is 1 too much
 
@@ -26,12 +26,12 @@
 * A mode that flags various parts of output
 
 * Parse and executes one command at a time in case several commands are send at
-once (should we? The current way of working has some interesting features!)
+  once (should we? The current way of working has some interesting features!)
 
 * Unattended messages should be printed above command line
 
 * Allow for remote connection + security?
-Use a tcl list:
+  Use a tcl list:
     % set xxxx_allow [list]
     % llength $xxxx_allow
     % lappend xxxx_allow "194.127.34.1"
@@ -66,7 +66,7 @@
 * <<<E>>> with addition of the command in the R command history
 
 * Check and solve possible clash when several clients submit commands at the
-same time
+  same time
 
 
 == Differences between CLI and processSocket()
@@ -75,63 +75,63 @@
 
 * When successive commands are issued and the last one is incomplete like:
 	> search(); log(
-processSocket() waits for a complete last command before processing everything
-while other consoles process all the commands and then wait for last one to be
-completed (should be considered as a feature)
+  processSocket() waits for a complete last command before processing everything
+  while other consoles process all the commands and then wait for last one to be
+  completed (should be considered as a feature)
 
 * Same problem with multiple instructions send at once when there is an error:
-the first few correct instructions before the error should be evaluated, while
-they are not with processSocket() (considered as a feature). Compare this
+  the first few correct instructions before the error should be evaluated, while
+  they are not with processSocket() (considered as a feature). Compare this
 	> search(); log)
 
 * For long calculations, processSocket() acts as a buffered console (like RGui)
-except that it does not understand (yet) flush.console!
+  except that it does not understand (yet) flush.console!
 
 * There are sometimes cosmetic differences in the way warnings are printed
-(essentially, truncation of call argument). For instance:
+  (essentially, truncation of call argument). For instance:
 	> options(warn = 0)
 	> (function() {warning("Warn!"); 1:3})()
 
 * There are slight differences in the way the error message is presented when
-incorrect code is processed. Moreover, R.app (Macintosh) does not print a
-descriptive error message, but only "syntax error". This is an old behaviour
-that remains only in R.app (among all tested consoles)
+  incorrect code is processed. Moreover, R.app (Macintosh) does not print a
+  descriptive error message, but only "syntax error". This is an old behaviour
+  that remains only in R.app (among all tested consoles)
 
 * R.app (Macintosh) always print prompts at the beginning of a line. So,
-cat("text") does not produce exactly the same result as in many other consoles
-including with processSocket() (should be considered wrong in R.app!)
+  cat("text") does not produce exactly the same result as in many other consoles
+  including with processSocket() (should be considered wrong in R.app!)
 
 * R.app (Macintosh) incorrectly prints a continuation prompt after:
 	> options(warn = 2)
 	> (function() {warning("Warn!"); 1:3})()
 
 * R.app (Macintosh) does not interpret \a and \b on the contrary to most other
-consoles. With processSocket(), it is the client that must decide how to
-interpret special characters. Most important ones are: \a => sound a bip and
-print nothing, \b = backspace, erase previous character, except if at the
-beginning of a line, \t = tabulation (4 spaces), \n = newline, \r = same as \n
-(but not interpreted on RGui), \r\n = same as \n, \r\r and \n\r are
-equivalent to \n\n (for portability) from one platform to the other. \f and \v
-are interpreted as \n (but not on RGui under Windows), \u and \x are also
-recognized but interpreted differently from one to the other console, as well
-as the other exotic escape sequences. It is better to ignore them, or to print
-a question mark instead.
+  consoles. With processSocket(), it is the client that must decide how to
+  interpret special characters. Most important ones are: \a => sound a bip and
+  print nothing, \b = backspace, erase previous character, except if at the
+  beginning of a line, \t = tabulation (4 spaces), \n = newline, \r = same as \n
+  (but not interpreted on RGui), \r\n = same as \n, \r\r and \n\r are
+  equivalent to \n\n (for portability) from one platform to the other. \f and \v
+  are interpreted as \n (but not on RGui under Windows), \u and \x are also
+  recognized but interpreted differently from one to the other console, as well
+  as the other exotic escape sequences. It is better to ignore them, or to print
+  a question mark instead.
 
 * Regarding internationalization of error messages, there are two differences
-between messages at the CLI and issued by processSocket():
+  between messages at the CLI and issued by processSocket():
 
-  - Warning message(s): is not translated at CLI bu it is translated by
-processSocket() (bug?) in:
+* Warning message(s): is not translated at CLI bu it is translated by
+  processSocket() (bug?) in:
 	> options(warn = 0)
 	> warning("Warn!")
 
-  - On the contrary, processSocket() fails to translate 'Error in' for most
-error messages, and I don't understand this bug:
+* On the contrary, processSocket() fails to translate 'Error in' for most
+  error messages, and I don't understand this bug:
 	> cos("a")
 
 * If you define options(warning.expression), there will be a problem because
-processSocket() redefines it also, and thus, at best, you expression is
-ignored (must fix this!)
+  processSocket() redefines it also, and thus, at best, you expression is
+  ignored (must fix this!)
 
 * On the MacOS X, there are many mismatches for string translation, bot at the
-command line and using processSocket(), but they are not same mismatches!
+  command line and using processSocket(), but they are not same mismatches!

Modified: pkg/svSocket/inst/CITATION
===================================================================
--- pkg/svSocket/inst/CITATION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svSocket/inst/CITATION	2009-08-10 22:00:31 UTC (rev 174)
@@ -3,15 +3,15 @@
 citEntry(entry="Manual",
          title = "SciViews-R: A GUI API for R",
          author = "Philippe Grosjean",
-         organization = "UMH",
+         organization = "UMons",
          address      = "Mons, Belgium",
          year         = version$year,
          url          = "http://www.sciviews.org/SciViews-R",
-         
-         textVersion = 
-         paste("Grosjean, Ph. (", version$year, "). ", 
+
+         textVersion =
+         paste("Grosjean, Ph. (", version$year, "). ",
                "SciViews: A GUI API for R. ",
-               "UMH, Mons, Belgium. ",
+               "UMons, Mons, Belgium. ",
                "URL http://www.sciviews.org/SciViews-R.",
                sep="")
          )

Modified: pkg/svSweave/DESCRIPTION
===================================================================
--- pkg/svSweave/DESCRIPTION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svSweave/DESCRIPTION	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,11 +1,13 @@
 Package: svSweave
+Type: Package
 Title: SciViews GUI API - Sweave functions
+Depends: R (>= 2.6.0)
 Imports: utils
-Depends: R (>= 2.6.0)
 Description: Supporting functions for the GUI API (Sweave functions)
 Version: 0.9-1
 Date: 2009-07-14
 Author: Philippe Grosjean
 Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: GPL (>= 2)
+LazyLoad: yes
 URL: http://www.sciviews.org/SciViews-R

Modified: pkg/svSweave/NEWS
===================================================================
--- pkg/svSweave/NEWS	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svSweave/NEWS	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,8 +1,10 @@
 = svSweave News
 
 == Changes in svSweave 0.9-1
+
 * The LaTeX command for our chunks is renamed from \Rchunk{} to \rchunk{}
 
+
 == Changes in svSweave 0.9-0
 
 This is the first version distributed on R-forge.

Modified: pkg/svSweave/inst/CITATION
===================================================================
--- pkg/svSweave/inst/CITATION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svSweave/inst/CITATION	2009-08-10 22:00:31 UTC (rev 174)
@@ -3,7 +3,7 @@
 citEntry(entry="Manual",
          title = "SciViews-R: A GUI API for R",
          author = "Philippe Grosjean",
-         organization = "UMH",
+         organization = "UMons",
          address      = "Mons, Belgium",
          year         = version$year,
          url          = "http://www.sciviews.org/SciViews-R",
@@ -11,7 +11,7 @@
          textVersion =
          paste("Grosjean, Ph. (", version$year, "). ",
                "SciViews: A GUI API for R. ",
-               "UMH, Mons, Belgium. ",
+               "UMons, Mons, Belgium. ",
                "URL http://www.sciviews.org/SciViews-R.",
                sep="")
          )

Modified: pkg/svTools/DESCRIPTION
===================================================================
--- pkg/svTools/DESCRIPTION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svTools/DESCRIPTION	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,14 +1,16 @@
 Package: svTools
 Type: Package
 Title: SciViews GUI API - Tools (wrapper for packages tools and codetools)
-Version: 0.0-10
-Date: 2009-08-07
-Author: Romain Francois <francoisromain at free.fr>
+Depends: R (>= 2.6.0)
+Imports: utils, tools, codetools, svMisc, operators
+Description: Set of tools aimed at wrapping some of the functionalities
+  of the packages tools, utils and codetools into a nicer format so
+  that an IDE can use them
+Version: 0.0-11
+Date: 2009-08-10
+Author: Romain Francois
 Maintainer: Romain Francois <francoisromain at free.fr>
-Description: Set of tools aimed at wrapping some of the functionalities
-	of the packages tools, utils and codetools into a nicer format so
-	that an IDE can use them
 License: GPL (>= 2)
 LazyLoad: yes
 LazyData: yes
-Depends: operators, codetools, svMisc, tools, utils
+URL: http://www.sciviews.org/SciViews-R

Modified: pkg/svTools/NAMESPACE
===================================================================
--- pkg/svTools/NAMESPACE	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svTools/NAMESPACE	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,58 +1,55 @@
-import( utils )
+import(utils, tools, codetools, svMisc, operators)
 
-export( generateRoxygenTemplate )
+export(generateRoxygenTemplate)
+export(checkUsageFile)
 
-export( checkUsageFile )
-
 # sidekick.R
-export( sidekick )
+export(sidekick)
 
 # errorlist.R
-# export( getErrors )
-# export( addError )
-# export( resetErrors )
-# export( emptyError )
+#export(getErrors)
+#export(addError)
+#export(resetErrors)
+#export(emptyError)
 
 # parseError.R
-# export( parseError )
+#export(parseError)
 
 # tryParse.R
-# export( tryParse )
+#export(tryParse)
 
 # trySource.R
-# export( trySource )
+#export(trySource)
 
 # check_description.R
-export( check_description )
+export(check_description)
 
 # complete_description.R
-export( completeDescription )
+export(completeDescription)
 
 # completion.R
-# export( ltyComplete     )
-# export( colComplete     )
-# export( pchComplete     )
-export( CompletePlusWrap)
+#export(ltyComplete)
+#export(colComplete)
+#export(pchComplete)
+export(CompletePlusWrap)
 
 # complete_namespace.R
-# export( namespaceComplete )
+#export(namespaceComplete)
 
 # check_namespace.R
-# export( namespaceParser )
-   
+export(namespaceParser)
+
 # packages.R
-# export( packwebdesc       )
-# export( packdesc          )
-export( installedPackages ) 
-export( loadedPackages    )
+#export(packwebdesc)
+#export(packdesc)
+export(installedPackages)
+export(loadedPackages)
 
 # rdparse.R
-# export( rdparse )
+#export(rdparse)
 
-# S3method( print, rsitesearch )
-# S3method( head, rsitesearch )
-# S3method( tail, rsitesearch )
-# S3method( summary, rsitesearch )
-# S3method( "[", rsitesearch )
-
-
+# S3method(print, rsitesearch)
+# S3method(head, rsitesearch)
+# S3method(tail, rsitesearch)
+# S3method(summary, rsitesearch)
+# S3method("[", rsitesearch)

Modified: pkg/svTools/NEWS
===================================================================
--- pkg/svTools/NEWS	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svTools/NEWS	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,7 +1,20 @@
 = svTools News
 
+== Changes in svTools 0.0-11
+
+* Further clean up of the NAMESPACE and DESCRIPTION files
+
+
+== Changes in svTools 0.0-10
+
+* Cleaning for CRAN submission
+
+
 == Changes in svTools 0.0-8
-* handling the token better in CompletePlusWrap
 
+* Handling the token better in CompletePlusWrap
+
+
 == Version 0.0-5
+
 First version on R-Forge.

Modified: pkg/svTools/R/zzz.R
===================================================================
--- pkg/svTools/R/zzz.R	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svTools/R/zzz.R	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,7 +1,6 @@
-
 svTools.env <- new.env()
 
-.onAttach <- function( libname, pkgname){ 
-	addError( emptyError( ) ) 
+.onAttach <- function (libname, pkgname)
+{
+	addError(emptyError())
 }
-

Modified: pkg/svTools/inst/CITATION
===================================================================
--- pkg/svTools/inst/CITATION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svTools/inst/CITATION	2009-08-10 22:00:31 UTC (rev 174)
@@ -3,20 +3,20 @@
 citEntry(entry="Manual",
          title = "SciViews-R: A GUI API for R",
          author = "Philippe Grosjean",
-         organization = "UMH",
+         organization = "UMons",
          address      = "Mons, Belgium",
          year         = version$year,
          url          = "http://www.sciviews.org/SciViews-R",
-         
-         textVersion = 
-         paste("Grosjean, Ph. (", version$year, "). ", 
+
+         textVersion =
+         paste("Grosjean, Ph. (", version$year, "). ",
                "SciViews: A GUI API for R. ",
-               "UMH, Mons, Belgium. ",
+               "UMons, Mons, Belgium. ",
                "URL http://www.sciviews.org/SciViews-R.",
                sep="")
          )
 
 citFooter("We have invested a lot of time and effort in creating SciViews-R,",
           "please cite it when using it together with R.",
-		  "See also", sQuote("citation()"),
-		  "for citing R.")
+	  "See also", sQuote("citation()"),
+	  "for citing R.")

Modified: pkg/svUnit/DESCRIPTION
===================================================================
--- pkg/svUnit/DESCRIPTION	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svUnit/DESCRIPTION	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,4 +1,5 @@
 Package: svUnit
+Type: Package
 Title: SciViews GUI API - Unit testing
 Depends: R (>= 1.9.0)
 Suggests: svGUI, datasets, utils
@@ -8,4 +9,5 @@
 Author: Philippe Grosjean
 Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: GPL (>= 2)
+LazyLoad: yes
 URL: http://www.sciviews.org/SciViews-R

Modified: pkg/svUnit/NEWS
===================================================================
--- pkg/svUnit/NEWS	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svUnit/NEWS	2009-08-10 22:00:31 UTC (rev 174)
@@ -1,48 +1,53 @@
 = svUnit News
 
 == svUnit 0.6-2
+
 * There is now a vignette for the svUnit package.
 
 
 == svUnit 0.6-1
+
 * Correction of a bug in Windows relative to path separators \\ versus /,
-especially usinf tempdir().
+  especially usinf tempdir().
 
 * Correction of a bug that prevented to list runit*.R files in the unitTests
-subdirectory of a package under Windows.
+  subdirectory of a package under Windows.
 
 
 == svUnit 0.6-0
+
 * The package does not depends any more from RUnit. It has his own checkXXX()
-function (they are compatible with those in RUnit 0.4.17, except that here the
-checkTrue() function is vectorized, but they operate very differently),
+  function (they are compatible with those in RUnit 0.4.17, except that here the
+  checkTrue() function is vectorized, but they operate very differently),
 
 * svUnit functions and objects are renamed svSuite, and there is a reworking of
-objects to end with svTest, svSuite, svTestData and svSuiteData, and many new
-methods for those objects (print, summary, stats, metadata, makeUnit, runTest)
+  objects to end with svTest, svSuite, svTestData and svSuiteData, and many new
+  methods for those objects (print, summary, stats, metadata, makeUnit, runTest)
 
 * print.svSuiteData and summary.svSuiteData are completely reworked.
 
 * svSuiteList() now accepts additional, dirs, manages an exclusion list and has
-an argument 'loadPackages' to force loading packages provided in the list.
+  an argument 'loadPackages' to force loading packages provided in the list.
 
 * Names for test units is now runit<name>.R, like in the RUnit package. Same for
-the test functions which are test<name>.R (used to be runit.<name>.R and
-test.<name.R).
+  the test functions which are test<name>.R (used to be runit.<name>.R and
+  test.<name.R).
 
 * The temporary directory is now emptied from old runit*.R files before making
-new ones, but not any more after running tests. That way, we avoid running old
-test definitions, while keeping the latest one available for inspection.
+  new ones, but not any more after running tests. That way, we avoid running old
+  test definitions, while keeping the latest one available for inspection.
 
 * koUnit_xxx() functions have been added to manipulate the R Unit GUI in
-Komodo from within R.
+  Komodo from within R.
 
 
 == svUnit 0.5-0
+
 * Added guiTestFeedback() and guiTestReport() functions.
 
 * A couple of other little changes.
 
 
 == svUnit 0.4-0
+
 First version compiled as a package and distributed on R-Forge.

Modified: pkg/svUnit/TODO
===================================================================
--- pkg/svUnit/TODO	2009-08-10 16:59:20 UTC (rev 173)
+++ pkg/svUnit/TODO	2009-08-10 22:00:31 UTC (rev 174)
@@ -7,13 +7,13 @@
 * Output results in htm, wiki, etc. format (summary.svSuiteData).
 
 * Queue tests to run and run them asynchronously using tcltk and after() if
-this package is loaded and we are in interactive() mode.
+  this package is loaded and we are in interactive() mode.
 
 * RUnit code coverage functions.
 
 * People ask for checkWarning() function... But warnings are not part of code
-execution. Provide an example to show how, by using options(warning = ...) and
-checkException(), one can detect warnings.
+  execution. Provide an example to show how, by using options(warning = ...) and
+  checkException(), one can detect warnings.
 
 * butler: benchmark and profiling => check it.
 
@@ -24,12 +24,12 @@
 * Translate this package.
 
 * In RUnit/share/R, there are checkCode.r and compareRUnitTestData.r. The former
-provides functions for test R code in R files, the latter does a comparison of
-timings in two test set runs, using a tolerance value. Worth checking and
-integrating later on!
+  provides functions for test R code in R files, the latter does a comparison of
+  timings in two test set runs, using a tolerance value. Worth checking and
+  integrating later on!
 
 * In RUnit: one bug is reported on RUnit SourceForge area for RUnit 0.4.17.
-Follow this to make sure it is corrected (or work on a patch!)
+  Follow this to make sure it is corrected (or work on a patch!)
 
 	myfun <- function(a, b = 98, c = 99){
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/sciviews -r 174


More information about the Sciviews-commits mailing list