[Vegan-commits] r455 - in branches/1.13: R inst man

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

Author: gsimpson
Date: 2008-08-04 12:28:24 +0200 (Mon, 04 Aug 2008)
New Revision: 455

Modified:
   branches/1.13/R/ordiArgAbsorber.R
   branches/1.13/inst/ChangeLog
   branches/1.13/man/vegan-internal.Rd
Log:
Merge r453 from trunk to 1.13 branch

Modified: branches/1.13/R/ordiArgAbsorber.R
===================================================================
--- branches/1.13/R/ordiArgAbsorber.R	2008-08-04 08:07:30 UTC (rev 454)
+++ branches/1.13/R/ordiArgAbsorber.R	2008-08-04 10:28:24 UTC (rev 455)
@@ -1,3 +1,3 @@
 `ordiArgAbsorber` <- function(..., shrink, origin, scaling, triangular,
-                                FUN)
+                              display, choices, FUN)
     match.fun(FUN)(...)

Modified: branches/1.13/inst/ChangeLog
===================================================================
--- branches/1.13/inst/ChangeLog	2008-08-04 08:07:30 UTC (rev 454)
+++ branches/1.13/inst/ChangeLog	2008-08-04 10:28:24 UTC (rev 455)
@@ -20,8 +20,11 @@
 	for the original statistic.
 
 	* merged r448: bind moving only to labels (was canvas) in
-	orditkplot. 
+	orditkplot.
 
+	* merged r453: ordiArgAbsorber knows about 'choices' and 'display'
+	args of function scores().
+
 Version 1.13-1 (released June 11, 2008)
 
 	* adonis: speed-up and doc updates.

Modified: branches/1.13/man/vegan-internal.Rd
===================================================================
--- branches/1.13/man/vegan-internal.Rd	2008-08-04 08:07:30 UTC (rev 454)
+++ branches/1.13/man/vegan-internal.Rd	2008-08-04 10:28:24 UTC (rev 455)
@@ -17,7 +17,8 @@
 ordiParseFormula(formula, data, xlev = NULL)
 ordiTerminfo(d, data)
 ordiArrowMul(x, at = c(0,0), fill = 0.75)
-ordiArgAbsorber(..., shrink, origin, scaling, triangular, FUN)
+ordiArgAbsorber(..., shrink, origin, scaling, triangular,
+                display, choices, FUN)
 centroids.cca(x, mf, wt)
 permuted.index(n, strata)
 pasteCall(call, prefix = "Call:")