[Vegan-commits] r2062 - in branches/2.0: . R inst inst/doc

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

Author: jarioksa
Date: 2012-02-04 17:35:31 +0100 (Sat, 04 Feb 2012)
New Revision: 2062

Added:
   branches/2.0/.Rinstignore
Modified:
   branches/2.0/R/adonis.R
   branches/2.0/inst/ChangeLog
   branches/2.0/inst/doc/veganjss.sty
Log:
merge r2056,2057,2061: janitorial, inconsolata fonts and adonis says she has sequential terms

Copied: branches/2.0/.Rinstignore (from rev 2057, pkg/vegan/.Rinstignore)
===================================================================
--- branches/2.0/.Rinstignore	                        (rev 0)
+++ branches/2.0/.Rinstignore	2012-02-04 16:35:31 UTC (rev 2062)
@@ -0,0 +1,5 @@
+Makefile
+.*tex$
+.*sty$
+.*bib$
+.*texi$

Modified: branches/2.0/R/adonis.R
===================================================================
--- branches/2.0/R/adonis.R	2012-02-04 09:25:22 UTC (rev 2061)
+++ branches/2.0/R/adonis.R	2012-02-04 16:35:31 UTC (rev 2062)
@@ -120,6 +120,7 @@
     rownames(tab) <- c(attr(attr(rhs.frame, "terms"), "term.labels")[u.grps],
                        "Residuals", "Total")
     colnames(tab)[ncol(tab)] <- "Pr(>F)"
+    attr(tab, "heading") <- "Terms added sequentially (first to last)\n"
     class(tab) <- c("anova", class(tab))
     out <- list(aov.tab = tab, call = match.call(),
                 coefficients = beta.spp, coef.sites = beta.sites,

Modified: branches/2.0/inst/ChangeLog
===================================================================
--- branches/2.0/inst/ChangeLog	2012-02-04 09:25:22 UTC (rev 2061)
+++ branches/2.0/inst/ChangeLog	2012-02-04 16:35:31 UTC (rev 2062)
@@ -4,6 +4,9 @@
 
 Version 2.0-3 (opened November 13, 2011)
 
+	* merge r2060: adonis tells terms were added sequentially.
+	* mrege r2057: add .Rinstignore to silense R 2.15.0 checks.
+	* merge r2056: use inconsolata fonts in vignettes.
 	* merge r2053: implement adjusted R2 for partial RDA.
 	* merge r2052: do not scale constraints in varpart[234].
 	* merge r2049: capscale robust for zeroed centroids.

Modified: branches/2.0/inst/doc/veganjss.sty
===================================================================
--- branches/2.0/inst/doc/veganjss.sty	2012-02-04 09:25:22 UTC (rev 2061)
+++ branches/2.0/inst/doc/veganjss.sty	2012-02-04 16:35:31 UTC (rev 2062)
@@ -17,6 +17,8 @@
   \textbf{\large \thesubsection. #2} \nopagebreak
   \vskip \postSskip \nopagebreak}
 
+%% use inconsolata fonts for code and examples 
+\usepackage{inconsolata}
 %% smaller examples
 \renewenvironment{Schunk}{\par\small}{}