diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-04-23 17:35:11 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-04-23 17:35:11 +0300 |
commit | 625f4088cd4c9d64f458ae969fa27bb57022502a (patch) | |
tree | 94d21453756c3d51a2a56288c67fd6f1d59285b5 | |
parent | e5363dd266d40bb8dddca6a385d48d0ef98ecf04 (diff) | |
download | direvent-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).
-rw-r--r-- | doc/Makefile.am | 4 | ||||
-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 @@ -24,21 +24,21 @@ EXTRA_DIST = \ gendocs_template\ gendocs.sh 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)' .PHONY: manual 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 man-tar: manual.tar.bz2 diff --git a/doc/Config b/doc/html.init index 8cae3b5..3fb5d84 100644 --- a/doc/Config +++ b/doc/html.init @@ -40,12 +40,13 @@ set_from_init_file('AFTER_BODY_OPEN', qq{ <ul class='tabs'> <li><a href="${top_html_dir}/direvent.html">Main</a></li> <li><a href="${top_html_dir}/download.html">Downloads</a></li> <li><a class="active" href="${top_html_dir}/manual.html">Documentation</a></li> </ul> </div> <!-- header --> +<div id="docmain"> }); sub gray_end_file($) { my $self = shift; my $program_text = ''; @@ -54,19 +55,19 @@ sub gray_end_file($) $program_text = "<p> $program_string </p>"; } 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> "; } texinfo_register_formatting_function('end_file', \&gray_end_file); @@ -78,18 +79,16 @@ set_from_init_file('PRE_BODY_CLOSE', set_from_init_file('PROGRAM_NAME_IN_FOOTER',1); # Disable horizontal bars 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); set_from_init_file('ACTIVE_ICONS', { @@ -152,15 +151,17 @@ sub gray_chap_ref($$) my @gray_buttons = (\&gray_document_title, ' ', \&gray_sec_ref, 'Back', 'Forward', ' ', \&gray_chap_ref, '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', 'Index', ' ', 'About' |