[AUCTeX-diffs] Changes to auctex/tex-fold.el,v

[Ralf Angeli]

CVSROOT:        /cvsroot/auctex
Module name:    auctex
Changes by:     Ralf Angeli <angeli>    08/05/30 20:22:47

Index: tex-fold.el
===================================================================
RCS file: /cvsroot/auctex/auctex/tex-fold.el,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- tex-fold.el 30 May 2008 19:59:07 -0000      1.61
+++ tex-fold.el 30 May 2008 20:22:46 -0000      1.62
@@ -1,6 +1,6 @@
 ;;; tex-fold.el --- Fold TeX macros.
 
-;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <address@hidden>
 ;; Maintainer: address@hidden
@@ -86,7 +86,21 @@
        "paragraph*" "subparagraph*"
        "emph" "textit" "textsl" "textmd" "textrm" "textsf" "texttt"
        "textbf" "textsc" "textup")))
-  "List of display strings and macros to fold."
+  "List of replacement specifiers and macros to fold.
+
+The first element of each item can be a string, an integer or a
+function symbol.  The second element is a list of macros two fold
+without the leading backslash.  If the first element is a string,
+it will be used as a display replacement for the whole macro.
+Numbers in braces, like \"{1}\" will be replaced by the
+respective macro argument.  If the first element is an integer,
+the macro will be replaced by the respective macro argument.  If
+the first element is a function symbol, the function will be
+called with all mandatory arguments of the macro and the result
+of the function call will be used as a replacement for the macro.
+
+Setting this variable does not take effect immediately.  Use
+Customize or reset the mode."
   :type '(repeat (group (choice (string :tag "Display String")
                                (integer :tag "Number of argument" :value 1)
                                (function :tag "Function to execute"))
@@ -713,12 +727,23 @@
         (ov-end (overlay-end ov))
         (spec (overlay-get ov 'TeX-fold-display-string-spec))
         (computed (cond
-                   ((stringp spec) spec)
+                   ((stringp spec)
+                    (let (match-end)
+                      (while (string-match "{\\([1-9]\\)}" spec match-end)
+                        (setq match-end (match-beginning 0))
+                        (setq spec (replace-match
+                                    (car (save-match-data
+                                           (TeX-fold-macro-nth-arg
+                                            (string-to-number
+                                             (match-string 1 spec))
+                                            ov-start ov-end)))
+                                    nil nil spec)))
+                      spec))
                    ((functionp spec)
-                    (let ((arg-list nil)
-                          (n 1)
-                          (arg ""))
-                      (while (setq arg (TeX-fold-macro-nth-arg n ov-start 
ov-end))
+                    (let (arg arg-list
+                          (n 1))
+                      (while (setq arg (TeX-fold-macro-nth-arg
+                                        n ov-start ov-end))
                         (add-to-list 'arg-list (car arg) t)
                         (setq n (1+ n)))
                       (or (condition-case nil