Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 87e9c792 87e9c7921d151d1b978348f94a1475423bf9dbfe by Sergey Poznyakoff
Options

Fix doc generation. 

The Config file applies to all output formats, which is wrong.
Use a dedicated configuration file for html output formats, and
default settings for the rest.

* doc/texinfo/Makefile.am (GENDOCS): Add html-specific configuration file.
* doc/texinfo/Config: Rename to doc/texinfo/html.init (with changes).
* doc/texinfo/programs.texi: Fix sectioning.
1 parent 17930dd7
Inline Side-by-side
Showing 4 changed files with 27 additions and 26 deletions
...@@ -52,7 +52,7 @@ final: imprimatur-final ...@@ -52,7 +52,7 @@ final: imprimatur-final
52 #EXTRA_DIST = \ 52 #EXTRA_DIST = \
53 # gendocs_template 53 # gendocs_template
54 54
55 GENDOCS=$(srcdir)/gendocs.sh 55 GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init'
56 TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E 56 TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
57 57
58 .PHONY: manual 58 .PHONY: manual
...@@ -60,7 +60,7 @@ manual: ...@@ -60,7 +60,7 @@ manual:
60 TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \ 60 TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
61 MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS) $(AM_MAKEINFOFLAGS)" \ 61 MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS) $(AM_MAKEINFOFLAGS)" \
62 TEXI2DVI="$(TEXI2DVI)" \ 62 TEXI2DVI="$(TEXI2DVI)" \
63 $(GENDOCS) --no-copy-images $(PACKAGE) '$(PACKAGE_NAME) manual' 63 $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'
64 64
65 manual.tar.bz2: manual 65 manual.tar.bz2: manual
66 tar cfj manual.tar.bz2 manual 66 tar cfj manual.tar.bz2 manual
......
1 # Texi2any configuration for rush documentation. -*- perl -*- 1 # Texi2any configuration for rush documentation. -*- perl -*-
2 # Copyright (C) 2009-2010, 2014, 2015 Sergey Poznyakoff 2 # Copyright (C) 2009-2010, 2014, 2015 Sergey Poznyakoff
3 # 3 #
4 # GNU Rush is free software; you can redistribute it and/or modify 4 # GNU Mailutils is free software; you can redistribute it and/or modify
5 # it under the terms of the GNU General Public License as published by 5 # it under the terms of the GNU General Public License as published by
6 # the Free Software Foundation; either version 3, or (at your option) 6 # the Free Software Foundation; either version 3, or (at your option)
7 # any later version. 7 # any later version.
8 # 8 #
9 # GNU Rush is distributed in the hope that it will be useful, 9 # GNU Mailutils is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details. 12 # GNU General Public License for more details.
13 # 13 #
14 # You should have received a copy of the GNU General Public License 14 # You should have received a copy of the GNU General Public License
15 # along with GNU Rush. If not, see <http://www.gnu.org/licenses/>. 15 # along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
16 use strict; 16 use strict;
17 17
18 my $top_html_dir=""; 18 my $top_html_dir="";
...@@ -79,12 +79,10 @@ set_from_init_file('PROGRAM_NAME_IN_FOOTER',1); ...@@ -79,12 +79,10 @@ set_from_init_file('PROGRAM_NAME_IN_FOOTER',1);
79 set_from_init_file('DEFAULT_RULE', ''); 79 set_from_init_file('DEFAULT_RULE', '');
80 set_from_init_file('BIG_RULE', ''); 80 set_from_init_file('BIG_RULE', '');
81 81
82 # Turn off footer buttons in section split
83 set_from_init_file('SECTION_FOOTER_BUTTONS', undef);
84 #set_from_init_file('SECTION_BUTTONS', undef);
85 # Turn off navigation bars at the bottom of each section in chapter split mode 82 # Turn off navigation bars at the bottom of each section in chapter split mode
83 # or subsection in section split mode.
86 set_from_init_file('HEADERS', undef) 84 set_from_init_file('HEADERS', undef)
87 if (get_conf('SPLIT') and (get_conf('SPLIT') eq 'chapter')); 85 if ((get_conf('SPLIT') eq 'chapter') or (get_conf('SPLIT') eq 'section'));
88 # Use navigation icons 86 # Use navigation icons
89 87
90 set_from_init_file('ICONS', 1); 88 set_from_init_file('ICONS', 1);
...@@ -153,8 +151,11 @@ my @gray_buttons = (\&gray_document_title, ' ', ...@@ -153,8 +151,11 @@ my @gray_buttons = (\&gray_document_title, ' ',
153 'FastBack', ' ', 'Up', ' ', 'FastForward', ' ', 151 'FastBack', ' ', 'Up', ' ', 'FastForward', ' ',
154 'Contents', 'Index' ); 152 'Contents', 'Index' );
155 153
154 set_from_init_file('TOP_BUTTONS', undef);
156 set_from_init_file('SECTION_BUTTONS', \@gray_buttons); 155 set_from_init_file('SECTION_BUTTONS', \@gray_buttons);
157 set_from_init_file('CHAPTER_BUTTONS', \@gray_buttons); 156 set_from_init_file('CHAPTER_BUTTONS', \@gray_buttons);
157 set_from_init_file('NODE_FOOTER_BUTTONS', \@gray_buttons);
158 set_from_init_file('SECTION_FOOTER_BUTTONS', \@gray_buttons);
158 set_from_init_file('MISC_BUTTONS', 159 set_from_init_file('MISC_BUTTONS',
159 [\&gray_document_title, 160 [\&gray_document_title,
160 'Contents', 161 'Contents',
......
...@@ -530,6 +530,21 @@ if a new format is added at a later date, your program will support ...@@ -530,6 +530,21 @@ if a new format is added at a later date, your program will support
530 that new format automatically as soon as it is compiled against the 530 that new format automatically as soon as it is compiled against the
531 new library. 531 new library.
532 532
533 @node Programs
534 @chapter Mailutils Programs
535 @cindex Programs
536 @include programs.texi
537
538 @node Libraries
539 @chapter Mailutils Libraries
540 @cindex Libraries
541 @WRITEME
542
543 @node Sieve Language
544 @chapter Sieve Language
545 @cindex Sieve Language
546 @include sieve.texi
547
533 @node Reporting Bugs 548 @node Reporting Bugs
534 @chapter Reporting Bugs 549 @chapter Reporting Bugs
535 550
...@@ -548,21 +563,6 @@ needed is: ...@@ -548,21 +563,6 @@ needed is:
548 The archives of bug-mailutils mailing list are available from 563 The archives of bug-mailutils mailing list are available from
549 @url{http://mail.gnu.org/@/mailman/@/listinfo/@/bug-mailutils}. 564 @url{http://mail.gnu.org/@/mailman/@/listinfo/@/bug-mailutils}.
550 565
551 @node Programs
552 @chapter Mailutils Programs
553 @cindex Programs
554 @include programs.texi
555
556 @node Libraries
557 @chapter Mailutils Libraries
558 @cindex Libraries
559 @WRITEME
560
561 @node Sieve Language
562 @chapter Sieve Language
563 @cindex Sieve Language
564 @include sieve.texi
565
566 @node News 566 @node News
567 @chapter Getting News About GNU Mailutils 567 @chapter Getting News About GNU Mailutils
568 568
......
...@@ -1294,7 +1294,7 @@ tcp-wrappers @{ ...@@ -1294,7 +1294,7 @@ tcp-wrappers @{
1294 @} 1294 @}
1295 @end example 1295 @end example
1296 1296
1297 @subsection Description 1297 @subheading Description
1298 The @code{tcp-wrappers} statements provides an alternative way to 1298 The @code{tcp-wrappers} statements provides an alternative way to
1299 control accesses to the resources served by GNU Mailutils. This 1299 control accesses to the resources served by GNU Mailutils. This
1300 statement is enabled if Mailutils is compiled with TCP wrappers 1300 statement is enabled if Mailutils is compiled with TCP wrappers
...@@ -1937,7 +1937,7 @@ sql @{ ...@@ -1937,7 +1937,7 @@ sql @{
1937 getpwuid @var{query}; 1937 getpwuid @var{query};
1938 @} 1938 @}
1939 @end example 1939 @end example
1940 @subsection Description 1940 @subheading Description
1941 1941
1942 The @code{sql} statement configures access credentials to 1942 The @code{sql} statement configures access credentials to
1943 @acronym{SQL} database and the queries for authentication and 1943 @acronym{SQL} database and the queries for authentication and
......