Revert "Switch to using Halibut's new direct .CHM generation."

This reverts commit 7bdfda840962e0de7442c4f58d37ca1f560a5797.

Conflicts:
	Buildscr
	Makefile.doc

diff --git a/Makefile.doc b/Makefile.doc
index 9812df8a569520e5a0ee1479030fd34ad5bd68ca..00436a56ab6b3f4ef60ecee7a233182541e2d8a3 100644 (file)
--- a/Makefile.doc
+++ b/Makefile.doc
@@ -1,14 +1,10 @@
-all: puzzles.chm puzzles.hlp puzzles.txt HACKING
+all: puzzles.hlp puzzles.txt HACKING
 
 preprocessed.but: puzzles.but
        sed 's/PREFIX-/$(BINPREFIX)/g' puzzles.but > preprocessed.but
 
-puzzles.chm: preprocessed.but
-       halibut --chm=puzzles.chm preprocessed.but
-puzzles.hlp: preprocessed.but
-       halibut --winhelp=puzzles.hlp preprocessed.but
-puzzles.txt: preprocessed.but
-       halibut --text=puzzles.txt preprocessed.but
+puzzles.hlp puzzles.txt: preprocessed.but
+       halibut --winhelp=puzzles.hlp --text=puzzles.txt preprocessed.but
 
 HACKING: devel.but
        halibut --text=HACKING devel.but

diff --git a/chm.but b/chm.but
new file mode 100644 (file)
index 0000000..e023704
--- /dev/null
+++ b/chm.but
@@ -0,0 +1,21 @@
+\# File containing the magic HTML configuration directives to create
+\# an MS HTML Help project. We put this on the end of the Puzzles
+\# docs build command line to build the HHP and friends.
+
+\cfg{html-leaf-level}{infinite}
+\cfg{html-leaf-contains-contents}{false}
+\cfg{html-suppress-navlinks}{true}
+\cfg{html-suppress-address}{true}
+
+\cfg{html-contents-filename}{index.html}
+\cfg{html-template-filename}{%k.html}
+\cfg{html-template-fragment}{%k}
+
+\cfg{html-mshtmlhelp-chm}{puzzles.chm}
+\cfg{html-mshtmlhelp-project}{puzzles.hhp}
+\cfg{html-mshtmlhelp-contents}{puzzles.hhc}
+\cfg{html-mshtmlhelp-index}{puzzles.hhk}
+
+\cfg{html-body-end}{}
+
+\cfg{html-head-end}{<link rel="stylesheet" type="text/css" href="chm.css">}

diff --git a/puzzles.but b/puzzles.but
index cf0bbc40cf30f84df353df373d97b87db5a3dfa8..473984d2b8724d72385007dc041a240b330b36a5 100644 (file)
--- a/puzzles.but
+++ b/puzzles.but
@@ -13,12 +13,6 @@
 \cfg{html-contents-depth-1}{2}
 \cfg{html-leaf-contains-contents}{true}
 
-\cfg{chm-filename}{puzzles.chm}
-\cfg{chm-contents-filename}{index.html}
-\cfg{chm-template-filename}{%k.html}
-\cfg{chm-head-end}{<link rel="stylesheet" type="text/css" href="chm.css">}
-\cfg{chm-extra-file}{chm.css}
-
 \cfg{info-filename}{puzzles.info}
 
 \cfg{ps-filename}{puzzles.ps}