aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2015-04-23 18:49:24 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2015-04-23 18:49:36 +0300
commitbe26ab5bb2d721d6edef82226ac453e0431cbe44 (patch)
tree4f2f7df0d7c8cb456072f53673020f9682dcc6c2
parentdda0428f8cf94142dfe79bb6e2dc38ccc73ff0d6 (diff)
downloadwydawca-be26ab5bb2d721d6edef82226ac453e0431cbe44.tar.gz
wydawca-be26ab5bb2d721d6edef82226ac453e0431cbe44.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). * doc/wydawca.texi: Fix cross-reference.
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/html.init (renamed from doc/Config)11
-rw-r--r--doc/wydawca.texi5
3 files changed, 11 insertions, 9 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 97adffb..7a70925 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,5 +28,5 @@ include ../imprimatur/imprimatur.mk
28CHECK_DOCS=$(top_srcdir)/@IMPRIMATUR_MODULE_DIR@/check-docs.sh 28CHECK_DOCS=$(top_srcdir)/@IMPRIMATUR_MODULE_DIR@/check-docs.sh
29 29
30GENDOCS=$(srcdir)/gendocs.sh 30GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init'
31EXTRA_DIST += gendocs.sh 31EXTRA_DIST += gendocs.sh
32 32
@@ -40,5 +40,5 @@ manual:
40 MAKEINFO="$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)" \ 40 MAKEINFO="$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)" \
41 TEXI2DVI="$(TEXI2DVI) -t @finalout" \ 41 TEXI2DVI="$(TEXI2DVI) -t @finalout" \
42 $(GENDOCS) --no-copy-images $(PACKAGE) '$(PACKAGE_NAME) manual' 42 $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'
43 43
44 44
diff --git a/doc/Config b/doc/html.init
index e2c33ce..eb349e3 100644
--- a/doc/Config
+++ b/doc/html.init
@@ -93,10 +93,8 @@ set_from_init_file('DEFAULT_RULE', '');
93set_from_init_file('BIG_RULE', ''); 93set_from_init_file('BIG_RULE', '');
94 94
95# Turn off footer buttons in section split 95# Turn off navigation bars at the bottom of each section in chapter split mode,
96set_from_init_file('SECTION_FOOTER_BUTTONS', undef); 96# or subsection in section split mode.
97#set_from_init_file('SECTION_BUTTONS', undef);
98# Turn off navigation bars at the bottom of each section in chapter split mode
99set_from_init_file('HEADERS', undef) 97set_from_init_file('HEADERS', undef)
100 if (get_conf('SPLIT') and (get_conf('SPLIT') eq 'chapter')); 98 if ((get_conf('SPLIT') eq 'chapter') or (get_conf('SPLIT') eq 'section'));
101# Use navigation icons 99# Use navigation icons
102 100
@@ -167,6 +165,9 @@ my @gray_buttons = (\&gray_document_title, ' ',
167 'Contents', 'Index' ); 165 'Contents', 'Index' );
168 166
167set_from_init_file('TOP_BUTTONS', undef);
169set_from_init_file('SECTION_BUTTONS', \@gray_buttons); 168set_from_init_file('SECTION_BUTTONS', \@gray_buttons);
170set_from_init_file('CHAPTER_BUTTONS', \@gray_buttons); 169set_from_init_file('CHAPTER_BUTTONS', \@gray_buttons);
170set_from_init_file('NODE_FOOTER_BUTTONS', \@gray_buttons);
171set_from_init_file('SECTION_FOOTER_BUTTONS', \@gray_buttons);
171set_from_init_file('MISC_BUTTONS', 172set_from_init_file('MISC_BUTTONS',
172 [\&gray_document_title, 173 [\&gray_document_title,
diff --git a/doc/wydawca.texi b/doc/wydawca.texi
index 6a9a8c9..59289fb 100644
--- a/doc/wydawca.texi
+++ b/doc/wydawca.texi
@@ -32,5 +32,5 @@ Published by the Free Software Foundation,
32Boston, MA 02110-1301, USA 32Boston, MA 02110-1301, USA
33 33
34Copyright @copyright{} 2007, 2009-2013 Sergey Poznyakoff 34Copyright @copyright{} 2007, 2009-2015 Sergey Poznyakoff
35 35
36Permission is granted to copy, distribute and/or modify this document 36Permission is granted to copy, distribute and/or modify this document
@@ -2786,7 +2786,8 @@ administrator (@dfn{owner}).
2786@item email:user @tab Full email address of the user who did 2786@item email:user @tab Full email address of the user who did
2787the upload. Not to be confused with @samp{user:email}. 2787the upload. Not to be confused with @samp{user:email}.
2788@anchor{check-result}
2788@kwindex check:result 2789@kwindex check:result
2789@item check:result @tab Code returned by external checker, in 2790@item check:result @tab Code returned by external checker, in
2790decimal. @xref{verification,,check:result}, for a detailed description. 2791decimal. @xref{verification,,check-result}, for a detailed description.
2791@kwindex check:diagn 2792@kwindex check:diagn
2792@item check:diagn @tab Diagnostics text returned by external 2793@item check:diagn @tab Diagnostics text returned by external

Return to:

Send suggestions and report system problems to the System administrator.