texinfo update (Mon Dec 19 12:22:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.547
retrieving revision 1.548
diff -c -r1.547 -r1.548
*** ChangeLog   18 Nov 2005 12:58:50 -0000      1.547
--- ChangeLog   19 Dec 2005 16:59:37 -0000      1.548
***************
*** 1,3 ****
--- 1,13 ----
+ 2005-12-19  Akim Demaille  <address@hidden>
+ 
+       * util/texi2dvi (run_conversion): Rename as...
+       (run_core_conversion): this.
+       (compile): New.
+       This is the former main program.
+       (clean): New.
+       Use it.
+       (language): Compute it in the main loop.
+ 
  2005-11-18  Akim Demaille  <address@hidden>
  
        Factor the handling of list of directories.
Index: doc/texi2dvi.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.43
retrieving revision 1.44
diff -c -r1.43 -r1.44
*** doc/texi2dvi.1      12 Dec 2005 13:57:44 -0000      1.43
--- doc/texi2dvi.1      19 Dec 2005 16:58:52 -0000      1.44
***************
*** 1,4 ****
! .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
  .TH TEXI2DVI "1" "December 2005" "texi2dvi 1.67" "User Commands"
  .SH NAME
  texi2dvi \- convert Texinfo documents to DVI
--- 1,4 ----
! .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
  .TH TEXI2DVI "1" "December 2005" "texi2dvi 1.67" "User Commands"
  .SH NAME
  texi2dvi \- convert Texinfo documents to DVI
***************
*** 77,83 ****
  .SS "Build modes:"
  .TP
  \fB\-\-build\fR=\fIMODE\fR
! specify the treatment of auxiliary files [local]
  .TP
  \fB\-\-tidy\fR
  same as \fB\-\-build\fR=\fItidy\fR
--- 77,83 ----
  .SS "Build modes:"
  .TP
  \fB\-\-build\fR=\fIMODE\fR
! specify the treatment of auxiliary files [tidy]
  .TP
  \fB\-\-tidy\fR
  same as \fB\-\-build\fR=\fItidy\fR
***************
*** 88,94 ****
  \fB\-\-build\-dir\fR=\fIDIR\fR
  specify where the tidy compilation is performed.
  implies \fB\-\-tidy\fR
! defaults to TEXI2DVI_BUILD_DIRECTORY [.]
  .PP
  The MODE specifies where the TeX compilation takes place, and, as a
  consequence, how auxiliary files are treated.  The build mode
--- 88,94 ----
  \fB\-\-build\-dir\fR=\fIDIR\fR
  specify where the tidy compilation is performed.
  implies \fB\-\-tidy\fR
! defaults to TEXI2DVI_BUILD_DIRECTORY [/tmp/akim.t2d]
  .PP
  The MODE specifies where the TeX compilation takes place, and, as a
  consequence, how auxiliary files are treated.  The build mode
***************
*** 120,126 ****
  .IP
  \- clutter can be reduced to zero using \fB\-\-build\-dir=\fR/tmp/$USER.t2d or
  .HP
! \fB\-\-build\-dir=\fR/u/karl/.t2d.
  .IP
  \- the output file is updated after every succesful TeX run, for
  .TP
--- 120,126 ----
  .IP
  \- clutter can be reduced to zero using \fB\-\-build\-dir=\fR/tmp/$USER.t2d or
  .HP
! \fB\-\-build\-dir=\fR/home/akim/.t2d.
  .IP
  \- the output file is updated after every succesful TeX run, for
  .TP
Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.67
retrieving revision 1.68
diff -c -r1.67 -r1.68
*** util/texi2dvi       18 Nov 2005 12:58:50 -0000      1.67
--- util/texi2dvi       19 Dec 2005 16:58:52 -0000      1.68
***************
*** 1,6 ****
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi,v 1.67 2005/11/18 12:58:50 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.68 2005/12/19 16:58:52 akim 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.67 $'
  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.68 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
***************
*** 349,355 ****
    done
    set X $ld_res; shift
    eval $ld_l=\"address@hidden"
-   eval echo $ld_l=\$$ld_l
  }
  
  ## ------------------------- ##
--- 349,354 ----
***************
*** 951,960 ****
  }
  
  
! # run_conversion ()
! # -----------------
  # Run the TeX tools until a fix point is reached.
! run_conversion ()
  {
    # Move to the working directory.
    if $tidy; then
--- 950,959 ----
  }
  
  
! # run_core_conversion ()
! # ----------------------
  # Run the TeX tools until a fix point is reached.
! run_core_conversion ()
  {
    # Move to the working directory.
    if $tidy; then
***************
*** 976,981 ****
--- 975,1051 ----
    cd "$orig_pwd" || exit 1
  }
  
