texinfo update (Mon Apr 4 16:22:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.486
retrieving revision 1.487
diff -c -r1.486 -r1.487
*** ChangeLog   4 Apr 2005 11:08:27 -0000       1.486
--- ChangeLog   4 Apr 2005 20:07:10 -0000       1.487
***************
*** 1,3 ****
--- 1,14 ----
+ 2005-04-04  Stepan Kasal  <address@hidden>
+ 
+       * makeinfo/makeinfo.c (usage): Add indentation to the examples, so
+         that help2man can recognize them; fix indentation of some other
+         options.
+       * doc/Makefile.am (makeinfo.1): Add a sed command to postprocess
+         the generated manpage.
+       * doc/makefile.1: Refresh.
+ 
+       Thanks to Jim Razmus for the bug report.
+ 
  2005-04-04  Torsten Bronger  <address@hidden>  (tiny changes)
  
        * doc/texinfo.txi: Fix several typos.
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** doc/Makefile.am     4 Apr 2005 11:08:27 -0000       1.24
--- doc/Makefile.am     4 Apr 2005 20:07:10 -0000       1.25
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.24 2005/04/04 11:08:27 kasal Exp $
  # Makefile.am for texinfo/doc.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 1,4 ----
! # $Id: Makefile.am,v 1.25 2005/04/04 20:07:10 kasal Exp $
  # Makefile.am for texinfo/doc.
  # Run automake in .. to produce Makefile.in from this.
  #
***************
*** 89,96 ****
--- 89,102 ----
        @name="compile customizations for Info" && $(man_rule_bin)
  $(srcdir)/install-info.1: $(top_srcdir)/util/install-info.c $(common_mandeps)
        @name="update info/dir entries" && $(man_rule_bin)
+ 
+ # Here we need some postprocessing:
  $(srcdir)/makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
        @name="translate Texinfo documents" && $(man_rule_bin)
+       mv $@ address@hidden
+       sed '/^\.IP$$/N;/\nin which/D;/\nAlso/s/I//;/\nThe/s/I//' 
address@hidden >$@
+       rm address@hidden
+       
  $(srcdir)/texindex.1: $(top_srcdir)/util/texindex.c $(common_mandeps)
        @name="sort Texinfo index files" && $(man_rule_bin)
  
Index: doc/makeinfo.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/makeinfo.1,v
retrieving revision 1.43
retrieving revision 1.44
diff -c -r1.43 -r1.44
*** doc/makeinfo.1      14 Mar 2005 13:06:23 -0000      1.43
--- doc/makeinfo.1      4 Apr 2005 20:07:11 -0000       1.44
***************
*** 1,5 ****
! .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
! .TH MAKEINFO "1" "March 2005" "makeinfo 4.8" "User Commands"
  .SH NAME
  makeinfo \- translate Texinfo documents
  .SH SYNOPSIS
--- 1,5 ----
! .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
! .TH MAKEINFO "1" "April 2005" "makeinfo 4.8" "User Commands"
  .SH NAME
  makeinfo \- translate Texinfo documents
  .SH SYNOPSIS
***************
*** 80,86 ****
  output footnotes in Info according to STYLE:
  `separate' to put them in their own node;
  `end' to put them at the end of the node
- .IP
  in which they are defined (default).
  .TP
  \fB\-\-paragraph\-indent\fR=\fIVAL\fR
--- 80,85 ----
***************
*** 154,162 ****
  .TP
  \fB\-\-no\-ifxml\fR
  do not process @ifxml and @xml text.
! .IP
  Also, for the \fB\-\-no\-ifFORMAT\fR options, do process @ifnotFORMAT text.
! .IP
  The defaults for the @if... conditionals depend on the output format:
  if generating HTML, \fB\-\-ifhtml\fR is on and the others are off;
  if generating Info, \fB\-\-ifinfo\fR is on and the others are off;
--- 153,161 ----
  .TP
  \fB\-\-no\-ifxml\fR
  do not process @ifxml and @xml text.
! .P
  Also, for the \fB\-\-no\-ifFORMAT\fR options, do process @ifnotFORMAT text.
! .P
  The defaults for the @if... conditionals depend on the output format:
  if generating HTML, \fB\-\-ifhtml\fR is on and the others are off;
  if generating Info, \fB\-\-ifinfo\fR is on and the others are off;
***************
*** 178,187 ****
  .TP
  makeinfo \fB\-\-no\-headers\fR foo.texi
  write plain text to standard output
! .IP
! makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi write html without 
node lines, menus
! makeinfo \fB\-\-number\-sections\fR foo.texi   write Info with numbered 
sections
! makeinfo \fB\-\-no\-split\fR foo.texi          write one Info file however big
  .SH "REPORTING BUGS"
  Email bug reports to address@hidden,
  general questions and discussion to address@hidden
--- 177,191 ----
  .TP
  makeinfo \fB\-\-no\-headers\fR foo.texi
  write plain text to standard output
! .TP
! makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi
! write html without node lines, menus
! .TP
! makeinfo \fB\-\-number\-sections\fR foo.texi
! write Info with numbered sections
! .TP
! makeinfo \fB\-\-no\-split\fR foo.texi
! write one Info file however big
  .SH "REPORTING BUGS"
  Email bug reports to address@hidden,
  general questions and discussion to address@hidden
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -c -r1.76 -r1.77
*** makeinfo/makeinfo.c 1 Apr 2005 21:30:40 -0000       1.76
--- makeinfo/makeinfo.c 4 Apr 2005 20:07:11 -0000       1.77
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.76 2005/04/01 21:30:40 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.77 2005/04/04 20:07:11 kasal Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
***************
*** 363,386 ****
       /* xgettext: no-wrap */
      puts (_("\
  Output format selection (default is to produce Info):\n\
!       --docbook             output Docbook XML rather than Info.\n\
!       --html                output HTML rather than Info.\n\
!       --xml                 output Texinfo XML rather than Info.\n\
!       --plaintext           output plain text rather than Info.\n\
  "));
  
      puts (_("\
  General output options:\n\
!   -E, --macro-expand FILE   output macro-expanded source to FILE.\n\
!                             ignoring any @setfilename.\n\
!       --no-headers          suppress node separators, Node: lines, and 
menus\n\
!                               from Info output (thus producing plain text)\n\
!                               or from HTML (thus producing shorter output);\n\
!                               also, write to standard output by default.\n\
!       --no-split            suppress splitting of Info or HTML output,\n\
!                             generate only one output file.\n\
!       --number-sections     output chapter and sectioning numbers.\n\
!   -o, --output=FILE         output to FILE (directory if split HTML),\n\
  "));
  
      printf (_("\
--- 363,386 ----
       /* xgettext: no-wrap */
      puts (_("\
  Output format selection (default is to produce Info):\n\
!       --docbook               output Docbook XML rather than Info.\n\
!       --html                  output HTML rather than Info.\n\
!       --xml                   output Texinfo XML rather than Info.\n\
!       --plaintext             output plain text rather than Info.\n\
  "));
  
      puts (_("\
  General output options:\n\
!   -E, --macro-expand FILE     output macro-expanded source to FILE.\n\
!                               ignoring any @setfilename.\n\
!       --no-headers            suppress node separators, Node: lines, and 
menus\n\
!                                 from Info output (thus producing plain 
text)\n\
!                                 or from HTML (thus producing shorter 
output);\n\
!                                 also, write to standard output by default.\n\
!       --no-split              suppress splitting of Info or HTML output,\n\
!                               generate only one output file.\n\
!       --number-sections       output chapter and sectioning numbers.\n\
!   -o, --output=FILE           output to FILE (directory if split HTML),\n\
  "));
  
      printf (_("\
***************
*** 402,415 ****
  
      puts (_("\
  Options for HTML:\n\
!       --css-include=FILE        include FILE in HTML <style> output;\n\
!                                   read stdin if FILE is -.\n\
  "));
  
      printf (_("\
  Options for XML and Docbook:\n\
!       --output-indent=VAL       indent XML elements by VAL spaces (default 
%d).\n\
!                                   If VAL is 0, ignorable whitespace is 
dropped.\n\
  "), xml_indentation_increment);
      puts ("");
  
--- 402,415 ----
  
      puts (_("\
  Options for HTML:\n\
!       --css-include=FILE      include FILE in HTML <style> output;\n\
!                                 read stdin if FILE is -.\n\
  "));
  
      printf (_("\
  Options for XML and Docbook:\n\
!       --output-indent=VAL     indent XML elements by VAL spaces (default 
%d).\n\
!                                 If VAL is 0, ignorable whitespace is 
dropped.\n\
  "), xml_indentation_increment);
      puts ("");
  
***************
*** 451,465 ****
  
      fputs (_("\
  Examples:\n\
!   makeinfo foo.texi                     write Info to foo's @setfilename\n\
!   makeinfo --html foo.texi              write HTML to @setfilename\n\
!   makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n\
!   makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n\
!   makeinfo --no-headers foo.texi        write plain text to standard output\n\
  \n\
!   makeinfo --html --no-headers foo.texi write html without node lines, 
menus\n\
!   makeinfo --number-sections foo.texi   write Info with numbered sections\n\
!   makeinfo --no-split foo.texi          write one Info file however big\n\
  "), stdout);
  
      puts (_("\n\
--- 451,465 ----
  
      fputs (_("\
  Examples:\n\
!   makeinfo foo.texi                      write Info to foo's @setfilename\n\
!   makeinfo --html foo.texi               write HTML to @setfilename\n\
!   makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n\
!   makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n\
!   makeinfo --no-headers foo.texi         write plain text to standard 
output\n\
  \n\
!   makeinfo --html --no-headers foo.texi  write html without node lines, 
menus\n\
!   makeinfo --number-sections foo.texi    write Info with numbered sections\n\
!   makeinfo --no-split foo.texi           write one Info file however big\n\
  "), stdout);
  
      puts (_("\n\
P ChangeLog
P doc/Makefile.am
P doc/makeinfo.1
P makeinfo/makeinfo.c