Mercurial > emacs
diff lisp/textmodes/reftex.el @ 60918:58a53f588384
* textmodes/refbib.el, textmodes/refer.el, textmodes/reftex-cite.el,
textmodes/reftex-index.el, textmodes/reftex-parse.el,
textmodes/reftex-ref.el, textmodes/reftex-vars.el,
textmodes/reftex.el, textmodes/org.el: Replace `illegal' with
`invalid'.
author | Werner LEMBERG <wl@gnu.org> |
---|---|
date | Fri, 25 Mar 2005 09:03:24 +0000 |
parents | 17819269525e |
children | 89202ce14f61 |
line wrap: on
line diff
--- a/lisp/textmodes/reftex.el Fri Mar 25 08:47:00 2005 +0000 +++ b/lisp/textmodes/reftex.el Fri Mar 25 09:03:24 2005 +0000 @@ -1,5 +1,6 @@ ;;; reftex.el --- minor mode for doing \label, \ref, \cite, \index in LaTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: 4.26 @@ -1416,7 +1417,7 @@ ((= key ?\C-i) (setq prefix (completing-read "Prefix: " xr-alist nil t)) (- len (length (memq (assoc prefix xr-alist) xr-alist)))) - (t (error "Illegal document selection [%c]" key))))))))) + (t (error "Invalid document selection [%c]" key))))))))) ;;; ========================================================================= ;;; @@ -2167,17 +2168,17 @@ (reftex-convert-string string "[-~ \t\n\r,;]" nil t t 5 40 nil 1 " " (nth 5 reftex-derive-label-parameters))) -(defun reftex-convert-string (string split-re illegal-re dot keep-fp - nwords maxchar illegal abbrev sep +(defun reftex-convert-string (string split-re invalid-re dot keep-fp + nwords maxchar invalid abbrev sep ignore-words &optional downcase) "Convert a string (a sentence) to something shorter. SPLIT-RE is the regular expression used to split the string into words. -ILLEGAL-RE matches characters which are illegal in the final string. +INVALID-RE matches characters which are invalid in the final string. DOT t means add dots to abbreviated words. KEEP-FP t means to keep a final punctuation when applicable. NWORDS Number of words to use. MAXCHAR Maximum number of characters in the final string. -ILLEGAL nil: Throw away any words containing stuff matched with ILLEGAL-RE. +INVALID nil: Throw away any words containing stuff matched with INVALID-RE. t: Throw away only the matched part, not the whole word. ABBREV nil: Never abbreviate words. t: Always abbreviate words (see `reftex-abbrev-parameters'). @@ -2187,7 +2188,7 @@ IGNORE-WORDS List of words which should be removed from the string." (let* ((words0 (split-string string (or split-re "[ \t\n\r]"))) - (reftex-label-illegal-re (or illegal-re "\000")) + (reftex-label-illegal-re (or invalid-re "\000")) (abbrev-re (concat "\\`\\(" (make-string (nth 0 reftex-abbrev-parameters) ?.) @@ -2203,7 +2204,7 @@ (cond ((member (downcase word) ignore-words)) ((string-match reftex-label-illegal-re word) - (when illegal + (when invalid (while (string-match reftex-label-illegal-re word) (setq word (replace-match "" nil nil word))) (push word words)))