Help Book: fix indexing

Newer version of Help Indexer require XML, so use "tidy" to convert HTML to XHTML. Conflicts: aquamacs/doc/README.txt aquamacs/doc/latex/Makefile
aquamacs-emacs · May 31, 2013 · 03e1e1e · 03e1e1e
1 parent a6b1419
commit 03e1e1e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/aquamacs/doc/README.txt b/aquamacs/doc/README.txt
@@ -5,8 +5,19 @@ example using the Texlive distribution. The most recent version of latex2html ca
 
 2. 
 
+curl -O http://tug.org/fonts/getnonfreefonts/install-getnonfreefonts
+sudo texlua install-getnonfreefonts
+sudo getnonfreefonts-sys --all
+
+3. Install "tidy"  (from source, https://github.com/w3c/tidy-html5 )
+   Modern versions of "hiutil" require XHTML
+
+4. Just run the Makefile:
+
 cd doc/latex
 make
 
 
+(make html creates the help files, make pdf the PDF manuals)
+
 
diff --git a/aquamacs/doc/latex/Makefile b/aquamacs/doc/latex/Makefile
@@ -32,7 +32,7 @@ pdf: aquamacs.tex changelog.tex changes.tex *.pdf
 
 html: aquamacs.tex *.pdf
 	echo "Running latex2html on $(fname)...";				     \
-	latex2html -init_file l2hconf-local.pm -local_icons -html_version=4.1 $(fname) ; \
+	latex2html -init_file l2hconf-local.pm -local_icons -html_version=4.0 $(fname) ; \
 	echo "$(fname) converted to HTML."					     ; \
 	cp aquamacs.css $(newdir)/aquamacs.css					     ; \
 	sed 's/<META NAME="description" CONTENT="/<META NAME="AppleTitle" content="Aquamacs Help ('"${AQUAMACS_MAJOR_VERSION}"')"><META NAME="AppleFont" content="Lucida Grande,Helvetica"><META NAME="description" CONTENT="/' <$(newdir)/index.html >$(newdir)/index2.html	     ; \
@@ -41,6 +41,7 @@ html: aquamacs.tex *.pdf
 	mv $(newdir)/index2.html $(newdir)/index.html ; \
 	sed 's|<BODY >|<BODY ><a name="AquamacsIndex"></a>|' <$(newdir)/index.html >$(newdir)/index2.html; \
 	mv $(newdir)/index2.html $(newdir)/index.html ; \
+	tidy -asxhtml -m *.html ; \
 	(cd $(newdir); \
 	echo newdir=$(newdir) ; \
 	chgfile=`/usr/bin/grep -m1 -l changelog-top node*.html` ; \
@@ -53,4 +54,4 @@ html: aquamacs.tex *.pdf
 	cp $(srcdir)/*.png $(destdir)/			     ; \
 	find $(destdir) -name *.helpindex -delete ; \
 	echo "Help files copied." ; \
-	hiutil -C -g -s en -a -f $(destdir)"/Aquamacs Help.helpindex" $(destdir)
+	hiutil -C -s en -a -f $(destdir)"/Aquamacs Help.helpindex" $(destdir)