Commit 4f595e15 authored by Ralf Angeli's avatar Ralf Angeli
Browse files

Merge from standalone RefTeX repository.

Here is the ChangeLog of the standalone version of RefTeX without
information about Makefiles and other auxiliary files.  The differences to
the Emacs repository are documented in the respective ChangeLog files.

2010-11-06  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-cite.el (reftex-create-bibtex-file): Make sure that
	entries with whitespace at various places are found.
	(reftex-extract-bib-entries-from-thebibliography): Remove
	superfluous backslash.

2010-10-16  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-cite.el
	(reftex-extract-bib-entries-from-thebibliography): Use
	`with-current-buffer'.

2010-09-14  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-cite.el (reftex-do-citation): Make it possible again
	to insert non-existent entries.

2010-01-30  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-base.el (reftex-syntax-table-for-bib, reftex-mode):
	Do not derive `reftex-syntax-table-for-bib' from
	`reftex-syntax-table' because parens have to retain their paren
	syntax in order for parsing of BibTeX entries like @book(...) to
	work.

2009-09-12  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-vars.el (reftex-label-alist): Doc fix.

	* lisp/reftex-toc.el (reftex-re-enlarge): Call `enlarge-window'
	only if there is something to do because in Emacs the horizontal
	version throws an error even if the parameter is 0.

2009-08-08  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-index.el: Suppress byte-compiler warnings.  Move
	provide statement to end of file.

	* lisp/reftex-dcr.el: Suppress byte-compiler warnings.  Move
	provide statement to end of file.

	* lisp/reftex-auc.el: Suppress byte-compiler warnings.

	* doc/reftex.texi (Imprint): Mention Wolfgang in list of
	contributors.

	* lisp/reftex-vars.el (reftex-plug-into-AUCTeX): Doc fix.

2009-07-05  Ralf Angeli  <angeli@caeruleus.net>

	* doc/reftex.texi (Creating Citations): Give a hint about how to
	auto-revert the BibTeX database file when using external editors.

	* lisp/reftex-cite.el (reftex-do-citation): Save match data when
	asking for optional arguments.

2009-04-29  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-base.el (reftex-in-comment): Do not error out if
	`comment-start-skip' is not set.

2009-03-01  Wolfgang Mayer  <wmayer7@gmail.com>

	* lisp/reftex-cite.el (reftex-all-used-citation-keys):
	Fix regexp to correctly extract all citations in the same line.

2008-12-29  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-vars.el (reftex-vref-is-default)
	(reftex-fref-is-default): Adapt doc string.
	(reftex-ref-style-default-list): New name for
	`reftex-ref-style-active-list'.  Use :set instead of :repeat.
	(reftex-vref-is-default, reftex-fref-is-default): Adapt to new
	name.

	* lisp/reftex-base.el (reftex-tie-multifile-symbols): Add doc
	string.
	(reftex-tie-multifile-symbols): Initialize
	`reftex-ref-style-list'.
	(reftex-untie-multifile-symbols): Add doc string.
	(reftex-add-index-macros): Doc fix.
	(reftex-ref-style-activate, reftex-ref-style-toggle)
	(reftex-ref-style-list): New functions.
	(reftex-mode-menu): Use them.

	* lisp/reftex-sel.el (reftex-select-cycle-ref-style-internal): Use
	`reftex-ref-style-list' function.

	* lisp/reftex-ref.el (reftex-reference): Use
	`reftex-ref-style-list' function.

	* doc/reftex.texi (Referencing Labels): Simplify section about
	reference macro cycling.
	(Reference Styles, Options (Referencing Labels)): Adapt to changed
	implementation.

2008-12-18  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-base.el (reftex-in-comment): Deal correctly with
	escaped comment characters.

2008-11-30  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-vars.el (reftex-ref-style-alist): Change structure
	so that it is not possible to use multiple different package names
	within a style.
	(reftex-ref-style-active-list): Adapt to new structure of
	`reftex-ref-style-alist'.

	* lisp/reftex-sel.el (reftex-select-cycle-active-ref-styles):
	Remove.
	(reftex-select-cycle-ref-style-internal): Adapt to new structure
	of `reftex-ref-style-alist'.

	* lisp/reftex-ref.el: Adapt creation of `reftex-<package>-<macro>'
	functions to new structure of `reftex-ref-style-alist'.
	(reftex-reference): Adapt to new structure of
	`reftex-ref-style-alist'.

	* lisp/reftex-base.el (reftex-mode-menu): Adapt to new structure
	of `reftex-ref-style-alist'.

	* doc/reftex.texi (Options (Referencing Labels)): Adapt to new
	structure of `reftex-ref-style-alist'.

2008-10-16  Ralf Angeli  <angeli@caeruleus.net>

	* doc/reftex.texi (Referencing Labels, Reference Styles): Document
	changes in the referencing functionality.

2008-10-15  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-vars.el (reftex-ref-style-alist): Remove the symbols
	for symbols for macro type distinction.  Add characters for macro
	selection.
	(reftex-ref-macro-prompt): New variable.

	* lisp/reftex-sel.el (reftex-select-cycle-ref-style-internal):
	Remove code for testing macro type.
	(reftex-select-toggle-numref-pageref): Remove.
	(reftex-select-label-map): Remove binding for
	`reftex-select-toggle-numref-pageref'.

	* lisp/reftex-ref.el (reftex-reference): Prompt for a reference
	macro if `reftex-ref-macro-prompt' is non-nil.

	* lisp/reftex-base.el (reftex-select-with-char): Kill the RefTeX
	Select buffer when done.

2008-06-07  David Kastrup  <dak@gnu.org>

	* lisp/reftex-base.el (reftex-remove-if): Improve performance.

