diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-04-24 14:11:05 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-04-24 14:11:05 +0300 |
| commit | 932c35656c13029812ed93f491296251fdde7553 (patch) | |
| tree | 43a792c34731993b40b6511c3386034448efc214 | |
| parent | d2b4e333f7833cc009c5b9c8548143868bee367d (diff) | |
| download | joh-932c35656c13029812ed93f491296251fdde7553.tar.gz joh-932c35656c13029812ed93f491296251fdde7553.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 | 6 | ||||
| -rw-r--r-- | doc/html.init (renamed from doc/Config) | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 8a1da1f..6b48666 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -20,9 +20,9 @@ info_TEXINFOS=joh.texi joh_TEXINFOS=\ fdl.texi -GENDOCS=$(srcdir)/gendocs.sh +GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init' -TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E +TEXI2DVI=texi2dvi -t '@set $(RENDITION)' # Make sure you set TEXINPUTS. # TEXINPUTS=/usr/share/texmf/pdftex/plain/misc/ is ok for most distributions @@ -31,4 +31,4 @@ 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' diff --git a/doc/Config b/doc/html.init index 671f009..9111f0c 100644 --- a/doc/Config +++ b/doc/html.init @@ -78,12 +78,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,6 +153,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', |