[Sciviews-commits] r409 - in pkg/tcltk2: . R man

[noreply at r-forge.r-project.org]

Author: phgrosjean
Date: 2011-10-19 17:20:41 +0200 (Wed, 19 Oct 2011)
New Revision: 409

Modified:
   pkg/tcltk2/DESCRIPTION
   pkg/tcltk2/NEWS
   pkg/tcltk2/R/tk2commands.R
   pkg/tcltk2/man/tcltk2-package.Rd
Log:
Bug correction in tcltk2: is.tk() returned always FALSE when options(scipen = -5)

Modified: pkg/tcltk2/DESCRIPTION
===================================================================
--- pkg/tcltk2/DESCRIPTION	2011-10-14 14:08:01 UTC (rev 408)
+++ pkg/tcltk2/DESCRIPTION	2011-10-19 15:20:41 UTC (rev 409)
@@ -7,8 +7,8 @@
 Description: A series of additional Tcl commands and Tk widgets with style
   and various functions (under Windows: DDE exchange, access to the
   registry and icon manipulation) to supplement the tcltk package
-Version: 1.1-5
-Date: 2010-09-24
+Version: 1.1-6
+Date: 2011-10-19
 Author: Philippe Grosjean
 Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: file LICENSE

Modified: pkg/tcltk2/NEWS
===================================================================
--- pkg/tcltk2/NEWS	2011-10-14 14:08:01 UTC (rev 408)
+++ pkg/tcltk2/NEWS	2011-10-19 15:20:41 UTC (rev 409)
@@ -1,5 +1,11 @@
 = tcltk2 news
 
+== Version 1.1-6
+
+* When setting options(scipen = -5) or lower, is.tk() returned FALSE, even if
+  Tk package was installed. Corrected.
+
+
 == Version 1.1-5
 
 * Little correction in Winico.c that prevented it to compile correctly on all

Modified: pkg/tcltk2/R/tk2commands.R
===================================================================
--- pkg/tcltk2/R/tk2commands.R	2011-10-14 14:08:01 UTC (rev 408)
+++ pkg/tcltk2/R/tk2commands.R	2011-10-19 15:20:41 UTC (rev 409)
@@ -236,7 +236,7 @@
 }
 
 is.tk <- function ()
-	return(tclvalue(.Tcl("catch { package present Tk }")) == 0)
+	return(tclvalue(.Tcl("catch { package present Tk }")) == "0")
 
 is.ttk <- function ()
 {

Modified: pkg/tcltk2/man/tcltk2-package.Rd
===================================================================
--- pkg/tcltk2/man/tcltk2-package.Rd	2011-10-14 14:08:01 UTC (rev 408)
+++ pkg/tcltk2/man/tcltk2-package.Rd	2011-10-19 15:20:41 UTC (rev 409)
@@ -16,8 +16,8 @@
 \tabular{ll}{
 Package: \tab tcltk2\cr
 Type: \tab Package\cr
-Version: \tab 1.1-5\cr
-Date: \tab 2010-09-24\cr
+Version: \tab 1.1-6\cr
+Date: \tab 2011-10-19\cr
 License: \tab see LICENSE file\cr
 LazyLoad: \tab yes\cr
 }