[Vegan-commits] r1734 - in pkg/vegan: R inst inst/doc

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

Author: jarioksa
Date: 2011-08-19 09:50:13 +0200 (Fri, 19 Aug 2011)
New Revision: 1734

Modified:
   pkg/vegan/R/vegandocs.R
   pkg/vegan/inst/ChangeLog
   pkg/vegan/inst/doc/Makefile
Log:
make doc/NEWS.html to display formatted NEWS in a browser

Modified: pkg/vegan/R/vegandocs.R
===================================================================
--- pkg/vegan/R/vegandocs.R	2011-08-19 07:02:08 UTC (rev 1733)
+++ pkg/vegan/R/vegandocs.R	2011-08-19 07:50:13 UTC (rev 1734)
@@ -16,7 +16,7 @@
             if (!tools:::httpdPort)
                 tools:::startDynamicHelp()
             browseURL(paste("http://127.0.0.1:", tools:::httpdPort,
-                            "/library/vegan/NEWS", sep=""))
+                            "/library/vegan/doc/NEWS.html", sep=""))
         } else {
             file.show(tools:::Rd2txt(file.path(path.package("vegan"),
                                                "NEWS.Rd"), tempfile()))

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2011-08-19 07:02:08 UTC (rev 1733)
+++ pkg/vegan/inst/ChangeLog	2011-08-19 07:50:13 UTC (rev 1734)
@@ -17,9 +17,12 @@
 	getOption("help_type") == "html", should start a browser to show
 	the NEWS, and use text console otherwise ("html" tested on MacOS
 	R.App GUI, text mode in Linux and MacOS bash shells, no testing on
-	Windows yet). However, although the browser knows how to show
-	NEWS.Rd it does not do the formatting: perhaps we need to build a
-	NEWS.html for the purpose, but I do not yet know how to do that.
+	Windows yet). Although the browser knows how to display NEWS.Rd,
+	it does not format the page properly (\code{foo} shows as ordinary
+	text etc). As a kluge we now make a NEWS.html file in the inst/doc
+	directory. NEWS.html cannot be made in the inst/ directory since
+	browser only agrees to show NEWS (plain) in the main directory or
+	files in doc directory.
 	
 Version 1.91-0 (closed August 18, 2011)
 

Modified: pkg/vegan/inst/doc/Makefile
===================================================================
--- pkg/vegan/inst/doc/Makefile	2011-08-19 07:02:08 UTC (rev 1733)
+++ pkg/vegan/inst/doc/Makefile	2011-08-19 07:50:13 UTC (rev 1734)
@@ -1,4 +1,4 @@
-all: FAQ-vegan.pdf decision-vegan.pdf intro-vegan.pdf diversity-vegan.pdf
+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
 decision-vegan.pdf: decision-vegan.tex
@@ -10,4 +10,6 @@
 diversity-vegan.pdf: diversity-vegan.tex
 	texi2dvi --pdf --clean diversity-vegan.tex
 	-rm -f diversity-vegan-0*.* Rplots.*
+NEWS.html: ../NEWS.Rd
+	R CMD Rd2txt -t html ../NEWS.Rd -o NEWS.html