[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Mon Mar 7 12:22:01 EST 2005)
From: |
Karl Berry |
Subject: |
texinfo update (Mon Mar 7 12:22:01 EST 2005) |
Date: |
Mon, 07 Mar 2005 12:22:54 -0500 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.472
retrieving revision 1.473
diff -c -r1.472 -r1.473
*** ChangeLog 5 Mar 2005 22:35:06 -0000 1.472
--- ChangeLog 7 Mar 2005 16:57:53 -0000 1.473
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-03-07 Akim Demaille <address@hidden>
+
+ * util/texi2dvi: Fix -o when -c is not passed.
+ Don't make thumbpdf failures fatal.
+
2005-03-05 Karl Berry <address@hidden>
* doc/texinfo.txi (General Index): Rename from Concept Index.
Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** util/texi2dvi 28 Feb 2005 13:41:03 -0000 1.47
--- util/texi2dvi 7 Mar 2005 16:57:54 -0000 1.48
***************
*** 1,6 ****
#! /bin/sh
# texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
! # $Id: texi2dvi,v 1.47 2005/02/28 13:41:03 kasal 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.48 2005/03/07 16:57:54 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.47 $'
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.48 $'
rcs_version=`set - $rcs_revision; echo $2`
program=`echo $0 | sed -e 's!.*/!!'`
version="texi2dvi (GNU Texinfo 4.8) $rcs_version
***************
*** 818,847 ****
&& grep 'thumbpdf\.sty' "$filename_noext.log" >&6 2>&1; \
then
verbose "Running $thumbpdf $filename_noext ..."
! $thumbpdf "$filename_noext" >&5 ||
! fatal 1 "$thumbpdf exited with bad status, quitting."
! run_tex
fi
! # If we were in clean mode, compilation was in a tmp directory.
! # Copy the DVI (or PDF) file into the directory where the compilation
! # has been done. (The temp dir is about to get removed anyway.)
! # We also return to the original directory so that
! # - the next file is processed in correct conditions
! # - the temporary file can be removed
! if test -n "$clean"; then
! if test -n "$oname"; then
! dest=$oname
! else
! dest=$orig_pwd
! fi
verbose "Copying $oformat file from `pwd` to $dest"
cp -p "./$filename_noext.$oformat" "$dest"
- cd / # in case $orig_pwd is on a different drive (for DOS)
- cd $orig_pwd || exit 1
fi
# Remove temporary files.
if test "x$debug" = "x"; then
verbose "Removing $tmpdir_src $tmpdir_xtr $tmpdir_bak ..."
--- 818,854 ----
&& grep 'thumbpdf\.sty' "$filename_noext.log" >&6 2>&1; \
then
verbose "Running $thumbpdf $filename_noext ..."
! if $thumbpdf "$filename_noext" >&5; then
! run_tex
! else
! report "$thumbpdf exited with bad status." \
! "Ignoring its output."
! fi
fi
+ # Honor the actual output destination.
+ case $clean:$oname in
+ :) dest=;;
+
+ t:) # If we were in clean mode, compilation was in a tmp
+ # directory. Copy the DVI (or PDF) file into the directory
+ # where the compilation has been done. (The temp dir is
+ # about to get removed anyway.)
+ dest=$orig_pwd;;
! *:*) dest=$oname;;
! esac
! if test -n "$dest"; then
verbose "Copying $oformat file from `pwd` to $dest"
cp -p "./$filename_noext.$oformat" "$dest"
fi
+ # Return to the original directory so that
+ # - the next file is processed in correct conditions
+ # - the temporary file can be removed
+ cd / # in case $orig_pwd is on a different drive (for DOS)
+ cd $orig_pwd || exit 1
+
# Remove temporary files.
if test "x$debug" = "x"; then
verbose "Removing $tmpdir_src $tmpdir_xtr $tmpdir_bak ..."
P ChangeLog
P util/texi2dvi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Mon Mar 7 12:22:01 EST 2005),
Karl Berry <=