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).
* doc/gendocs.sh: New option --no-copy-images

3 files changed, 17 insertions, 15 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0e02104..084bba9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
 # This file is part of GNU Dico
-# Copyright (C) 2008, 2010, 2012, 2014 Sergey Poznyakoff
+# Copyright (C) 2008-2015 Sergey Poznyakoff
 #
@@ -78,6 +78,5 @@ final: imprimatur-final
 
-GENDOCS=gendocs.sh 
+GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init'
 
-#FIXME: -E
-TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -I $(top_srcdir)/imprimatur
+TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
 
diff --git a/doc/gendocs.sh b/doc/gendocs.sh
index cd130d0..8ac3a06 100755
--- a/doc/gendocs.sh
+++ b/doc/gendocs.sh
@@ -80,2 +80,4 @@ Options:
   --no-ascii   skip generating the plain text output.
+  --no-copy-images
+               don't try to copy images referenced by img HTML tags,
   --source ARG include ARG in tar archive of sources.
@@ -149,2 +151,3 @@ split=default
 srcfile=
+no_copy_images=
 
@@ -164,3 +167,3 @@ while test $# -gt 0; do
     --texi2html) use_texi2html=1;;
-
+    --no-copy-images) no_copy_images=1;;
     --help)      echo "$usage"; exit 0;;
@@ -227,2 +230,3 @@ copy_images()
 {
+  test -n "$no_copy_images" && return
   local odir
@@ -345,4 +349,3 @@ if test -z "$use_texi2html"; then
   html_mono_gz_size=`calcsize "$outdir/$PACKAGE.html.gz"`
-## FIXME  
-#  copy_images "$outdir/" $PACKAGE.html
+  copy_images "$outdir/" $PACKAGE.html
   mv $PACKAGE.html "$outdir/"
@@ -350,5 +353,2 @@ if test -z "$use_texi2html"; then
 
-  # Before Texinfo 5.0, makeinfo did not accept a --split=HOW option,
-  # it just always split by node.  So if we're splitting by node anyway,
-  # leave it out.
   version=`makeinfo --version|sed -n '1s/.* \([0-9][0-9]*\)\.[0-9.]*/\1/p'`
@@ -358,2 +358,5 @@ if test -z "$use_texi2html"; then
   esac
+  # Before Texinfo 5.0, makeinfo did not accept a --split=HOW option,
+  # it just always split by node.  So if we're splitting by node anyway,
+  # leave it out.
   if test $version -lt 5 -o "x$split" != xdefault; then
diff --git a/doc/Config b/doc/html.init
index 8ee754b..d312e6a 100644
--- a/doc/Config
+++ b/doc/html.init
@@ -87,8 +87,6 @@ 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
@@ -161,2 +159,3 @@ my @gray_buttons = (\&gray_document_title, ' ',
 
+set_from_init_file('TOP_BUTTONS', undef);
 set_from_init_file('SECTION_BUTTONS', \@gray_buttons);
@@ -164,2 +163,3 @@ 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',