Fix doc generation.

Default Config file applied to all output formats, which is wrong.
Use a dedicated configuration file for html output formats, and
defaults for the rest.

* doc/Makefile.am (GENDOCS): Add html-specific configuration file.
* doc/Config: Rename to doc/html.init (with changes).

2 files changed, 7 insertions, 6 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c6628cd..1c21968 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -131,7 +131,7 @@ final: imprimatur-final
 # Just call `make RENDITION=PROOF [target]' if you want PROOF rendition.
 RENDITION = DISTRIB
 
-GENDOCS=$(srcdir)/gendocs.sh
+GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init'
 EXTRA_DIST += gendocs.sh
 
 TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -I $(top_srcdir)/imprimatur
diff --git a/doc/Config b/doc/html.init
index 0e01134..9523a9d 100644
--- a/doc/Config
+++ b/doc/html.init
@@ -77,12 +77,10 @@ set_from_init_file('PROGRAM_NAME_IN_FOOTER',1);
 set_from_init_file('DEFAULT_RULE', '');
 set_from_init_file('BIG_RULE', '');
 
-# Turn off footer buttons in section split
-set_from_init_file('SECTION_FOOTER_BUTTONS', undef);
-#set_from_init_file('SECTION_BUTTONS', undef);
-# Turn off navigation bars at the bottom of each section in chapter split mode
+# Turn off navigation bars at the bottom of each section in chapter split mode,
+# or subsection in section split mode.
 set_from_init_file('HEADERS', undef)
-    if (get_conf('SPLIT') and (get_conf('SPLIT') eq 'chapter'));
+    if ((get_conf('SPLIT') eq 'chapter') or (get_conf('SPLIT') eq 'section'));
 # Use navigation icons
 
 set_from_init_file('ICONS', 1);
@@ -151,8 +149,11 @@ my @gray_buttons = (\&gray_document_title, ' ',
                     'FastBack', ' ', 'Up', ' ', 'FastForward', ' ',
                     'Contents', 'Index' );
 
+set_from_init_file('TOP_BUTTONS', \@gray_buttons);
 set_from_init_file('SECTION_BUTTONS', \@gray_buttons);
 set_from_init_file('CHAPTER_BUTTONS', \@gray_buttons);
+set_from_init_file('NODE_FOOTER_BUTTONS', \@gray_buttons);
+set_from_init_file('SECTION_FOOTER_BUTTONS', \@gray_buttons);
 set_from_init_file('MISC_BUTTONS',
                    [\&gray_document_title,
                     'Contents',