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

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.485
retrieving revision 1.486
diff -c -r1.485 -r1.486
*** ChangeLog   1 Apr 2005 21:30:40 -0000       1.485
--- ChangeLog   4 Apr 2005 11:08:27 -0000       1.486
***************
*** 1,3 ****
--- 1,12 ----
+ 2005-04-04  Torsten Bronger  <address@hidden>  (tiny changes)
+ 
+       * doc/texinfo.txi: Fix several typos.
+ 
+ 2005-04-04  Stepan Kasal  <address@hidden>
+ 
+       * doc/Makefile.am: Fix my previous patch, so that the rules work; and
+         don't modify the path, it's simpler to give help2man the full path.
+ 
  2005-03-31  Per Bothner  <address@hidden>
  
        * makeinfo/makeinfo.c (maybe_escaped_expansion): Don't start a new
***************
*** 243,255 ****
        * util/texi2dvi (findprog): make sure test -x isn't returning true
        for a directory.  From Stepan and others, 20 Jan 2005 12:35:08 +0100.
  
! 2005-01-16  Torsten Bronger <address@hidden>
  
        * makeinfo/insertion.c (handle_verbatim_environment): do HTML
                conversions, to make ]]> work.
        * makeinfo/xml.c (xml_add_char): also escape >.
  
! 2005-01-16  Torsten Bronger <address@hidden>
  
        * makeinfo/cmds.c (cm_tie): use &nbsp; for HTML, &#xa0; for
                XML/Docbook.
--- 252,264 ----
        * util/texi2dvi (findprog): make sure test -x isn't returning true
        for a directory.  From Stepan and others, 20 Jan 2005 12:35:08 +0100.
  
! 2005-01-16  Torsten Bronger  <address@hidden>  (tiny change)
  
        * makeinfo/insertion.c (handle_verbatim_environment): do HTML
                conversions, to make ]]> work.
        * makeinfo/xml.c (xml_add_char): also escape >.
  
! 2005-01-16  Torsten Bronger  <address@hidden>  (tiny change)
  
        * makeinfo/cmds.c (cm_tie): use &nbsp; for HTML, &#xa0; for
                XML/Docbook.
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -c -r1.23 -r1.24
*** doc/Makefile.am     25 Mar 2005 13:55:14 -0000      1.23
--- doc/Makefile.am     4 Apr 2005 11:08:27 -0000       1.24
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.23 2005/03/25 13:55:14 kasal Exp $
  # Makefile.am for texinfo/doc.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 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.
  #
***************
*** 65,97 ****
  # The man pages depend on the --help strings and the version number.
  common_mandeps = $(top_srcdir)/configure.ac
  
! # Set up variables:
! man_rule_0 = echo "Updating man page $@" && \
        program=`expr '/$@' : '.*/\(.*\)\.1'` && \
        case $$program in makeinfo) dir=makeinfo;; info*) dir=info;; \
                *) dir=util;; esac && \
        case $$program in info|install-info) program=g$$program;; \
                esac
  
! # Update the binary:
! man_rule_1 = \
!       echo cd $(top_builddir)/$$dir '&&' $(MAKE) $(AM_MAKEFLAGS) 
$$program$(EXEEXT) && \
!            cd $(top_builddir)/$$dir  &&  $(MAKE) $(AM_MAKEFLAGS) 
$$program$(EXEEXT)
! 
! # Generate the page:
! # Add $(top_srcdir)/util to the path, because texi2dvi is in source tree.
! man_rule_2 = \
!       PATH="$(top_srcdir)/address@hidden@$$PATH" && \
!       for dir in util info makeinfo; do \
!         PATH="$(top_builddir)/$(native_tools)/address@hidden@$$PATH"; \
!       done && \
!       echo PATH="$$PATH" $(HELP2MAN) --name=\"$$name\" $$program '>$@' && \
!       $(HELP2MAN) --name="$$name" $$program >$@
! 
! # Update manpage for a binary program:
! man_rule_bin = $(man_rule_0) && $(man_rule_1) && $(man_rule_2)
! # Update manpage for a script:
! man_rule_scr = $(man_rule_0) && $(man_rule_2)
  
  $(srcdir)/info.1: $(top_srcdir)/info/info.c $(common_mandeps)
        @name="read Info documents" && $(man_rule_bin)