+ 
+ # compile ()
+ # ----------
+ # Run the full compilation chain, from pre-processing to installation
+ # of the output at its expected location.
+ compile ()
+ {
+   # Source file might include additional sources.
+   # We want `.:$orig_pwd' before anything else.  (We'll add `.:' later
+   # after all other directories have been turned into absolute paths.)
+   # `.' goes first to ensure that any old .aux, .cps,
+   # etc. files in ${directory} don't get used in preference to fresher
+   # files in `.'.  Include orig_pwd in case we are in clean build mode, where
+   # we've cd'd to a temp directory.
+   txincludes=`list_infix includes $path_sep`
+   common="$orig_pwd$path_sep$in_dir$path_sep$txincludes$path_sep"
+   for var in $tex_envvars; do
+     eval val="\$common\$${var}_orig"
+     # Convert relative paths to absolute paths, so we can run in another
+     # directory (e.g., in clean build mode, or during the macro-support
+     # detection).
+     val=`absolute_filenames "$val"`
+     eval $var="$val"
+     eval export $var
+     eval verbose "$var=\'\$${var}\'"
+   done
+ 
+   # --expand
+   run_makeinfo
+ 
+   # --command, --texinfo
+   insert_commands
+ 
+   # --recode
+   run_recode
+ 
+   # Run until a fix point is reached.
+   run_core_conversion
+ }
+ 
+ 
+ # clean ()
+ # --------
+ # Remove auxiliary files.
+ clean ()
+ {
+   # In case $orig_pwd is on a different drive (for DOS).
+   cd /
+ 
+   # Return to the original directory so that
+   # - the next file is processed in correct conditions
+   # - the temporary file can be removed
+   cd "$orig_pwd" || exit 1
+ 
+   if $tidy; then
+     # Simply remove the build dir.
+     verbose "Removing $t2ddir"
+     rm -rf "$t2ddir"
+   else
+     # Find the auxiliary files, and remove them.
+     local log=$work_build/$in_noext.log
+     if test -f "$log"; then
+       local aux=$(sed -n "s,^\\\\openout.* = 
\`\\(.*\\)'\\.,$work_build/\\1,p" "$log")
+       cp $work_build/$in_noext.log /tmp
+       echo rm $aux
+     fi
+   fi
+ }
+ 
+ 
+ 
  ## ---------------------- ##
  ## Command line parsing.  ##
  ## ---------------------- ##
***************
*** 1225,1230 ****
--- 1295,1303 ----
  
    input_file_name_decode
  
+   # `texinfo' or `latex'?
+   language=`compute_language $command_line_filename`
+ 
    # An auxiliary directory used for all the auxiliary tasks involved
    # in compiling this document.
    case $build_dir in
***************
*** 1235,1241 ****
    esac
    # Remove it at exit if clean mode.
    $clean &&
!     trap "cd / && rm -rf $t2ddir" 0 1 2 15
  
    ensure_dir "$build_dir" "$t2ddir"
  
--- 1308,1314 ----
    esac
    # Remove it at exit if clean mode.
    $clean &&
!     trap "clean" 0 1 2 15
  
    ensure_dir "$build_dir" "$t2ddir"
  
***************
*** 1261,1306 ****
    # Make those directories.
    ensure_dir "$work_build" "$work_bak"
  
!   # Source file might include additional sources.
!   # We want `.:$orig_pwd' before anything else.  (We'll add `.:' later
!   # after all other directories have been turned into absolute paths.)
!   # `.' goes first to ensure that any old .aux, .cps,
!   # etc. files in ${directory} don't get used in preference to fresher
!   # files in `.'.  Include orig_pwd in case we are in clean build mode, where
!   # we've cd'd to a temp directory.
!   txincludes=`list_infix includes $path_sep`
!   common="$orig_pwd$path_sep$in_dir$path_sep$txincludes$path_sep"
!   for var in $tex_envvars; do
!     eval val="\$common\$${var}_orig"
!     # Convert relative paths to absolute paths, so we can run in another
!     # directory (e.g., in clean build mode, or during the macro-support
!     # detection).
!     val=`absolute_filenames "$val"`
!     eval $var="$val"
!     eval export $var
!     eval verbose "$var=\'\$${var}\'"
!   done
! 
!   # `texinfo' or `latex'?
!   language=`compute_language $command_line_filename`
! 
!   # --expand
!   run_makeinfo
! 
!   # --command, --texinfo
!   insert_commands
! 
!   # --recode
!   run_recode
! 
!   # Run until a fix point is reached.
!   run_conversion
  
    # Remove temporary files.
!   if $clean; then
!     verbose "Removing $t2ddir"
!     rm -rf "$t2ddir"
!   fi
  done
  
  verbose "done."
--- 1334,1344 ----
    # Make those directories.
    ensure_dir "$work_build" "$work_bak"
  
!   # Compile the document.
!   compile
  
    # Remove temporary files.
!   $clean && clean
  done
  
  verbose "done."
P ChangeLog
P doc/texi2dvi.1
P util/texi2dvi