(tex-font-lock-match-suscript): New function.

(tex-font-lock-keywords-3): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76177538012d7105e9b7fee9d8e6f2b12ea99e25..a3cb1b00313227cec9239cc1060fc38ca1714a9e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-17  Ralf Angeli  <angeli@iwi.uni-sb.de>
+
+       * textmodes/tex-mode.el (tex-font-lock-match-suscript): New function.
+       (tex-font-lock-keywords-3): Use it.
+
 2006-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * newcomment.el (comment-add): New function.

diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 97153e31a25dc3081d45ef23a36f671700f9be32..0b0d60242bc285f85714f45855bc9728a4704d1e 100644 (file)
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -594,20 +594,24 @@ An alternative value is \" . \", if you use a font with a narrow period."
        '(face subscript display (raise -0.3))
       '(face superscript display (raise +0.3)))))
 
+(defun tex-font-lock-match-suscript (limit)
+  "Match subscript and superscript patterns up to LIMIT."
+  (when (re-search-forward "[_^] *\\([^\n\\{}]\\|\
+\\\\\\([a-zA-Z@]+\\|[^ \t\n]\\)\\|{[^\\{]*}\\|\\({\\)\\)" limit t)
+    (when (match-end 3)
+      (let ((beg (match-beginning 3))
+           (end (save-restriction
+                  (narrow-to-region (point-min) limit)
+                  (condition-case nil (scan-lists (point) 1 1) (error nil)))))
+       (store-match-data (if end
+                             (list (match-beginning 0) end beg end))
+                         (list beg beg beg beg))))
+    t))
+
 (defconst tex-font-lock-keywords-3
   (append tex-font-lock-keywords-2
-   (eval-when-compile
-     (let ((general "\\([a-zA-Z@]+\\|[^ \t\n]\\)")
-          (slash "\\\\")
-          ;; This is not the same regexp as before: it has a `+' removed.
-          ;; The + makes the matching faster in the above cases (where we can
-          ;; exit as soon as the match fails) but would make this matching
-          ;; degenerate to nasty complexity (because we try to match the
-          ;; closing brace, which forces trying all matching combinations).
-          (arg "{\\(?:[^{}\\]\\|\\\\.\\|{[^}]*}\\)*"))
-       `((,(concat "[_^] *\\([^\n\\{}#]\\|" slash general "\\|#[0-9]\\|" arg "}\\)")
-         (1 (tex-font-lock-suscript (match-beginning 0))
-            append))))))
+         '((tex-font-lock-match-suscript
+            (1 (tex-font-lock-suscript (match-beginning 0)) append))))
   "Experimental expressions to highlight in TeX modes.")
 
 (defvar tex-font-lock-keywords tex-font-lock-keywords-1