2008-06-07  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-cite.el (reftex-get-string-refs): Use a regexp
	alternative for better performance.

	* doc/reftex.texi (Commands): Mention options for definition of
	header and footer in BibTeX files.
	(Options (Creating Citations)): Document
	`reftex-create-bibtex-header' and `reftex-create-bibtex-footer'.

	* lisp/reftex-cite.el (reftex-stringref-p): Remove.
	(reftex-get-string-refs): Do without `reftex-stringref-p' and use
	`reftex-remove-if' instead of the cl-based `remove-if'.
	(reftex-create-bibtex-file): Doc fix.

	* lisp/reftex-base.el (reftex-remove-if): New function.

2008-06-07  Wolfgang Mayer  <wmayer7@gmail.com>

	* lisp/reftex-vars.el (reftex-create-bibtex-header)
	(reftex-create-bibtex-footer): New variables.

	* lisp/reftex-cite.el (reftex-parse-bibtex-entry): Accept
	additional optional argument `raw' and keep quotes or braces if it
	is non-nil.
	(reftex-stringref-p, reftex-get-string-refs): New functions.
	(reftex-create-bibtex-file): Include entries that are
	cross-referenced from cited entries.  Include @String definitions
	in the resulting bib file.  Add header and footer defined in
	`reftex-create-bibtex-header' and `reftex-create-bibtex-footer'.

2008-05-03  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-parse.el (reftex-parse-from-file): Move backward one
	char if a `\' was matched after a section macro.

	* lisp/reftex-global.el (reftex-isearch-switch-to-next-file): Use
	`reverse' instead of `nreverse' and `copy-list' in order to make
	the byte compiler happy.  Get rid of unused `orig-flist' variable.

	* lisp/reftex-base.el (reftex-compile-variables): Revert last
	change.  Match `\' after a section macro.
	(reftex-mapconcat-with-predicate): Remove.

2008-04-13  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-base.el (reftex-mapconcat-with-predicate): New
	function.
	(reftex-compile-variables): Use it.  Treat environments and macros
	differently in the regexp for section matching.

	* lisp/reftex-parse.el (reftex-parse-from-file): Use beginning of
	match instead of end as bound.

	* lisp/reftex-sel.el (reftex-select-label-map): Changing binding
	of reference style toggling to "s" which is not already taken.

	* doc/reftex.texi (Reference Styles): Reflect change in key
	binding for toggling reference styles.  Some minor changes.

2008-03-27  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-vars.el: Some whitespace, doc and checkdoc fixes.

2008-03-16  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-index.el (reftex-index-selection-or-word): Use
	`reftex-region-active-p'.
	(reftex-index-show-entry)
	(reftex-index-initialize-phrases-buffer)
	(reftex-index-phrases-apply-to-region): Sync with Emacs trunk.

	* lisp/reftex-dcr.el (reftex-start-itimer-once): Silence the byte
	compiler.

	* lisp/reftex-auc.el: Move `provide' call to bottom of file.

	* lisp/reftex-base.el: Require easymenu and define autoloads
	earlier to avoid compiler warnings.
	(reftex-region-active-p, reftex-select-with-char)
	(reftex-show-commentary): Sync with version in Emacs trunk.
	(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
	(reftex-delete-overlay): Define in a way which hides the XEmacs
	symbols from the byte compiler.
	(reftex-info): Silence the byte compiler.  Use `reftex.info'
	instead of `reftex' in order to get the correct file.

2008-03-07  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-cite.el (reftex-extract-bib-entries): Check if
	BibTeX file changed on disk and ask if it should be reread in case
	it did.

2008-03-02  Ralf Angeli  <angeli@caeruleus.net>

	* doc/reftex.texi: Lots of small fixes.
	(Reference Styles): New section.
	(varioref (LaTeX package), fancyref (LaTeX package)): Remove.
	(Options (Referencing Labels)): Remove descriptions of deprecated
	variables `reftex-vref-is-default' and `reftex-fref-is-default'.
	Add descriptions for `reftex-ref-style-alist' and
	`reftex-ref-style-active-list'.
	(Referencing Labels): Update regarding reference styles.

2008-02-17  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-ref.el (reftex-format-special): Add third argument
	for refstyle possible to be passed, making the byte compiler
	happy.
	(reftex-reference): Pass refstyle to `reftex-format-special'.

	* lisp/reftex-vars.el (reftex-ref-style-active-list): Make
	creation of type compatible with Emacs 21.
	(reftex-format-ref-function): Mention third argument of special
	format function.

	* lisp/reftex-base.el (reftex-mode-menu): Make creation of
	Reference Style menu compatible with Emacs 21.

	* doc/reftex.texi: Fix some typos.

2008-01-27  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-vars.el (reftex-ref-style-active-list): Doc fix.

	* lisp/reftex-base.el (reftex-erase-all-selection-and-index-buffers)
	(reftex-access-parse-file): Use `mapc' instead of `mapcar' where
	return value is not used.

	* lisp/reftex-ref.el (reftex-offer-label-menu): Use `mapc' instead
	of `mapcar' where return value is not used.

	* lisp/reftex-sel.el (reftex-select-item, reftex-select-unmark):
	Use `mapc' instead of `mapcar' where return value is not used.

	* lisp/reftex-vars.el (reftex-ref-style-alist)
	(reftex-ref-style-active-list): New variables.
	(reftex-vref-is-default, reftex-fref-is-default): Adapt doc string
	to new implementation.  Mark as obsolete.  Add compatibility code
	for honoring the variable values in case they are set.

	* lisp/reftex-base.el (reftex-mode-menu): Reference styles are now
	computed from `reftex-ref-style-alist'.  Fix typo.

	* lisp/reftex-ref.el (reftex-reference): Determine reference macro
	by looking at `reftex-ref-style-active-list' and
	`reftex-ref-style-alist'.  Use only one special format function.
	(reftex-varioref-vref, reftex-fancyref-fref)
	(reftex-fancyref-Fref): Remove definitions.  The functions are now
	generated from `reftex-ref-style-alist'.
	(reftex-format-vref, reftex-format-Fref, reftex-format-fref):
	Remove.
	(reftex-format-special): New function.

	* lisp/reftex-sel.el (reftex-select-toggle-varioref)
	(reftex-select-toggle-fancyref): Remove.
	(reftex-select-cycle-active-ref-styles)
	(reftex-select-cycle-ref-style-internal)
	(reftex-select-cycle-ref-style-forward)
	(reftex-select-cycle-ref-style-backward)
	(reftex-select-toggle-numref-pageref): New functions.
	(reftex-select-label-map): Use `v' and `V' for general cycling
	through reference styles.  Add `p' for switching between number
	and page reference types.

2008-01-06  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-cite.el (reftex-pop-to-bibtex-entry)
	(reftex-extract-bib-entries-from-thebibliography): Match \bibitem
	entries with spaces or tabs in front of arguments.
	(reftex-insert-bib-matches): Use `mapc' instead of `mapcar'
	because return value is not used.

