Switch to Texinfo 5.0

* doc/Config: Rewrite.
* doc/Makefile.am: Use Makeinfo 5 instead of texi2htm
* doc/gendocs_template: Ps is not built
* imprimatur: Upgrade.

5 files changed, 602 insertions, 315 deletions

diff --git a/doc/Config b/doc/Config
index e07180b..0e01134 100644
--- a/doc/Config
+++ b/doc/Config
@@ -1,4 +1,4 @@
-# Texi2html configuration for PAM-Modules documentation. -*- perl -*-
+# Texi2any configuration for pam-modules documentation. -*- perl -*-
 # Copyright (C) 2009, 2012, 2014-2015 Sergey Poznyakoff
 #
 # PAM-Modules is free software; you can redistribute it and/or modify
@@ -13,352 +13,150 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with PAM-Modules.  If not, see <http://www.gnu.org/licenses/>.
+use strict;
 
-$top_html_dir="/software/pam-modules";
-$graphics_dir="$top_html_dir/graphics";
-
-## texi2html configuration
-
+my $top_html_dir="/software/pam-modules";
+my $graphics_dir="$top_html_dir/graphics";
+    
 # Show TOC in place of the @contents directive.
-$INLINE_CONTENTS = 1;
+set_from_init_file('INLINE_CONTENTS', 1);
 # Do not show Texinfo menus.
-$SHOW_MENU = 0;
+set_from_init_file('SHOW_MENU', 0);
 # Inhibit output of CSS lines in page headers.
-$CSS_LINES='';
-# Print footnotes at the end of each file (if the document is split).
-$SEPARATED_FOOTNOTES = 0;    
+set_from_init_file('CSS_LINES', '');
 
-$BODYTEXT = "";
+set_from_init_file('BODYTEXT', "");
 
-$EXTRA_HEAD=qq{
-  <link rev="made" href="mailto:gray@gnu.org.ua">
+set_from_init_file('EXTRA_HEAD', qq{
+  <link rev="made" href="mailto:gray\@gnu.org.ua">
   <link rel="stylesheet" type="text/css" href="${top_html_dir}/gray.css">
   <link rel="stylesheet" type="text/css" href="${top_html_dir}/texi.css">
-  <link rel="icon" type="image/png" href="/graphics/gnu-head-icon.png">};
+  <link rel="icon" type="image/png" href="/graphics/gnu-head-icon.png">});
 
