[Vegan-commits] r1161 - branches/1.17/R

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

Author: gsimpson
Date: 2010-03-03 09:18:42 +0100 (Wed, 03 Mar 2010)
New Revision: 1161

Modified:
   branches/1.17/R/screeplot.cca.R
   branches/1.17/R/screeplot.prcomp.R
   branches/1.17/R/screeplot.princomp.R
Log:
manual merge r1139 to 1.17-x branch

Modified: branches/1.17/R/screeplot.cca.R
===================================================================
--- branches/1.17/R/screeplot.cca.R	2010-03-03 08:11:50 UTC (rev 1160)
+++ branches/1.17/R/screeplot.cca.R	2010-03-03 08:18:42 UTC (rev 1161)
@@ -41,15 +41,15 @@
         mids <- comps
     }
     if(bstick) {
+        dot.args <- list(...)
+        dot.nams <- names(dot.args)
+        pch <- if("pch" %in% dot.nams)
+            dot.args$pch
+        else
+            par("pch")
         lines(mids, ord.bstick[comps], type = ptype, col = bst.col,
               lty = bst.lty)
         if(legend) {
-            dot.args <- list(...)
-            dot.nams <- names(dot.args)
-            pch <- if("pch" %in% dot.nams)
-                dot.args$pch
-            else
-                par("pch")
             col <- if("col" %in% dot.nams)
                 dot.args$col
             else

Modified: branches/1.17/R/screeplot.prcomp.R
===================================================================
--- branches/1.17/R/screeplot.prcomp.R	2010-03-03 08:11:50 UTC (rev 1160)
+++ branches/1.17/R/screeplot.prcomp.R	2010-03-03 08:18:42 UTC (rev 1161)
@@ -33,15 +33,15 @@
         box()
     }
     if(bstick) {
+        dot.args <- list(...)
+        dot.nams <- names(dot.args)
+        pch <- if("pch" %in% dot.nams)
+            dot.args$pch
+        else
+            par("pch")
         lines(mids, ord.bstick[comps], type = ptype, col = bst.col,
               lty = bst.lty)
         if(legend) {
-            dot.args <- list(...)
-            dot.nams <- names(dot.args)
-            pch <- if("pch" %in% dot.nams)
-                dot.args$pch
-            else
-                par("pch")
             col <- if("col" %in% dot.nams)
                 dot.args$col
             else

Modified: branches/1.17/R/screeplot.princomp.R
===================================================================
--- branches/1.17/R/screeplot.princomp.R	2010-03-03 08:11:50 UTC (rev 1160)
+++ branches/1.17/R/screeplot.princomp.R	2010-03-03 08:18:42 UTC (rev 1161)
@@ -33,15 +33,15 @@
         box()
     }
     if(bstick) {
+        dot.args <- list(...)
+        dot.nams <- names(dot.args)
+        pch <- if("pch" %in% dot.nams)
+            dot.args$pch
+        else
+            par("pch")
         lines(mids, ord.bstick[comps], type = ptype, col = bst.col,
               lty = bst.lty)
         if(legend) {
-            dot.args <- list(...)
-            dot.nams <- names(dot.args)
-            pch <- if("pch" %in% dot.nams)
-                dot.args$pch
-            else
-                par("pch")
             col <- if("col" %in% dot.nams)
                 dot.args$col
             else