2008-01-05  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-toc.el (reftex-make-separate-toc-frame): Hide
	non-operational call to `focus-frame' in Emacs for the compilers's
	sake.

2008-01-03  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-dcr.el (reftex-mouse-view-crossref): Explain why
	point is set.

	* lisp/reftex-toc.el (reftex-toc-do-promote): Use `mapc' instead
	of `mapcar' because return value is not used.
	(reftex-toggle-auto-toc-recenter): Fix typo.

	* lisp/reftex-cite.el (reftex-do-citation): Use `mapc' instead of
	`mapcar' because return value is not used.

2007-10-10  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-vars.el (reftex-cite-format-builtin)
	(reftex-bibliography-commands): Add support for ConTeXt.

	* doc/reftex.texi (Citation Styles): Mention support for ConTeXt.

2007-08-23  Ralf Angeli  <angeli@caeruleus.net>

	* doc/reftex.texi (Options (Defining Label Environments)): Fix
	typo.

2007-07-22  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-base.el (reftex-set-cite-format): Autoload.
	(reftex-access-parse-file): Create parse file in a way that does
	not interfere with recentf mode.
	(reftex-access-parse-file): Do not risk destroying an existing
	buffer.

2007-07-07  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-parse.el (reftex-nth-arg): Use `forward-comment'
	instead of `comment-forward'.  The latter is not always available
	and the former is sufficient for LaTeX.
	(reftex-nth-arg): Revert last change since moving over whitespace
	and comments is done by `reftex-move-to-next-arg'.

2007-05-20  Ralf Angeli  <angeli@caeruleus.net>

	* doc/reftex.texi (Citation Styles): Correct some mistakes.

2007-04-03  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-cite.el: Delete trailing whitespace.
	(reftex-pop-to-bibtex-entry, reftex-extract-bib-entries)
	(reftex-parse-bibtex-entry, reftex-create-bibtex-file): Match
	entries containing numbers and symbol constituents.

2007-03-28  Ralf Angeli  <angeli@caeruleus.net>

	* doc/reftex.texi: Replace BibTeX by @BibTeX{} throughout the
	file.

2007-03-12  John Paul Wallington  <jpw@pobox.com>

	* lisp/reftex-vars.el (reftex-format-ref-function)
	(reftex-format-cite-function): Fix custom type.

2007-03-10  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-base.el: Remove information in comment already in
	imprint or cluttering output of `finder-commentary'.
	Require reftex.el.

	* lisp/reftex.el: Remove.  Now generated from reftex.el.in.

	* lisp/reftex-dcr.el: Remove version info in header.  Add
	maintainer info.

	* lisp/reftex-global.el Remove version info in header.  Add
	maintainer info.

	* lisp/reftex-index.el Remove version info in header.  Add
	maintainer info.

	* lisp/reftex-parse.el Remove version info in header.  Add
	maintainer info.

	* lisp/reftex-ref.el Remove version info in header.  Add
	maintainer info.

	* lisp/reftex-sel.el Remove version info in header.  Add
	maintainer info.

	* lisp/reftex-toc.el Remove version info in header.  Add
	maintainer info.

	* lisp/reftex-vars.el Remove version info in header.  Add
	maintainer info.

2007-03-08  Ralf Angeli  <angeli@caeruleus.net>

	* doc/reftex.texi: Include macros.texi and version.texi.  Change
	maintainer and version information.  Express TeX, LaTeX, AUCTeX
	and RefTeX with macros.
	(Imprint): Change maintainer information.

2007-03-04  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex.el: Update.

	* lisp/reftex-base.el (reftex-show-commentary): Look in
	reftex-base.el.
	(reftex-report-bug): New function.

	* lisp/reftex.el: Move original content to reftex-base.el.  Add
	new header and automatically generated autoloads.

	* lisp/reftex-base.el: New file.  Insert original content of
	reftex.el.  Remove autoload for `reftex-index-phrases-mode'.
	Delete trailing whitespace.

2007-02-26  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-index.el (reftex-index-visit-phrases-buffer): Set
	marker when visiting buffer.  This allows for returning from the
	phrases file to the file one was just editing instead of the file
	where the last phrases was added from.

2007-02-25  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-index.el (reftex-index-phrases-syntax-table): New
	variable.  Give ?\" punctuation syntax as it usually is not used
	as string quote in TeX-related modes and may occur unmatched.  The
	change also prevents fontification of quoted content.
	(reftex-index-phrases-mode): Use it.

	* lisp/reftex-cite.el (reftex-parse-bibtex-entry): Match fields
	containing hyphens (besides word constituents).

