texinfo update (Wed Aug 25 12:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.378
retrieving revision 1.380
diff -c -r1.378 -r1.380
*** ChangeLog   20 Aug 2004 13:12:54 -0000      1.378
--- ChangeLog   25 Aug 2004 15:49:48 -0000      1.380
***************
*** 1,3 ****
--- 1,11 ----
+ 2004-08-25   Akim Demaille  <address@hidden>
+ 
+       * util/Makefile.am (texinfo.cat): Fix for srcdir != builddir.
+ 
+ 2004-08-25  Karl Berry  <address@hidden>
+ 
+       * util/texi2dvi: @ is also ok for the first character of xref_files.
+ 
  2004-08-20  Karl Berry  <address@hidden>
  
        * doc/texinfo.tex (\tablez): accidentally removed assignments
Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** util/texi2dvi       14 Aug 2004 00:54:34 -0000      1.31
--- util/texi2dvi       25 Aug 2004 15:48:21 -0000      1.32
***************
*** 1,6 ****
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
! # $Id: texi2dvi,v 1.31 2004/08/14 00:54:34 karl Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,6 ----
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
! # $Id: texi2dvi,v 1.32 2004/08/25 15:48:21 karl Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 27,33 ****
  # the `--debug' option when making a bug report.
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.31 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.7) $rcs_version
--- 27,33 ----
  # the `--debug' option when making a bug report.
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.32 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.7) $rcs_version
***************
*** 326,337 ****
    test -s "$this_file" || continue
    # If the file is not suitable to be an index or xref file, don't
    # process it.  It's suitable if the first character is a
!   # backslash or right quote, as long as the first line isn't
    # \input texinfo.
    first_character=`sed -n '1s/^\(.\).*$/\1/p;q' $this_file`
    if (test "x$first_character" = "x\\" \
        && sed 1q $this_file | grep -v '^\\input *texinfo' >/dev/null) \
!      || test "x$first_character" = "x'"; then
      xref_files="$xref_files ./$this_file"
    fi
  done
--- 326,338 ----
    test -s "$this_file" || continue
    # If the file is not suitable to be an index or xref file, don't
    # process it.  It's suitable if the first character is a
!   # backslash or right quote or at, as long as the first line isn't
    # \input texinfo.
    first_character=`sed -n '1s/^\(.\).*$/\1/p;q' $this_file`
    if (test "x$first_character" = "x\\" \
        && sed 1q $this_file | grep -v '^\\input *texinfo' >/dev/null) \
!      || test "x$first_character" = "x'" \
!      || test "x$first_character" = "x@"; then
      xref_files="$xref_files ./$this_file"
    fi
  done
P ChangeLog
P util/texi2dvi