fix for PR 7084; thanks to Heather Turner and Ella Kaye

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

Author: murrell

doc/NEWS.Rd

@@ -142,6 +142,10 @@
       \item \code{t.test(c(1:3, Inf))} and similar no longer produce an error but
       return a (still not so useful) \code{"htest"} result, fixing
       \PR{18901}, thanks to \I{Jesse Alderliesten}.
+
+      \item \code{text()} now truncates \code{labels} to maximum length
+      of \code{x} and \code{y} (if it is longer), fixing \PR{7084}.
+      Thanks to \I{Heather Turner} and \I{Ella Kaye}.
     }
   }
 }

src/library/graphics/R/text.R

@@ -26,7 +26,18 @@ function(x, y = NULL, labels = seq_along(x$x),
     if (!missing(y) && (is.character(y) || is.expression(y))) {
 	labels <- y; y <- NULL
     }
+
     x <- xy.coords(x,y, recycle = TRUE, setLab = FALSE)
+    
+    if (is.language(labels)) {
+        labels <- as.expression(labels)
+    }
+
+    if (length(labels) > (n <- length(x$x)) && n >= 1) {
+        labels <- labels[1:n]
+        warning("length(labels) > max(length(x), length(y)). labels truncated to length ", n, ".")
+    }
+
     labels <- as.graphicsAnnot(labels)
     if (!is.null(vfont))
         vfont <- c(typeface = pmatch(vfont[1L], Hershey$typeface),

src/library/graphics/man/text.Rd

@@ -24,7 +24,7 @@ text(x, \dots)
     language objects (names and calls) to expressions, and vectors and
     other classed objects to character vectors by \code{\link{as.character}}.
     If \code{labels} is longer than \code{x} and
-    \code{y}, the coordinates are recycled to the length of \code{labels}.}
+    \code{y}, \code{labels} is truncated to \code{max(length(x), length(y))}.}
   \item{adj}{one or two values in \eqn{[0, 1]} which specify the x
     (and optionally y) adjustment (\sQuote{justification}) of the
     labels, with 0 for left/bottom, 1 for right/top, and 0.5 for