2007-02-25  David Kastrup  <dak@gnu.org>

	* lisp/reftex.el (reftex-uniquify, reftex-uniquify-by-car):
	Replace O(n^2) algorithms with O(n log n).  Introduce optional
	argument SORT (not yet used).  TODO: figure out callers that can
	specify SORT, in order to further speed this up.

2007-02-25  Ralf Angeli  <angeli@caeruleus.net>

	* lisp/reftex-vars.el (reftex-cite-key-separator): New variable.

	* lisp/reftex-auc.el (reftex-arg-cite): Use
	`reftex-cite-key-separator'.

	* lisp/reftex-cite.el (reftex-do-citation)
	(reftex-figure-out-cite-format): Use `reftex-cite-key-separator'.

	* doc/reftex.texi (Options (Creating Citations)): Document
	`reftex-cite-key-separator'.

	* lisp/reftex-cite.el (reftex-do-citation): Return all keys, not
	just the first one.

	* lisp/reftex-auc.el (reftex-arg-cite): Correctly handle new
	value type returned by `reftex-citation'.

2007-02-24  Ralf Angeli  <angeli@caeruleus.net>

	* doc/reftex.texi: Set correct filename for standalone
	distribution.

2007-02-07  Ralf Angeli  <angeli@caeruleus.net>

	Create `reftex' module.
parent 440ba395
2012-09-30 Ralf Angeli <angeli@caeruleus.net>
Merge from standalone RefTeX repository.
* reftex.texi: Express TeX, LaTeX, AUCTeX, BibTeX and RefTeX
with macros.
(Imprint): Mention Wolfgang in list of contributors.
(Creating Citations): Give a hint about how to
auto-revert the BibTeX database file when using external editors.
(Referencing Labels): Simplify section about reference macro
cycling.
(Options (Referencing Labels)): Adapt to new structure of
`reftex-ref-style-alist'.
(Referencing Labels, Reference Styles): Document changes in the
referencing functionality.
(Commands): Mention options for definition of header and footer in
BibTeX files.
(Options (Creating Citations)): Document
`reftex-create-bibtex-header' and `reftex-create-bibtex-footer'.
(Reference Styles): New section.
(varioref (LaTeX package), fancyref (LaTeX package)): Remove.
(Options (Referencing Labels)): Remove descriptions of deprecated
variables `reftex-vref-is-default' and `reftex-fref-is-default'.
Add descriptions for `reftex-ref-style-alist' and
`reftex-ref-style-default-list'.
(Referencing Labels): Update regarding reference styles.
(Citation Styles): Mention support for ConTeXt.
(Options (Defining Label Environments)): Fix typo.
(Options (Creating Citations)): Document
`reftex-cite-key-separator'.
2012-09-30 Achim Gratz <Stromeko@Stromeko.DE> 2012-09-30 Achim Gratz <Stromeko@Stromeko.DE>
* org.texi: Add description of ORG_ADD_CONTRIB to info * org.texi: Add description of ORG_ADD_CONTRIB to info
......
This diff is collapsed.
2012-09-30 Ralf Angeli <angeli@caeruleus.net>
Merge from standalone RefTeX repository.
The following ChangeLog entries are shortened versions of the
original ones with file paths adapted. A not so strongly edited
version of the original ChangeLog can be found in the commit log.
* textmodes/reftex-auc.el: Move `provide' call to bottom of file.
(reftex-arg-cite): Use `reftex-cite-key-separator'. Correctly
handle new value type returned by `reftex-citation'.
* textmodes/reftex-cite.el (reftex-create-bibtex-file): Make sure
that entries with whitespace at various places are found. Doc
fix. Include entries that are cross-referenced from cited entries.
Include @String definitions in the resulting bib file. Add header
and footer defined in `reftex-create-bibtex-header' and
`reftex-create-bibtex-footer'.
(reftex-do-citation): Make it possible again to insert
non-existent entries. Save match data when asking for optional
arguments. Return all keys, not just the first one.
(reftex-all-used-citation-keys): Fix regexp to correctly extract
all citations in the same line.
(reftex-parse-bibtex-entry): Accept additional optional argument
`raw' and keep quotes or braces if it is non-nil. Match fields
containing hyphens besides word constituents.
(reftex-get-string-refs): New function.
(reftex-extract-bib-entries): Check if BibTeX file changed on disk
and ask if it should be reread in case it did.
(reftex-pop-to-bibtex-entry)
(reftex-extract-bib-entries-from-thebibliography): Match \bibitem
entries with spaces or tabs in front of arguments.
(reftex-pop-to-bibtex-entry, reftex-extract-bib-entries)
(reftex-parse-bibtex-entry, reftex-create-bibtex-file): Match
entries containing numbers and symbol constituents.
(reftex-do-citation, reftex-figure-out-cite-format): Use
`reftex-cite-key-separator'.
* textmodes/reftex-dcr.el: Move provide statement to end of file.
(reftex-mouse-view-crossref): Explain why point is set.
* textmodes/reftex-global.el: Whitespace changes.
* textmodes/reftex-index.el: Move provide statement to end of
file.
(reftex-index-selection-or-word): Use `reftex-region-active-p'.
(reftex-index-visit-phrases-buffer): Set marker when visiting
buffer. This allows for returning from the phrases file to the
file one was just editing instead of the file where the last
phrases was added from.
(reftex-index-phrases-syntax-table): New variable. Give ?\"
punctuation syntax as it usually is not used as string quote in
TeX-related modes and may occur unmatched. The change also
prevents fontification of quoted content.
(reftex-index-phrases-mode): Use it.
* textmodes/reftex-parse.el (reftex-parse-from-file): Move
backward one char if a `\' was matched after a section macro.
(reftex-parse-from-file): Use beginning of match instead of end as
bound.
* textmodes/reftex-ref.el: Adapt creation of
`reftex-<package>-<macro>' functions to new structure of
`reftex-ref-style-alist'.
(reftex-reference): Use `reftex-ref-style-list' function. Adapt
to new structure of `reftex-ref-style-alist'. Prompt for a
reference macro if `reftex-ref-macro-prompt' is non-nil.
(reftex-reference): Pass refstyle to `reftex-format-special'.
Determine reference macro by looking at
`reftex-ref-style-default-list' and `reftex-ref-style-alist'. Use
only one special format function.
(reftex-varioref-vref, reftex-fancyref-fref)
(reftex-fancyref-Fref): Remove definitions. The functions are now
generated from `reftex-ref-style-alist'.
(reftex-format-vref, reftex-format-Fref, reftex-format-fref):
Remove.
(reftex-format-special): New function.
* textmodes/reftex-sel.el
(reftex-select-cycle-ref-style-internal): Adapt to new structure
of `reftex-ref-style-alist'. Remove code for testing macro type.
(reftex-select-toggle-varioref)
(reftex-select-toggle-fancyref): Remove.
(reftex-select-cycle-ref-style-internal)
(reftex-select-cycle-ref-style-forward)
(reftex-select-cycle-ref-style-backward): New functions.
(reftex-select-label-map): Use `v' and `V' for general cycling
through reference styles. Add `p' for switching between number
and page reference types.
* textmodes/reftex-toc.el (reftex-re-enlarge): Call
`enlarge-window' only if there is something to do because in Emacs
the horizontal version throws an error even if the parameter is 0.
* textmodes/reftex-vars.el (reftex-label-alist): Doc fix.
(reftex-plug-into-AUCTeX): Doc fix.
(reftex-vref-is-default, reftex-fref-is-default): Adapt doc
string. Adapt to new name.
(reftex-ref-style-alist): Change structure so that it is not
possible to use multiple different package names within a style.
Remove the symbols for symbols for macro type distinction. Add
characters for macro selection.
(reftex-ref-macro-prompt, reftex-create-bibtex-header)
(reftex-create-bibtex-footer): New variables.
(reftex-format-ref-function): Mention third argument of special
format function.
(reftex-ref-style-alist, reftex-ref-style-default-list): New
variables.
(reftex-vref-is-default, reftex-fref-is-default): Adapt doc string
to new implementation. Mark as obsolete. Add compatibility code
for honoring the variable values in case they are set.
(reftex-cite-format-builtin, reftex-bibliography-commands): Add
support for ConTeXt.
(reftex-format-ref-function, reftex-format-cite-function): Fix
custom type.
(reftex-cite-key-separator): New variable.
* textmodes/reftex.el (reftex-syntax-table-for-bib)
(reftex-mode): Do not derive `reftex-syntax-table-for-bib' from
`reftex-syntax-table' because parens have to retain their paren
syntax in order for parsing of BibTeX entries like @book(...) to
work.
(reftex-in-comment): Do not error out if `comment-start-skip' is
not set. Deal correctly with escaped comment characters.
(reftex-tie-multifile-symbols): Add doc string. Initialize
`reftex-ref-style-list'.
(reftex-untie-multifile-symbols): Add doc string.
(reftex-add-index-macros): Doc fix.
(reftex-ref-style-activate, reftex-ref-style-toggle)
(reftex-ref-style-list): New functions.
(reftex-mode-menu): Use them. Adapt to new structure of
`reftex-ref-style-alist'.
(reftex-select-with-char): Kill the RefTeX Select buffer when
done.
(reftex-remove-if): New function.
(reftex-erase-all-selection-and-index-buffers)
(reftex-mode-menu): Reference styles are now computed from
`reftex-ref-style-alist'. Fix typo.
(reftex-report-bug): New function.
(reftex-uniquify, reftex-uniquify-by-car): Replace O(n^2)
algorithms with O(n log n). Introduce optional argument SORT (not
yet used).
2012-09-30 Fabián Ezequiel Gallina <fgallina@cuca> 2012-09-30 Fabián Ezequiel Gallina <fgallina@cuca>
   
