texinfo update (Sun Dec 25 14:22:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.550
retrieving revision 1.551
diff -c -r1.550 -r1.551
*** ChangeLog   22 Dec 2005 15:15:30 -0000      1.550
--- ChangeLog   25 Dec 2005 19:13:56 -0000      1.551
***************
*** 1,3 ****
--- 1,10 ----
+ 2005-12-25  Karl Berry  <address@hidden>
+ 
+       * util/texi2dvi (no_file_line_error): new control,
+       with option --no-line-error to set it.  Wybo Dekker's mk program
+       wants to parse TeX's original error messages.
+       (run_tex): obey it.
+ 
  2005-12-22  Akim Demaille  <address@hidden>
  
        Implement --mostly-clean, improve the detection of aux files.
Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.69
retrieving revision 1.70
diff -c -r1.69 -r1.70
*** util/texi2dvi       22 Dec 2005 15:15:30 -0000      1.69
--- util/texi2dvi       25 Dec 2005 19:13:56 -0000      1.70
***************
*** 1,6 ****
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi,v 1.69 2005/12/22 15:15:30 akim Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
--- 1,6 ----
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi,v 1.70 2005/12/25 19:13:56 karl Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
***************
*** 32,38 ****
  unset RUNNING_KSH
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.69 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
--- 32,38 ----
  unset RUNNING_KSH
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.70 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
***************
*** 63,74 ****
  Makeinfo is used to perform Texinfo macro expansion before running TeX
  when needed.
  
! Operation modes:
    -b, --batch         no interaction
    -D, --debug         turn on shell debugging (set -x)
    -h, --help          display this help and exit successfully
    -o, --output=OFILE  leave output in OFILE (implies --clean);
!                       Only one input FILE may be specified in this case
    -q, --quiet         no output unless errors (implies --batch)
    -s, --silent        same as --quiet
    -v, --version       display version information and exit successfully
--- 63,75 ----
  Makeinfo is used to perform Texinfo macro expansion before running TeX
  when needed.
  
! General options:
    -b, --batch         no interaction
    -D, --debug         turn on shell debugging (set -x)
    -h, --help          display this help and exit successfully
+       --no-line-error do not pass --file-line-error to TeX
    -o, --output=OFILE  leave output in OFILE (implies --clean);
!                       only one input FILE may be specified in this case
    -q, --quiet         no output unless errors (implies --batch)
    -s, --silent        same as --quiet
    -v, --version       display version information and exit successfully
***************
*** 144,149 ****
--- 145,151 ----
  expand=         # t for expansion via makeinfo
  includes=
  line_error=true # Pass --file-line-error to TeX.
+ no_line_error=false  # absolutely do not pass --file-line-error to TeX
  oname=          # --output
  out_lang=dvi
  quiet=false     # by default let the tools' message be displayed
***************
*** 640,648 ****
      ensure_dir "$tex_help_dir"
      tex_help=`cd "$tex_help_dir" >&6 && $tex --help </dev/null 2>&1`
    fi
!   $line_error && case $tex_help in
!     *file-line-error*) cmd="$cmd --file-line-error";;
!   esac
  
    # Tell TeX to be batch if requested.
    if $batch; then
--- 642,654 ----
      ensure_dir "$tex_help_dir"
      tex_help=`cd "$tex_help_dir" >&6 && $tex --help </dev/null 2>&1`
    fi
!   if $no_line_error; then :; else
!     # The mk program and perhaps others want to parse TeX's
!     # original error messages.
!     $line_error && case $tex_help in
!       *file-line-error*) cmd="$cmd --file-line-error";;
!     esac
!   fi
  
    # Tell TeX to be batch if requested.
    if $batch; then
***************
*** 1133,1138 ****
--- 1139,1145 ----
        ;;
      -l | --lang | --language) shift; set_language=$1;;
      --mostly-clean) action=mostly-clean;;
+     --no-line-error) no_line_error=true;;
      -o | --out  | --output)
        shift
        # Make it absolute, just in case we also have --clean, or whatever.
P ChangeLog
P util/texi2dvi