From MAILER-DAEMON Fri Sep 09 03:31:27 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R1vYd-0003Zz-UC
	for mharc-commit-mailutils@gnu.org; Fri, 09 Sep 2011 03:31:27 -0400
Received: from eggs.gnu.org ([140.186.70.92]:47888)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R1vYZ-0003Zm-LC
	for commit-mailutils@gnu.org; Fri, 09 Sep 2011 03:31:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R1vYX-00047r-DN
	for commit-mailutils@gnu.org; Fri, 09 Sep 2011 03:31:23 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50922)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R1vYX-00047e-B5
	for commit-mailutils@gnu.org; Fri, 09 Sep 2011 03:31:21 -0400
Received: from gray by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R1vYU-0006do-5O
	for commit-mailutils@gnu.org; Fri, 09 Sep 2011 07:31:20 +0000
Date: Fri, 09 Sep 2011 07:31:18 +0000
Message-Id: <E1R1vYU-0006do-5O@vcs.savannah.gnu.org>
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
Subject: [SCM] GNU Mailutils branch, master, updated. release-2.2-387-g7fe176c
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: aa651ae97b561a53c8a2f0235b6763e6bff00c73
X-Git-Newrev: 7fe176c3a04b15d5f519412b11b23e8f2aed6af1
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Sep 2011 07:31:25 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=7fe176c3a04b15d5f519412b11b23e8f2aed6af1

