authorSergey Poznyakoff <>2015-04-23 15:49:24 (GMT)
committer Sergey Poznyakoff <>2015-04-23 15:49:36 (GMT)
commitbe26ab5bb2d721d6edef82226ac453e0431cbe44 (patch) (side-by-side diff)
parentdda0428f8cf94142dfe79bb6e2dc38ccc73ff0d6 (diff)
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/ (GENDOCS): Add html-specific configuration file. * doc/Config: Rename to doc/html.init (with changes). * doc/wydawca.texi: Fix cross-reference.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--doc/html.init (renamed from doc/Config)11
3 files changed, 11 insertions, 9 deletions
diff --git a/doc/ b/doc/
index 97adffb..7a70925 100644
--- a/doc/
+++ b/doc/
@@ -27,7 +27,7 @@ imprimatur_INPUT=$(info_TEXINFOS) $(wydawca_TEXINFOS)
include ../imprimatur/
+GENDOCS=$(srcdir)/ --no-copy-images --html '--init-file=$(abs_srcdir)/html.init'
TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -I $(top_srcdir)/imprimatur
@@ -39,7 +39,7 @@ manual:
TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
TEXI2DVI="$(TEXI2DVI) -t @finalout" \
- $(GENDOCS) --no-copy-images $(PACKAGE) '$(PACKAGE_NAME) manual'
manual.tar.bz2: manual
diff --git a/doc/Config b/doc/html.init
index e2c33ce..eb349e3 100644
--- a/doc/Config
+++ b/doc/html.init
@@ -92,12 +92,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);
@@ -166,8 +164,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);
diff --git a/doc/wydawca.texi b/doc/wydawca.texi
index 6a9a8c9..59289fb 100644
--- a/doc/wydawca.texi
+++ b/doc/wydawca.texi
@@ -31,7 +31,7 @@ Published by the Free Software Foundation,
51 Franklin Street, Fifth Floor
Boston, MA 02110-1301, USA
-Copyright @copyright{} 2007, 2009-2013 Sergey Poznyakoff
+Copyright @copyright{} 2007, 2009-2015 Sergey Poznyakoff
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -2785,9 +2785,10 @@ administrator (@dfn{owner}).
@kwindex email:user
@item email:user @tab Full email address of the user who did
the upload. Not to be confused with @samp{user:email}.
@kwindex check:result
@item check:result @tab Code returned by external checker, in
-decimal. @xref{verification,,check:result}, for a detailed description.
+decimal. @xref{verification,,check-result}, for a detailed description.
@kwindex check:diagn
@item check:diagn @tab Diagnostics text returned by external
checker. @xref{verification}, for a detailed description.

Return to:

Send suggestions and report system problems to the System administrator.