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

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

Author: jarioksa
Date: 2012-08-23 17:13:58 +0200 (Thu, 23 Aug 2012)
New Revision: 2259

Modified:
   branches/2.0/inst/ChangeLog
   branches/2.0/inst/doc/Makefile
   branches/2.0/inst/doc/diversity-vegan.Rnw
   branches/2.0/inst/doc/intro-vegan.Rnw
Log:
merge r2244,9: fix vignette building in TeXLive 2012

Modified: branches/2.0/inst/ChangeLog
===================================================================
--- branches/2.0/inst/ChangeLog	2012-08-23 08:45:31 UTC (rev 2258)
+++ branches/2.0/inst/ChangeLog	2012-08-23 15:13:58 UTC (rev 2259)
@@ -5,9 +5,11 @@
 Version 2.0-5 (opened June 18, 2012)
 
 	* merge r2254: stylistic in examples of Rd files.
-	* merge r2250: do not use paste0 in envift.Rd (fails in R 2.14). 
+	* merge r2250: do not use paste0 in envift.Rd (fails in R 2.14).
+	* merge r2249: fix vignette building with TeXLive 2012.
 	* merge r2246: remove dead code from cIndexKM() and R-devel CMD
 	check warning.
+	* merge r2244: more portable doc/Makefile
 	* merge r2237 thru 2240: add labels.envfit() and "labels" arg to
 	plot.envfit(). 
 	* merge r2225: biplot.rda 'type' fix.

Modified: branches/2.0/inst/doc/Makefile
===================================================================
--- branches/2.0/inst/doc/Makefile	2012-08-23 08:45:31 UTC (rev 2258)
+++ branches/2.0/inst/doc/Makefile	2012-08-23 15:13:58 UTC (rev 2259)
@@ -1,14 +1,14 @@
 all: FAQ-vegan.pdf decision-vegan.pdf intro-vegan.pdf diversity-vegan.pdf NEWS.html
 FAQ-vegan.pdf: FAQ-vegan.texi
-	texi2dvi --pdf --clean FAQ-vegan.texi
+	"$(R_HOME)/bin/R" CMD texi2dvi --pdf --clean FAQ-vegan.texi
 decision-vegan.pdf: decision-vegan.tex
-	texi2dvi --pdf --clean decision-vegan.tex
+	"$(R_HOME)/bin/R" CMD texi2dvi --pdf --clean decision-vegan.tex
 	-rm -f decision-vegan-0*.* Rplots.*
 intro-vegan.pdf: intro-vegan.tex
-	texi2dvi --pdf --clean intro-vegan.tex
+	"$(R_HOME)/bin/R" CMD texi2dvi --pdf --clean intro-vegan.tex
 	-rm -f intro-vegan-0*.* Rplots.*
 diversity-vegan.pdf: diversity-vegan.tex
-	texi2dvi --pdf --clean diversity-vegan.tex
+	"$(R_HOME)/bin/R" CMD texi2dvi --pdf --clean diversity-vegan.tex
 	-rm -f diversity-vegan-0*.* Rplots.*
 NEWS.html: ../NEWS.Rd
 	"$(R_HOME)/bin/R" CMD Rd2txt -t html ../NEWS.Rd -o NEWS.html

Modified: branches/2.0/inst/doc/diversity-vegan.Rnw
===================================================================
--- branches/2.0/inst/doc/diversity-vegan.Rnw	2012-08-23 08:45:31 UTC (rev 2258)
+++ branches/2.0/inst/doc/diversity-vegan.Rnw	2012-08-23 15:13:58 UTC (rev 2259)
@@ -49,9 +49,8 @@
 
 \tableofcontents
 
-\section*{~}
-
-The \pkg{vegan} package has two major components:
+ ~\\[2ex]
+\noindent The \pkg{vegan} package has two major components:
 multivariate analysis (mainly ordination), and methods for diversity
 analysis of ecological communities.  This document gives an
 introduction to the latter.  Ordination methods are covered in other

Modified: branches/2.0/inst/doc/intro-vegan.Rnw
===================================================================
--- branches/2.0/inst/doc/intro-vegan.Rnw	2012-08-23 08:45:31 UTC (rev 2258)
+++ branches/2.0/inst/doc/intro-vegan.Rnw	2012-08-23 15:13:58 UTC (rev 2259)
@@ -55,9 +55,8 @@
 
 \tableofcontents
 
-\section*{~}
-
-\pkg{Vegan} is a package for community ecologists.  This
+~\\[2ex]
+\noindent \pkg{Vegan} is a package for community ecologists.  This
 documents explains how the commonly used ordination methods can be
 performed in \pkg{vegan}.  The document only is a very basic
 introduction.  Another document (\emph{vegan tutorial})