Corrected HTML documentation

git-svn-id: svn+ssh://scm.r-forge.r-project.org/svnroot/geometry@133 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
davidcsterratt · Oct 29, 2014 · 39cafc4 · 39cafc4
1 parent 4d8afbc
commit 39cafc4
Show file tree

Hide file tree

Showing 27 changed files with 2,187 additions and 2,362 deletions.
diff --git a/Makefile b/Makefile
@@ -2,6 +2,7 @@ GEOMETRY_VERSION=$(shell grep Version pkg/DESCRIPTION | perl -p -e "s/Version: /
 GEOMETRY_SVN_REVISION=$(shell svn info -R | grep "Revision:" | perl -p -e 's/Revision: //;' | sort -n -r | head -1)
 GEOMETRY_SVN_REVISION1=$(shell echo $(GEOMETRY_SVN_REVISION) + 1 | bc) 
 PACKAGE=geometry_$(GEOMETRY_VERSION).tar.gz
+QHULL_DIR=qhull-2012.1
 
 roxygen:
 	rm -f pkg/man/*
@@ -28,10 +29,18 @@ revision:
 	@echo $(GEOMETRY_SVN_REVISION)
 	@echo $(GEOMETRY_SVN_REVISION1)
 
+
 ## qhull doc files need to have html suffixes and to have html 
-## cd inst/doc
+htmldoc:
+	cp $(QHULL_DIR)/index.htm pkg/inst/doc/index.html
+	for f in  $(QHULL_DIR)/html/*.htm ; do cp $$f pkg/inst/doc/html/`basename $${f} .htm`.html ; done	
+	cp $(QHULL_DIR)/html/*.gif pkg/inst/doc/html/
+	perl -p -i -e 's/\.htm([#\"])/.html\1/g;' pkg/inst/doc/index.html	pkg/inst/doc/html/*.html
+	perl -p -i -e 's|<head>|<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>|g;' pkg/inst/doc/index.html	pkg/inst/doc/html/*.html
+	tidy -config tidy-config -f tidy-error.log -m pkg/inst/doc/index.html	pkg/inst/doc/html/*.html
+
 ## for f in  *.htm ; do svn move $f ${f}l ; done
-## perl -p -i -e 's/\.htm([#\"])/.html\1/g; ' *.html
+## 
 ## cd html
 ## for f in  *.htm ; do svn move $f ${f}l ; done
 ## perl -p -i -e 's/\.htm([#\"])/.html\1/g; ' *.html

diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION
@@ -17,7 +17,7 @@ Description: This package makes the qhull library (www.qhull.org)
     Delaunay triangulation and convex hull computation.
 Version: 0.3-5
 URL: http://geometry.r-forge.r-project.org/
-Date: 2014-09-22
+Date: 2014-10-29
 BugReports: https://r-forge.r-project.org/tracker/?group_id=1149
 Depends:
     R (>= 2.5.0),

diff --git a/pkg/NEWS b/pkg/NEWS
@@ -8,6 +8,10 @@ DOCUMENTATION IMPROVEMENTS
 * The documentation of "cart2bary" and "bary2cart" has been corrected
   and improved. Thanks to Francisco Mendoza Torres for raising the issue.
 
+* HTML documentation has been for validation errors with HTML tidy.
+  Thanks to Kurt Hornik and the CRAN maintainers for alerting me to
+  the problem.
+
 CHANGES IN VERSION 0.3-4  - Released 2014/03/04
 
 BUG FIXES

diff --git a/pkg/inst/doc/html/index.html b/pkg/inst/doc/html/index.html