bug-texinfo
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: texi2dvi: use texindy if available


From: Akim Demaille
Subject: FYI: texi2dvi: use texindy if available
Date: Wed, 15 Apr 2009 17:26:07 +0200
User-agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.95 (gnu/linux)

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        texi2dvi: use texindy if available.
        * bin/texi2dvi (run_index): Use texindy if available.

Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.150
diff -u -u -r1.150 texi2dvi
--- util/texi2dvi 15 Apr 2009 15:15:33 -0000 1.150
+++ util/texi2dvi 15 Apr 2009 15:25:07 -0000
@@ -1087,18 +1087,19 @@
 
 # run_index ()
 # ------------
-# Run texindex (or makeindex) on current index files.  If they already
-# exist, and after running TeX a first time the index files don't
-# change, then there's no reason to run TeX again.  But we won't know
-# that if the index files are out of date or nonexistent.
+# Run texindex (or makeindex or texindy) on current index files.  If
+# they already exist, and after running TeX a first time the index
+# files don't change, then there's no reason to run TeX again.  But we
+# won't know that if the index files are out of date or nonexistent.
 run_index ()
 {
   local index_files=`generated_files_get $in_noext index_file_p`
   test -n "$index_files" ||
     return 0
 
-  local makeindex=${MAKEINDEX:-makeindex}
-  local texindex=${TEXINDEX:-texindex}
+  : ${MAKEINDEX:=makeindex}
+  : ${TEXINDEX:=texindex}
+  : ${TEXINDY:=texindy}
 
   local index_file
   local index_noext
@@ -1110,16 +1111,20 @@
         run tex \
             '\def\filename{{'"$index_noext"'}{idx}{4dx}{ind}}
              \input idxmake.4ht'
-        run $makeindex -o $index_noext.ind $index_noext.4dx
+        run $MAKEINDEX -o $index_noext.ind $index_noext.4dx
       done
       ;;
 
     latex:*)
-      run $makeindex $index_files
+      if $TEXINDY --version >&6 2>&1; then
+        run $TEXINDY $index_files
+      else
+        run $MAKEINDEX $index_files
+      fi
       ;;
 
     texinfo:*)
-      run $texindex $index_files
+      run $TEXINDEX $index_files
       ;;
   esac
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]