Merge branch 'labelled-orditext'

R/text.ordiplot.R

@@ -1,6 +1,6 @@
 `text.ordiplot`  <-
     function (x, what, labels, select, arrows = FALSE, length = 0.05,
-              arr.mul, ...)
+              arr.mul, bg, ...)
 {
     sco <- scores(x, what)
     if (!missing(labels))
@@ -21,6 +21,9 @@
         arrows(0, 0, sco[,1], sco[,2], length = length, ...)
         sco <- ordiArrowTextXY(sco, rownames(sco), rescale = FALSE, ...)
     }
-    text(sco, labels = rownames(sco), ...)
+    if (missing(bg))
+        text(sco, labels = rownames(sco), ...)
+    else
+        ordilabel(sco, labels = rownames(sco), fill = bg, ...)
     invisible(x)
 }

man/ordiplot.Rd

@@ -24,7 +24,7 @@ ordiplot(ord, choices = c(1, 2), type="points", display, xlim, ylim,
 \method{points}{ordiplot}(x, what, select, arrows = FALSE,
     length = 0.05, arr.mul, ...)
 \method{text}{ordiplot}(x, what, labels, select, arrows = FALSE,
-    length = 0.05, arr.mul, ...)
+    length = 0.05, arr.mul, bg, ...)
 \method{identify}{ordiplot}(x, what, labels,  ...)
 }
 
@@ -60,6 +60,9 @@ ordiplot(ord, choices = c(1, 2), type="points", display, xlim, ylim,
     \code{arrows = TRUE}. The default is to automatically adjust arrow
     lengths with \code{"biplot"} and \code{"regression"} scores and else
     use scores directly.}
+  \item{bg}{Background colour for labels. If \code{bg} is set, the
+    labels are displayed with \code{\link{ordilabel}} instead of
+    \code{\link{text}}.  }
   \item{select}{Items to be displayed.  This can either be a logical
     vector which is \code{TRUE} for displayed items or a vector of indices
     of displayed items.}