texinfo update (Mon Jan 9 04:52:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.555
retrieving revision 1.556
diff -c -r1.555 -r1.556
*** ChangeLog   9 Jan 2006 01:49:25 -0000       1.555
--- ChangeLog   9 Jan 2006 09:49:23 -0000       1.556
***************
*** 1,9 ****
  2006-01-08  Loic Minier  <address@hidden>  (tiny change)
!       
        * info/display.c (display_update_one_window): systematize
        check as to whether `entry' is non-null before referring to it.
        Still some segfaults when resizing the window rapidly.
!       
  2006-01-08  Karl Berry  <address@hidden>
  
        * doc/texinfo.tex (\normalturnoffactive): restore setting of
--- 1,17 ----
+ 2006-01-09  Akim Demaille  <address@hidden>
+ 
+       * util/texi2dvi: set -e.
+       Stop using the idiom "test && action" in favor of "if test; then
+       action; fi".
+       (xref_files_save): Use tar instead of cp.
+       (run_makeinfo): Fix a "local" use.
+ 
  2006-01-08  Loic Minier  <address@hidden>  (tiny change)
! 
        * info/display.c (display_update_one_window): systematize
        check as to whether `entry' is non-null before referring to it.
        Still some segfaults when resizing the window rapidly.
! 
  2006-01-08  Karl Berry  <address@hidden>
  
        * doc/texinfo.tex (\normalturnoffactive): restore setting of
Index: doc/texi2dvi.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.45
retrieving revision 1.46
diff -c -r1.45 -r1.46
*** doc/texi2dvi.1      22 Dec 2005 15:15:30 -0000      1.45
--- doc/texi2dvi.1      9 Jan 2006 09:49:23 -0000       1.46
***************
*** 1,5 ****
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
! .TH TEXI2DVI "1" "December 2005" "texi2dvi 1.68" "User Commands"
  .SH NAME
  texi2dvi \- convert Texinfo documents to DVI
  .SH SYNOPSIS
--- 1,5 ----
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
! .TH TEXI2DVI "1" "January 2006" "texi2dvi 1.70" "User Commands"
  .SH NAME
  texi2dvi \- convert Texinfo documents to DVI
  .SH SYNOPSIS
***************
*** 23,29 ****
  .PP
  Makeinfo is used to perform Texinfo macro expansion before running TeX
  when needed.
! .SS "Operation modes:"
  .TP
  \fB\-b\fR, \fB\-\-batch\fR
  no interaction
--- 23,29 ----
  .PP
  Makeinfo is used to perform Texinfo macro expansion before running TeX
  when needed.
! .SS "General options:"
  .TP
  \fB\-b\fR, \fB\-\-batch\fR
  no interaction
***************
*** 33,42 ****
  .TP
  \fB\-h\fR, \fB\-\-help\fR
  display this help and exit successfully
  .TP
  \fB\-o\fR, \fB\-\-output\fR=\fIOFILE\fR
  leave output in OFILE (implies \fB\-\-clean\fR);
! Only one input FILE may be specified in this case
  .TP
  \fB\-q\fR, \fB\-\-quiet\fR
  no output unless errors (implies \fB\-\-batch\fR)
--- 33,44 ----
  .TP
  \fB\-h\fR, \fB\-\-help\fR
  display this help and exit successfully
+ .HP
+ \fB\-\-no\-line\-error\fR do not pass \fB\-\-file\-line\-error\fR to TeX
  .TP
  \fB\-o\fR, \fB\-\-output\fR=\fIOFILE\fR
  leave output in OFILE (implies \fB\-\-clean\fR);
! only one input FILE may be specified in this case
  .TP
  \fB\-q\fR, \fB\-\-quiet\fR
  no output unless errors (implies \fB\-\-batch\fR)
Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** doc/version.texi    22 Dec 2005 15:15:30 -0000      1.34
--- doc/version.texi    9 Jan 2006 09:49:23 -0000       1.35
***************
*** 1,4 ****
! @set UPDATED 22 December 2005
! @set UPDATED-MONTH December 2005
  @set EDITION 4.8
  @set VERSION 4.8
--- 1,4 ----
! @set UPDATED 2 January 2006
! @set UPDATED-MONTH January 2006
  @set EDITION 4.8
  @set VERSION 4.8
Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.70
retrieving revision 1.71
diff -c -r1.70 -r1.71
*** util/texi2dvi       25 Dec 2005 19:13:56 -0000      1.70
--- util/texi2dvi       9 Jan 2006 09:49:23 -0000       1.71
***************
*** 1,9 ****
  #! /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.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,9 ----
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi,v 1.71 2006/01/09 09:49:23 akim Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
! # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 31,38 ****
    && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
  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
--- 31,41 ----
    && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
  unset RUNNING_KSH
  
+ # No failure shall remain unpunished.
+ set -e
+ 
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.71 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
***************
*** 275,281 ****
  # Report some verbose information.
  verbose ()
  {
!   $verb && echo >&2 "$0: $@"
  }
  
  # fatal EXIT_STATUS LINE1 LINE2...
--- 278,286 ----
  # Report some verbose information.
  verbose ()
  {
!   if $verb; then
!     echo >&2 "$0: $@"
!   fi
  }
  
  # fatal EXIT_STATUS LINE1 LINE2...
***************
*** 409,415 ****
          res=$res$path_sep
          ;;
        *)