Enhancements for triple-quote string syntax. Enhancements for triple-quote string syntax.
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Maintainer: auctex-devel@gnu.org ;; Maintainer: auctex-devel@gnu.org
;; Version: 4.31
;; Package: reftex
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -27,21 +25,21 @@ ...@@ -27,21 +25,21 @@
;;; Code: ;;; Code:
(eval-when-compile (require 'cl)) (eval-when-compile (require 'cl))
(provide 'reftex-auc)
(require 'reftex) (require 'reftex)
;;;
(declare-function TeX-argument-prompt "ext:tex"
(declare-function TeX-argument-insert "ext:tex" (name optional &optional prefix)) (optional prompt default &optional complete))
(declare-function TeX-argument-prompt "ext:tex" (optional prompt default &optional complete)) (declare-function TeX-argument-insert "ext:tex"
(declare-function multi-prompt "ext:multi-prompt" (name optional &optional prefix))
(separator
unique prompt table
&optional mp-predicate require-match initial history))
(declare-function LaTeX-add-index-entries "ext:tex" (&rest entries) t)
(declare-function LaTeX-add-labels "ext:tex" (&rest entries) t) (declare-function LaTeX-add-labels "ext:tex" (&rest entries) t)
(declare-function LaTeX-add-index-entries "ext:tex" (&rest entries) t)
(declare-function LaTeX-bibitem-list "ext:tex" () t) (declare-function LaTeX-bibitem-list "ext:tex" () t)
(declare-function LaTeX-index-entry-list "ext:tex" () t) (declare-function LaTeX-index-entry-list "ext:tex" () t)
(declare-function LaTeX-label-list "ext:tex" () t) (declare-function LaTeX-label-list "ext:tex" () t)
(declare-function multi-prompt "ext:multi-prompt"
(separator unique prompt table &optional
mp-predicate require-match initial history))
(defun reftex-plug-flag (which) (defun reftex-plug-flag (which)
;; Tell if a certain flag is set in reftex-plug-into-AUCTeX ;; Tell if a certain flag is set in reftex-plug-into-AUCTeX
...@@ -76,14 +74,15 @@ What is being used depends upon `reftex-plug-into-AUCTeX'." ...@@ -76,14 +74,15 @@ What is being used depends upon `reftex-plug-into-AUCTeX'."
(let (items) (let (items)
(cond (cond
((and (not definition) (reftex-plug-flag 3)) ((and (not definition) (reftex-plug-flag 3))
(setq items (list (or (reftex-citation t) "")))) (setq items (or (reftex-citation t) (list ""))))
(t (t
(setq prompt (concat (if optional "(Optional) " "") (setq prompt (concat (if optional "(Optional) " "")
(if prompt prompt "Add key") (if prompt prompt "Add key")
" (default none): ")) " (default none): "))
(setq items (multi-prompt "," t prompt (LaTeX-bibitem-list))))) (setq items (multi-prompt "," t prompt (LaTeX-bibitem-list)))))
(apply 'LaTeX-add-bibitems items) (apply 'LaTeX-add-bibitems items)
(TeX-argument-insert (mapconcat 'identity items ",") optional))) (TeX-argument-insert (mapconcat 'identity items reftex-cite-key-separator)
optional)))
(defun reftex-arg-index-tag (optional &optional prompt &rest args) (defun reftex-arg-index-tag (optional &optional prompt &rest args)
...@@ -223,4 +222,6 @@ of ENTRY-LIST is a list of cons cells (\"MACRONAME\" . LEVEL). See ...@@ -223,4 +222,6 @@ of ENTRY-LIST is a list of cons cells (\"MACRONAME\" . LEVEL). See
(defun reftex-notice-new-section () (defun reftex-notice-new-section ()
(reftex-notice-new 1 'force)) (reftex-notice-new 1 'force))
(provide 'reftex-auc)
;;; reftex-auc.el ends here ;;; reftex-auc.el ends here
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Maintainer: auctex-devel@gnu.org ;; Maintainer: auctex-devel@gnu.org
;; Version: 4.31
;; Package: reftex
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -129,9 +127,10 @@ ...@@ -129,9 +127,10 @@
(let* ((re (let* ((re
(if item (if item
(concat "\\\\bibitem\\(\\[[^]]*\\]\\)?{" (regexp-quote key) "}") (concat "\\\\bibitem[ \t]*\\(\\[[^]]*\\]\\)?[ \t]*{"
(concat "@[a-zA-Z]+[ \t\n\r]*[{(][ \t\n\r]*" (regexp-quote key) (regexp-quote key) "}")
"[, \t\r\n}]"))) (concat "@\\(?:\\w\\|\\s_\\)+[ \t\n\r]*[{(][ \t\n\r]*"
(regexp-quote key) "[, \t\r\n}]")))
(buffer-conf (current-buffer)) (buffer-conf (current-buffer))
file buf pos oldpos) file buf pos oldpos)
...@@ -229,7 +228,13 @@ ...@@ -229,7 +228,13 @@
buffer (not reftex-keep-temporary-buffers)))) buffer (not reftex-keep-temporary-buffers))))
(if (not buffer1) (if (not buffer1)
(message "No such BibTeX file %s (ignored)" buffer) (message "No such BibTeX file %s (ignored)" buffer)
(message "Scanning bibliography database %s" buffer1)) (message "Scanning bibliography database %s" buffer1)
(unless (verify-visited-file-modtime buffer1)
(when (y-or-n-p
(format "File %s changed on disk. Reread from disk? "
(file-name-nondirectory
(buffer-file-name buffer1))))
(with-current-buffer buffer1 (revert-buffer t t)))))
(set-buffer buffer1) (set-buffer buffer1)
(reftex-with-special-syntax-for-bib (reftex-with-special-syntax-for-bib
...@@ -238,8 +243,8 @@ ...@@ -238,8 +243,8 @@
(while (re-search-forward first-re nil t) (while (re-search-forward first-re nil t)
(catch 'search-again (catch 'search-again
(setq key-point (point)) (setq key-point (point))
(unless (re-search-backward (unless (re-search-backward "\\(\\`\\|[\n\r]\\)[ \t]*\
"\\(\\`\\|[\n\r]\\)[ \t]*@\\([a-zA-Z]+\\)[ \t\n\r]*[{(]" nil t) @\\(\\(?:\\w\\|\\s_\\)+\\)[ \t\n\r]*[{(]" nil t)
(throw 'search-again nil)) (throw 'search-again nil))
(setq start-point (point)) (setq start-point (point))
(goto-char (match-end 0)) (goto-char (match-end 0))
...@@ -451,7 +456,8 @@ ...@@ -451,7 +456,8 @@
(setq names (replace-match " " nil t names))) (setq names (replace-match " " nil t names)))
(split-string names "\n"))) (split-string names "\n")))
(defun reftex-parse-bibtex-entry (entry &optional from to) (defun reftex-parse-bibtex-entry (entry &optional from to raw)
; if RAW is non-nil, keep double quotes/curly braces delimiting fields
(let (alist key start field) (let (alist key start field)
(save-excursion (save-excursion
(save-restriction (save-restriction
...@@ -463,41 +469,56 @@ ...@@ -463,41 +469,56 @@
(erase-buffer) (erase-buffer)
(insert entry)) (insert entry))
(widen) (widen)
(narrow-to-region from to)) (if (and from to) (narrow-to-region from to)))
(goto-char (point-min)) (goto-char (point-min))
(if (re-search-forward (if (re-search-forward "@\\(\\(?:\\w\\|\\s_\\)+\\)[ \t\n\r]*\
"@\\(\\w+\\)[ \t\n\r]*[{(][ \t\n\r]*\\([^ \t\n\r,]+\\)" nil t) \[{(][ \t\n\r]*\\([^ \t\n\r,]+\\)" nil t)
(setq alist (setq alist
(list (list
(cons "&type" (downcase (reftex-match-string 1))) (cons "&type" (downcase (reftex-match-string 1)))
(cons "&key" (reftex-match-string 2))))) (cons "&key" (reftex-match-string 2)))))
(while (re-search-forward "\\(\\w+\\)[ \t\n\r]*=[ \t\n\r]*" nil t) (while (re-search-forward "\\(\\(?:\\w\\|-\\)+\\)[ \t\n\r]*=[ \t\n\r]*"
nil t)
(setq key (downcase (reftex-match-string 1))) (setq key (downcase (reftex-match-string 1)))
(cond (cond
((= (following-char) ?{) ((= (following-char) ?{)
(forward-char 1) (cond
(setq start (point)) (raw
(condition-case nil (setq start (point))
(up-list 1) (forward-char 1))
(error nil))) (t
(forward-char 1)
(setq start (point))
(condition-case nil
(up-list 1)
(error nil)))))
((= (following-char) ?\") ((= (following-char) ?\")
(forward-char 1) (cond
(setq start (point)) (raw
(setq start (point))
(forward-char 1))
(t
(forward-char 1)
(setq start (point))))
(while (and (search-forward "\"" nil t) (while (and (search-forward "\"" nil t)
(= ?\\ (char-after (- (point) 2)))))) (= ?\\ (char-after (- (point) 2))))))
(t (t
(setq start (point)) (setq start (point))
(re-search-forward "[ \t]*[\n\r,}]" nil 1))) (re-search-forward "[ \t]*[\n\r,}]" nil 1)))
(setq field (buffer-substring-no-properties start (1- (point)))) ;; extract field value, ignore trailing comma if in RAW mode
(let ((stop (if (and raw (not (= (char-after (1- (point))) ?,)))
(point)
(1- (point))) ))
(setq field (buffer-substring-no-properties start stop)))
;; remove extra whitespace ;; remove extra whitespace
(while (string-match "[\n\t\r]\\|[ \t][ \t]+" field) (while (string-match "[\n\t\r]\\|[ \t][ \t]+" field)
(setq field (replace-match " " nil t field))) (setq field (replace-match " " nil t field)))
;; remove leading garbage ;; remove leading garbage
(if (string-match "^[ \t{]+" field) (if (string-match (if raw "^[ \t]+" "^[ \t{]+") field)
(setq field (replace-match "" nil t field))) (setq field (replace-match "" nil t field)))
;; remove trailing garbage ;; remove trailing garbage
(if (string-match "[ \t}]+$" field) (if (string-match (if raw "[ \t]+$" "[ \t}]+$") field)
(setq field (replace-match "" nil t field))) (setq field (replace-match "" nil t field)))
(push (cons key field) alist)))) (push (cons key field) alist))))
alist)) alist))
...@@ -638,15 +659,13 @@ While entering the regexp, completion on knows citation keys is possible. ...@@ -638,15 +659,13 @@ While entering the regexp, completion on knows citation keys is possible.
(insert-entries selected-entries) (insert-entries selected-entries)
entry string cite-view) entry string cite-view)
(when (stringp selected-entries)
(error selected-entries))
(unless selected-entries (error "Quit")) (unless selected-entries (error "Quit"))
(if (stringp selected-entries) (if (stringp selected-entries)
;; Nonexistent entry ;; Nonexistent entry
(setq selected-entries nil (setq insert-entries (list (list selected-entries
insert-entries (list (list selected-entries (cons "&key" selected-entries)))
(cons "&key" selected-entries)))) selected-entries nil)
;; It makes sense to compute the cite-view strings. ;; It makes sense to compute the cite-view strings.
(setq cite-view t)) (setq cite-view t))
...@@ -654,7 +673,8 @@ While entering the regexp, completion on knows citation keys is possible. ...@@ -654,7 +673,8 @@ While entering the regexp, completion on knows citation keys is possible.
;; All keys go into a single command - we need to trick a little ;; All keys go into a single command - we need to trick a little
;; FIXME: Unfortunately, this means that commenting does not work right. ;; FIXME: Unfortunately, this means that commenting does not work right.
(pop selected-entries) (pop selected-entries)
(let ((concat-keys (mapconcat 'car selected-entries ","))) (let ((concat-keys (mapconcat 'car selected-entries
reftex-cite-key-separator)))
(setq insert-entries (setq insert-entries
(list (list concat-keys (cons "&key" concat-keys)))))) (list (list concat-keys (cons "&key" concat-keys))))))
...@@ -675,8 +695,9 @@ While entering the regexp, completion on knows citation keys is possible. ...@@ -675,8 +695,9 @@ While entering the regexp, completion on knows citation keys is possible.
(equal arg '(4)))) (equal arg '(4))))
(let ((start 0) (nth 0) value) (let ((start 0) (nth 0) value)
(while (setq start (string-match "\\[\\]" string start)) (while (setq start (string-match "\\[\\]" string start))
(setq value (read-string (format "Optional argument %d: " (setq value (save-match-data
(setq nth (1+ nth))))) (read-string (format "Optional argument %d: "
(setq nth (1+ nth))))))
(setq string (replace-match (concat "[" value "]") t t string)) (setq string (replace-match (concat "[" value "]") t t string))
(setq start (1+ start))))) (setq start (1+ start)))))
;; Should we cleanup empty optional arguments? ;; Should we cleanup empty optional arguments?
...@@ -725,7 +746,7 @@ While entering the regexp, completion on knows citation keys is possible. ...@@ -725,7 +746,7 @@ While entering the regexp, completion on knows citation keys is possible.
(forward-char 1))) (forward-char 1)))
;; Return the citation key ;; Return the citation key
(car (car selected-entries)))) (mapcar 'car selected-entries)))
(defun reftex-figure-out-cite-format (arg &optional no-insert format-key) (defun reftex-figure-out-cite-format (arg &optional no-insert format-key)
;; Check if there is already a cite command at point and change cite format ;; Check if there is already a cite command at point and change cite format
...@@ -744,9 +765,13 @@ While entering the regexp, completion on knows citation keys is possible. ...@@ -744,9 +765,13 @@ While entering the regexp, completion on knows citation keys is possible.
(if (or (not arg) (not (listp arg))) (if (or (not arg) (not (listp arg)))
(setq format (setq format
(concat (concat
(if (member (preceding-char) '(?\{ ?,)) "" ",") (if (member (preceding-char) '(?\{ ?,))
""
reftex-cite-key-separator)
"%l" "%l"
(if (member (following-char) '(?\} ?,)) "" ","))) (if (member (following-char) '(?\} ?,))
""
reftex-cite-key-separator)))
(setq format "%l"))) (setq format "%l")))
(t (t
;; Figure out the correct format ;; Figure out the correct format
...@@ -1114,7 +1139,7 @@ While entering the regexp, completion on knows citation keys is possible. ...@@ -1114,7 +1139,7 @@ While entering the regexp, completion on knows citation keys is possible.
(save-restriction (save-restriction
(widen) (widen)
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "^[^%\n\r]*\\\\\\(bibentry\\|[a-zA-Z]*cite[a-zA-Z]*\\)\\(\\[[^\\]]*\\]\\)?{\\([^}]+\\)}" nil t) (while (re-search-forward "\\(?:^\\|\\=\\)[^%\n\r]*?\\\\\\(bibentry\\|[a-zA-Z]*cite[a-zA-Z]*\\)\\(\\[[^\\]]*\\]\\)?{\\([^}]+\\)}" nil t)
(setq kk (match-string-no-properties 3)) (setq kk (match-string-no-properties 3))
(while (string-match "%.*\n?" kk) (while (string-match "%.*\n?" kk)
(setq kk (replace-match "" t t kk))) (setq kk (replace-match "" t t kk)))
...@@ -1125,18 +1150,35 @@ While entering the regexp, completion on knows citation keys is possible. ...@@ -1125,18 +1150,35 @@ While entering the regexp, completion on knows citation keys is possible.
(reftex-kill-temporary-buffers) (reftex-kill-temporary-buffers)
keys)) keys))
(defun reftex-get-string-refs (alist)
"Return a list of BibTeX @string references that appear as values in ALIST."
(reftex-remove-if (lambda (x) (string-match "^\\([\"{]\\|[0-9]+$\\)" x))
;; get list of values, discard keys
(mapcar 'cdr
;; remove &key and &type entries
(reftex-remove-if (lambda (pair)
(string-match "^&" (car pair)))
alist))))
(defun reftex-create-bibtex-file (bibfile) (defun reftex-create-bibtex-file (bibfile)
"Create a new BibTeX database file with all entries referenced in document. "Create a new BibTeX database file with all entries referenced in document.
The command prompts for a filename and writes the collected entries to The command prompts for a filename and writes the collected
that file. Only entries referenced in the current document with entries to that file. Only entries referenced in the current
any \\cite-like macros are used. document with any \\cite-like macros are used. The sequence in
The sequence in the new file is the same as it was in the old database." the new file is the same as it was in the old database.
Entries referenced from other entries must appear after all
referencing entries.
You can define strings to be used as header or footer for the
created files in the variables `reftex-create-bibtex-header' or
`reftex-create-bibtex-footer' respectively."
(interactive "FNew BibTeX file: ") (interactive "FNew BibTeX file: ")
(let ((keys (reftex-all-used-citation-keys)) (let ((keys (reftex-all-used-citation-keys))
(files (reftex-get-bibfile-list)) (files (reftex-get-bibfile-list))
file key entries beg end entry) file key entries beg end entry string-keys string-entries)
(save-current-buffer (save-current-buffer
(while (setq file (pop files)) (dolist (file files)
(set-buffer (reftex-get-file-buffer-force file 'mark)) (set-buffer (reftex-get-file-buffer-force file 'mark))
(reftex-with-special-syntax-for-bib (reftex-with-special-syntax-for-bib
(save-excursion (save-excursion
...@@ -1156,14 +1198,54 @@ The sequence in the new file is the same as it was in the old database." ...@@ -1156,14 +1198,54 @@ The sequence in the new file is the same as it was in the old database."
(when (member key keys) (when (member key keys)
(setq entry (buffer-substring beg end) (setq entry (buffer-substring beg end)
entries (cons entry entries) entries (cons entry entries)
keys (delete key keys))))))))) keys (delete key keys))
;; check for crossref entries
(let* ((attr-list (reftex-parse-bibtex-entry nil beg end))
(xref-key (cdr (assoc "crossref" attr-list))))
(if xref-key (pushnew xref-key keys)))
;; check for string references
(let* ((raw-fields (reftex-parse-bibtex-entry nil beg end t))
(string-fields (reftex-get-string-refs raw-fields)))
(dolist (skey string-fields)
(unless (member skey string-keys)
(push skey string-keys)))))))))))
;; second pass: grab @string references