--- 65,87 ----
  # The man pages depend on the --help strings and the version number.
  common_mandeps = $(top_srcdir)/configure.ac
  
! # Set up the variables:
! man_rule_0 = \
        program=`expr '/$@' : '.*/\(.*\)\.1'` && \
        case $$program in makeinfo) dir=makeinfo;; info*) dir=info;; \
                *) dir=util;; esac && \
+       dir="$(top_builddir)/$(native_tools)/$$dir" && \
        case $$program in info|install-info) program=g$$program;; \
                esac
  
! # Update the manpage for a binary program; set up the variables,
! # make sure the binary is up-to-date and then generate the man page.
! man_rule_bin = echo "Updating man page $@" && \
!       $(man_rule_0) && \
!       echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT) && \
!           (cd "$$dir"  &&  $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT)) && \
!       echo $(HELP2MAN) --name=\""$$name"\" "$$dir/$$program" '>$@' && \
!            $(HELP2MAN) --name="$$name"     "$$dir/$$program"  >$@
  
  $(srcdir)/info.1: $(top_srcdir)/info/info.c $(common_mandeps)
        @name="read Info documents" && $(man_rule_bin)
***************
*** 105,111 ****
        @name="sort Texinfo index files" && $(man_rule_bin)
  
  $(srcdir)/texi2dvi.1: $(top_srcdir)/util/texi2dvi $(common_mandeps)
!       @name="print Texinfo documents" && $(man_rule_scr)
  
  # Do not create info files for distribution.
  dist-info:
--- 95,101 ----
        @name="sort Texinfo index files" && $(man_rule_bin)
  
  $(srcdir)/texi2dvi.1: $(top_srcdir)/util/texi2dvi $(common_mandeps)
!       $(HELP2MAN) --name="print Texinfo documents" 
$(top_srcdir)/util/texi2dvi >$@
  
  # Do not create info files for distribution.
  dist-info:
Index: doc/texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.137
retrieving revision 1.138
diff -c -r1.137 -r1.138
*** doc/texinfo.txi     22 Mar 2005 01:29:05 -0000      1.137
--- doc/texinfo.txi     4 Apr 2005 11:08:08 -0000       1.138
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.137 2005/03/22 01:29:05 karl Exp $
  @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
  @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
  
--- 1,5 ----
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.138 2005/04/04 11:08:08 kasal Exp $
  @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
  @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
  
***************
*** 1359,1365 ****
  @cindex Required in Texinfo file
  @cindex Texinfo file minimum
  
! By convention, the namea of a Texinfo file ends with (in order of
  preference) one of the extensions @file{.texinfo}, @file{.texi},
  @file{.txi}, or @file{.tex}.  The longer extensions are preferred since
  they describe more clearly to a human reader the nature of the file.
--- 1359,1365 ----
  @cindex Required in Texinfo file
  @cindex Texinfo file minimum
  
! By convention, the name of a Texinfo file ends with (in order of
  preference) one of the extensions @file{.texinfo}, @file{.texi},
  @file{.txi}, or @file{.tex}.  The longer extensions are preferred since
  they describe more clearly to a human reader the nature of the file.
***************
*** 6704,6710 ****
  
  @item @@address@hidden@address@hidden
  Indicate an environment variable.
! @xref{env,,@code{@@kenv}}.
  
  @item @@address@hidden@address@hidden
  Indicate the name of a file.
--- 6704,6710 ----
  
  @item @@address@hidden@address@hidden
  Indicate an environment variable.
