enhance tcltk:tclVersion()

git-svn-id: https://svn.r-project.org/R/trunk@88292 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

doc/NEWS.Rd

@@ -14,7 +14,8 @@
 
   \subsection{NEW FEATURES}{
     \itemize{
-      \item \code{str()} now shows more via \code{format()} for external pointers.
+      \item \code{str()} now shows more via \code{format()} for external
+      pointers.
 
       \item \code{terms(<formula>, specials = *)} now treats non-syntactic
       specials more gracefully, thanks to \I{Mikael Jagan}'s \PR{18568}.
@@ -38,9 +39,13 @@
 	license identifiers},
       thanks to \I{Thierry Onkelinx} and \I{LLuís Revilla}.
 
-      \item \code{read.dcf} now recognizes lines starting with \samp{#}
-      as comment lines.  By \I{Dirk Eddelbuettel}, \I{Laurent Gatto} and
-      \I{Hugo Gruson}.
+      \item \code{read.dcf()} now recognizes lines starting with
+      \samp{#} as comment lines.  By \I{Dirk Eddelbuettel}, \I{Laurent
+      Gatto} and \I{Hugo Gruson}.
+
+      \item \code{tcltk::tclVersion()} now only optionally includes the
+      \sQuote{patch level}, as Tcl full versions can be of the the form
+      \code{8.7a5} or \code{9.0b1} without three clear components.
     }
   }
 

src/library/tcltk/R/utils.R

@@ -226,4 +226,11 @@ tk_messageBox <-
     tclvalue(do.call("tcl", args))
 }
 
-tclVersion <- function() as.character(tcl("info", "patchlevel"))
+## aadded for R 3.2.0, enhanced for R 4.6.0
+##tclVersion <- function() as.character(tcl("info", "patchlevel"))
+
+tclVersion <- function(with_parselevel = FALSE)
+{
+    if(isTRUE(with_parselevel)) as.character(tcl("info", "patchlevel"))
+    else as.character(tcl("info", "tclversion"))
+}

src/library/tcltk/man/TclInterface.Rd

@@ -113,7 +113,7 @@ is.tclObj(x)
 
 addTclPath(path = ".")
 tclRequire(package, warn = TRUE)
-tclVersion()
+tclVersion(with_parselevel = FALSE)
 }
 \arguments{
   \item{objv}{a named vector of Tcl objects}
@@ -131,6 +131,7 @@ tclVersion()
   \item{warn}{logical. Warn if not found?}
   \item{...}{Additional arguments. See below.}
   \item{init}{initialization value}
+  \item{with_parselevel}{logical: should the \sQuote{parse level} be included?}
 }
 \details{
   Many of these functions are not intended for general use but are used
@@ -265,15 +266,11 @@ system is active; if \code{FALSE}, only the Tcl interpreter is available.
   Note that a report of \sQuote{not found} will be given if the package is
   found but is not compatible with the Tcl/Tk version in use.
 
-  \code{tclVersion} returns the full Tcl version as a character string such
-  as \code{"8.6.16"} or \code{"9.0.1"}). (This uses the Tcl command
-  \code{info patchlevel} and so includes the patch level.)  An
-  alternative is to use \preformatted{
-      as.character(tcl('info', 'tclversion'))
-}
-  which does not include the patch level.  (This is also available as the
-  Tcl variable \code{tcl_version}.)  NB: the \sQuote{patch level} is not
-  necessarily numeric, e.g. \code{9.0b1}.
+  \code{tclVersion} optionally returns the full Tcl version as a
+  character string such as \code{"8.6.16"} or \code{"9.0.1"}). NB: the
+  \sQuote{patch level} is not necessarily numeric, e.g. \code{9.0b1}.
+  (\R{} versions before 8.6.0 reported the full version including the
+  \sQuote{patch level}.)
 }
 \note{
   Strings containing unbalanced braces are currently not handled
@@ -289,6 +286,7 @@ system is active; if \code{FALSE}, only the Tcl interpreter is available.
 }
 \examples{
 tclVersion()
+tclVersion(TRUE)
 
 .Tcl("format \"\%s\\n\" \"Hello, World!\"")
 \dontdiff{
@@ -306,7 +304,7 @@ tcl("set", as.character(xyzzy))
 \dontrun{
 ## These cannot be run by example() but should be OK when pasted
 ## into an interactive R session with the tcltk package loaded
-top <- tktoplevel() # a Tk widget, see Tk-widgets
+top <- tktoplevel() # a Tk widget, see ?Tkwidgets
 ls(envir = top$env, all.names = TRUE)
 }
 \dontdiff{