!         test -d $dir && res=$res$path_sep`absolute "$dir"`
          ;;
      esac
    done
--- 414,422 ----
          res=$res$path_sep
          ;;
        *)
!         if test -d $dir; then
!         res=$res$path_sep`absolute "$dir"`
!       fi
          ;;
      esac
    done
***************
*** 521,527 ****
      case $language in
        (texinfo)
          # texindex: texinfo.cp -> texinfo.cps
!       index_file_p $file && echo ${file}s
        ;;
        (latex)
        # bibtex: *.aux -> *.bbl and *.blg.
--- 528,536 ----
      case $language in
        (texinfo)
          # texindex: texinfo.cp -> texinfo.cps
!       if index_file_p $file; then
!         echo ${file}s
!       fi
        ;;
        (latex)
        # bibtex: *.aux -> *.bbl and *.blg.
***************
*** 551,557 ****
    xref_files_orig=`generated_files_get "$in_noext" xref_file_p`
    if test -n "$xref_files_orig"; then
      verbose "Backing up xref files: $xref_files_orig"
!     cp $xref_files_orig "$work_bak"
    fi
  }
  
--- 560,569 ----
    xref_files_orig=`generated_files_get "$in_noext" xref_file_p`
    if test -n "$xref_files_orig"; then
      verbose "Backing up xref files: $xref_files_orig"
!     # The following line improves `cp $xref_files_orig "$work_bak"'
!     # by preserving the directory parts.  Think of
!     # cp chap1/main.aux chap2/main.aux $work_bak.
!     tar cf - $xref_files_orig | (cd "$work_bak" && tar xf -)
    fi
  }
  
***************
*** 566,581 ****
    # subdirs, since texi2dvi does not try to compare xref files in
    # subdirs.  Performing xref files test is still good since LaTeX
    # does not report changes in xref files.
!   grep "Rerun to get" "$in_noext.log" >&6 2>&1 &&
      return 0
  
    # If old and new lists don't at least have the same file list,
    # then one file or another has definitely changed.
    xref_files_new=`generated_files_get "$in_noext" xref_file_p`
    verbose "Original xref files = $xref_files_orig"
    verbose "New xref files      = $xref_files_new"
!   test "x$xref_files_orig" != "x$xref_files_new" &&
      return 0
  
    # Compare each file until we find a difference.
    for this_file in $xref_files_new; do
--- 578,595 ----
    # subdirs, since texi2dvi does not try to compare xref files in
    # subdirs.  Performing xref files test is still good since LaTeX
    # does not report changes in xref files.
!   if grep "Rerun to get" "$in_noext.log" >&6 2>&1; then
      return 0
+   fi
  
    # If old and new lists don't at least have the same file list,
    # then one file or another has definitely changed.
    xref_files_new=`generated_files_get "$in_noext" xref_file_p`
    verbose "Original xref files = $xref_files_orig"
    verbose "New xref files      = $xref_files_new"
!   if test "x$xref_files_orig" != "x$xref_files_new"; then
      return 0
+   fi
  
    # Compare each file until we find a difference.
    for this_file in $xref_files_new; do
***************
*** 583,589 ****
      # cmp -s returns nonzero exit status if files differ.
      if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
        verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
!       $debug && diff -u "$work_bak/$this_file" "$this_file"
        return 0
      fi
    done
