[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/textmodes/reftex.el
|
From: |
Juanma Barranquero |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/textmodes/reftex.el |
|
Date: |
Wed, 29 Jan 2003 06:54:35 -0500 |
Index: emacs/lisp/textmodes/reftex.el
diff -c emacs/lisp/textmodes/reftex.el:1.48 emacs/lisp/textmodes/reftex.el:1.49
*** emacs/lisp/textmodes/reftex.el:1.48 Wed Oct 16 14:38:36 2002
--- emacs/lisp/textmodes/reftex.el Wed Jan 29 06:54:35 2003
***************
*** 25,31 ****
;;---------------------------------------------------------------------------
;;
;;; Commentary:
! ;;
;; RefTeX is a minor mode with distinct support for \ref, \label, \cite,
;; and \index commands in (multi-file) LaTeX documents.
;; - A table of contents provides easy access to any part of a document.
--- 25,31 ----
;;---------------------------------------------------------------------------
;;
;;; Commentary:
! ;;
;; RefTeX is a minor mode with distinct support for \ref, \label, \cite,
;; and \index commands in (multi-file) LaTeX documents.
;; - A table of contents provides easy access to any part of a document.
***************
*** 70,76 ****
;;
;; Introduction
;; ************
! ;;
;; RefTeX is a specialized package for support of labels, references,
;; citations, and the index in LaTeX. RefTeX wraps itself round 4 LaTeX
;; macros: `\label', `\ref', `\cite', and `\index'. Using these macros
--- 70,76 ----
;;
;; Introduction
;; ************
! ;;
;; RefTeX is a specialized package for support of labels, references,
;; citations, and the index in LaTeX. RefTeX wraps itself round 4 LaTeX
;; macros: `\label', `\ref', `\cite', and `\index'. Using these macros
***************
*** 79,91 ****
;; time-consuming tasks almost entirely. It also provides functions to
;; display the structure of a document and to move around in this
;; structure quickly.
! ;;
;; *Note Imprint::, for information about who to contact for help, bug
;; reports or suggestions.
! ;;
;; Environment
;; ===========
! ;;
;; RefTeX needs to access all files which are part of a multifile
;; document, and the BibTeX database files requested by the
;; `\bibliography' command. To find these files, RefTeX will require a
--- 79,91 ----
;; time-consuming tasks almost entirely. It also provides functions to
;; display the structure of a document and to move around in this
;; structure quickly.
! ;;
;; *Note Imprint::, for information about who to contact for help, bug
;; reports or suggestions.
! ;;
;; Environment
;; ===========
! ;;
;; RefTeX needs to access all files which are part of a multifile
;; document, and the BibTeX database files requested by the
;; `\bibliography' command. To find these files, RefTeX will require a
***************
*** 94,119 ****
;; which are also used by RefTeX. However, on some systems these
;; variables do not contain the full search path. If RefTeX does not work
;; for you because it cannot find some files, read *Note Finding Files::.
! ;;
;; Entering RefTeX Mode
;; ====================
! ;;
;; To turn RefTeX Mode on and off in a particular buffer, use `M-x
;; reftex-mode'. To turn on RefTeX Mode for all LaTeX files, add the
;; following lines to your `.emacs' file:
! ;;
;; (add-hook 'LaTeX-mode-hook 'turn-on-reftex) ; with AUCTeX LaTeX mode
;; (add-hook 'latex-mode-hook 'turn-on-reftex) ; with Emacs latex mode
! ;;
;; RefTeX in a Nutshell
;; ====================
! ;;
;; 1. Table of Contents
;; Typing `C-c =' (`reftex-toc') will show a table of contents of the
;; document. This buffer can display sections, labels and index
;; entries defined in the document. From the buffer, you can jump
;; quickly to every part of your document. Press `?' to get help.
! ;;
;; 2. Labels and References
;; RefTeX helps to create unique labels and to find the correct key
;; for references quickly. It distinguishes labels for different
--- 94,119 ----
;; which are also used by RefTeX. However, on some systems these
;; variables do not contain the full search path. If RefTeX does not work
;; for you because it cannot find some files, read *Note Finding Files::.
! ;;
;; Entering RefTeX Mode
;; ====================
! ;;
;; To turn RefTeX Mode on and off in a particular buffer, use `M-x
;; reftex-mode'. To turn on RefTeX Mode for all LaTeX files, add the
;; following lines to your `.emacs' file:
! ;;
;; (add-hook 'LaTeX-mode-hook 'turn-on-reftex) ; with AUCTeX LaTeX mode
;; (add-hook 'latex-mode-hook 'turn-on-reftex) ; with Emacs latex mode
! ;;
;; RefTeX in a Nutshell
;; ====================
! ;;
;; 1. Table of Contents
;; Typing `C-c =' (`reftex-toc') will show a table of contents of the
;; document. This buffer can display sections, labels and index
;; entries defined in the document. From the buffer, you can jump
;; quickly to every part of your document. Press `?' to get help.
! ;;
;; 2. Labels and References
;; RefTeX helps to create unique labels and to find the correct key
;; for references quickly. It distinguishes labels for different
***************
*** 121,127 ****
;; others), and can be configured to recognize any additional labeled
;; environments you have defined yourself (variable
;; `reftex-label-alist').
! ;;
;; * Creating Labels
;; Type `C-c (' (`reftex-label') to insert a label at point.
;; RefTeX will either
--- 121,127 ----
;; others), and can be configured to recognize any additional labeled
;; environments you have defined yourself (variable
;; `reftex-label-alist').
! ;;
;; * Creating Labels
;; Type `C-c (' (`reftex-label') to insert a label at point.
;; RefTeX will either
***************
*** 130,146 ****
;; tables) or
;; - insert a simple label made of a prefix and a number (all
;; other environments)
! ;;
;; Which labels are created how is configurable with the variable
;; `reftex-insert-label-flags'.
! ;;
;; * Referencing Labels
;; To make a reference, type `C-c )' (`reftex-reference'). This
;; shows an outline of the document with all labels of a certain
;; type (figure, equation,...) and some label context.
;; Selecting a label inserts a `\ref{LABEL}' macro into the
;; original buffer.
! ;;
;; 3. Citations
;; Typing `C-c [' (`reftex-citation') will let you specify a regular
;; expression to search in current BibTeX database files (as
--- 130,146 ----
;; tables) or
;; - insert a simple label made of a prefix and a number (all
;; other environments)
! ;;
;; Which labels are created how is configurable with the variable
;; `reftex-insert-label-flags'.
! ;;
;; * Referencing Labels
;; To make a reference, type `C-c )' (`reftex-reference'). This
;; shows an outline of the document with all labels of a certain
;; type (figure, equation,...) and some label context.
;; Selecting a label inserts a `\ref{LABEL}' macro into the
;; original buffer.
! ;;
;; 3. Citations
;; Typing `C-c [' (`reftex-citation') will let you specify a regular
;; expression to search in current BibTeX database files (as
***************
*** 149,155 ****
;; sorted. The selected article is referenced as `\cite{KEY}' (see
;; the variable `reftex-cite-format' if you want to insert different
;; macros).
! ;;
;; 4. Index Support
;; RefTeX helps to enter index entries. It also compiles all entries
;; into an alphabetically sorted `*Index*' buffer which you can use
--- 149,155 ----
;; sorted. The selected article is referenced as `\cite{KEY}' (see
;; the variable `reftex-cite-format' if you want to insert different
;; macros).
! ;;
;; 4. Index Support
;; RefTeX helps to enter index entries. It also compiles all entries
;; into an alphabetically sorted `*Index*' buffer which you can use
***************
*** 157,181 ****
;; index macros and can be configured to recognize any additional
;; macros you have defined (`reftex-index-macros'). Multiple indices
;; are supported.
! ;;
;; * Creating Index Entries
;; To index the current selection or the word at point, type
;; `C-c /' (`reftex-index-selection-or-word'). The default macro
;; `reftex-index-default-macro' will be used. For a more
;; complex entry type `C-c <' (`reftex-index'), select any of
;; the index macros and enter the arguments with completion.
! ;;
;; * The Index Phrases File (Delayed Indexing)
;; Type `C-c \' (`reftex-index-phrase-selection-or-word') to add
;; the current word or selection to a special _index phrase
;; file_. RefTeX can later search the document for occurrences
;; of these phrases and let you interactively index the matches.
! ;;
;; * Displaying and Editing the Index
;; To display the compiled index in a special buffer, type `C-c
;; >' (`reftex-display-index'). From that buffer you can check
;; and edit all entries.
! ;;
;; 5. Viewing Cross-References
;; When point is on the KEY argument of a cross-referencing macro
;; (`\label', `\ref', `\cite', `\bibitem', `\index', and variations)
--- 157,181 ----
;; index macros and can be configured to recognize any additional
;; macros you have defined (`reftex-index-macros'). Multiple indices
;; are supported.
! ;;
;; * Creating Index Entries
;; To index the current selection or the word at point, type
;; `C-c /' (`reftex-index-selection-or-word'). The default macro
;; `reftex-index-default-macro' will be used. For a more
;; complex entry type `C-c <' (`reftex-index'), select any of
;; the index macros and enter the arguments with completion.
! ;;
;; * The Index Phrases File (Delayed Indexing)
;; Type `C-c \' (`reftex-index-phrase-selection-or-word') to add
;; the current word or selection to a special _index phrase
;; file_. RefTeX can later search the document for occurrences
;; of these phrases and let you interactively index the matches.
! ;;
;; * Displaying and Editing the Index
;; To display the compiled index in a special buffer, type `C-c
;; >' (`reftex-display-index'). From that buffer you can check
;; and edit all entries.
! ;;
;; 5. Viewing Cross-References
;; When point is on the KEY argument of a cross-referencing macro
;; (`\label', `\ref', `\cite', `\bibitem', `\index', and variations)
***************
*** 185,198 ****
;; When the enclosing macro is `\cite' or `\ref' and no other message
;; occupies the echo area, information about the citation or label
;; will automatically be displayed in the echo area.
! ;;
;; 6. Multifile Documents
;; Multifile Documents are fully supported. The included files must
;; have a file variable `TeX-master' or `tex-main-file' pointing to
;; the master file. RefTeX provides cross-referencing information
;; from all parts of the document, and across document borders
;; (`xr.sty').
! ;;
;; 7. Document Parsing
;; RefTeX needs to parse the document in order to find labels and
;; other information. It does it automatically once and updates its
--- 185,198 ----
;; When the enclosing macro is `\cite' or `\ref' and no other message
;; occupies the echo area, information about the citation or label
;; will automatically be displayed in the echo area.
! ;;
;; 6. Multifile Documents
;; Multifile Documents are fully supported. The included files must
;; have a file variable `TeX-master' or `tex-main-file' pointing to
;; the master file. RefTeX provides cross-referencing information
;; from all parts of the document, and across document borders
;; (`xr.sty').
! ;;
;; 7. Document Parsing
;; RefTeX needs to parse the document in order to find labels and
;; other information. It does it automatically once and updates its
***************
*** 201,223 ****
;; with a raw `C-u' prefix, or press the `r' key in the label
;; selection buffer, the table of contents buffer, or the index
;; buffer.
! ;;
;; 8. AUCTeX
;; If your major LaTeX mode is AUCTeX, RefTeX can cooperate with it
;; (see variable `reftex-plug-into-AUCTeX'). AUCTeX contains style
;; files which trigger appropriate settings in RefTeX, so that for
;; many of the popular LaTeX packages no additional customizations
;; will be necessary.
! ;;
;; 9. Useful Settings
;; To make RefTeX faster for large documents, try these:
;; (setq reftex-enable-partial-scans t)
;; (setq reftex-save-parse-info t)
;; (setq reftex-use-multiple-selection-buffers t)
! ;;
;; To integrate with AUCTeX, use
;; (setq reftex-plug-into-AUCTeX t)
! ;;
;; To make your own LaTeX macro definitions known to RefTeX,
;; customize the variables
;; `reftex-label-alist' (for label macros/environments)
--- 201,223 ----
;; with a raw `C-u' prefix, or press the `r' key in the label
;; selection buffer, the table of contents buffer, or the index
;; buffer.
! ;;
;; 8. AUCTeX
;; If your major LaTeX mode is AUCTeX, RefTeX can cooperate with it
;; (see variable `reftex-plug-into-AUCTeX'). AUCTeX contains style
;; files which trigger appropriate settings in RefTeX, so that for
;; many of the popular LaTeX packages no additional customizations
;; will be necessary.
! ;;
;; 9. Useful Settings
;; To make RefTeX faster for large documents, try these:
;; (setq reftex-enable-partial-scans t)
;; (setq reftex-save-parse-info t)
;; (setq reftex-use-multiple-selection-buffers t)
! ;;
;; To integrate with AUCTeX, use
;; (setq reftex-plug-into-AUCTeX t)
! ;;
;; To make your own LaTeX macro definitions known to RefTeX,
;; customize the variables
;; `reftex-label-alist' (for label macros/environments)
***************
*** 227,233 ****
;; `reftex-index-default-macro' (to set the default macro)
;; If you have a large number of macros defined, you may want to write
;; an AUCTeX style file to support them with both AUCTeX and RefTeX.
! ;;
;; 10. Where Next?
;; Go ahead and use RefTeX. Use its menus until you have picked up
;; the key bindings. For an overview of what you can do in each of
--- 227,233 ----
;; `reftex-index-default-macro' (to set the default macro)
;; If you have a large number of macros defined, you may want to write
;; an AUCTeX style file to support them with both AUCTeX and RefTeX.
! ;;
;; 10. Where Next?
;; Go ahead and use RefTeX. Use its menus until you have picked up
;; the key bindings. For an overview of what you can do in each of
***************
*** 236,242 ****
;; The first part of the manual explains in a tutorial way how to use
;; and customize RefTeX. The second part is a command and variable
;; reference.
! ;;
;;---------------------------------------------------------------------------
;;
;; AUTHOR
--- 236,242 ----
;; The first part of the manual explains in a tutorial way how to use
;; and customize RefTeX. The second part is a command and variable
;; reference.
! ;;
;;---------------------------------------------------------------------------
;;
;; AUTHOR
***************
*** 312,318 ****
(setq reftex-syntax-table (copy-syntax-table))
(modify-syntax-entry ?\( "." reftex-syntax-table)
(modify-syntax-entry ?\) "." reftex-syntax-table))
!
(unless reftex-syntax-table-for-bib
(setq reftex-syntax-table-for-bib
(copy-syntax-table reftex-syntax-table))
--- 312,318 ----
(setq reftex-syntax-table (copy-syntax-table))
(modify-syntax-entry ?\( "." reftex-syntax-table)
(modify-syntax-entry ?\) "." reftex-syntax-table))
!
(unless reftex-syntax-table-for-bib
(setq reftex-syntax-table-for-bib
(copy-syntax-table reftex-syntax-table))
***************
*** 388,394 ****
(setq reftex-syntax-table (copy-syntax-table (syntax-table)))
(modify-syntax-entry ?\( "." reftex-syntax-table)
(modify-syntax-entry ?\) "." reftex-syntax-table)
!
(setq reftex-syntax-table-for-bib
(copy-syntax-table reftex-syntax-table))
(modify-syntax-entry ?\' "." reftex-syntax-table-for-bib)
--- 388,394 ----
(setq reftex-syntax-table (copy-syntax-table (syntax-table)))
(modify-syntax-entry ?\( "." reftex-syntax-table)
(modify-syntax-entry ?\) "." reftex-syntax-table)
!
(setq reftex-syntax-table-for-bib
(copy-syntax-table reftex-syntax-table))
(modify-syntax-entry ?\' "." reftex-syntax-table-for-bib)
***************
*** 529,535 ****
((master
(cond
((fboundp 'TeX-master-file) ; AUCTeX is loaded. Use its mechanism.
! (condition-case nil
(TeX-master-file t)
(error (buffer-file-name))))
((fboundp 'tex-main-file) (tex-main-file)) ; Emacs LaTeX mode
--- 529,535 ----
((master
(cond
((fboundp 'TeX-master-file) ; AUCTeX is loaded. Use its mechanism.
! (condition-case nil
(TeX-master-file t)
(error (buffer-file-name))))
((fboundp 'tex-main-file) (tex-main-file)) ; Emacs LaTeX mode
***************
*** 569,575 ****
)
(t
;; Use buffer file name.
! (buffer-file-name)))
(expand-file-name master)))
(defun reftex-is-multi ()
--- 569,575 ----
)
(t
;; Use buffer file name.
! (setq master (buffer-file-name))))
(expand-file-name master)))
(defun reftex-is-multi ()
***************
*** 728,741 ****
;; A list of all variables in the cache.
;; The cache is used to save the compiled versions of some variables.
! (defconst reftex-cache-variables
'(reftex-memory ;; This MUST ALWAYS be the first!
!
;; Outline
reftex-section-levels-all
;; Labels
! reftex-env-or-mac-alist
reftex-special-env-parsers
reftex-macros-with-labels
reftex-label-mac-list
--- 728,741 ----
;; A list of all variables in the cache.
;; The cache is used to save the compiled versions of some variables.
! (defconst reftex-cache-variables
'(reftex-memory ;; This MUST ALWAYS be the first!
!
;; Outline
reftex-section-levels-all
;; Labels
! reftex-env-or-mac-alist
reftex-special-env-parsers
reftex-macros-with-labels
reftex-label-mac-list
***************
*** 751,757 ****
reftex-index-macro-alist
reftex-macros-with-index
reftex-query-index-macro-prompt
! reftex-query-index-macro-help
reftex-key-to-index-macro-alist
;; Regular expressions
--- 751,757 ----
reftex-index-macro-alist
reftex-macros-with-index
reftex-query-index-macro-prompt
! reftex-query-index-macro-help
reftex-key-to-index-macro-alist
;; Regular expressions
***************
*** 796,802 ****
(t (reftex-compile-variables)))))
(defun reftex-reset-mode ()
! "Reset RefTeX Mode.
This will re-compile the configuration information and remove all
current scanning information and the parse file to enforce a rescan
on next use."
--- 796,802 ----
(t (reftex-compile-variables)))))
(defun reftex-reset-mode ()
! "Reset RefTeX Mode.
This will re-compile the configuration information and remove all
current scanning information and the parse file to enforce a rescan
on next use."
***************
*** 846,857 ****
(defun reftex-erase-all-selection-and-index-buffers ()
;; Remove all selection buffers associated with current document.
! (mapcar
(lambda (type)
(reftex-erase-buffer (reftex-make-selection-buffer-name type)))
reftex-typekey-list)
;; Kill all index buffers
! (mapcar
(lambda (tag)
(reftex-kill-buffer (reftex-make-index-buffer-name tag)))
(cdr (assoc 'index-tags (symbol-value reftex-docstruct-symbol)))))
--- 846,857 ----
(defun reftex-erase-all-selection-and-index-buffers ()
;; Remove all selection buffers associated with current document.
! (mapcar
(lambda (type)
(reftex-erase-buffer (reftex-make-selection-buffer-name type)))
reftex-typekey-list)
;; Kill all index buffers
! (mapcar
(lambda (tag)
(reftex-kill-buffer (reftex-make-index-buffer-name tag)))
(cdr (assoc 'index-tags (symbol-value reftex-docstruct-symbol)))))
***************
*** 867,873 ****
;; Record that we have done this, and what we have used.
(setq reftex-tables-dirty nil)
! (setq reftex-memory
(list reftex-label-alist
(get reftex-docstruct-symbol 'reftex-section-levels)
(get reftex-docstruct-symbol 'reftex-label-alist-style)
--- 867,873 ----
;; Record that we have done this, and what we have used.
(setq reftex-tables-dirty nil)
! (setq reftex-memory
(list reftex-label-alist
(get reftex-docstruct-symbol 'reftex-section-levels)
(get reftex-docstruct-symbol 'reftex-label-alist-style)
***************
*** 886,892 ****
'(nil)))
(all-index (reftex-uniquify-by-car
(reftex-splice-symbols-into-list
! (append reftex-index-macros
(get reftex-docstruct-symbol
'reftex-index-macros-style)
'(default))
--- 886,892 ----
'(nil)))
(all-index (reftex-uniquify-by-car
(reftex-splice-symbols-into-list
! (append reftex-index-macros
(get reftex-docstruct-symbol
'reftex-index-macros-style)
'(default))
***************
*** 947,953 ****
((symbolp env-or-mac)
;; A special parser function
(unless (fboundp env-or-mac)
! (message "Warning: %s does not seem to be a valid function"
env-or-mac))
(setq nargs nil nlabel nil opt-args nil)
(add-to-list 'reftex-special-env-parsers env-or-mac)
--- 947,953 ----
((symbolp env-or-mac)
;; A special parser function
(unless (fboundp env-or-mac)
! (message "Warning: %s does not seem to be a valid function"
env-or-mac))
(setq nargs nil nlabel nil opt-args nil)
(add-to-list 'reftex-special-env-parsers env-or-mac)
***************
*** 975,982 ****
(push (cons string toc-level) toc-levels))))))))
;; Translate some special context cases
(when (assq context reftex-default-context-regexps)
! (setq context
! (format
(cdr (assq context reftex-default-context-regexps))
(regexp-quote env-or-mac))))
;; See if this is the first format for this typekey
--- 975,982 ----
(push (cons string toc-level) toc-levels))))))))
;; Translate some special context cases
(when (assq context reftex-default-context-regexps)
! (setq context
! (format
(cdr (assq context reftex-default-context-regexps))
(regexp-quote env-or-mac))))
;; See if this is the first format for this typekey
***************
*** 1009,1015 ****
(nreverse reftex-typekey-to-prefix-alist))
;; Prepare the typekey query prompt and help string.
! (setq qh-list
(sort qh-list
(lambda (x1 x2)
(string< (downcase (car x1)) (downcase (car x2))))))
--- 1009,1015 ----
(nreverse reftex-typekey-to-prefix-alist))
;; Prepare the typekey query prompt and help string.
! (setq qh-list
(sort qh-list
(lambda (x1 x2)
(string< (downcase (car x1)) (downcase (car x2))))))
***************
*** 1020,1026 ****
"]"))
;; In the help string, we need to wrap lines...
(setq reftex-type-query-help
! (concat
"SELECT A LABEL TYPE:\n--------------------\n"
(mapconcat
(lambda(x)
--- 1020,1026 ----
"]"))
;; In the help string, we need to wrap lines...
(setq reftex-type-query-help
! (concat
"SELECT A LABEL TYPE:\n--------------------\n"
(mapconcat
(lambda(x)
***************
*** 1040,1046 ****
;; which allow for some chars from the ref format to be in the buffer.
;; These characters will be seen and removed.
(setq reftex-words-to-typekey-alist
! (mapcar
(lambda (x)
(setq word (car x)
typekey (cdr x)
--- 1040,1046 ----
;; which allow for some chars from the ref format to be in the buffer.
;; These characters will be seen and removed.
(setq reftex-words-to-typekey-alist
! (mapcar
(lambda (x)
(setq word (car x)
typekey (cdr x)
***************
*** 1093,1110 ****
(setq reftex-key-to-index-macro-alist
(sort reftex-key-to-index-macro-alist
(lambda (a b) (< (downcase (car a)) (downcase (car b))))))
! (setq reftex-query-index-macro-prompt
(concat "Index macro: ["
(mapconcat (lambda (x) (char-to-string (car x)))
reftex-key-to-index-macro-alist "")
"]"))
(setq i 0
reftex-query-index-macro-help
! (concat
"SELECT A MACRO:\n---------------\n"
(mapconcat
(lambda(x)
! (format "[%c] %-20.20s%s" (car x) (nth 1 x)
(if (= 0 (mod (incf i) 3)) "\n" "")))
reftex-key-to-index-macro-alist "")))
--- 1093,1110 ----
(setq reftex-key-to-index-macro-alist
(sort reftex-key-to-index-macro-alist
(lambda (a b) (< (downcase (car a)) (downcase (car b))))))
! (setq reftex-query-index-macro-prompt
(concat "Index macro: ["
(mapconcat (lambda (x) (char-to-string (car x)))
reftex-key-to-index-macro-alist "")
"]"))
(setq i 0
reftex-query-index-macro-help
! (concat
"SELECT A MACRO:\n---------------\n"
(mapconcat
(lambda(x)
! (format "[%c] %-20.20s%s" (car x) (nth 1 x)
(if (= 0 (mod (incf i) 3)) "\n" "")))
reftex-key-to-index-macro-alist "")))
***************
*** 1118,1128 ****
(let* (
; (wbol "\\(\\`\\|[\n\r]\\)[ \t]*")
(wbol "\\(^\\)[ \t]*") ; Need to keep the empty group because
! ;;; because match number are hard coded
(label-re "\\\\label{\\([^}]*\\)}")
! (include-re (concat wbol
"\\\\\\("
! (mapconcat 'identity
reftex-include-file-commands "\\|")
"\\)[{ \t]+\\([^} \t\n\r]+\\)"))
(section-re
--- 1118,1128 ----
(let* (
; (wbol "\\(\\`\\|[\n\r]\\)[ \t]*")
(wbol "\\(^\\)[ \t]*") ; Need to keep the empty group because
! ;;; because match number are hard coded
(label-re "\\\\label{\\([^}]*\\)}")
! (include-re (concat wbol
"\\\\\\("
! (mapconcat 'identity
reftex-include-file-commands "\\|")
"\\)[{ \t]+\\([^} \t\n\r]+\\)"))
(section-re
***************
*** 1176,1182 ****
reftex-macros-with-labels macros-with-labels
reftex-find-index-entry-regexp-format find-index-re-format
reftex-find-label-regexp-format find-label-re-format
! reftex-find-label-regexp-format2
"\\([]} \t\n\r]\\)\\([[{]\\)\\(%s\\)[]}]")
(message "Compiling label environment definitions...done")))
(put reftex-docstruct-symbol 'reftex-cache
--- 1176,1182 ----
reftex-macros-with-labels macros-with-labels
reftex-find-index-entry-regexp-format find-index-re-format
reftex-find-label-regexp-format find-label-re-format
! reftex-find-label-regexp-format2
"\\([]} \t\n\r]\\)\\([[{]\\)\\(%s\\)[]}]")
(message "Compiling label environment definitions...done")))
(put reftex-docstruct-symbol 'reftex-cache
***************
*** 1248,1254 ****
(and (symbolp reftex-docstruct-symbol)
(symbol-value reftex-docstruct-symbol)
t))
!
(defun reftex-silence-toc-markers (list n)
;; Set all toc markers in the first N entries in list to nil
(while (and list (> (decf n) -1))
--- 1248,1254 ----
(and (symbolp reftex-docstruct-symbol)
(symbol-value reftex-docstruct-symbol)
t))
!
(defun reftex-silence-toc-markers (list n)
;; Set all toc markers in the first N entries in list to nil
(while (and list (> (decf n) -1))
***************
*** 1265,1271 ****
(master (reftex-TeX-master-file))
(enable-local-variables nil)
(file (if (string-match "\\.[a-zA-Z]+\\'" master)
! (concat (substring master 0 (match-beginning 0))
reftex-parse-file-extension)
(concat master reftex-parse-file-extension))))
(cond
--- 1265,1271 ----
(master (reftex-TeX-master-file))
(enable-local-variables nil)
(file (if (string-match "\\.[a-zA-Z]+\\'" master)
! (concat (substring master 0 (match-beginning 0))
reftex-parse-file-extension)
(concat master reftex-parse-file-extension))))
(cond
***************
*** 1344,1350 ****
;; Check if the master is the same: when moving a document, this will see
it.
(let* ((real-master (reftex-TeX-master-file))
! (parsed-master
(nth 1 (assq 'bof (symbol-value reftex-docstruct-symbol)))))
(unless (string= (file-truename real-master) (file-truename
parsed-master))
(message "Master file name in load file is different: %s versus %s"
--- 1344,1350 ----
;; Check if the master is the same: when moving a document, this will see
it.
(let* ((real-master (reftex-TeX-master-file))
! (parsed-master
(nth 1 (assq 'bof (symbol-value reftex-docstruct-symbol)))))
(unless (string= (file-truename real-master) (file-truename
parsed-master))
(message "Master file name in load file is different: %s versus %s"
***************
*** 1364,1370 ****
(defun reftex-select-external-document (xr-alist xr-index)
;; Return index of an external document.
(let* ((len (length xr-alist)) (highest (1- (+ ?0 len)))
! (prompt (format "[%c-%c] Select TAB: Read prefix with completion"
?0 highest))
key prefix)
(cond
--- 1364,1370 ----
(defun reftex-select-external-document (xr-alist xr-index)
;; Return index of an external document.
(let* ((len (length xr-alist)) (highest (1- (+ ?0 len)))
! (prompt (format "[%c-%c] Select TAB: Read prefix with completion"
?0 highest))
key prefix)
(cond
***************
*** 1375,1381 ****
(- 1 xr-index))
(t
(save-excursion
! (let* ((length (apply 'max (mapcar
(lambda(x) (length (car x))) xr-alist)))
(fmt (format " [%%c] %%-%ds %%s\n" length))
(n (1- ?0)))
--- 1375,1381 ----
(- 1 xr-index))
(t
(save-excursion
! (let* ((length (apply 'max (mapcar
(lambda(x) (length (car x))) xr-alist)))
(fmt (format " [%%c] %%-%ds %%s\n" length))
(n (1- ?0)))
***************
*** 1385,1391 ****
(concat
"SELECT EXTERNAL DOCUMENT\n------------------------\n"
(mapconcat
! (lambda (x)
(format fmt (incf n) (or (car x) "")
(abbreviate-file-name (cdr x))))
xr-alist ""))
--- 1385,1391 ----
(concat
"SELECT EXTERNAL DOCUMENT\n------------------------\n"
(mapconcat
! (lambda (x)
(format fmt (incf n) (or (car x) "")
(abbreviate-file-name (cdr x))))
xr-alist ""))
***************
*** 1409,1415 ****
(let* ((rec-values (if reftex-search-unrecursed-path-first '(nil t) '(t)))
(extensions (cdr (assoc type reftex-file-extensions)))
(def-ext (car extensions))
! (ext-re (concat "\\("
(mapconcat 'regexp-quote extensions "\\|")
"\\)\\'"))
(files (if (string-match ext-re file)
--- 1409,1415 ----
(let* ((rec-values (if reftex-search-unrecursed-path-first '(nil t) '(t)))
(extensions (cdr (assoc type reftex-file-extensions)))
(def-ext (car extensions))
! (ext-re (concat "\\("
(mapconcat 'regexp-quote extensions "\\|")
"\\)\\'"))
(files (if (string-match ext-re file)
***************
*** 1418,1425 ****
path old-path file1)
(cond
((file-name-absolute-p file)
! (setq file1
! (or
(and (car files) (file-regular-p (car files)) (car files))
(and (cdr files) (file-regular-p (cdr files)) (cdr files)))))
((and reftex-use-external-file-finders
--- 1418,1425 ----
path old-path file1)
(cond
((file-name-absolute-p file)
! (setq file1
! (or
(and (car files) (file-regular-p (car files)) (car files))
(and (cdr files) (file-regular-p (cdr files)) (cdr files)))))
((and reftex-use-external-file-finders
***************
*** 1434,1443 ****
(setq old-path path
path (cons master-dir path)
file1 (or (and (car files)
! (reftex-find-file-on-path
(car files) path master-dir))
(and (cdr files)
! (reftex-find-file-on-path
(cdr files) path master-dir))))))))
(cond (file1 file1)
(die (error "No such file: %s" file) nil)
--- 1434,1443 ----
(setq old-path path
path (cons master-dir path)
file1 (or (and (car files)
! (reftex-find-file-on-path
(car files) path master-dir))
(and (cdr files)
! (reftex-find-file-on-path
(cdr files) path master-dir))))))))
(cond (file1 file1)
(die (error "No such file: %s" file) nil)
***************
*** 1482,1488 ****
(reftex-uniq
(reftex-parse-colon-path
(mapconcat
! (lambda(x)
(if (string-match "^!" x)
(apply 'reftex-process-string
(split-string (substring x 1)))
--- 1482,1488 ----
(reftex-uniq
(reftex-parse-colon-path
(mapconcat
! (lambda(x)
(if (string-match "^!" x)
(apply 'reftex-process-string
(split-string (substring x 1)))
***************
*** 1491,1497 ****
;; (cdr (assoc type reftex-path-environment))
;; However, historically we have separate options for the
;; environment variables, so we have to do this:
! (symbol-value (intern (concat "reftex-" type
"path-environment-variables")))
path-separator))))
(put pathvar 'status 'split)
--- 1491,1497 ----
;; (cdr (assoc type reftex-path-environment))
;; However, historically we have separate options for the
;; environment variables, so we have to do this:
! (symbol-value (intern (concat "reftex-" type
"path-environment-variables")))
path-separator))))
(put pathvar 'status 'split)
***************
*** 1517,1527 ****
;; or: Relative recursive path elements need to be expanded
;; relative to new default directory
(message "Expanding search path to find %s file: %s ..." type file)
! (put pathvar 'recursive-path
(reftex-expand-path (symbol-value pathvar) master-dir))
(put pathvar 'master-dir master-dir)
(get pathvar 'recursive-path))
! (t
;; Recursive path computed earlier is still OK.
(get pathvar 'recursive-path)))
;; The simple path was requested
--- 1517,1527 ----
;; or: Relative recursive path elements need to be expanded
;; relative to new default directory
(message "Expanding search path to find %s file: %s ..." type file)
! (put pathvar 'recursive-path
(reftex-expand-path (symbol-value pathvar) master-dir))
(put pathvar 'master-dir master-dir)
(get pathvar 'recursive-path))
! (t
;; Recursive path computed earlier is still OK.
(get pathvar 'recursive-path)))
;; The simple path was requested
***************
*** 1550,1556 ****
;; Trailing ! or !! will be converted into `//' (emTeX convention)
(mapcar
(lambda (dir)
! (if (string-match "\\(//+\\|/*!+\\)\\'" dir)
(setq dir (replace-match "//" t t dir)))
(file-name-as-directory dir))
(delete "" (split-string path (concat path-separator "+")))))
--- 1550,1556 ----
;; Trailing ! or !! will be converted into `//' (emTeX convention)
(mapcar
(lambda (dir)
! (if (string-match "\\(//+\\|/*!+\\)\\'" dir)
(setq dir (replace-match "//" t t dir)))
(file-name-as-directory dir))
(delete "" (split-string path (concat path-separator "+")))))
***************
*** 1579,1585 ****
(when (file-directory-p dir)
(setq files (nreverse (directory-files dir t "[^.]")))
(while (setq file (pop files))
! (if (file-directory-p file)
(push (file-name-as-directory file) path)))
(push dir path1)))
path1))
--- 1579,1585 ----
(when (file-directory-p dir)
(setq files (nreverse (directory-files dir t "[^.]")))
(while (setq file (pop files))
! (if (file-directory-p file)
(push (file-name-as-directory file) path)))
(push dir path1)))
path1))
***************
*** 1863,1869 ****
(while list
(if (funcall predicate (car list))
(push (if completion
! (list (nth nth (car list)))
(nth nth (car list)))
rtn))
(setq list (cdr list)))
--- 1863,1869 ----
(while list
(if (funcall predicate (car list))
(push (if completion
! (list (nth nth (car list)))
(nth nth (car list)))
rtn))
(setq list (cdr list)))
***************
*** 1899,1905 ****
;; If POS is given, calculate distances relative to it.
;; Return nil if there is no match.
(let ((pos (point))
! (dist (or max-length (length regexp)))
match1 match2 match)
(goto-char (min (+ pos dist) (point-max)))
(when (re-search-backward regexp nil t)
--- 1899,1905 ----
;; If POS is given, calculate distances relative to it.
;; Return nil if there is no match.
(let ((pos (point))
! (dist (or max-length (length regexp)))
match1 match2 match)
(goto-char (min (+ pos dist) (point-max)))
(when (re-search-backward regexp nil t)
***************
*** 1985,1994 ****
((and scroll (equal char ?\C-? ))
(condition-case nil (scroll-down) (error nil))
(message prompt))
! (t (message "")
(throw 'exit char)))
(setq char (read-char-exclusive)))))))
!
(defun reftex-make-regexp-allow-for-ctrl-m (string)
;; convert STRING into a regexp, allowing ^M for \n and vice versa
--- 1985,1994 ----
((and scroll (equal char ?\C-? ))
(condition-case nil (scroll-down) (error nil))
(message prompt))
! (t (message "")
(throw 'exit char)))
(setq char (read-char-exclusive)))))))
!
(defun reftex-make-regexp-allow-for-ctrl-m (string)
;; convert STRING into a regexp, allowing ^M for \n and vice versa
***************
*** 2186,2195 ****
;; Restrict number of words
(if (> (length words) nwords)
(setcdr (nthcdr (1- nwords) words) nil))
!
;; First, try to use all words
(setq string (mapconcat 'identity words sep))
!
;; Abbreviate words if enforced by user settings or string length
(if (or (eq t abbrev)
(and abbrev
--- 2186,2195 ----
;; Restrict number of words
(if (> (length words) nwords)
(setcdr (nthcdr (1- nwords) words) nil))
!
;; First, try to use all words
(setq string (mapconcat 'identity words sep))
!
;; Abbreviate words if enforced by user settings or string length
(if (or (eq t abbrev)
(and abbrev
***************
*** 2281,2287 ****
(font-lock-set-defaults-1)
(reftex-select-font-lock-fontify-region (point-min) (point-max))))
(t
! ;; Oops?
(message "Sorry: cannot refontify RefTeX Select buffer."))))
(rename-buffer oldname))))
--- 2281,2287 ----
(font-lock-set-defaults-1)
(reftex-select-font-lock-fontify-region (point-min) (point-max))))
(t
! ;; Oops?
(message "Sorry: cannot refontify RefTeX Select buffer."))))
(rename-buffer oldname))))
***************
*** 2321,2327 ****
;; Initialize the overlays
(aset reftex-highlight-overlays 0 (make-overlay 1 1))
! (overlay-put (aref reftex-highlight-overlays 0)
'face 'highlight)
(aset reftex-highlight-overlays 1 (make-overlay 1 1))
(overlay-put (aref reftex-highlight-overlays 1)
--- 2321,2327 ----
;; Initialize the overlays
(aset reftex-highlight-overlays 0 (make-overlay 1 1))
! (overlay-put (aref reftex-highlight-overlays 0)
'face 'highlight)
(aset reftex-highlight-overlays 1 (make-overlay 1 1))
(overlay-put (aref reftex-highlight-overlays 1)
***************
*** 2346,2352 ****
;;; =========================================================================
;;;
! ;;; Keybindings
;; The default bindings in the mode map.
(loop for x in
--- 2346,2352 ----
;;; =========================================================================
;;;
! ;;; Keybindings
;; The default bindings in the mode map.
(loop for x in
***************
*** 2366,2375 ****
;; Bind `reftex-mouse-view-crossref' only when the key is still free
(if (featurep 'xemacs)
(unless (key-binding [(shift button2)])
! (define-key reftex-mode-map [(shift button2)]
'reftex-mouse-view-crossref))
(unless (key-binding [(shift mouse-2)])
! (define-key reftex-mode-map [(shift mouse-2)]
'reftex-mouse-view-crossref)))
;; Bind `reftex-view-crossref-from-bibtex' in BibTeX mode map
--- 2366,2375 ----
;; Bind `reftex-mouse-view-crossref' only when the key is still free
(if (featurep 'xemacs)
(unless (key-binding [(shift button2)])
! (define-key reftex-mode-map [(shift button2)]
'reftex-mouse-view-crossref))
(unless (key-binding [(shift mouse-2)])
! (define-key reftex-mode-map [(shift mouse-2)]
'reftex-mouse-view-crossref)))
;; Bind `reftex-view-crossref-from-bibtex' in BibTeX mode map
***************
*** 2465,2471 ****
("Reference Style"
["Default" (setq reftex-vref-is-default nil
reftex-fref-is-default nil)
! :style radio :selected (not (or reftex-vref-is-default
reftex-fref-is-default))]
["Varioref" (setq reftex-vref-is-default t
reftex-fref-is-default nil)
--- 2465,2471 ----
("Reference Style"
["Default" (setq reftex-vref-is-default nil
reftex-fref-is-default nil)
! :style radio :selected (not (or reftex-vref-is-default
reftex-fref-is-default))]
["Varioref" (setq reftex-vref-is-default t
reftex-fref-is-default nil)
***************
*** 2500,2506 ****
(list 'reftex-add-index-macros (list 'list (list 'quote (car x))))
:style 'radio :selected
(list 'memq (list 'quote (car x))
! (list 'get 'reftex-docstruct-symbol
(list 'quote 'reftex-index-macros-style)))))
reftex-index-macros-builtin))
"--"
--- 2500,2506 ----
(list 'reftex-add-index-macros (list 'list (list 'quote (car x))))
:style 'radio :selected
(list 'memq (list 'quote (car x))
! (list 'get 'reftex-docstruct-symbol
(list 'quote 'reftex-index-macros-style)))))
reftex-index-macros-builtin))
"--"
***************
*** 2509,2515 ****
("Customize"
["Browse RefTeX Group" reftex-customize t]
"--"
! ["Build Full Customize Menu" reftex-create-customize-menu
(fboundp 'customize-menu-create)])
("Documentation"
["Info" reftex-info t]
--- 2509,2515 ----
("Customize"
["Browse RefTeX Group" reftex-customize t]
"--"
! ["Build Full Customize Menu" reftex-create-customize-menu
(fboundp 'customize-menu-create)])
("Documentation"
["Info" reftex-info t]
***************
*** 2525,2531 ****
(interactive)
(if (fboundp 'customize-menu-create)
(progn
! (easy-menu-change
'("Ref") "Customize"
`(["Browse RefTeX group" reftex-customize t]
"--"
--- 2525,2531 ----
(interactive)
(if (fboundp 'customize-menu-create)
(progn
! (easy-menu-change
'("Ref") "Customize"
`(["Browse RefTeX group" reftex-customize t]
"--"
***************
*** 2563,2569 ****
;;; That's it!
----------------------------------------------------------------
(setq reftex-tables-dirty t) ; in case this file is evaluated by hand
! (provide 'reftex)
;;;============================================================================
--- 2563,2569 ----
;;; That's it!
----------------------------------------------------------------
(setq reftex-tables-dirty t) ; in case this file is evaluated by hand
! (provide 'reftex)
;;;============================================================================
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/textmodes/reftex.el,
Juanma Barranquero <=