summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2015-04-23 12:08:22 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2015-04-23 12:08:22 (GMT)
commit353839b7a29a53aa754b98b02ede449c737a873a (patch) (side-by-side diff)
tree77a151bf81a5185cce0112f5f8d2a2c5a2570e79
parent1d0aa74665d44e84bba8070a49a74ab7cd1f52d0 (diff)
downloadidest-353839b7a29a53aa754b98b02ede449c737a873a.tar.gz
idest-353839b7a29a53aa754b98b02ede449c737a873a.tar.bz2
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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/html.init (renamed from doc/Config)9
2 files changed, 6 insertions, 7 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6aa3dee..ecc3fb8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -24,7 +24,7 @@ EXTRA_DIST = \
clean-local:
rm -rf manual
-GENDOCS=$(srcdir)/gendocs.sh
+GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init'
TEXI2DVI=texi2dvi -t '@set $(RENDITION)'
@@ -35,7 +35,7 @@ manual:
TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS)" \
TEXI2DVI="$(TEXI2DVI) -t @finalout" \
- $(GENDOCS) --no-copy-images $(PACKAGE) '$(PACKAGE_NAME) manual'
+ $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'
manual.tar.bz2: manual
tar cfj manual.tar.bz2 manual
diff --git a/doc/Config b/doc/html.init
index f0da661..5157448 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);
@@ -154,6 +152,7 @@ my @gray_buttons = (\&gray_document_title, ' ',
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',

Return to:

Send suggestions and report system problems to the System administrator.