summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2015-04-23 14:35:11 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2015-04-23 14:35:11 (GMT)
commit625f4088cd4c9d64f458ae969fa27bb57022502a (patch) (side-by-side diff)
tree94d21453756c3d51a2a56288c67fd6f1d59285b5
parente5363dd266d40bb8dddca6a385d48d0ef98ecf04 (diff)
downloaddirevent-625f4088cd4c9d64f458ae969fa27bb57022502a.tar.gz
direvent-625f4088cd4c9d64f458ae969fa27bb57022502a.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 (with changes).
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/html.init (renamed from doc/Config)19
2 files changed, 12 insertions, 11 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 908204c..8ed8e5c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -27,7 +27,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)'
@@ -36,7 +36,7 @@ manual:
TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS) $(AM_MAKEINFOFLAGS)" \
TEXI2DVI="$(TEXI2DVI)" \
- $(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 8cae3b5..3fb5d84 100644
--- a/doc/Config
+++ b/doc/html.init
@@ -43,6 +43,7 @@ set_from_init_file('AFTER_BODY_OPEN', qq{
<li><a class="active" href="${top_html_dir}/manual.html">Documentation</a></li>
</ul>
</div> <!-- header -->
+<div id="docmain">
});
sub gray_end_file($)
@@ -57,13 +58,13 @@ sub gray_end_file($)
}
my $pre_body_close = $self->get_conf('PRE_BODY_CLOSE');
$pre_body_close = '' if (!defined($pre_body_close));
- return "</div>
-<div class=\"copyright\">
+ return "</div><!-- docmain -->
+<div id=\"copyright\">
$program_text
$pre_body_close
-</div>
-</div>
+</div> <!-- copyright -->
+</div> <!-- content -->
</body>
</html>
";
@@ -81,12 +82,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);
@@ -155,9 +154,11 @@ my @gray_buttons = (\&gray_document_title, ' ',
'FastBack', ' ', 'Up', ' ', 'FastForward', ' ',
'Contents', 'Index' );
+set_from_init_file('TOP_BUTTONS', undef);
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.