[6644] warning for fl index

[Gavin D. Smith]

Revision: 6644
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6644
Author:   gavin
Date:     2015-09-24 10:17:45 +0000 (Thu, 24 Sep 2015)
Log Message:
-----------
warning for fl index

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/util/texi2dvi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-09-23 17:18:44 UTC (rev 6643)
+++ trunk/ChangeLog     2015-09-24 10:17:45 UTC (rev 6644)
@@ -1,5 +1,12 @@
 2015-09-23  Gavin Smith  <address@hidden>
 
+       * util/texi2dvi (generated_files_get): Print a warning if the
+       filename recorder is used along with an index file with an "fl"
+       extension.
+       (input_file_name_decode): Comment tweaked.
+
+2015-09-23  Gavin Smith  <address@hidden>
+
        * util/texi2dvi (comment_iftex, uncomment_iftex): Move in file 
        closer to where they are used.
 

Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2015-09-23 17:18:44 UTC (rev 6643)
+++ trunk/util/texi2dvi 2015-09-24 10:17:45 UTC (rev 6644)
@@ -709,6 +709,14 @@
 generated_files_get ()
 {
   $generated_files_get_method "$in_noext"
+  if test $generated_files_get_method = generated_files_get_from_fls; then
+    if test -r "$in_noext.fl"; then
+      report 'WARNING!!  The fl index may typeset as garbage!' # goes to stderr
+      report 'Try upgrading your version of texinfo.tex, or else try setting'
+      report 'the environment variable TEXI2DVI_USE_RECORDER to '\''no'\''.'
+report 'Once you'\''ve done that, delete the file with an '\''fl'\'' 
extension.'
+    fi
+  fi
 }
 
 
@@ -1640,19 +1648,23 @@
 }
 
 
-#  input_file_name_decode - Decode COMMAND_LINE_FILENAME, and compute:
-# - COMMAND_LINE_FILENAME clean of TeX commands
+#  input_file_name_decode - Decode COMMAND_LINE_FILENAME, and set the
+# following shell variables:
+#
+# - COMMAND_LINE_FILENAME
+#   The filename given on the commmand line, but cleaned of TeX commands.
 # - IN_DIR
-#   The directory to the input file, possibly absolute if needed.
+#   The directory containing the input file, possibly absolute if needed.
 # - IN_DIR_ABS
 #   The absolute directory of the input file.
 # - IN_BASE
 #   The input file base name (no directory part).
 # - IN_NOEXT
-#   The input file name without extensions (nor directory part).
+#   The input file name with neither file extensions nor directory part.
 # - IN_INPUT
-#   Defaults to COMMAND_LINE_FILENAME, but might change if the
-#   input is preprocessed.  With directory, possibly absolute.
+#   The path to the input file for passing as a command-line argument
+#   to TeX.  Defaults to COMMAND_LINE_FILENAME, but might change if the
+#   input is preprocessed.
 input_file_name_decode ()
 {
   # See if we are run from within AUC-Tex, in which case we are