[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: |
Juanma Barranquero |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/textmodes/reftex-vars.el |
|
Date: |
Tue, 13 Sep 2005 04:52:00 -0400 |
Index: emacs/lisp/textmodes/reftex-vars.el
diff -c emacs/lisp/textmodes/reftex-vars.el:1.27
emacs/lisp/textmodes/reftex-vars.el:1.28
*** emacs/lisp/textmodes/reftex-vars.el:1.27 Sat Aug 6 17:41:15 2005
--- emacs/lisp/textmodes/reftex-vars.el Tue Sep 13 08:52:00 2005
***************
*** 29,34 ****
--- 29,35 ----
(eval-when-compile (require 'cl))
(eval-and-compile
+ (defvar reftex-tables-dirty)
(defun reftex-set-dirty (symbol value)
(setq reftex-tables-dirty t)
(set symbol value)))
***************
*** 101,122 ****
("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:
--- 102,123 ----
("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:
***************
*** 208,214 ****
`?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)))
--- 209,215 ----
`?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)))
***************
*** 220,226 ****
(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
--- 221,227 ----
(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
***************
*** 232,238 ****
(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")
--- 233,239 ----
(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")
***************
*** 327,340 ****
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
--- 328,341 ----
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
***************
*** 426,432 ****
'(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
--- 427,433 ----
'(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
***************
*** 625,631 ****
(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
--- 626,632 ----
(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
***************
*** 687,693 ****
(regexp)
(repeat :tag "List"
(string :tag "prefix (with colon)"))))
!
(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
--- 688,694 ----
(regexp)
(repeat :tag "List"
(string :tag "prefix (with colon)"))))
!
(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
***************
*** 733,739 ****
(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))
--- 734,740 ----
(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))
***************
*** 743,749 ****
nil
;; OK, we got it
(cons \"linguex\" p1)))
! ;; Return nil for not found
nil))))
3. Tell RefTeX to use this function
--- 744,750 ----
nil
;; OK, we got it
(cons \"linguex\" p1)))
! ;; Return nil for not found
nil))))
3. Tell RefTeX to use this function
***************
*** 942,948 ****
(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
--- 943,949 ----
(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
***************
*** 952,958 ****
(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
--- 953,959 ----
(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
***************
*** 976,982 ****
(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
--- 977,983 ----
(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
***************
*** 1057,1069 ****
%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.
A pair of square brackets indicates an optional argument, and RefTeX
--- 1058,1070 ----
%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.
A pair of square brackets indicates an optional argument, and RefTeX
***************
*** 1078,1084 ****
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
--- 1079,1085 ----
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
***************
*** 1172,1178 ****
(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
--- 1173,1179 ----
(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
***************
*** 1255,1261 ****
:group 'reftex-index-support
:set 'reftex-set-dirty
:type `(list
! (repeat
:inline t
(list :value ("" "idx" ?a "" nil)
(string :tag "Macro with args")
--- 1256,1262 ----
:group 'reftex-index-support
:set 'reftex-set-dirty
:type `(list
! (repeat
:inline t
(list :value ("" "idx" ?a "" nil)
(string :tag "Macro with args")
***************
*** 1282,1288 ****
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."
--- 1283,1289 ----
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."
***************
*** 1423,1429 ****
(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)
--- 1424,1430 ----
(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)
***************
*** 1446,1452 ****
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).
--- 1447,1453 ----
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).
***************
*** 1467,1473 ****
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)
--- 1468,1474 ----
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)
***************
*** 1513,1519 ****
- 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.
--- 1514,1520 ----
- 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.
***************
*** 1528,1534 ****
- 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.
--- 1529,1535 ----
- 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.
***************
*** 1573,1579 ****
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)
--- 1574,1580 ----
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)
***************
*** 1664,1670 ****
(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
--- 1665,1671 ----
(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
***************
*** 1857,1863 ****
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
--- 1858,1864 ----
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
- [Emacs-diffs] Changes to emacs/lisp/textmodes/reftex-vars.el,
Juanma Barranquero <=