! @xref{env,,@code{@@env}}.
  
  @item @@address@hidden@address@hidden
  Indicate the name of a file.
***************
*** 9327,9333 ****
  
  @cindex GIF images, unsupported due to patents
  @cindex PNG image format
! @cindex JPG image format
  If you do not supply the optional @var{extension} (fifth) argument,
  @code{makeinfo} first tries @address@hidden; if that does
  not exist, it tries @address@hidden  If that does not exist
--- 9327,9333 ----
  
  @cindex GIF images, unsupported due to patents
  @cindex PNG image format
! @cindex JPEG image format
  If you do not supply the optional @var{extension} (fifth) argument,
  @code{makeinfo} first tries @address@hidden; if that does
  not exist, it tries @address@hidden  If that does not exist
***************
*** 10065,10071 ****
  these cases, the comma character is used to separate arguments.
  
  Since a comma character would confuse Texinfo's parsing for these
! commands, you must use the command @address@hidden instead if you want
  to pass an actual comma.  Here are some examples:
  
  @example
--- 10065,10071 ----
  these cases, the comma character is used to separate arguments.
  
  Since a comma character would confuse Texinfo's parsing for these
! commands, you must use the command @samp{@@address@hidden@}} instead if you 
want
  to pass an actual comma.  Here are some examples:
  
  @example
***************
*** 10268,10274 ****
  This is text. Two sentences. Three sentences. French spacing.
  
  @@frenchspacing off
! This is text. Two sentences. Three sentences. Non-french spacing.
  @end example
  
  @noindent produces (there will be no difference in Info):
--- 10268,10274 ----
  This is text. Two sentences. Three sentences. French spacing.
  
  @@frenchspacing off
! This is text. Two sentences. Three sentences. Non-French spacing.
  @end example
  
  @noindent produces (there will be no difference in Info):
***************
*** 10277,10283 ****
  This is text. Two sentences. Three sentences. French spacing.
  
  @frenchspacing off
! This is text. Two sentences. Three sentences. Non-french spacing.
  
  @code{@@frenchspacing} mainly affects the printed output, including
  the output after @code{@@.}, @code{@@!}, and @code{@@?} (@pxref{Ending
--- 10277,10283 ----
  This is text. Two sentences. Three sentences. French spacing.
  
  @frenchspacing off
! This is text. Two sentences. Three sentences. Non-French spacing.
  
  @code{@@frenchspacing} mainly affects the printed output, including
  the output after @code{@@.}, @code{@@!}, and @code{@@?} (@pxref{Ending
***************
*** 13409,13415 ****
  @item
  @code{sa} @tab Sanskrit @tab
  @code{sd} @tab Sindhi @tab
! @code{sg} @tab Sangro
  @item
  @code{sh} @tab Serbo-Croatian @tab
  @code{si} @tab Sinhalese @tab
--- 13409,13415 ----
  @item
  @code{sa} @tab Sanskrit @tab
  @code{sd} @tab Sindhi @tab
! @code{sg} @tab Sango
  @item
  @code{sh} @tab Serbo-Croatian @tab
  @code{si} @tab Sinhalese @tab
***************
*** 18582,18588 ****
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.137 2005/03/22 01:29:05 karl Exp $
  @end example
  (This is useful in all sources that use version control, not just manuals.)
  You may wish to include the @samp{$Id:} comment in the @code{@@copying}
--- 18582,18588 ----
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.138 2005/04/04 11:08:08 kasal Exp $
  @end example
  (This is useful in all sources that use version control, not just manuals.)
  You may wish to include the @samp{$Id:} comment in the @code{@@copying}
***************
*** 18648,18654 ****
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.137 2005/03/22 01:29:05 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
--- 18648,18654 ----
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.138 2005/04/04 11:08:08 kasal Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
P ChangeLog
P doc/Makefile.am
P doc/texinfo.txi