texinfo update (Fri Jun 24 11:52:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.512
retrieving revision 1.513
diff -c -r1.512 -r1.513
*** ChangeLog   24 Jun 2005 13:01:36 -0000      1.512
--- ChangeLog   24 Jun 2005 15:25:41 -0000      1.513
***************
*** 1,5 ****
--- 1,8 ----
  2005-06-24  Akim Demaille  <address@hidden>
  
+       * util/texi2dvi: Move the computation of $makeinfo to...
+       (run_makeinfo): here.
+ 
        * util/texi2dvi (tex, bibtex, texindex): Move their computation to...
        (run_tex, run_bibtex, run_texindex): here, to clarify.
        (move_to_dest): New.
Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.56
retrieving revision 1.57
diff -c -r1.56 -r1.57
*** util/texi2dvi       24 Jun 2005 13:01:37 -0000      1.56
--- util/texi2dvi       24 Jun 2005 15:25:41 -0000      1.57
***************
*** 1,6 ****
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
! # $Id: texi2dvi,v 1.56 2005/06/24 13:01:37 karl 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 LaTeX) sources.
! # $Id: texi2dvi,v 1.57 2005/06/24 15:25:41 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.56 $'
  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.57 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
***************
*** 529,554 ****
  # main info output, the user asked to run TeX, not makeinfo.
  run_makeinfo ()
  {
!   if test -n "$makeinfo"; then
!     # filename_src: the file with macros expanded.
!     # Use the same basename to generate the same aux file names.
!     work_src=$workdir/src
!     ensure_dir "$work_src"
!     filename_src=$work_src/$filename_noext.$ext
! 
!     verbose "Macro-expanding $command_line_filename to $filename_src ..."
!     sed "$comment_iftex" "$command_line_filename" \
!       | $makeinfo --footnote-style=end -I "$filename_dir" $miincludes \
!         -o /dev/null --macro-expand=- \
!       | sed "$uncomment_iftex" >"$filename_src"
!     # Continue only if everything succeeded.
!     if test $? -ne 0 \
!        || test ! -r "$filename_src"; then
!       verbose "Expansion failed, ignored...";
      else
!       filename_input=$filename_src
      fi
!   fi
  }
  
  # insert_commands ()
--- 529,594 ----
  # main info output, the user asked to run TeX, not makeinfo.
  run_makeinfo ()
  {
!   case $language in
!   texinfo)
!     # Unless required by the user, makeinfo expansion is wanted only
!     # if texinfo.tex is too old.
!     if test "$expand" = t; then
!       makeinfo=${MAKEINFO:-makeinfo}
      else
!       # Check if texinfo.tex performs macro expansion by looking for
!       # its version.  The version is a date of the form YEAR-MO-DA.
!       # We don't need to use [0-9] to match the digits since anyway
!       # the comparison with $txiprereq, a number, will fail with non
!       # digits.
!       # Run in a temporary directory to avoid leaving files.
!       version_test_dir=$t2ddir/version_test
!       ensure_dir $version_test_dir
!       (
!          cd $version_test_dir
!          echo '\input texinfo.tex @bye' >txiversion.tex
!          # Be sure that if tex wants to fail, it is not interactive:
!          # close stdin.
!          tex txiversion.tex </dev/null >txiversion.out 2>txiversion.err
!       )
!       if test $? != 0; then
!         cat $version_test_dir/txiversion.out
!         cat $version_test_dir/txiversion.err >&2
!         fatal 1 "texinfo.tex appears to be broken, quitting."
!       fi
!       eval `sed -n 's/^.*\[\(.*\)version 
\(....\)-\(..\)-\(..\).*$/txiformat=\1 txiversion="\2\3\4"/p' 
$version_test_dir/txiversion.out`
!       verbose "texinfo.tex preloaded as \`$txiformat', version is 
\`$txiversion' ..."
!       if test "$txiprereq" -le "$txiversion" >&6 2>&1; then
!         makeinfo=
!       else
!         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
!       # filename_src: the file with macros expanded.
!       # Use the same basename to generate the same aux file names.
!       work_src=$workdir/src
!       ensure_dir "$work_src"
!       filename_src=$work_src/$filename_noext.$ext
! 
!       verbose "Macro-expanding $command_line_filename to $filename_src ..."
!       sed "$comment_iftex" "$command_line_filename" \
!         | $makeinfo --footnote-style=end -I "$filename_dir" $miincludes \
!           -o /dev/null --macro-expand=- \
!         | sed "$uncomment_iftex" >"$filename_src"
!       # Continue only if everything succeeded.
!       if test $? -ne 0 \
!          || test ! -r "$filename_src"; then
!         verbose "Expansion failed, ignored...";
!       else
!         filename_input=$filename_src
!       fi
!     fi
!     ;;
!   esac
  }
  
  # insert_commands ()
***************
*** 865,871 ****
        # Assume a LaTeX file.  LaTeX needs bibtex and uses latex for
        # compilation.  No makeinfo.
        language=latex
-       makeinfo= # no point in running makeinfo on latex source.
        textra_cmd=1i
        ;;
  
--- 905,910 ----
***************
*** 873,913 ****
        # Assume a Texinfo file.
        language=texinfo
        textra_cmd='/address@hidden/a'
-       # Unless required by the user, makeinfo expansion is wanted only
-       # if texinfo.tex is too old.
-       if test "$expand" = t; then
-         makeinfo=${MAKEINFO:-makeinfo}
-       else
-         # Check if texinfo.tex performs macro expansion by looking for
-         # its version.  The version is a date of the form YEAR-MO-DA.
-         # We don't need to use [0-9] to match the digits since anyway
-         # the comparison with $txiprereq, a number, will fail with non
-         # digits.
-         # Run in a temporary directory to avoid leaving files.
-       version_test_dir=$t2ddir/version_test
-       ensure_dir $version_test_dir
-       (
-            cd $version_test_dir
-          echo '\input texinfo.tex @bye' >txiversion.tex
-          # Be sure that if tex wants to fail, it is not interactive:
-          # close stdin.
-            $tex txiversion.tex </dev/null >txiversion.out 2>txiversion.err
-       )
-       if test $? != 0; then
-         cat $version_test_dir/txiversion.out
-         cat $version_test_dir/txiversion.err >&2
-         fatal 1 "texinfo.tex appears to be broken, quitting."
-         fi
-       eval `sed -n 's/^.*\[\(.*\)version 
\(....\)-\(..\)-\(..\).*$/txiformat=\1 txiversion="\2\3\4"/p' 
$version_test_dir/txiversion.out`
-         verbose "texinfo.tex preloaded as \`$txiformat', version is 
\`$txiversion' ..."
-         if test "$txiprereq" -le "$txiversion" >&6 2>&1; then
-           makeinfo=
-         else
-           makeinfo=${MAKEINFO:-makeinfo}
-         fi
-         # As long as we had to run TeX, offer the user this convenience:
-         test "$txiformat" = Texinfo && escape=@
-       fi
        ;;
    esac
  
--- 912,917 ----
P ChangeLog
P util/texi2dvi