[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/textmodes/reftex-vars.el
|
From: |
Carsten Dominik |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/textmodes/reftex-vars.el |
|
Date: |
Mon, 11 Aug 2003 08:27:03 -0400 |
Index: emacs/lisp/textmodes/reftex-vars.el
diff -c emacs/lisp/textmodes/reftex-vars.el:1.17
emacs/lisp/textmodes/reftex-vars.el:1.18
*** emacs/lisp/textmodes/reftex-vars.el:1.17 Tue Feb 4 08:30:45 2003
--- emacs/lisp/textmodes/reftex-vars.el Mon Aug 11 08:27:02 2003
***************
*** 1,8 ****
;;; reftex-vars.el --- configuration variables for RefTeX
! ;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
;; Author: Carsten Dominik <address@hidden>
! ;; Version: 4.18
;; This file is part of GNU Emacs.
--- 1,8 ----
;;; reftex-vars.el --- configuration variables for RefTeX
! ;; Copyright (c) 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
;; Author: Carsten Dominik <address@hidden>
! ;; Version: 4.21
;; This file is part of GNU Emacs.
***************
*** 13,23 ****
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
! ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
! ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
--- 13,23 ----
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
! ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
! ;; along with GNU Emacs; see the file COPYING If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
***************
*** 93,120 ****
(LaTeX "LaTeX default environments"
(("section" ?s "%S" "~\\ref{%s}" (nil . t)
(regexp "parts?" "chapters?" "chap\\." "sections?" "sect?\\."
! "paragraphs?" "par\\."
! "\\\\S" "\247" "Teile?" "Kapitel" "Kap\\." "Abschnitte?"
! "appendi\\(x\\|ces\\)" "App\\." "Anh\"?ange?" "Anh\\."))
("enumerate" ?i "item:" "~\\ref{%s}" item
(regexp "items?" "Punkte?"))
!
("equation" ?e "eq:" "~(\\ref{%s})" t
(regexp "equations?" "eqs?\\." "eqn\\." "Gleichung\\(en\\)?" "Gl\\."))
("eqnarray" ?e "eq:" nil eqnarray-like)
!
("figure" ?f "fig:" "~\\ref{%s}" caption
(regexp "figure?[sn]?" "figs?\\." "Abbildung\\(en\\)?" "Abb\\."))
("figure*" ?f nil nil caption)
!
("table" ?t "tab:" "~\\ref{%s}" caption
(regexp "tables?" "tab\\." "Tabellen?"))
("table*" ?t nil nil caption)
!
("\\footnote[]{}" ?n "fn:" "~\\ref{%s}" 2
(regexp "footnotes?" "Fussnoten?"))
!
("any" ?\ " " "~\\ref{%s}" nil)
;; The label macro is hard coded, but it *could* be defined like this:
--- 93,120 ----
(LaTeX "LaTeX default environments"
(("section" ?s "%S" "~\\ref{%s}" (nil . t)
(regexp "parts?" "chapters?" "chap\\." "sections?" "sect?\\."
! "paragraphs?" "par\\."
! "\\\\S" "\247" "Teile?" "Kapitel" "Kap\\." "Abschnitte?"
! "appendi\\(x\\|ces\\)" "App\\." "Anh\"?ange?" "Anh\\."))
("enumerate" ?i "item:" "~\\ref{%s}" item
(regexp "items?" "Punkte?"))
!
("equation" ?e "eq:" "~(\\ref{%s})" t
(regexp "equations?" "eqs?\\." "eqn\\." "Gleichung\\(en\\)?" "Gl\\."))
("eqnarray" ?e "eq:" nil eqnarray-like)
!
("figure" ?f "fig:" "~\\ref{%s}" caption
(regexp "figure?[sn]?" "figs?\\." "Abbildung\\(en\\)?" "Abb\\."))
("figure*" ?f nil nil caption)
!
("table" ?t "tab:" "~\\ref{%s}" caption
(regexp "tables?" "tab\\." "Tabellen?"))
("table*" ?t nil nil caption)
!
("\\footnote[]{}" ?n "fn:" "~\\ref{%s}" 2
(regexp "footnotes?" "Fussnoten?"))
!
("any" ?\ " " "~\\ref{%s}" nil)
;; The label macro is hard coded, but it *could* be defined like this:
***************
*** 141,146 ****
--- 141,159 ----
(?A . "\\citeauthor*{%l}")
(?y . "\\citeyear{%l}")
(?n . "\\nocite{%l}")))
+ (amsrefs "The AMSRefs package"
+ ((?\C-m . "\\cite{%l}")
+ (?p . "\\cite{%l}")
+ (?P . "\\cites{%l}")
+ (?t . "\\ocite{%l}")
+ (?T . "\\ocites{%l}")
+ (?y . "\\ycite{%l}")
+ (?Y . "\\ycites{%l}")
+ (?a . "\\citeauthor{%l}")
+ (?A . "\\citeauthory{%l}")
+ (?f . "\\fullcite{%l}")
+ (?F . "\\fullocite{%l}")
+ (?n . "\\nocite{%l}")))
(bibentry "The Bibentry package"
"\\bibentry{%l}")
(harvard "The Harvard package"
***************
*** 178,197 ****
`?t' should point to a textual citation (citation as a noun).
`?p' should point to a parenthetical citation.")
! (defconst reftex-index-macros-builtin
'((default "Default \\index and \\glossary macros"
(("\\index{*}" "idx" ?i "" nil t)
("\\glossary{*}" "glo" ?g "" nil t)))
(multind "The multind.sty package"
(("\\index{}{*}" 1 ?i "" nil t)))
(index "The index.sty package"
! (("\\index[]{*}" 1 ?i "" nil t)
! ("\\index*[]{*}" 1 ?I "" nil nil)))
(Index-Shortcut "index.sty with \\shortindexingon"
(("\\index[]{*}" 1 ?i "" nil t)
! ("\\index*[]{*}" 1 ?I "" nil nil)
! ("^[]{*}" 1 ?^ "" texmathp t)
! ("_[]{*}" 1 ?_ "" texmathp nil))))
"Builtin stuff for reftex-index-macros.
Lower-case symbols correspond to a style file of the same name in the LaTeX
distribution. Mixed-case symbols are convenience aliases.")
--- 191,210 ----
`?t' should point to a textual citation (citation as a noun).
`?p' should point to a parenthetical citation.")
! (defconst reftex-index-macros-builtin
'((default "Default \\index and \\glossary macros"
(("\\index{*}" "idx" ?i "" nil t)
("\\glossary{*}" "glo" ?g "" nil t)))
(multind "The multind.sty package"
(("\\index{}{*}" 1 ?i "" nil t)))
(index "The index.sty package"
! (("\\index[]{*}" 1 ?i "" nil t)
! ("\\index*[]{*}" 1 ?I "" nil nil)))
(Index-Shortcut "index.sty with \\shortindexingon"
(("\\index[]{*}" 1 ?i "" nil t)
! ("\\index*[]{*}" 1 ?I "" nil nil)
! ("^[]{*}" 1 ?^ "" texmathp t)
! ("_[]{*}" 1 ?_ "" texmathp nil))))
"Builtin stuff for reftex-index-macros.
Lower-case symbols correspond to a style file of the same name in the LaTeX
distribution. Mixed-case symbols are convenience aliases.")
***************
*** 202,209 ****
(defgroup reftex nil
"LaTeX label and citation support."
:tag "RefTeX"
! :link '(url-link :tag "Home Page"
! "http://strw.leidenuniv.nl/~dominik/Tools/";)
:link '(emacs-commentary-link :tag "Commentary in reftex.el" "reftex.el")
:link '(custom-manual "(reftex)Top")
:prefix "reftex-"
--- 215,222 ----
(defgroup reftex nil
"LaTeX label and citation support."
:tag "RefTeX"
! :link '(url-link :tag "Home Page"
! "http://zon.astro.uva.nl/~dominik/Tools/";)
:link '(emacs-commentary-link :tag "Commentary in reftex.el" "reftex.el")
:link '(custom-manual "(reftex)Top")
:prefix "reftex-"
***************
*** 240,246 ****
("subsubsection" . 4)
("paragraph" . 5)
("subparagraph" . 6)
- ("subsubparagraph" . 7)
("addchap" . -1) ; KOMA-Script
("addsec" . -2) ; KOMA-Script
;;; ("minisec" . -7) ; KOMA-Script
--- 253,258 ----
***************
*** 251,264 ****
the backslash). The cdr is a number indicating its level. A negative
level means the same level as the positive value, but the section will
never get a number. The cdr may also be a function which will be called
! to after the section-re matched to determine the level."
:group 'reftex-table-of-contents-browser
:set 'reftex-set-dirty
:type '(repeat
(cons (string :tag "sectioning macro" "")
! (choice
! (number :tag "level " 0)
! (symbol :tag "function " my-level-func)))))
(defcustom reftex-toc-max-level 100
"*The maximum level of toc entries which will be included in the TOC.
--- 263,281 ----
the backslash). The cdr is a number indicating its level. A negative
level means the same level as the positive value, but the section will
never get a number. The cdr may also be a function which will be called
! to after the section-re matched to determine the level.
! This list is also used for promotion and demption of sectioning commands.
! If you are using a document class which has several sets of sectioning
! commands, promotion only works correctly if this list is sorted first
! by set, then within each set by level. The promotion commands always
! select the nearest entry with the correct new level."
:group 'reftex-table-of-contents-browser
:set 'reftex-set-dirty
:type '(repeat
(cons (string :tag "sectioning macro" "")
! (choice
! (number :tag "level " 0)
! (symbol :tag "function " my-level-func)))))
(defcustom reftex-toc-max-level 100
"*The maximum level of toc entries which will be included in the TOC.
***************
*** 278,304 ****
:type 'boolean)
! (defcustom reftex-auto-recenter-toc nil
! "*Non-nil means, initially turn automatic recentering of toc on.
! When active, the *TOC* buffer will always show the section you
are currently working in. Recentering happens whenever Emacs is idle for
more than `reftex-idle-time' seconds.
- This feature can be turned on and off from the menu
- (Ref->Options)."
- :group 'reftex-table-of-contents-browser
- :type 'boolean)
(defcustom reftex-toc-split-windows-horizontally nil
"*Non-nil means, create TOC window by splitting window horizontally."
:group 'reftex-table-of-contents-browser
:type 'boolean)
! (defcustom reftex-toc-split-windows-horizontally-fraction .5
! "*Fraction of the horizontal width of the frame to be used for TOC window.
! Only relevant when `reftex-toc-split-windows-horizontally' is non-nil."
:group 'reftex-table-of-contents-browser
:type 'number)
(defcustom reftex-toc-keep-other-windows t
"*Non-nil means, split the selected window to display the *toc* buffer.
This helps to keep the window configuration, but makes the *toc* small.
--- 295,337 ----
:type 'boolean)
! (defcustom reftex-auto-recenter-toc 'frame
! "*Non-nil means, turn automatic recentering of *TOC* window on.
! When active, the *TOC* window will always show the section you
are currently working in. Recentering happens whenever Emacs is idle for
more than `reftex-idle-time' seconds.
+ Value t means, turn on immediately when RefTeX gets started. Then,
+ recentering will work for any toc window created during the session.
+
+ Value 'frame (the default) means, turn automatic recentering on only while the
+ dedicated TOC frame does exist, and do the recentering only in that frame. So
+ when creating that frame (with \"d\" key in an ordinary TOC window), the
+ automatic recentering is turned on. When the frame gets destroyed, automatic
+ recentering is turned off again.
+
+ This feature can be turned on and off from the menu
+ \(Ref->Options)."
+ :group 'reftex-table-of-contents-browser
+ :type '(choice
+ (const :tag "never" nil)
+ (const :tag "always" t)
+ (const :tag "in dedicated frame only" 'frame)))
+
(defcustom reftex-toc-split-windows-horizontally nil
"*Non-nil means, create TOC window by splitting window horizontally."
:group 'reftex-table-of-contents-browser
:type 'boolean)
! (defcustom reftex-toc-split-windows-fraction .3
! "*Fraction of the width or height of the frame to be used for TOC window.
! See also `reftex-toc-split-windows-horizontally'."
:group 'reftex-table-of-contents-browser
:type 'number)
+ (defvar reftex-toc-split-windows-horizontally-fraction 0.5
+ "This variable is obsolete, use `reftex-toc-split-windows-fraction'
instead.")
+
(defcustom reftex-toc-keep-other-windows t
"*Non-nil means, split the selected window to display the *toc* buffer.
This helps to keep the window configuration, but makes the *toc* small.
***************
*** 325,330 ****
--- 358,374 ----
:group 'reftex-table-of-contents-browser
:type 'boolean)
+ (defcustom reftex-toc-confirm-promotion 2
+ "*Non-nil means, promotion/demotion commands first prompt for confirmation.
+ When nil, the command is executed immediately. When this is an integer
+ N, ask for confirmation only if N or more section commands are going to be
+ changed."
+ :group 'reftex-table-of-contents-browser
+ :type '(choice
+ (const :tag "Never" nil)
+ (const :tag "Always" t)
+ (number :tag "When more than N sections" :value 2)))
+
(defcustom reftex-toc-include-context nil
"*Non-nil means, include context with labels in the *toc* buffer.
Context will only be shown when labels are visible as well.
***************
*** 363,384 ****
(defcustom reftex-default-label-alist-entries
'(amsmath endnotes fancybox floatfig longtable picinpar
! rotating sidecap subfigure supertab wrapfig LaTeX)
"Default label alist specifications. LaTeX should always be the last entry.
! The value of this variable is a list of symbols with associations in the
constant `reftex-label-alist-builtin'. Check that constant for a full list
of options."
:group 'reftex-defining-label-environments
:set 'reftex-set-dirty
:type `(set
! :indent 4
:inline t
:greedy t
,@(mapcar
! (lambda (x)
! (list 'const :tag (concat (symbol-name (nth 0 x))
! ": " (nth 1 x))
! (nth 0 x)))
reftex-label-alist-builtin)))
(defcustom reftex-label-alist nil
--- 407,428 ----
(defcustom reftex-default-label-alist-entries
'(amsmath endnotes fancybox floatfig longtable picinpar
! rotating sidecap subfigure supertab wrapfig LaTeX)
"Default label alist specifications. LaTeX should always be the last entry.
! The value of this variable is a list of symbols with associations in the
constant `reftex-label-alist-builtin'. Check that constant for a full list
of options."
:group 'reftex-defining-label-environments
:set 'reftex-set-dirty
:type `(set
! :indent 4
:inline t
:greedy t
,@(mapcar
! (lambda (x)
! (list 'const :tag (concat (symbol-name (nth 0 x))
! ": " (nth 1 x))
! (nth 0 x)))
reftex-label-alist-builtin)))
(defcustom reftex-label-alist nil
***************
*** 526,535 ****
(choice :tag "Environment or \\macro "
(const :tag "Ignore, just use typekey" nil)
(string "")
! (symbol :tag "Special parser" my-parser))
! (choice :tag "Type specification "
! (const :tag "unspecified, like in \\label" nil)
! (character :tag "Char " ?a))
(choice :tag "Label prefix string "
(const :tag "Default" nil)
(string :tag "String" "lab:"))
--- 570,579 ----
(choice :tag "Environment or \\macro "
(const :tag "Ignore, just use typekey" nil)
(string "")
! (symbol :tag "Special parser" my-parser))
! (choice :tag "Type specification "
! (const :tag "unspecified, like in \\label" nil)
! (character :tag "Char " ?a))
(choice :tag "Label prefix string "
(const :tag "Default" nil)
(string :tag "String" "lab:"))
***************
*** 537,580 ****
(const :tag "Default" nil)
(string :tag "String" "~\\ref{%s}"))
(choice :tag "Context method "
! (const :tag "Default position" t)
! (const :tag "After label" nil)
! (number :tag "Macro arg nr" 1)
! (regexp :tag "Regexp" "")
! (const :tag "Caption in float" caption)
! (const :tag "Item in list" item)
! (const :tag "Eqnarray-like" eqnarray-like)
! (const :tag "Alignat-like" alignat-like)
! (symbol :tag "Function" my-func))
! (repeat :tag "Magic words" :extra-offset 2 (string))
! (option (choice :tag "Make TOC entry "
! (const :tag "No entry" nil)
! (integer :tag "Level" :value -3))))
(choice
:tag "Package"
:value AMSTeX
,@(mapcar
! (lambda (x)
! (list 'const :tag (concat (symbol-name (nth 0 x)))
! (nth 0 x)))
! reftex-label-alist-builtin)))))
(defcustom reftex-section-prefixes '((0 . "part:") (1 . "cha:") (t . "sec:"))
"Prefixes for section labels.
When the label prefix given in an entry in `reftex-label-alist' contains `%S',
! this list is used to determine the correct prefix string depending on the
current section level.
The list is an alist, with each entry of the form (KEY . PREFIX)
Possible keys are sectioning macro names like `chapter', section levels
! (as given in `reftex-section-levels'), and t for the default."
:group 'reftex-defining-label-environments
:type '(repeat
! (cons :value (0 . "")
! (choice
! (string :tag "macro name")
! (integer :tag "section level")
! (const :tag "default" t))
! (string :tag "Prefix"))))
(defcustom reftex-default-context-regexps
'((caption . "\\\\\\(rot\\)?caption\\*?[[{]")
--- 581,624 ----
(const :tag "Default" nil)
(string :tag "String" "~\\ref{%s}"))
(choice :tag "Context method "
! (const :tag "Default position" t)
! (const :tag "After label" nil)
! (number :tag "Macro arg nr" 1)
! (regexp :tag "Regexp" "")
! (const :tag "Caption in float" caption)
! (const :tag "Item in list" item)
! (const :tag "Eqnarray-like" eqnarray-like)
! (const :tag "Alignat-like" alignat-like)
! (symbol :tag "Function" my-func))
! (repeat :tag "Magic words" :extra-offset 2 (string))
! (option (choice :tag "Make TOC entry "
! (const :tag "No entry" nil)
! (integer :tag "Level" :value -3))))
(choice
:tag "Package"
:value AMSTeX
,@(mapcar
! (lambda (x)
! (list 'const :tag (concat (symbol-name (nth 0 x)))
! (nth 0 x)))
! reftex-label-alist-builtin)))))
(defcustom reftex-section-prefixes '((0 . "part:") (1 . "cha:") (t . "sec:"))
"Prefixes for section labels.
When the label prefix given in an entry in `reftex-label-alist' contains `%S',
! this list is used to determine the correct prefix string depending on the
current section level.
The list is an alist, with each entry of the form (KEY . PREFIX)
Possible keys are sectioning macro names like `chapter', section levels
! \(as given in `reftex-section-levels'), and t for the default."
:group 'reftex-defining-label-environments
:type '(repeat
! (cons :value (0 . "")
! (choice
! (string :tag "macro name")
! (integer :tag "section level")
! (const :tag "default" t))
! (string :tag "Prefix"))))
(defcustom reftex-default-context-regexps
'((caption . "\\\\\\(rot\\)?caption\\*?[[{]")
***************
*** 587,593 ****
or macro."
:group 'reftex-defining-label-environments
:type '(repeat (cons (symbol) (regexp))))
!
(defcustom reftex-special-environment-functions nil
"List of functions to be called when trying to figure out current
environment.
These are special functions to detect \"environments\" which do not
--- 631,637 ----
or macro."
:group 'reftex-defining-label-environments
:type '(repeat (cons (symbol) (regexp))))
!
(defcustom reftex-special-environment-functions nil
"List of functions to be called when trying to figure out current
environment.
These are special functions to detect \"environments\" which do not
***************
*** 633,639 ****
(let ((pos (point)) p1)
(save-excursion
;; Search for any of the linguex item macros at the beginning of a
line
! (if (re-search-backward
\"^[
\\t]*\\\\(\\\\\\\\\\\\(ex\\\\|a\\\\|b\\\\|c\\\\|d\\\\|e\\\\|f\\\\)g?\\\\.\\\\)\"
bound t)
(progn
(setq p1 (match-beginning 1))
--- 677,683 ----
(let ((pos (point)) p1)
(save-excursion
;; Search for any of the linguex item macros at the beginning of a
line
! (if (re-search-backward
\"^[
\\t]*\\\\(\\\\\\\\\\\\(ex\\\\|a\\\\|b\\\\|c\\\\|d\\\\|e\\\\|f\\\\)g?\\\\.\\\\)\"
bound t)
(progn
(setq p1 (match-beginning 1))
***************
*** 643,649 ****
nil
;; OK, we got it
(cons \"linguex\" p1)))
! ;; Return nil for not found
nil))))
3. Tell RefTeX to use this function
--- 687,693 ----
nil
;; OK, we got it
(cons \"linguex\" p1)))
! ;; Return nil for not found
nil))))
3. Tell RefTeX to use this function
***************
*** 690,696 ****
like character classes.
Thus, the combination may be set differently for each label type. The
default settings \"s\" and \"sft\" mean: Derive section labels from headings
! (with confirmation). Prompt for figure and table labels. Use simple labels
without confirmation for everything else.
The available label types are: s (section), f (figure), t (table), i (item),
e (equation), n (footnote), N (endnote), plus any definitions in
--- 734,740 ----
like character classes.
Thus, the combination may be set differently for each label type. The
default settings \"s\" and \"sft\" mean: Derive section labels from headings
! \(with confirmation). Prompt for figure and table labels. Use simple labels
without confirmation for everything else.
The available label types are: s (section), f (figure), t (table), i (item),
e (equation), n (footnote), N (endnote), plus any definitions in
***************
*** 751,757 ****
(repeat :tag "Ignore words"
:entry-format " %i %d %v"
(string :tag ""))
! (option (boolean :tag "Downcase words "))))
(defcustom reftex-label-illegal-re "[^-a-zA-Z0-9_+=:;,.]"
"Regexp matching characters not legal in labels."
--- 795,801 ----
(repeat :tag "Ignore words"
:entry-format " %i %d %v"
(string :tag ""))
! (option (boolean :tag "Downcase words "))))
(defcustom reftex-label-illegal-re "[^-a-zA-Z0-9_+=:;,.]"
"Regexp matching characters not legal in labels."
***************
*** 827,833 ****
(choice :tag "Hide short context " ,@reftex-tmp)
(choice :tag "Follow context in other window " ,@reftex-tmp)
(choice :tag "Show commented labels " ,@reftex-tmp)
! (choice :tag "Obsolete flag. Don't use. " ,@reftex-tmp)
(choice :tag "Show begin/end of included files" ,@reftex-tmp)))
(defcustom reftex-multiref-punctuation '((?, . ", ") (?- . "--") (?+ . " and
"))
--- 871,877 ----
(choice :tag "Hide short context " ,@reftex-tmp)
(choice :tag "Follow context in other window " ,@reftex-tmp)
(choice :tag "Show commented labels " ,@reftex-tmp)
! (choice :tag "Obsolete flag, Don't use. " ,@reftex-tmp)
(choice :tag "Show begin/end of included files" ,@reftex-tmp)))
(defcustom reftex-multiref-punctuation '((?, . ", ") (?- . "--") (?+ . " and
"))
***************
*** 842,848 ****
(defcustom reftex-vref-is-default nil
"*Non-nil means, the varioref macro \\vref is used as default.
! In the selection buffer, the `v' key toggles the reference macro between
`\\ref' and `\\vref'. The value of this variable determines the default
which is active when entering the selection process.
Instead of nil or t, this may also be a string of type letters indicating
--- 886,892 ----
(defcustom reftex-vref-is-default nil
"*Non-nil means, the varioref macro \\vref is used as default.
! In the selection buffer, the `v' key toggles the reference macro between
`\\ref' and `\\vref'. The value of this variable determines the default
which is active when entering the selection process.
Instead of nil or t, this may also be a string of type letters indicating
***************
*** 852,858 ****
(defcustom reftex-fref-is-default nil
"*Non-nil means, the fancyref macro \\fref is used as default.
! In the selection buffer, the `V' key toggles the reference macro between
`\\ref', `\\fref' and `\\Fref'. The value of this variable determines
the default which is active when entering the selection process.
Instead of nil or t, this may also be a string of type letters indicating
--- 896,902 ----
(defcustom reftex-fref-is-default nil
"*Non-nil means, the fancyref macro \\fref is used as default.
! In the selection buffer, the `V' key toggles the reference macro between
`\\ref', `\\fref' and `\\Fref'. The value of this variable determines
the default which is active when entering the selection process.
Instead of nil or t, this may also be a string of type letters indicating
***************
*** 876,882 ****
(defcustom reftex-format-ref-function nil
"Function which produces the string to insert as a reference.
! Normally should be nil, because the format to insert a reference can
already be specified in `reftex-label-alist'.
This hook also is used by the special commands to insert `\\vref' and `\\fref'
references, so even if you set this, your setting will be ignored by
--- 920,926 ----
(defcustom reftex-format-ref-function nil
"Function which produces the string to insert as a reference.
! Normally should be nil, because the format to insert a reference can
already be specified in `reftex-label-alist'.
This hook also is used by the special commands to insert `\\vref' and `\\fref'
references, so even if you set this, your setting will be ignored by
***************
*** 957,969 ****
%i institution %j journal %k key %m month
%n number %o organization %p pages %P first page
%r address %s school %u publisher %t title
! %v volume %y year
%B booktitle, abbreviated %T title, abbreviated
Usually, only %l is needed. The other stuff is mainly for the echo area
display, and for (setq reftex-comment-citations t).
! %< as a special operator kills punctuation and space around it after the
string has been formatted.
Beware that all this only works with BibTeX database files. When
--- 1001,1013 ----
%i institution %j journal %k key %m month
%n number %o organization %p pages %P first page
%r address %s school %u publisher %t title
! %v volume %y year
%B booktitle, abbreviated %T title, abbreviated
Usually, only %l is needed. The other stuff is mainly for the echo area
display, and for (setq reftex-comment-citations t).
! %< as a special operator kills punctuation and space around it after the
string has been formatted.
Beware that all this only works with BibTeX database files. When
***************
*** 975,981 ****
strings.
In order to configure this variable, you can either set
`reftex-cite-format' directly yourself or set it to the SYMBOL of one of
! the predefined styles. The predefined symbols are those which have an
association in the constant `reftex-cite-format-builtin'.
E.g.: (setq reftex-cite-format 'natbib)"
:group 'reftex-citation-support
--- 1019,1025 ----
strings.
In order to configure this variable, you can either set
`reftex-cite-format' directly yourself or set it to the SYMBOL of one of
! the predefined styles. The predefined symbols are those which have an
association in the constant `reftex-cite-format-builtin'.
E.g.: (setq reftex-cite-format 'natbib)"
:group 'reftex-citation-support
***************
*** 1033,1039 ****
(defcustom reftex-format-cite-function nil
"Function which produces the string to insert as a citation.
! Normally should be nil, because the format to insert a reference can
already be specified in `reftex-cite-format'.
The function will be called with two arguments, the CITATION KEY and the
DEFAULT FORMAT, which is taken from `reftex-cite-format'. The function
--- 1077,1083 ----
(defcustom reftex-format-cite-function nil
"Function which produces the string to insert as a citation.
! Normally should be nil, because the format to insert a reference can
already be specified in `reftex-cite-format'.
The function will be called with two arguments, the CITATION KEY and the
DEFAULT FORMAT, which is taken from `reftex-cite-format'. The function
***************
*** 1066,1081 ****
These correspond to the makeindex keywords LEVEL ENCAP ACTUAL QUOTE ESCAPE."
:group 'reftex-index-support
:type '(list
! (string :tag "LEVEL separator")
! (string :tag "ENCAP char ")
! (string :tag "ACTUAL char ")
! (string :tag "QUOTE char ")
! (string :tag "ESCAPE char ")))
(defcustom reftex-index-macros nil
"Macros which define index entries. The structure is
! (MACRO INDEX-TAG KEY PREFIX EXCLUDE REPEAT)
MACRO is the macro. Arguments should be denoted by empty braces like
\\index[]{*}. Use square brackets to denote optional arguments. The star
--- 1110,1125 ----
These correspond to the makeindex keywords LEVEL ENCAP ACTUAL QUOTE ESCAPE."
:group 'reftex-index-support
:type '(list
! (string :tag "LEVEL separator")
! (string :tag "ENCAP char ")
! (string :tag "ACTUAL char ")
! (string :tag "QUOTE char ")
! (string :tag "ESCAPE char ")))
(defcustom reftex-index-macros nil
"Macros which define index entries. The structure is
! \(MACRO INDEX-TAG KEY PREFIX EXCLUDE REPEAT)
MACRO is the macro. Arguments should be denoted by empty braces like
\\index[]{*}. Use square brackets to denote optional arguments. The star
***************
*** 1116,1158 ****
:group 'reftex-index-support
:set 'reftex-set-dirty
:type `(list
! (repeat
! :inline t
! (list :value ("" "idx" ?a "" nil)
! (string :tag "Macro with args")
! (choice :tag "Index Tag "
! (string)
! (integer :tag "Macro arg Nr" :value 1))
! (character :tag "Access Key ")
! (string :tag "Key Prefix ")
! (symbol :tag "Exclusion hook ")
(boolean :tag "Repeat Outside ")))
! (option
! :tag "Package:"
! (choice :tag "Package"
! :value index
! ,@(mapcar
! (lambda (x)
! (list 'const :tag (concat (symbol-name (nth 0 x))
! ": " (nth 1 x))
! (nth 0 x)))
! reftex-index-macros-builtin)))))
(defcustom reftex-index-default-macro '(?i "idx")
"The default index macro for \\[reftex-index-selection-or-word].
This is a list with (MACRO-KEY DEFAULT-TAG).
MACRO-KEY: Character identifying an index macro - see `reftex-index-macros'.
! DEFAULT-TAG: This is the tag to be used if the macro requires a TAG argument.
When this is nil and a TAG is needed, RefTeX will ask for it.
When this is the empty string and the TAG argument of the index
macro is optional, the TAG argument will be omitted."
:group 'reftex-index-support
:type '(list
! (character :tag "Character identifying default macro")
! (choice :tag "Default index tag "
! (const nil)
! (string))))
(defcustom reftex-index-default-tag "idx"
"Default index tag.
--- 1160,1202 ----
:group 'reftex-index-support
:set 'reftex-set-dirty
:type `(list
! (repeat
! :inline t
! (list :value ("" "idx" ?a "" nil)
! (string :tag "Macro with args")
! (choice :tag "Index Tag "
! (string)
! (integer :tag "Macro arg Nr" :value 1))
! (character :tag "Access Key ")
! (string :tag "Key Prefix ")
! (symbol :tag "Exclusion hook ")
(boolean :tag "Repeat Outside ")))
! (option
! :tag "Package:"
! (choice :tag "Package"
! :value index
! ,@(mapcar
! (lambda (x)
! (list 'const :tag (concat (symbol-name (nth 0 x))
! ": " (nth 1 x))
! (nth 0 x)))
! reftex-index-macros-builtin)))))
(defcustom reftex-index-default-macro '(?i "idx")
"The default index macro for \\[reftex-index-selection-or-word].
This is a list with (MACRO-KEY DEFAULT-TAG).
MACRO-KEY: Character identifying an index macro - see `reftex-index-macros'.
! DEFAULT-TAG: This is the tag to be used if the macro requires a TAG argument.
When this is nil and a TAG is needed, RefTeX will ask for it.
When this is the empty string and the TAG argument of the index
macro is optional, the TAG argument will be omitted."
:group 'reftex-index-support
:type '(list
! (character :tag "Character identifying default macro")
! (choice :tag "Default index tag "
! (const nil)
! (string))))
(defcustom reftex-index-default-tag "idx"
"Default index tag.
***************
*** 1166,1181 ****
last The last used index tag will be offered as default."
:group 'reftex-index-support
:type '(choice
! (const :tag "no default" nil)
! (const :tag "last used " 'last)
! (string :tag "index tag " "idx")))
(defcustom reftex-index-math-format "$%s$"
"Format of index entries when copied from inside math mode.
When `reftex-index-selection-or-word' is executed inside TeX math mode,
the index key copied from the buffer is processed with this format string
through the `format' function. This can be used to add the math delimiters
! (e.g. `$') to the string.
Requires the `texmathp.el' library which is part of AUCTeX."
:group 'reftex-index-support
:type 'string)
--- 1210,1225 ----
last The last used index tag will be offered as default."
:group 'reftex-index-support
:type '(choice
! (const :tag "no default" nil)
! (const :tag "last used " 'last)
! (string :tag "index tag " "idx")))
(defcustom reftex-index-math-format "$%s$"
"Format of index entries when copied from inside math mode.
When `reftex-index-selection-or-word' is executed inside TeX math mode,
the index key copied from the buffer is processed with this format string
through the `format' function. This can be used to add the math delimiters
! \(e.g. `$') to the string.
Requires the `texmathp.el' library which is part of AUCTeX."
:group 'reftex-index-support
:type 'string)
***************
*** 1229,1236 ****
If the function returns nil, the current match is skipped."
:group 'reftex-index-support
:type '(choice
! (const :tag "No verification" nil)
! (function)))
(defcustom reftex-index-phrases-skip-indexed-matches nil
"*Non-nil means, skip matches which appear to be indexed already.
--- 1273,1280 ----
If the function returns nil, the current match is skipped."
:group 'reftex-index-support
:type '(choice
! (const :tag "No verification" nil)
! (function)))
(defcustom reftex-index-phrases-skip-indexed-matches nil
"*Non-nil means, skip matches which appear to be indexed already.
***************
*** 1238,1244 ****
phrases may match at places where that phrase was already indexed. In
particular when indexing an already processed document again, this
will even be the norm. When this variable is non-nil, RefTeX checks if
! the match is an index macro argument, or if an index macro is directly
before or after the phrase. If that is the case, that match will
be ignored."
:group 'reftex-index-support
--- 1282,1288 ----
phrases may match at places where that phrase was already indexed. In
particular when indexing an already processed document again, this
will even be the norm. When this variable is non-nil, RefTeX checks if
! the match is inside an index macro argument, or if an index macro is directly
before or after the phrase. If that is the case, that match will
be ignored."
:group 'reftex-index-support
***************
*** 1282,1288 ****
(defcustom reftex-index-include-context nil
"*Non-nil means, display the index definition context in the index buffer.
! This flag may also be toggled from the index buffer with the `c' key."
:group 'reftex-index-support
:type 'boolean)
--- 1326,1332 ----
(defcustom reftex-index-include-context nil
"*Non-nil means, display the index definition context in the index buffer.
! This flag may also be toggled from the index buffer with the `c' key."
:group 'reftex-index-support
:type 'boolean)
***************
*** 1305,1313 ****
argument of a macro. Note that crossref viewing for citations,
references (both ways) and index entries is hard-coded. This variable
is only to configure additional structures for which crossreference
! viewing can be useful. Each entry has the structure
! (MACRO-RE SEARCH-RE HIGHLIGHT).
MACRO-RE is matched against the macro. SEARCH-RE is the regexp used
to search for cross references. `%s' in this regexp is replaced with
--- 1349,1357 ----
argument of a macro. Note that crossref viewing for citations,
references (both ways) and index entries is hard-coded. This variable
is only to configure additional structures for which crossreference
! viewing can be useful. Each entry has the structure
! \(MACRO-RE SEARCH-RE HIGHLIGHT).
MACRO-RE is matched against the macro. SEARCH-RE is the regexp used
to search for cross references. `%s' in this regexp is replaced with
***************
*** 1315,1322 ****
which subgroup of the match should be highlighted."
:group 'reftex-viewing-cross-references
:type '(repeat (group (regexp :tag "Macro Regexp ")
! (string :tag "Search Regexp ")
! (integer :tag "Highlight Group"))))
(defcustom reftex-auto-view-crossref t
"*Non-nil means, initially turn automatic viewing of crossref info on.
--- 1359,1366 ----
which subgroup of the match should be highlighted."
:group 'reftex-viewing-cross-references
:type '(repeat (group (regexp :tag "Macro Regexp ")
! (string :tag "Search Regexp ")
! (integer :tag "Highlight Group"))))
(defcustom reftex-auto-view-crossref t
"*Non-nil means, initially turn automatic viewing of crossref info on.
***************
*** 1326,1337 ****
displayed, the echo area will display information about that cross
reference. You can also set the variable to the symbol `window'. In
this case a small temporary window is used for the display.
! This feature can be turned on and off from the menu
! (Ref->Options)."
:group 'reftex-viewing-cross-references
:type '(choice (const :tag "off" nil)
! (const :tag "in Echo Area" t)
! (const :tag "in Other Window" window)))
(defcustom reftex-idle-time 1.2
"*Time (secs) Emacs has to be idle before automatic crossref display is
done.
--- 1370,1381 ----
displayed, the echo area will display information about that cross
reference. You can also set the variable to the symbol `window'. In
this case a small temporary window is used for the display.
! This feature can be turned on and off from the menu
! \(Ref->Options)."
:group 'reftex-viewing-cross-references
:type '(choice (const :tag "off" nil)
! (const :tag "in Echo Area" t)
! (const :tag "in Other Window" window)))
(defcustom reftex-idle-time 1.2
"*Time (secs) Emacs has to be idle before automatic crossref display is
done.
***************
*** 1372,1378 ****
- If an element is the name of an environment variable, its content is used.
- If an element starts with an exclamation mark, it is used as a command
to retrieve the path. A typical command with the kpathsearch library would
! be `!kpsewhich -show-path=.tex'.
- Otherwise the element itself is interpreted as a path.
Multiple directories can be separated by the system dependent
`path-separator'.
Directories ending in `//' or `!!' will be expanded recursively.
--- 1416,1422 ----
- If an element is the name of an environment variable, its content is used.
- If an element starts with an exclamation mark, it is used as a command
to retrieve the path. A typical command with the kpathsearch library would
! be `!kpsewhich -show-path=.tex'.
- Otherwise the element itself is interpreted as a path.
Multiple directories can be separated by the system dependent
`path-separator'.
Directories ending in `//' or `!!' will be expanded recursively.
***************
*** 1387,1393 ****
- If an element is the name of an environment variable, its content is used.
- If an element starts with an exclamation mark, it is used as a command
to retrieve the path. A typical command with the kpathsearch library would
! be `!kpsewhich -show-path=.bib'.
- Otherwise the element itself is interpreted as a path.
Multiple directories can be separated by the system dependent
`path-separator'.
Directories ending in `//' or `!!' will be expanded recursively.
--- 1431,1437 ----
- If an element is the name of an environment variable, its content is used.
- If an element starts with an exclamation mark, it is used as a command
to retrieve the path. A typical command with the kpathsearch library would
! be `!kpsewhich -show-path=.bib'.
- Otherwise the element itself is interpreted as a path.
Multiple directories can be separated by the system dependent
`path-separator'.
Directories ending in `//' or `!!' will be expanded recursively.
***************
*** 1398,1404 ****
:type '(repeat (string :tag "Specification")))
(defcustom reftex-file-extensions '(("tex" . (".tex" ".ltx"))
! ("bib" . (".bib")))
"*Association list with file extensions for different file types.
This is a list of items, each item is like: (TYPE . (DEF-EXT OTHER-EXT ...))
--- 1442,1448 ----
:type '(repeat (string :tag "Specification")))
(defcustom reftex-file-extensions '(("tex" . (".tex" ".ltx"))
! ("bib" . (".bib")))
"*Association list with file extensions for different file types.
This is a list of items, each item is like: (TYPE . (DEF-EXT OTHER-EXT ...))
***************
*** 1413,1419 ****
TeX-file-extensions."
:group 'reftex-finding-files
:type '(repeat (cons (string :tag "File type")
! (repeat (string :tag "Extension")))))
(defcustom reftex-search-unrecursed-path-first t
"*Non-nil means, search all specified directories before trying recursion.
--- 1457,1463 ----
TeX-file-extensions."
:group 'reftex-finding-files
:type '(repeat (cons (string :tag "File type")
! (repeat (string :tag "Extension")))))
(defcustom reftex-search-unrecursed-path-first t
"*Non-nil means, search all specified directories before trying recursion.
***************
*** 1432,1444 ****
TEXINPUTS and BIBINPUTS to find TeX files and BibTeX database files.
With this option turned on, it calls an external program specified in the
option `reftex-external-file-finders' instead. As a side effect,
! the variables `reftex-texpath-environment-variables' and
`reftex-bibpath-environment-variables' will be ignored."
:group 'reftex-finding-files
:type 'boolean)
(defcustom reftex-external-file-finders '(("tex" . "kpsewhich -format=.tex
%f")
! ("bib" . "kpsewhich -format=.bib %f"))
"*Association list with external programs to call for finding files.
Each entry is a cons cell (TYPE . PROGRAM).
TYPE is either \"tex\" or \"bib\". PROGRAM is the external program to use
with
--- 1476,1488 ----
TEXINPUTS and BIBINPUTS to find TeX files and BibTeX database files.
With this option turned on, it calls an external program specified in the
option `reftex-external-file-finders' instead. As a side effect,
! the variables `reftex-texpath-environment-variables' and
`reftex-bibpath-environment-variables' will be ignored."
:group 'reftex-finding-files
:type 'boolean)
(defcustom reftex-external-file-finders '(("tex" . "kpsewhich -format=.tex
%f")
! ("bib" . "kpsewhich -format=.bib
%f"))
"*Association list with external programs to call for finding files.
Each entry is a cons cell (TYPE . PROGRAM).
TYPE is either \"tex\" or \"bib\". PROGRAM is the external program to use
with
***************
*** 1447,1453 ****
Only relevant when `reftex-use-external-file-finders' is non-nil."
:group 'reftex-finding-files
:type '(repeat (cons (string :tag "File type")
! (string :tag "Program "))))
;; Tuning the parser ----------------------------------------------------
--- 1491,1497 ----
Only relevant when `reftex-use-external-file-finders' is non-nil."
:group 'reftex-finding-files
:type '(repeat (cons (string :tag "File type")
! (string :tag "Program "))))
;; Tuning the parser ----------------------------------------------------
***************
*** 1523,1529 ****
(defcustom reftex-save-parse-info nil
"*Non-nil means, save information gathered with parsing in a file.
The file MASTER.rel in the same directory as MASTER.tex is used to save the
! information. When this variable is t,
- accessing the parsing information for the first time in an editing session
will read that file (if available) instead of parsing the document.
- exiting Emacs or killing a buffer in reftex-mode will cause a new version
--- 1567,1573 ----
(defcustom reftex-save-parse-info nil
"*Non-nil means, save information gathered with parsing in a file.
The file MASTER.rel in the same directory as MASTER.tex is used to save the
! information. When this variable is t,
- accessing the parsing information for the first time in an editing session
will read that file (if available) instead of parsing the document.
- exiting Emacs or killing a buffer in reftex-mode will cause a new version
***************
*** 1607,1616 ****
to become effective (keys `g' or `r')."
:group 'reftex-fontification-configurations
:type '(choice
! (const :tag "Never" nil)
! (const :tag "Cursor driven" cursor)
! (const :tag "Mouse driven" mouse)
! (const :tag "Mouse and Cursor driven." both)))
(defcustom reftex-cursor-selected-face 'highlight
"Face name to highlight cursor selected item in toc and selection buffers.
--- 1651,1660 ----
to become effective (keys `g' or `r')."
:group 'reftex-fontification-configurations
:type '(choice
! (const :tag "Never" nil)
! (const :tag "Cursor driven" cursor)
! (const :tag "Mouse driven" mouse)
! (const :tag "Mouse and Cursor driven." both)))
(defcustom reftex-cursor-selected-face 'highlight
"Face name to highlight cursor selected item in toc and selection buffers.
***************
*** 1716,1733 ****
may require a restart of Emacs in order to become effective."
:group 'reftex-miscellaneous-configurations
:group 'LaTeX
! :type '(choice
! (const :tag "No plug-ins" nil)
! (const :tag "All possible plug-ins" t)
! (list
! :tag "Individual choice"
! :value (t t t t t)
! (boolean :tag "supply label in new sections and environments")
! (boolean :tag "supply argument for macros like `\\label' ")
! (boolean :tag "supply argument for macros like `\\ref' ")
! (boolean :tag "supply argument for macros like `\\cite' ")
! (boolean :tag "supply argument for macros like `\\index' ")
! )))
(defcustom reftex-allow-detached-macro-args nil
"*Non-nil means, allow arguments of macros to be detached by whitespace.
--- 1760,1777 ----
may require a restart of Emacs in order to become effective."
:group 'reftex-miscellaneous-configurations
:group 'LaTeX
! :type '(choice
! (const :tag "No plug-ins" nil)
! (const :tag "All possible plug-ins" t)
! (list
! :tag "Individual choice"
! :value (t t t t t)
! (boolean :tag "supply label in new sections and environments")
! (boolean :tag "supply argument for macros like `\\label' ")
! (boolean :tag "supply argument for macros like `\\ref' ")
! (boolean :tag "supply argument for macros like `\\cite' ")
! (boolean :tag "supply argument for macros like `\\index' ")
! )))
(defcustom reftex-allow-detached-macro-args nil
"*Non-nil means, allow arguments of macros to be detached by whitespace.
***************
*** 1746,1751 ****
--- 1790,1796 ----
"Hook which is being run when turning on RefTeX mode."
:group 'reftex-miscellaneous-configurations
:type 'hook)
+
(provide 'reftex-vars)
- [Emacs-diffs] Changes to emacs/lisp/textmodes/reftex-vars.el,
Carsten Dominik <=