-$AFTER_BODY_OPEN=qq{
+set_from_init_file('AFTER_BODY_OPEN', qq{
 <!--#include virtual="${top_html_dir}/inc/header.html" -->
 <ul class="tabs">
   <li><a href="${top_html_dir}/pam-modules.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>};
-
-$PRE_BODY_CLOSE="Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved.";
-    
-$format_map{'multitable'}='table class="multitable"';
+</ul>});
 
-$SMALL_RULE = '';
-$DEFAULT_RULE = '';
-$MIDDLE_RULE = '';
-# This is output at the end of a section.
-$BIG_RULE = '';
+sub gray_end_file($)
+{
+    my $self = shift;
+    my $program_text = '';
+    if ($self->get_conf('PROGRAM_NAME_IN_FOOTER')) {
+        my $program_string = &{$self->{'format_program_string'}}($self);
+        $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\">
+$program_text
+
+$pre_body_close
+</div>
+</div>
+</body>
+</html>
+";
+}
 
-# Use navigation icons
-$ICONS = 1;
-%ACTIVE_ICONS =
-    (
-     'Top',         "$graphics_dir/top.png",
-     'Contents',    "$graphics_dir/ctx.png",
-     'Overview',    '',
-     'Index',       "$graphics_dir/idx.png",
-     'This',        '',
-     'Back',        "$graphics_dir/left.png",
-     'FastBack',    "$graphics_dir/bwd.png",
-     'Prev',        "",
-     'Up',          "$graphics_dir/up.png",
-     'Next',        "$graphics_dir/right.png",
-     'NodeUp',      "$graphics_dir/left.png", 
-     'NodeNext',    "$graphics_dir/up.png",   
-     'NodePrev',    "$graphics_dir/right.png",
-     'Following',   "$graphics_dir/right.png",
-     'Forward',     "$graphics_dir/right.png",
-     'FastForward', "$graphics_dir/fwd.png",
-     'About' ,      '',
-     'First',       '',
-     'Last',        '',
-     ' ',           ''
-    );
+texinfo_register_formatting_function('end_file', \&gray_end_file);
 
-@SECTION_BUTTONS =
-    (
-     \&gray_document_title,
-     \&gray_sec_ref,
-     'Back', 'Forward',
-     \&gray_chap_ref, 'FastBack', 'Up', 'FastForward',
-     \&gray_doc_ref,
-     'Contents', 'Index',
-     ' ','About',
-    );
+set_from_init_file('PRE_BODY_CLOSE',
+                   'Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved.');
 
-@SECTION_FOOTER_BUTTONS = @SECTION_BUTTONS;
-@NODE_FOOTER_BUTTONS = @SECTION_BUTTONS;
+# Print generating program name at the bottom of a page.
+set_from_init_file('PROGRAM_NAME_IN_FOOTER',1);
 
-# buttons for misc stuff
-@MISC_BUTTONS = (
-    \&gray_document_title,
-    'Contents',
-    'Index',
-    ' ',
-    'About'
-    );
+# 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
+set_from_init_file('HEADERS', undef)
+    if (get_conf('SPLIT') and (get_conf('SPLIT') eq 'chapter'));
+# Use navigation icons
 
-$print_section = \&gray_print_section;
-$print_navigation = \&gray_print_navigation;
-$print_head_navigation = \&gray_print_head_navigation;
-$print_foot_navigation = \&gray_print_foot_navigation;
-$print_About          = \&gray_print_About;
-$cell = \&gray_multitable_cell;
-$print_page_foot = \&gray_print_page_foot;
-    
-sub gray_multitable_cell($$)
-{
-    my $text = shift;
-    my $row_macro = shift;
+set_from_init_file('ICONS', 1);
 
-    $text =~ s/<p>//;
-    $text =~ s/<\/p>//;
-    if ($row_macro eq 'headitem')
+set_from_init_file('ACTIVE_ICONS',
     {
-        return '<th>' . $text . '</th>';
-    }
-    return '<td>' . $text . '</td>';
-}
-
-sub gray_print_About
-{
-    return &$print_misc(@_) if (!($SPLIT eq '') or $SECTION_NAVIGATION);
-}
+     'Top'         =>    "$graphics_dir/top.png",
+     'Contents'    =>    "$graphics_dir/ctx.png",
+     'Overview'    =>    '',
+     'Index'       =>    "$graphics_dir/idx.png",
+     'This'        =>    '',
+     'Back'        =>    "$graphics_dir/left.png",
+     'FastBack'    =>    "$graphics_dir/bwd.png",
+     'Prev'        =>    "",
+     'Up'          =>    "$graphics_dir/up.png",
+     'Next'        =>    "$graphics_dir/right.png",
+     'NodeUp'      =>    "$graphics_dir/left.png",
+     'NodeNext'    =>    "$graphics_dir/up.png",
+     'NodePrev'    =>    "$graphics_dir/right.png",
+     'Following'   =>    "$graphics_dir/right.png",
+     'Forward'     =>    "$graphics_dir/right.png",
+     'FastForward' =>    "$graphics_dir/fwd.png",
+     'About'       =>    '',
+     'First'       =>    '',
+     'Last'        =>    '',
+     ' '           =>    ''
+    });
 
 sub gray_split_status()
 {
-    if ($SPLIT eq '') {
+    my $split = get_conf('SPLIT');
+    if ($split eq '') {
         return '';
-    } elsif ($SPLIT eq 'node') {
+    } elsif ($split eq 'node') {
         return ' <span class="splitstatus">(split by node)</span>';
-    } elsif ($SPLIT eq 'section') {
+    } elsif ($split eq 'section') {
         return ' <span class="splitstatus">(split by section)</span>';
-    } elsif ($SPLIT eq 'chapter') {
+    } elsif ($split eq 'chapter') {
         return ' <span class="splitstatus">(split by chapter)</span>';
     }
 }