texinfo ChangeLog NEWS util/texi2dvi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       09/10/26 21:52:24

Modified files:
        .              : ChangeLog NEWS 
        util           : texi2dvi 

Log message:
        texi2dvi --max-iterations, from Roland Kaufmann, 26 Oct 2009 14:22:39

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1017&r2=1.1018
http://cvs.savannah.gnu.org/viewcvs/texinfo/NEWS?cvsroot=texinfo&r1=1.191&r2=1.192
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texi2dvi?cvsroot=texinfo&r1=1.153&r2=1.154

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1017
retrieving revision 1.1018
diff -u -b -r1.1017 -r1.1018
--- ChangeLog   25 Oct 2009 23:30:42 -0000      1.1017
+++ ChangeLog   26 Oct 2009 21:52:23 -0000      1.1018
@@ -1,3 +1,7 @@
+2009-10-26  Roland Kaufmann  <address@hidden>  (tiny change)
+
+       * util/texi2dvi (max-iterations): new option.
+
 2009-10-25  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Predefined Indices): insert @findex entries

Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -b -r1.191 -r1.192
--- NEWS        20 Mar 2009 18:33:51 -0000      1.191
+++ NEWS        26 Oct 2009 21:52:23 -0000      1.192
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.191 2009/03/20 18:33:51 karl Exp $
+$Id: NEWS,v 1.192 2009/10/26 21:52:23 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
@@ -32,10 +32,13 @@
 
 * texinfo.tex:
   . support some per-language hyphenation, when the underlying TeX
-    engine does (for instance, etex/pdfetex from TeX Live 2008).  Words
-    with accented letters are still not handled properly.
+    engine does (for instance, etex/pdfetex from TeX Live 2008 or
+    later).  Words with accented letters are still not handled properly.
   . new Icelandic translation: txi-is.tex.
 
+* texi2dvi:
+  . new option --max-iterations.
+  
 * info:
   . INFOPATH is determined by PATH by default, or if an element "PATH"
     is specified.

Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- util/texi2dvi       8 Oct 2009 21:49:30 -0000       1.153
+++ util/texi2dvi       26 Oct 2009 21:52:23 -0000      1.154
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.153 2009/10/08 21:49:30 karl Exp $
+# $Id: texi2dvi,v 1.154 2009/10/26 21:52:23 karl Exp $
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
 # 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -33,7 +33,7 @@
 set -e
 
 # This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.153 $'
+rcs_revision='$Revision: 1.154 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 
@@ -44,16 +44,17 @@
 # Don't use `unset' since old bourne shells don't have this command.
 # Instead, assign them an empty value.
 action=compile
-batch=false     # true for batch mode
+batch=false     # interact normally
 catcode_special=maybe
 debug=false
 escape="\\"
 expand=false    # true for expansion via makeinfo
 includes=
-line_error=true # Pass --file-line-error to TeX.
+line_error=true # pass --file-line-error to TeX
+max_iters=-1    # keep going forever
 oname=          # --output
 out_lang=dvi
-quiet=false     # by default let the tools' message be displayed
+quiet=false     # let the tools' message be displayed
 recode=false
 set_language=
 src_specials=
@@ -353,6 +354,7 @@
                         defaults to TEXI2DVI_BUILD_DIRECTORY [$build_dir]
   --mostly-clean       remove the auxiliary files and directories
                         but not the output
+  --max-iterations=N   don't process files more than N times
 
 The MODE specifies where the TeX compilation takes place, and, as a
 consequence, how auxiliary files are treated.  The build mode
@@ -1220,6 +1222,13 @@
   local cycle=0
 
   while :; do
+    # check for probably LaTeX loop (e.g. varioref)
+    if test $cycle -eq "$max_iters"; then
+      error 0 "Maximum of $max_iters cycles exceeded"
+      break
+    fi
+
+    # report progress
     cycle=`expr $cycle + 1`
     verbose "Cycle $cycle for $command_line_filename"
 
@@ -1674,6 +1683,7 @@
     -l | --lang | --language) shift; set_language=$1;;
     --mostly-clean) action=mostly-clean;;
     --no-line-error) line_error=false;;
+    --max-iterations) shift; max_iters=$1;;
     -o | --out  | --output)
       shift
       # Make it absolute, just in case we also have --clean, or whatever.