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

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.487
retrieving revision 1.488
diff -c -r1.487 -r1.488
*** ChangeLog   4 Apr 2005 20:07:10 -0000       1.487
--- ChangeLog   4 Apr 2005 21:21:22 -0000       1.488
***************
*** 1,8 ****
  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.
--- 1,8 ----
  2005-04-04  Stepan Kasal  <address@hidden>
  
!       * makeinfo/makeinfo.c (usage): Add indentation to the examples and
!         fix the indentation of the --footnote-style option, so that
!         help2man can recognize these; also some cosmetic indentation fixes.
        * doc/Makefile.am (makeinfo.1): Add a sed command to postprocess
          the generated manpage.
        * doc/makefile.1: Refresh.
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** doc/Makefile.am     4 Apr 2005 20:07:10 -0000       1.25
--- doc/Makefile.am     4 Apr 2005 21:21:22 -0000       1.26
***************
*** 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.
  #
--- 1,4 ----
! # $Id: Makefile.am,v 1.26 2005/04/04 21:21:22 kasal Exp $
  # Makefile.am for texinfo/doc.
  # Run automake in .. to produce Makefile.in from this.
  #
***************
*** 94,100 ****
  $(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)
--- 94,100 ----
  $(srcdir)/makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
        @name="translate Texinfo documents" && $(man_rule_bin)
        mv $@ address@hidden
!       sed '/^\.IP$$/N;/\nAlso/s/I//;/\nThe/s/I//' address@hidden >$@
        rm address@hidden
        
  $(srcdir)/texindex.1: $(top_srcdir)/util/texindex.c $(common_mandeps)
Index: doc/makeinfo.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/makeinfo.1,v
retrieving revision 1.44
retrieving revision 1.45
diff -c -r1.44 -r1.45
*** doc/makeinfo.1      4 Apr 2005 20:07:11 -0000       1.44
--- doc/makeinfo.1      4 Apr 2005 21:21:22 -0000       1.45
***************
*** 79,86 ****
  \fB\-\-footnote\-style\fR=\fISTYLE\fR
  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
! in which they are defined (default).
  .TP
  \fB\-\-paragraph\-indent\fR=\fIVAL\fR
  indent Info paragraphs by VAL spaces (default 3).
--- 79,86 ----
  \fB\-\-footnote\-style\fR=\fISTYLE\fR
  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, in
! which they are defined (this is the default).
  .TP
  \fB\-\-paragraph\-indent\fR=\fIVAL\fR
  indent Info paragraphs by VAL spaces (default 3).
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -c -r1.77 -r1.78
*** makeinfo/makeinfo.c 4 Apr 2005 20:07:11 -0000       1.77
--- makeinfo/makeinfo.c 4 Apr 2005 21:21:22 -0000       1.78
***************
*** 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.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.78 2005/04/04 21:21:22 kasal Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
***************
*** 390,397 ****
        --fill-column=NUM       break Info lines at NUM characters (default 
%d).\n\
        --footnote-style=STYLE  output footnotes in Info according to STYLE:\n\
                                  `separate' to put them in their own node;\n\
!                                 `end' to put them at the end of the node\n\
!                                   in which they are defined (default).\n\
        --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default 
%d).\n\
                                  If VAL is `none', do not indent; if VAL is\n\
                                  `asis', preserve existing indentation.\n\
--- 390,397 ----
        --fill-column=NUM       break Info lines at NUM characters (default 
%d).\n\
        --footnote-style=STYLE  output footnotes in Info according to STYLE:\n\
                                  `separate' to put them in their own node;\n\
!                                 `end' to put them at the end of the node, 
in\n\
!                                 which they are defined (this is the 
default).\n\
        --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default 
%d).\n\
                                  If VAL is `none', do not indent; if VAL is\n\
                                  `asis', preserve existing indentation.\n\
P ChangeLog
P doc/Makefile.am
P doc/makeinfo.1
P makeinfo/makeinfo.c