--- 597,605 ----
      # cmp -s returns nonzero exit status if files differ.
      if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
        verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
!       if $debug; then
!       diff -u "$work_bak/$this_file" "$this_file"
!       fi
        return 0
      fi
    done
***************
*** 645,652 ****
    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
  
--- 661,668 ----
    if $no_line_error; then :; else
      # The mk program and perhaps others want to parse TeX's
      # original error messages.
!     case $line_error:$tex_help in
!       true:*file-line-error*) cmd="$cmd --file-line-error";;
      esac
    fi
  
***************
*** 727,734 ****
           (grep '^\\bibstyle[{]' "$f"   \
            && grep '^\\bibdata[{]' "$f" \
          ## The following line is suspicious: fails when there
!         ## are citations in sub aux files.  We need to be
!         ## smarter in this case.
            ## && grep '^\\citation[{]' "$f"
          ) >&6 2>&1; then
          verbose "Running $bibtex $f ..."
--- 743,750 ----
           (grep '^\\bibstyle[{]' "$f"   \
            && grep '^\\bibdata[{]' "$f" \
          ## The following line is suspicious: fails when there
!           ## are citations in sub aux files.  We need to be
!           ## smarter in this case.
            ## && grep '^\\citation[{]' "$f"
          ) >&6 2>&1; then
          verbose "Running $bibtex $f ..."
***************
*** 888,894 ****
          makeinfo=${MAKEINFO:-makeinfo}
        fi
        # As long as we had to run TeX, offer the user this convenience:
!       test "$txiformat" = Texinfo && escape=@
      fi
  
      if test -n "$makeinfo"; then
--- 904,912 ----
          makeinfo=${MAKEINFO:-makeinfo}
        fi
        # As long as we had to run TeX, offer the user this convenience:
!       if test "$txiformat" = Texinfo; then
!       escape=@
!       fi
      fi
  
      if test -n "$makeinfo"; then
***************
*** 897,903 ****
        work_src=$workdir/src
        ensure_dir "$work_src"
        in_src=$work_src/$in_base
!       local $miincludes=`list_prefix includes -I`
        verbose "Macro-expanding $command_line_filename to $in_src ..."
        sed "$comment_iftex" "$command_line_filename" \
          | $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
--- 915,921 ----
        work_src=$workdir/src
        ensure_dir "$work_src"
        in_src=$work_src/$in_base
!       local miincludes=`list_prefix includes -I`
        verbose "Macro-expanding $command_line_filename to $in_src ..."
        sed "$comment_iftex" "$command_line_filename" \
          | $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
***************
*** 1308,1314 ****
    in_dir=`func_dirname "$command_line_filename"`
    in_dir_abs=`absolute "$in_dir"`
    # In a clean build, we `cd', so get an absolute file name.
!   $tidy && in_dir=$in_dir_abs
  
    # Strip directory part but leave extension.
    in_base=`basename "$command_line_filename"`
--- 1326,1334 ----
    in_dir=`func_dirname "$command_line_filename"`
    in_dir_abs=`absolute "$in_dir"`
    # In a clean build, we `cd', so get an absolute file name.
!   if $tidy; then
!     in_dir=$in_dir_abs
!   fi
  
    # Strip directory part but leave extension.
    in_base=`basename "$command_line_filename"`
***************
*** 1357,1364 ****
               sed 's,/,!,g'`
    esac
    # Remove it at exit if clean mode.
!   $clean &&
      trap "mostly_clean" 0 1 2 15
  
    ensure_dir "$build_dir" "$t2ddir"
  
--- 1377,1385 ----
               sed 's,/,!,g'`
    esac
    # Remove it at exit if clean mode.
!   if $clean; then
      trap "mostly_clean" 0 1 2 15
+   fi
  
    ensure_dir "$build_dir" "$t2ddir"
  
***************
*** 1389,1395 ****
        # Compile the document.
        compile
        # Remove temporary files.
!       $clean && mostly_clean
        ;;
  
      mostly-clean)
--- 1410,1418 ----
        # Compile the document.
        compile
        # Remove temporary files.
!       if $clean; then
!       mostly_clean
!       fi
        ;;
  
      mostly-clean)
P ChangeLog
P doc/texi2dvi.1
P doc/version.texi
P util/texi2dvi