New version number.

(reftex-parse-file-extionsion,reftex-index-phrase-file-extension): New options

11 files changed, 52 insertions, 38 deletions

diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el
index 27c4d19a096..e4d6bb5b664 100644
--- a/lisp/textmodes/reftex-auc.el
+++ b/lisp/textmodes/reftex-auc.el
@@ -1,9 +1,9 @@
 ;;; reftex-auc.el - RefTeX's interface to AUC TeX
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
-;; Keywords:   tex
+;; Version: 4.10
+;;
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 9d8ecc2692f..c4cd677db84 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -1,9 +1,9 @@
 ;;; reftex-cite.el - Creating citations with RefTeX
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
-;; Keywords:   tex
+;; Version: 4.10
+;;
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index 11d8511750a..82bdad87f71 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -1,9 +1,9 @@
 ;;; reftex-dcr.el - Viewing cross references and citations with RefTeX
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
-;; Keywords:   tex
+;; Version: 4.10
+;;
 
 ;; This file is part of GNU Emacs.
 
@@ -23,8 +23,8 @@
 ;; Boston, MA 02111-1307, USA.
 
 (eval-when-compile (require 'cl))
-(provide 'reftex-vcr)
 (provide 'reftex-dcr)
+(provide 'reftex-vcr)
 (require 'reftex)
 ;;;
 
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index 1f90af01b34..a6d21e2ff61 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -1,9 +1,9 @@
 ;;; reftex-global.el - Operations on entire documents with RefTeX
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
-;; Keywords:   tex
+;; Version: 4.10
+;;
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 091bcb61137..731dbf95274 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1,9 +1,9 @@
 ;;; reftex-index.el - Index support with RefTeX
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
-;; Keywords:   tex
+;; Version: 4.10
+;;
 
 ;; This file is part of GNU Emacs.
 
@@ -1187,7 +1187,8 @@ You get a chance to edit the entry in the phrases buffer - finish with
   (interactive)
   (reftex-access-scan-info)
   (let* ((master (reftex-TeX-master-file))
-	 (name (concat (file-name-sans-extension master) ".rip")))
+	 (name (concat (file-name-sans-extension master)
+		       reftex-index-phrase-file-extension)))
     (find-file name)
     (unless (eq major-mode 'reftex-index-phrases-mode)
       (reftex-index-phrases-mode))
@@ -1452,7 +1453,7 @@ the document and stores the list in `reftex-index-phrases-files'."
 	      reftex-index-phrases-macro-data))
       ;; Reverse the list, so that the first macro is first
       (if (null reftex-index-phrases-macro-data)
-	  (error "No valid MACRO DEFINITION line in .rip file (make sure to use TAB separators)"))
+	  (error "No valid MACRO DEFINITION line in %s file (make sure to use TAB separators)" reftex-index-phrase-file-extension))
       (setq reftex-index-phrases-macro-data 
 	    (nreverse reftex-index-phrases-macro-data))
       (goto-char (point-min)))))
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 4a9bb7d6424..91c49f7c85d 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -1,9 +1,9 @@
 ;;; reftex-parse.el - Parser Functions for RefTeX
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
-;; Keywords:   tex
+;; Version: 4.10
+;;
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el
index 392428ac21b..05e5a774180 100644
--- a/lisp/textmodes/reftex-ref.el
+++ b/lisp/textmodes/reftex-ref.el
@@ -1,9 +1,9 @@
 ;;; reftex-ref.el - Code to create labels and references with RefTeX
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
-;; Keywords:   tex
+;; Version: 4.10
+;;
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index 50d655063b5..aa174761e1e 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -1,9 +1,9 @@
 ;;; reftex-sel.el - The selection modes for RefTeX
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
-;; Keywords:   tex
+;; Version: 4.10
+;;
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 70a529b70a8..71620ff2209 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -1,9 +1,9 @@
 ;;; reftex-toc.el - RefTeX's table of contents mode
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
-;; Keywords:   tex
+;; Version: 4.10
+;;
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index a295aac1db2..e1f088eeae4 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -1,9 +1,9 @@
 ;;; reftex-vars.el - Configuration variables for RefTeX
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
-;; Keywords:   tex
+;; Version: 4.10
+;;
 
 ;; This file is part of GNU Emacs.
 
@@ -1126,6 +1126,12 @@ Requires the `texmathp.el' library which is part of AUCTeX."
   :group 'reftex-index-support
   :type 'string)
 
+(defcustom reftex-index-phrase-file-extension ".rip"
+  "File extension for the index phrase file.
+This extension will be added to the base name of the master file."
+  :group 'reftex-index-support
+  :type 'string)
+
 (defcustom reftex-index-phrases-logical-and-regexp " *&& *"
   "Regexp matching the `and' operator for index arguments in phrases file.
 When several index arguments in a phrase line are separated by this
@@ -1459,6 +1465,12 @@ information.  When this variable is t,
   :group 'reftex-optimizations-for-large-documents
   :type 'boolean)
 
+(defcustom reftex-parse-file-extension ".rel"
+  "*File extension for the file in which parser information is stored.
+This extension is added to the base name of the master file."
+  :group 'reftex-optimizations-for-large-documents
+  :type 'string)
+
 (defcustom reftex-use-multiple-selection-buffers nil
   "*Non-nil means use a separate selection buffer for each label type.
 These buffers are kept from one selection to the next and need not to be
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 5cfa11395b6..95ae59922ad 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -1,8 +1,8 @@
 ;;; reftex.el --- Minor mode for doing \label, \ref, \cite, \index in LaTeX
-;; Copyright (c) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Carsten Dominik <dominik@strw.LeidenUniv.nl>
-;; Version:    4.9
+;; Version:    4.10
 ;; Keywords:   tex
 
 ;; This file is part of GNU Emacs.
@@ -300,7 +300,7 @@
 ;;; Define the formal stuff for a minor mode named RefTeX.
 ;;;
 
-(defconst reftex-version "RefTeX version 4.9"
+(defconst reftex-version "RefTeX version 4.10"
   "Version string for RefTeX.")
 
 (defvar reftex-mode nil
@@ -1224,8 +1224,9 @@ Valid actions are: readable, restore, read, kill, write."
          (master (reftex-TeX-master-file))
 	 (enable-local-variables nil)
          (file (if (string-match "\\.[a-zA-Z]+\\'" master)
-                   (concat (substring master 0 (match-beginning 0)) ".rel")
-                 (concat master ".rel"))))
+                   (concat (substring master 0 (match-beginning 0)) 
+			   reftex-parse-file-extension)
+                 (concat master reftex-parse-file-extension))))
     (cond
      ((eq action 'readable)
       (file-readable-p file))