[R-gregmisc-commits] r2089 - in pkg/gplots: R man

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

Author: warnes
Date: 2016-03-24 14:47:48 +0100 (Thu, 24 Mar 2016)
New Revision: 2089

Modified:
   pkg/gplots/R/smartlegend.R
   pkg/gplots/man/gplots-defunct.Rd
   pkg/gplots/man/gplots-deprecated.Rd
Log:
The smartlegend() function has been made defunct and is no longer available.

Modified: pkg/gplots/R/smartlegend.R
===================================================================
--- pkg/gplots/R/smartlegend.R	2016-03-24 13:38:46 UTC (rev 2088)
+++ pkg/gplots/R/smartlegend.R	2016-03-24 13:47:48 UTC (rev 2089)
@@ -3,54 +3,6 @@
 smartlegend <- function(x=c("left","center","right"),
                         y=c("top","center","bottom"),
                         ..., inset=0.05 )
-  {
+    .Defunct('legend', 'gplots')
 
-    .Deprecated('legend', 'graphics')
 
-    x <- match.arg(x)
-    y <- match.arg(y)
-
-    usr <- par("usr")
-    inset.x <- inset * (usr[2] - usr[1])
-    inset.y <- inset * (usr[4] - usr[3])
-
-    if(x=="left")
-      {
-        x.pos <- usr[1] + inset.x
-        xjust = 0
-      }
-    else if(x=="center")
-      {
-        x.pos <- (usr[1] + usr[2])/2
-        xjust = 0.5
-      }
-    else # y=="right"
-      {
-        x.pos <- usr[2] - inset.x
-        xjust = 1
-      }
-
-    if(y=="bottom")
-      {
-        y.pos <- usr[3] + inset.y
-        yjust = 0
-      }
-    else if(y=="center")
-      {
-        y.pos <- (usr[3] + usr[4])/2
-        yjust = 0.5
-      }
-    else
-      {
-        y.pos <- usr[4] - inset.y
-        yjust = 1
-      }
-
-
-    if(par("xlog")) x.pos <- 10^x.pos
-    if(par("ylog")) y.pos <- 10^y.pos
-
-    legend( x=x.pos, y=y.pos, ..., xjust=xjust, yjust=yjust)
-  }
-
-

Modified: pkg/gplots/man/gplots-defunct.Rd
===================================================================
--- pkg/gplots/man/gplots-defunct.Rd	2016-03-24 13:38:46 UTC (rev 2088)
+++ pkg/gplots/man/gplots-defunct.Rd	2016-03-24 13:47:48 UTC (rev 2089)
@@ -1,9 +1,10 @@
 \name{gplots-defunct}
 \alias{boxplot.n}
 \alias{plot.lm2}
+\alias{smartlegend}
 \title{Defunct functions}
 \description{
-  These funcntion are defunct and have been removed from the gplots package.
+  These functions are defunct and have been removed from the gplots package.
 }
 \usage{
    boxplot.n(..., top=FALSE, shrink=1, textcolor=NULL)
@@ -25,6 +26,10 @@
             width=1/10,
             max.n=5000
             )
+  smartlegend(x = c("left", "center", "right"),
+             y = c("top", "center", "bottom"),
+             ...,
+             inset = 0.05)
 }
 \arguments{
   \item{\dots}{see man page for the corresponding replacement function}
@@ -33,6 +38,7 @@
   \item{x, which, caption, panel, sub.caption, main, ask, id.n,
     labels.id, cex.id, band, rug, width, max.n}{See man page for
     \code{\link{lmplot2}}.}
+  \item{x, y, inset, \dots}{see man page for the corresponding replacement function}
 }
 \details{
 These functions are no longer available.  Please refer to the manual page
@@ -40,12 +46,15 @@
   \itemize{
     \item \code{boxplot.n} has been replaced by \code{\link{boxplot2}}
     \item \code{plot.lm2} has been replaced by \code{\link{lmplot2}}
+    \item \code{smartlegend} is no longer needed because relative
+    positioning has been implemented in \code{\link[graphics]{legend}}.
   }
 }
 \author{Gregory R. Warnes \email{greg at warnes.net}}
 \seealso{
   \code{\link{boxplot2}},
   \code{\link{lmplot2}},
+  \code{\link[graphics]{legend}},
   \code{\link[base]{Defunct}}
 }
 \keyword{misc}

Modified: pkg/gplots/man/gplots-deprecated.Rd
===================================================================
--- pkg/gplots/man/gplots-deprecated.Rd	2016-03-24 13:38:46 UTC (rev 2088)
+++ pkg/gplots/man/gplots-deprecated.Rd	2016-03-24 13:47:48 UTC (rev 2089)
@@ -1,31 +1,24 @@
 \name{gplots-deprecated}
 \alias{deprecated}
-\alias{smartlegend}
 \title{Deprecated functions}
 \description{
-  These funcntion have been deprecated and will be removed in future
+  These functions have been deprecated and will be removed in future
   releases of gplots.
 }
 \usage{
-smartlegend(x = c("left", "center", "right"),
-            y = c("top", "center", "bottom"),
-            ...,
-            inset = 0.05)
+  (No deprecated functions at this time)
 }
 \arguments{
-  \item{x, y, inset, \dots}{see man page for the corresponding replacement function}
 }
 \details{
 These functions have been deprecated.  Please refer to the manual page
 for the replacement function:
   \itemize{
-    \item \code{smartlegend} is no longer needed because relative
-    positioning has been implemented in graphics::legend().
+    \item (No deprecated functions at this time)
   }
 }
 \author{Gregory R. Warnes \email{greg at warnes.net}}
 \seealso{
-  \code{\link{legend}},
   \code{\link[base]{Deprecated}}
 }
 \keyword{misc}