The branch, master has been updated
       via  7fe176c3a04b15d5f519412b11b23e8f2aed6af1 (commit)
      from  aa651ae97b561a53c8a2f0235b6763e6bff00c73 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7fe176c3a04b15d5f519412b11b23e8f2aed6af1
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Fri Sep 9 10:29:47 2011 +0300

    Fix generation of the doc files.
    
    * doc/texinfo/Config: New file.
    * doc/texinfo/Makefile.am (manual): Use texi2html.
    * doc/texinfo/gendocs_template: Rewrite.
    * doc/texinfo/maint.mk: Use VPATH to find source files.
    Add the `clean' rule.

-----------------------------------------------------------------------

Summary of changes:
 doc/texinfo/Config           |  365 ++++++++++++++++++++++++++++++++++++++++++
 doc/texinfo/Makefile.am      |    4 +-
 doc/texinfo/gendocs_template |  132 ++++++----------
 doc/texinfo/maint.mk         |   14 +-
 4 files changed, 425 insertions(+), 90 deletions(-)
 create mode 100644 doc/texinfo/Config

diff --git a/doc/texinfo/Config b/doc/texinfo/Config
new file mode 100644
index 0000000..cc466d4
--- /dev/null
+++ b/doc/texinfo/Config
@@ -0,0 +1,365 @@
+# Texi2html configuration for GNU Mailutils documentation. -*- perl -*-
+# Copyright (C) 2009, 2010, 2011 Sergey Poznyakoff
+#
+# GNU Mailutils is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+$top_html_dir="";
+$graphics_dir="$top_html_dir/graphics";
+
+## texi2html configuration
+
+# Show TOC in place of the @contents directive.
+$INLINE_CONTENTS = 1;
+# Do not show Texinfo menus.
+$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;
+
+$BODYTEXT = "";
+
+$EXTRA_HEAD="\
+  <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=\"${top_html_dir}/graphics/mustamp.png\">";
+
+$AFTER_BODY_OPEN=qq{
+<!--#include virtual=\"${top_html_dir}/inc/header.html\" -->
+<ul class='tabs'>
+  <li><a href="${top_html_dir}/">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>
+  <li><a href="${top_html_dir}/wiki">Wiki</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"';
+
+$SMALL_RULE = '';
+$DEFAULT_RULE = '';
+$MIDDLE_RULE = '';
+# This is output at the end of a section.
+$BIG_RULE = '';
+
+# 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',        '',
+     ' ',           ''
+    );
+
+@SECTION_BUTTONS =
+    (
+     \&gray_document_title,
+     \&gray_sec_ref,
+     'Back', 'Forward',
+     \&gray_chap_ref, 'FastBack', 'Up', 'FastForward',
+     \&gray_doc_ref,
+     'Contents', 'Index',
+     ' ','About',
+    );
+
+@SECTION_FOOTER_BUTTONS = @SECTION_BUTTONS;
+@NODE_FOOTER_BUTTONS = @SECTION_BUTTONS;
+
+# buttons for misc stuff
+@MISC_BUTTONS = (
+    \&gray_document_title,
+    'Contents',
+    'Index',
+    ' ',
+    'About'
+    );
+
+
+$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;
+
+    $text =~ s/<p>//;
+    $text =~ s/<\/p>//;
+    if ($row_macro eq 'headitem')
+    {
+	return '<th>' . $text . '</th>';
+    }
+    return '<td>' . $text . '</td>';
+}
+
+sub gray_print_About
+{
+    return &$print_misc(@_) if (!($SPLIT eq '') or $SECTION_NAVIGATION);
+}
+
+sub gray_split_status()
+{
+    if ($SPLIT eq '') {
+	return '';
+    } elsif ($SPLIT eq 'node') {
+	return ' <span class="splitstatus">(split by node)</span>';
+    } elsif ($SPLIT eq 'section') {
+	return ' <span class="splitstatus">(split by section)</span>';
+    } elsif ($SPLIT eq 'chapter') {
+	return ' <span class="splitstatus">(split by chapter)</span>';
+    }
+}
+
+sub gray_document_title($$)
+{
+    my $fh = shift;
+    my $vertical = shift;
+    my $status = gray_split_status();
+    print $fh qq{<td class="title">} . $Texi2HTML::THISDOC{title} . $status . ":</td>\n";
+}
+
+sub gray_node_ref($$)
+{
+    my $fh = shift;
+    my $vertical = shift;
+    print $fh qq{<span class="navtext">Node:</span>};
+}
+
+sub gray_sec_ref($$)
+{
+    my $fh = shift;
+    my $vertical = shift;
+    print $fh qq{<span class="navtext">Section:</span>};
+}
+
+sub gray_chap_ref($$)
+{
+    my $fh = shift;
+    my $vertical = shift;
+    print $fh qq{<span class="navtext">Chapter:</span>};
+}
+
+sub gray_doc_ref($$)
+{
+    my $fh = shift;
+    my $vertical = shift;
+    print $fh qq{<span class="navtext">Doc:</span>};
+}
+
+sub gray_print_navigation
+{
+    my $fh = shift;
+    my $buttons = shift;
+    my $vertical = shift;
+    my $spacing = 1;
+    my $class="nav";
+
+    print $fh qq{<table class="nav">\n};
+
+    print $fh "<tr>" unless $vertical;
+    for my $button (@$buttons)
+    {
+	if ($button =~ /^\@class=(.*)/) {
+	    $class = "$class $1";
+	    next;
+	}
+	print $fh "<tr>\n" if $vertical;
+	print $fh qq{<td class="$class">};
+
+	if (ref($button) eq 'CODE')
+	{
+	    &$button($fh, $vertical);
+	}
+	elsif (ref($button) eq 'SCALAR')
+	{
+	    print $fh "$$button" if defined($$button);
+	}
+	elsif (ref($button) eq 'ARRAY')
+	{
+	    my $text = $button->[1];
+	    my $button_href = $button->[0];
+	    # verify that $button_href is simple text and text is a reference
+	    if (defined($button_href) and !ref($button_href)
+	       and defined($text) and (ref($text) eq 'SCALAR') and defined($$text))
+	    {             # use given text
+		if ($Texi2HTML::HREF{$button_href})
+		{
+		  print $fh "" .
+			&$anchor('',
+				    $Texi2HTML::HREF{$button_href},
+				    $$text
+				   )
+				    ;
+		}
+		else
+		{
+		  print $fh $$text;
+		}
+	    }
+	}
+	elsif ($button eq ' ')
+	{                       # handle space button
+	    print $fh
+		($ICONS && $ACTIVE_ICONS{' '}) ?
+		    &$button_icon_img($BUTTONS_NAME{$button}, $ACTIVE_ICONS{' '}) :
+			$NAVIGATION_TEXT{' '};
+	    #next;
+	}
+	elsif ($Texi2HTML::HREF{$button})
+	{                       # button is active
+	    my $btitle = $BUTTONS_GOTO{$button} ?
+		'title="' . $BUTTONS_GOTO{$button} . '"' : '';
+	    if ($ICONS && $ACTIVE_ICONS{$button})
+	    {                   # use icon
+		print $fh '' .
+		    &$anchor('',
+			$Texi2HTML::HREF{$button},
+			&$button_icon_img($BUTTONS_NAME{$button},
+				   $ACTIVE_ICONS{$button},
+				   $Texi2HTML::SIMPLE_TEXT{$button}),
+			$btitle
+		      );
+	    }
+	    else
+	    {                   # use text
+		print $fh
+		    '' .
+			&$anchor('',
+				    $Texi2HTML::HREF{$button},
+				    $NAVIGATION_TEXT{$button},
+				    $btitle
+				   );
+	    }
+	}
+	else {                       # button is passive
+	    print $fh '<span class="passive">' .
+		($ICONS && $PASSIVE_ICONS{$button} ?
+		    &$button_icon_img($BUTTONS_NAME{$button},
+					  $PASSIVE_ICONS{$button},
+					  $Texi2HTML::SIMPLE_TEXT{$button}) :
+
+					  $NAVIGATION_TEXT{$button}) . '</span>';
+	}
+	print $fh "</td>\n";
+	print $fh "</tr>\n" if $vertical;
+	$class = "nav";
+    }
+    print $fh "</tr>" unless $vertical;
+    print $fh "</table>\n";
+}
+
+sub gray_print_head_navigation($$)
+{
+    my $fh = shift;
+    my $buttons = shift;
+
+    return if ($SPLIT eq '');
+    if ($VERTICAL_HEAD_NAVIGATION)
+    {
+	print $fh <<EOT;
+<table class='nav'>
+<tr>
+<td>
+EOT
+    }
+    main::print_lines($fh, $Texi2HTML::THIS_HEADER);
+    &$print_navigation($fh, $buttons, $VERTICAL_HEAD_NAVIGATION);
+    if ($VERTICAL_HEAD_NAVIGATION)
+    {
+	print $fh <<EOT;
+</td>
+<td>
+EOT
+    }
+}
+
+sub gray_print_foot_navigation
+{
+    my $fh = shift;
+
+    return if ($SPLIT eq '');
+    if ($VERTICAL_HEAD_NAVIGATION)
+    {
+	print $fh <<EOT;
+</td>
+</tr>
+</table>
+EOT
+    }
+}
+
+sub gray_print_page_foot($)
+{
+    my $fh = shift;
+    my $program_string = program_string();
+    print $fh <<EOT;
+<div class="copyright">
+$program_string
+EOT
+    if (defined($PRE_BODY_CLOSE) && $PRE_BODY_CLOSE) {
+	print $fh "<p>$PRE_BODY_CLOSE</p>";
+    }
+    print $fh <<EOT;
+</div>
+</body>
+</html>
+EOT
+}
+
+sub gray_print_section
+{
+    my $fh = shift;
+    my $first_in_page = shift;
+    my $previous_is_top = shift;
+    my $buttons = \@SECTION_BUTTONS;
+
+    if ($first_in_page) {
+	&$print_head_navigation($fh, $buttons)
+    } else {
+	main::print_lines($fh, $Texi2HTML::THIS_HEADER);
+    }
+    my $nw = main::print_lines($fh);
+    if (defined $SPLIT
+	and ($SPLIT eq 'node')) {
+	&$print_foot_navigation($fh);
+	print $fh "$SMALL_RULE\n";
+	&$print_navigation($fh, \@NODE_FOOTER_BUTTONS) if (!defined($WORDS_IN_PAGE) or (defined ($nw)
+				    and $nw >= $WORDS_IN_PAGE));
+    }
+}
diff --git a/doc/texinfo/Makefile.am b/doc/texinfo/Makefile.am
index a22a93e..dd28976 100644
--- a/doc/texinfo/Makefile.am
+++ b/doc/texinfo/Makefile.am
@@ -91,10 +91,10 @@ TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
 TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$$TEXINPUTS
 
 manual:
-	 TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
+	TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
 	 MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS)" \
 	 TEXI2DVI="$(TEXI2DVI) -t @finalout" \
-	$(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'
+	$(GENDOCS) --texi2html $(PACKAGE) '$(PACKAGE_NAME) manual'
 
 
 EXTRA_DIST=gendocs_template mastermenu.el untabify.el
diff --git a/doc/texinfo/gendocs_template b/doc/texinfo/gendocs_template
index 6caa9c0..13482db 100755
--- a/doc/texinfo/gendocs_template
+++ b/doc/texinfo/gendocs_template
@@ -1,110 +1,78 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- $Id$ -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <head>
-<title>%%TITLE%% - GNU Project - Free Software Foundation (FSF)</title>
-<meta http-equiv="content-type" content='text/html; charset=utf-8' />
-<link rel="stylesheet" type="text/css" href="/gnu.css" />
-<link rev="made" href="mailto:gray@gnu.org" />
- <link rel="icon" type="image/png" href="/graphics/gnu-head-icon.png" />
+ <title>Mailutils</title>
+ <link rev="made" href="mailto:gray@gnu.org.ua" />
+ <link rel="stylesheet" type="text/css" href="/gray.css" />
+ <link rel="icon" type="image/png" href="/graphics/mustamp.png" />
 </head>
-
-<!-- This document is in XML, and xhtml 1.0 -->
-<!-- Please make sure to properly nest your tags -->
-<!-- and ensure that your final document validates -->
-<!-- consistent with W3C xhtml 1.0 and CSS standards -->
-<!-- See validator.w3.org -->
-
 <body>
+<!--#include virtual="/inc/header.html" -->
+<ul class='tabs'>
+  <li><a href="/">Main</a></li>
+  <li><a href="/download.html">Downloads</a></li>
+  <li><a class="active" href="/manual">Documentation</a></li>
+  <li><a href="/wiki">Wiki</a></li>
+</ul>
 
-<h3>%%TITLE%%</h3>
-
-<address>Free Software Foundation</address>
-<address>last updated %%DATE%%</address>
-<p>
-<a href="/graphics/gnu-head.jpg">
-	<img src="/graphics/gnu-head-sm.jpg"
-	alt=" [image of the head of a GNU] "
-	width="129" height="122" />
-</a>
-<a href="/philosophy/gif.html">(no gifs due to patent problems)</a>
-</p>
-<hr />
-
-<p>The manual for %%PACKAGE%% is available in the following formats:</p>
+<div id="main">
+<p>The manual for <b>%%PACKAGE%%</b> is available in the following formats:</p>
 
 <ul>
-  <li><a href="%%PACKAGE%%.html">HTML 
-      (%%HTML_MONO_SIZE%%K characters)</a> - entirely on one web page.</li>
-  <li><a href="html_node/index.html">HTML</a> - with one web page per
+  <li><a href="manual/%%PACKAGE%%.html">HTML
+      (%%HTML_MONO_SIZE%%K bytes)</a> - entirely on one web page.</li>
+  <li><a href="manual/html_node/index.html">HTML</a> - with one web page per
       node.</li>
-  <li><a href="%%PACKAGE%%.html.gz">HTML compressed
-      (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on 
-      one web page.</li>
-  <li><a href="%%PACKAGE%%.html_node.tar.gz">HTML compressed
+%%IF HTML_SECTION%%
+  <li><a href="manual/html_section/index.html">HTML</a> - with one web page per
+      section.</li>
+%%ENDIF HTML_SECTION%%
+%%IF HTML_CHAPTER%%
+  <li><a href="manual/html_chapter/index.html">HTML</a> - with one web page per
+      chapter.</li>
+%%ENDIF HTML_CHAPTER%%
+  <li><a href="manual/%%PACKAGE%%.html.gz">HTML compressed
+       (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on
+       one web page.</li>
+  <li><a href="manual/%%PACKAGE%%.html_node.tar.gz">HTML compressed
       (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file)</a> -
       with one web page per node.</li>
-  <li><a href="%%PACKAGE%%.info.tar.gz">Info document
+%%IF HTML_SECTION%%
+  <li><a href="manual/%%PACKAGE%%.html_section.tar.gz">HTML compressed
+      (%%HTML_SECTION_TGZ_SIZE%%K gzipped tar file)</a> -
+      with one web page per section.</li>
+%%ENDIF HTML_SECTION%%
+%%IF HTML_CHAPTER%%
+  <li><a href="manual/%%PACKAGE%%.html_chapter.tar.gz">HTML compressed
+      (%%HTML_CHAPTER_TGZ_SIZE%%K gzipped tar file)</a> -
+      with one web page per chapter.</li>
+%%ENDIF HTML_CHAPTER%%
+  <li><a href="manual/%%PACKAGE%%.info.tar.gz">Info document
       (%%INFO_TGZ_SIZE%%K characters gzipped tar file)</a>.</li>
-  <li><a href="%%PACKAGE%%.txt">ASCII text
+  <li><a href="manual/%%PACKAGE%%.txt">ASCII text
       (%%ASCII_SIZE%%K characters)</a>.</li>
-  <li><a href="%%PACKAGE%%.txt.gz">ASCII text compressed
+  <li><a href="manual/%%PACKAGE%%.txt.gz">ASCII text compressed
       (%%ASCII_GZ_SIZE%%K gzipped characters)</a>.</li>
-  <li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file
+  <li><a href="manual/%%PACKAGE%%.dvi.gz">TeX dvi file
       (%%DVI_GZ_SIZE%%K characters gzipped)</a>.</li>
-  <li><a href="%%PACKAGE%%.ps.gz">PostScript file
+  <li><a href="manual/%%PACKAGE%%.ps.gz">PostScript file
       (%%PS_GZ_SIZE%%K characters gzipped)</a>.</li>
-  <li><a href="%%PACKAGE%%.pdf">PDF file
+  <li><a href="manual/%%PACKAGE%%.pdf">PDF file
       (%%PDF_SIZE%%K characters)</a>.</li>
-  <li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source
+  <li><a href="manual/%%PACKAGE%%.texi.tar.gz">Texinfo source
       (%%TEXI_TGZ_SIZE%%K characters gzipped tar file)</a></li>
 </ul>
 
-<p>(This page generated by the <a
+</div>
+<div class="generator">
+<p>(This page is generated by the <a
 href="%%SCRIPTURL%%">%%SCRIPTNAME%%</a> script.)
 </p>
-
-<p>
-<a href="http://validator.w3.org/check?uri=referer"><img
-          src="http://www.w3.org/Icons/valid-xhtml10"
-          alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-</p>
-
-<div class="copyright">
-<p>
-Return to the <a href="/home.html">GNU Project home page</a>.
-</p>
-<p>
-Return to <a href="/software/%%PACKAGE%%">GNU %%PACKAGE%% home page</a>.
-</p>
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:gnu@gnu.org"><em>gnu@gnu.org</em></a>.
-There are also <a href="/home.html#ContactInfo">other ways to contact</a> 
-the FSF.
-<br />
-Please send broken links and other corrections (or suggestions) to
-<a href="mailto:webmasters@gnu.org"><em>webmasters@gnu.org</em></a>.
-</p>
-
-<p>
-Copyright (C) 2005, 2010, 2011 Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02111, USA
-<br />
-Verbatim copying and distribution of this entire article is
-permitted in any medium, provided this notice is preserved.
-</p>
-
-<p>
-Updated:
-<!-- timestamp start -->
-$Date$ $Author$
-<!-- timestamp end -->
-</p>
 </div>
 
+<!--#include virtual="/inc/footer.html" -->
 </body>
 </html>
diff --git a/doc/texinfo/maint.mk b/doc/texinfo/maint.mk
index d77b2c9..3355070 100644
--- a/doc/texinfo/maint.mk
+++ b/doc/texinfo/maint.mk
@@ -16,16 +16,18 @@
 
 mu_aux_dir = ../../mu-aux
 
+VPATH = ../../libmailutils/tests/:../../examples/
 .SUFFIXES: .c .inc
 .c.inc:
 	sed -f $(mu_aux_dir)/texify.sed $< > $@
 
 all: addr.inc http.inc mailcap.inc numaddr.inc sfrom.inc url-parse.inc
 
-addr.inc:	../../libmailutils/tests/addr.c
-http.inc:	../../examples/http.inc
-mailcap.inc:	../../libmailutils/tests/mailcap.c
-numaddr.inc:	../../examples/numaddr.inc
-sfrom.inc:	../../examples/sfrom.inc
-url-parse.inc:	../../libmailutils/tests/url-parse.inc
+addr.inc:	addr.c
+http.inc:	http.c
+mailcap.inc:	mailcap.c
+numaddr.inc:	numaddr.c
+sfrom.inc:	sfrom.c
+url-parse.inc:	url-parse.c
 
+clean:;	rm -f *.inc


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Fri Sep 09 14:07:32 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R25UC-0000iq-Gu
	for mharc-commit-mailutils@gnu.org; Fri, 09 Sep 2011 14:07:32 -0400
Received: from eggs.gnu.org ([140.186.70.92]:34440)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R25U9-0000iJ-72
	for commit-mailutils@gnu.org; Fri, 09 Sep 2011 14:07:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R25U7-0006Y2-GE
	for commit-mailutils@gnu.org; Fri, 09 Sep 2011 14:07:29 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:49810)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R25U7-0006Xy-Eh
	for commit-mailutils@gnu.org; Fri, 09 Sep 2011 14:07:27 -0400
Received: from gray by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R25U7-0008Uw-2D
	for commit-mailutils@gnu.org; Fri, 09 Sep 2011 18:07:27 +0000
Date: Fri, 09 Sep 2011 18:07:27 +0000
Message-Id: <E1R25U7-0008Uw-2D@vcs.savannah.gnu.org>
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
Subject: [SCM] GNU Mailutils branch, master, updated. release-2.2-388-g843523b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7fe176c3a04b15d5f519412b11b23e8f2aed6af1
X-Git-Newrev: 843523b03d1690b700c2bc55fab31f95954669d6
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Sep 2011 18:07:30 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=843523b03d1690b700c2bc55fab31f95954669d6

The branch, master has been updated
       via  843523b03d1690b700c2bc55fab31f95954669d6 (commit)
      from  7fe176c3a04b15d5f519412b11b23e8f2aed6af1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 843523b03d1690b700c2bc55fab31f95954669d6
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Fri Sep 9 21:07:23 2011 +0300

    Minor fix.
    
    * doc/texinfo/programs.texi: Use @group inside @cartouche, not
    vice-versa.

-----------------------------------------------------------------------

Summary of changes:
 doc/texinfo/programs.texi |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/texinfo/programs.texi b/doc/texinfo/programs.texi
index bbcd7a6..bcac978 100644
--- a/doc/texinfo/programs.texi
+++ b/doc/texinfo/programs.texi
@@ -3019,15 +3019,15 @@ Like @code{save}, but the file to append messages to is named after the
 sender of the first message in @var{msglist}. For example:
 
 @smallexample
-@group
 @cartouche
+@group
 & from 14 15
  U  14 smith@@noldor.org Fri Jun 30 18:11  14/358   The Save c
  U  15 gray@@noldor.org  Fri Jun 30 18:30  8/245    Re: The Sa
 & Save 14 15
 "smith" 22/603
-@end cartouche
 @end group
+@end cartouche
 @end smallexample
 @noindent
 


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Thu Sep 22 15:09:07 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R6odv-0000hw-TO
	for mharc-commit-mailutils@gnu.org; Thu, 22 Sep 2011 15:09:07 -0400
Received: from eggs.gnu.org ([140.186.70.92]:60169)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R6odr-0000hV-Rr
	for commit-mailutils@gnu.org; Thu, 22 Sep 2011 15:09:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R6odp-0002kp-Uz
	for commit-mailutils@gnu.org; Thu, 22 Sep 2011 15:09:03 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34745)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R6odp-0002ki-QK
	for commit-mailutils@gnu.org; Thu, 22 Sep 2011 15:09:01 -0400
Received: from gray by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1R6odo-000458-M7
	for commit-mailutils@gnu.org; Thu, 22 Sep 2011 19:09:01 +0000
Date: Thu, 22 Sep 2011 19:09:00 +0000
Message-Id: <E1R6odo-000458-M7@vcs.savannah.gnu.org>
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
Subject: [SCM] GNU Mailutils branch, master, updated. release-2.2-390-ge759db2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 843523b03d1690b700c2bc55fab31f95954669d6
X-Git-Newrev: e759db27d650197ed1d8f837f30a2d03dcc23b4a
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Sep 2011 19:09:05 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=e759db27d650197ed1d8f837f30a2d03dcc23b4a

The branch, master has been updated
       via  e759db27d650197ed1d8f837f30a2d03dcc23b4a (commit)
       via  d232a4677cd0b69cd5bb763eaf1325d7dfc8dda3 (commit)
      from  843523b03d1690b700c2bc55fab31f95954669d6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e759db27d650197ed1d8f837f30a2d03dcc23b4a
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Thu Sep 22 22:07:09 2011 +0300

    Bugfix
    
    * libmailutils/filter/crlfflt.c (_crlf_encoder): Reset state to
    initial if any character other than \r and \n is read.

commit d232a4677cd0b69cd5bb763eaf1325d7dfc8dda3
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Sat Sep 10 00:23:24 2011 +0300

    Minor changes.
    
    * doc/texinfo/mailutils.texi: Update.
    * doc/texinfo/rendition.texi: Rewrite.

-----------------------------------------------------------------------

Summary of changes:
 doc/texinfo/mailutils.texi    |    1 +
 doc/texinfo/mom.texi          |  147 -----------------------------------------
 doc/texinfo/rendition.texi    |   73 +++++++++++++--------
 libmailutils/filter/crlfflt.c |    5 +-
 4 files changed, 51 insertions(+), 175 deletions(-)
 delete mode 100644 doc/texinfo/mom.texi

diff --git a/doc/texinfo/mailutils.texi b/doc/texinfo/mailutils.texi
index f783c94..5e4ae5e 100644
--- a/doc/texinfo/mailutils.texi
+++ b/doc/texinfo/mailutils.texi
@@ -37,6 +37,7 @@
 * mail: (mailutils)mail.                Send and Receive Mail.
 * maidag: (mailutils)maidag.            A General-Purpose Mail Delivery Agent.
 * messages: (mailutils)messages.        Count Messages in a Mailbox.
+* movemail: (mailutils)movemail.        Move Mail between Mailboxes.
 * pop3d: (mailutils)pop3d.              POP3 Daemon.
 * readmsg: (mailutils)readmsg.          Extract Messages from a Folder.
 * sieve: (mailutils)sieve.              Mail Filtering Utility.
diff --git a/doc/texinfo/mom.texi b/doc/texinfo/mom.texi
deleted file mode 100644
index c2a184c..0000000
--- a/doc/texinfo/mom.texi
+++ /dev/null
@@ -1,147 +0,0 @@
-@c This is part of the GNU Mailutils manual.
-@c Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2007, 2008, 2010,
-@c 2011 Free Software Foundation, Inc.
-@c See file mailutils.texi for copying conditions.
-@comment *******************************************************************
-
-@chapter Mailutils Object Model
-Mailutils is written in C, the language is widely supported on
-many platforms and the ABI (Binary Interface) for linking objects
-with other languages (like Guile, Java, ...) is well-defined.
-
-The C language does not provide support for object oriented programming,
-but by using structures and pointers to function, it is possible to provide
-a simple framework.
-
-Every Mailutils object has a corresponding C structure holding its interface
-and specific data. For example mu_object_t, is the root object and all mailutils objects
-extends it:
-
-@smallexample
-struct _mu_object;
-typedef struct _mu_object* mu_object_t;
-
-/* Definition of the interface for mu_object */
-struct _mu_object_vtable
-@{
-  int  (*create)   (mu_object_t *object);
-  void (*destroy)  (mu_object_t *object);
-  void (*notify)   (mu_object_t object, int event, void *data);
-@}
-
-struct _mu_object
-@{
-  struct _mu_object_vtable *vtable;
-  int type;
-@}
-@end smallexample
-
-The @var{vtable} is an array of pointers to function, it provides the interface
-or the list of function for this object. The library provides wrapper to
-access the functions instead using the @var{vtable} directly.
-
-@smallexample
-int mu_object_notify(mu_object object, int event, void *data)
-@{
-  if (object == NULL || object->vtable == NULL
-      || object->vtable->notify == NULL)
-    return MU_ERR_NOT_SUPPORTED;
-  return object->vtable->notify (object, event, data);
-@}
-@end smallexample
-
-Instead of using macros or the vtable directly.
-@smallexample
-#define mu_object_notify(o, evt, d)  ((o)->vtable->notify(o, evt, d))
-@end smallexample
-
-@section Implementing an Interface
-
-@comment ***********************************************************
-@comment This is not a very good/useful example, we should do one using
-@comment header or message, something usefully that would clarify the concepts
-@comment better and at the same could be reuse in code by clients.
-@comment
-@comment For example mime_t "extends" message_t, this is a good example
-@comment since you can consider a mime_t as a message_t but with extra functions.
-@comment ***********************************************************
-
-For a more concrete implementation, lets say we are implementing some caching mailbox
-but we need to keep a better track of the objects in our implementation.
-We take the approach of simple reference counting and extend the mu_object_t.
-
-@smallexample
-#include <mailutils/sys/object.h>
-
-struct my_object;
-typedef struct refcount* refcount;
-
-struct refcount_vtable
-@{
-   struct _mu_object_vtable base;  
-   int (*increment)(refcount_t);
-   int (*decrement)(refcount_t);
-@} 
-
-struct refcount
-@{
-  struct refcount_vtable * vtable;
-  int count;
-@}
-
-static int
-refcount_increment (mu_object_t obj)
-@{
-   refcount_t refcount = (refcount_t)obj;
-   refcount->count++;
-   return refcount->count;
-@}
-
-static int
-refcount_decrement (mu_object_t obj)
-@{
-   refcount_t refcount = (refcount_t)obj;
-   if (refcount->count > 0)
-     refcount->count--;
-   return refcount->count;
-@}
-
-int
-my_mu_object_create (mu_object_t *pobject)
-@{
-   static struct refcount_vtable* vtable;
-   refcount_t ref;
-
-   if (object == NULL)
-     return EINVAL;
-
-   if (!vtable)
-    @{
-      vtable = calloc(1, sizeof(*vtable));
-      if (vtable == NULL)
-        return ENOMEM;
-      vtable->base.vtable = &_mu_object_vtable; // FIXME where can they get the base vtable
-      vtable->increment = refcount_increment;
-      vtable->decrement = refcount_decrement;
-    @}
-
-   ref = malloc(sizeof *ref);
-   ref->base = vtable;
-   *pobject = &ref->base.vtable
-   return 0;
-@}
-@end smallexample
-
-The interface adds a @code{decrement} and @code{increment} to the @code{mu_object_t}
-interface. Creating a @code{refcount_t} can be savely typecast to @code{mu_object_t},
-for example:
-
-@smallexample
-refcount_t ref;
-mu_object_t obj;
-refcount_create (&ref);
-
-/* send a notification to the listeners of an event.  */
-mu_object_notify ((mu_object_t)ref, 5, NULL)
-
-@end smallexample
diff --git a/doc/texinfo/rendition.texi b/doc/texinfo/rendition.texi
index 2936694..5e4627c 100644
--- a/doc/texinfo/rendition.texi
+++ b/doc/texinfo/rendition.texi
@@ -1,7 +1,22 @@
-@c Let's use the concept of 'renditions' by Fra@,{c}ois Pinard
-@c I extended it by adding a FIXME_FOOTNOTE variable, which controls
-@c whether FIXME information should be placed in footnotes or
-@c inlined. 
+@c This file is part of GNU Mailutils.
+@c Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2009, 2010, 2011
+@c Free Software Foundation, Inc.
+@c
+@c GNU Mailutils is free software; you can redistribute it and/or
+@c modify it under the terms of the GNU General Public License as
+@c published by the Free Software Foundation; either version 3, or (at
+@c your option) any later version.
+@c
+@c GNU Mailutils is distributed in the hope that it will be useful, but
+@c WITHOUT ANY WARRANTY; without even the implied warranty of
+@c MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+@c General Public License for more details.
+@c
+@c You should have received a copy of the GNU General Public License
+@c along with GNU Mailutils.  If not, see
+@c <http://www.gnu.org/licenses/>.
+
+@c This file implements Fra@,{c}ois Pinard's concept of 'renditions'.
 
 @c ======================================================================
 @c This document has three levels of rendition: PUBLISH, DISTRIB or PROOF,
@@ -39,9 +54,9 @@
 
 @macro WRITEME
 @ifclear PUBLISH
-@quotation
-@emph{This node is to be written.}
-@end quotation
+@cartouche
+@center @emph{@strong{Editor's note:} This node is to be written.}
+@end cartouche
 @end ifclear
 @end macro
 
@@ -49,10 +64,10 @@
 
 @macro UNREVISED
 @ifclear PUBLISH
-@quotation
-(@emph{The information in this node may be obsolete or otherwise inaccurate.}
-This message will disappear, once this node revised.)
-@end quotation
+@cartouche
+@emph{Editor's note:} The information in this node may be obsolete or
+otherwise inaccurate.  This message will disappear, once this node revised.
+@end cartouche
 @end ifclear
 @end macro
 
@@ -60,35 +75,39 @@ This message will disappear, once this node revised.)
 
 @macro FIXME{string}
 @ifset PROOF
-@ifset PROOF_FOOTNOTED
-@footnote{@strong{FIXME:} \string\}
-@end ifset
-@ifclear PROOF_FOOTNOTED
+@sp 1
 @cartouche
-@strong{<FIXME>} \string\ @strong{</>}
+@strong{Editor's note:} \string\
 @end cartouche
-@end ifclear
 @end ifset
+@w{}
+@end macro
 
+@macro deadlink{}
+(@strong{Editor's note: dangling link})
 @end macro
 
-@macro FIXME-ref{string}
+@macro FIXMEREF{text,string}
 @ifset PROOF
-@strong{<REF>} \string\ @strong{</>}
+@html
+\text\ <span class="deadlink">\string\</span> 
+@end html
+@ifnothtml
+\text\ @i{\string\}
+@end ifnothtml
+@deadlink{}
 @end ifset
+@w{}
+@end macro
 
+@macro FIXME-ref{string}
+@FIXMEREF{,\string\}
 @end macro
 
 @macro FIXME-pxref{string}
-@ifset PROOF
-@strong{<PXREF>} \string\ @strong{</>}
-@end ifset
-
+@FIXMEREF{see,\string\}
 @end macro
 
 @macro FIXME-xref{string}
-@ifset PROOF
-@strong{<XREF>} \string\ @strong{</>}
-@end ifset
-
+@FIXMEREF{See,\string\}
 @end macro
diff --git a/libmailutils/filter/crlfflt.c b/libmailutils/filter/crlfflt.c
index 96291b8..abec353 100644
--- a/libmailutils/filter/crlfflt.c
+++ b/libmailutils/filter/crlfflt.c
@@ -88,7 +88,10 @@ _crlf_encoder (void *xd,
 	  optr[j++] = c;
 	}
       else
-	optr[j++] = c;
+	{
+	  *state = state_init;
+	  optr[j++] = c;
+	}
     }
   iobuf->isize = i;
   iobuf->osize = j;


hooks/post-receive
-- 
GNU Mailutils


