emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] elpa f72d2a9 26/35: Improve font related queries


From: Tassilo Horn
Subject: [elpa] elpa f72d2a9 26/35: Improve font related queries
Date: Sun, 31 Jan 2016 16:05:41 +0000

branch: elpa
commit f72d2a9686aca89d26e13d15048be59554c4965e
Author: Arash Esbati <address@hidden>
Commit: Mosè Giordano <address@hidden>

    Improve font related queries
    
    * style/theorem.el (LaTeX-theorem-fontdecl): Do not prefix the
    elements with `TeX-esc'.
    (LaTeX-arg-theorem-fontdecl): New function.
    ("theorem"): Use `LaTeX-arg-theorem-fontdecl' for font related
    queries.
    
    Signed-off-by: Mosè Giordano <address@hidden>
---
 style/theorem.el |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/style/theorem.el b/style/theorem.el
index 7d8bffd..d8466f1 100644
--- a/style/theorem.el
+++ b/style/theorem.el
@@ -42,21 +42,34 @@
   "List of theorem styles provided by `theorem.sty'.")
 
 (defvar LaTeX-theorem-fontdecl
-  (mapcar (lambda (elt) (concat TeX-esc elt))
-         '(;; family
-           "rmfamily" "sffamily" "ttfamily"
-           ;; series
-           "mdseries" "bfseries"
-           ;; shape
-           "upshape" "itshape" "slshape" "scshape"
-           ;; size
-           "tiny"  "scriptsize" "footnotesize"
-           "small" "normalsize" "large"
-           "Large" "LARGE" "huge" "Huge"
-           ;; reset macro
-           "normalfont"))
+  '(;; family
+    "rmfamily" "sffamily" "ttfamily"
+    ;; series
+    "mdseries" "bfseries"
+    ;; shape
+    "upshape" "itshape" "slshape" "scshape"
+    ;; size
+    "tiny"  "scriptsize" "footnotesize"
+    "small" "normalsize" "large"
+    "Large" "LARGE" "huge" "Huge"
+    ;; reset macro
+    "normalfont")
   "List of font declaration commands for \"\\theorem(body\|header)font\".")
 
+(defun LaTeX-arg-theorem-fontdecl (optional &optional prompt)
+  "Prompt for font declaration commands in \"\\theorem(body\|header)font\".
+If OPTIONAL is non-nil, insert the resulting value as an optional
+argument.  Use PROMPT as the prompt string."
+  ;; `INITIAL-INPUT' (5th argument to `TeX-completing-read-multiple')
+  ;; is hard-coded to `TeX-esc'.
+  (let* ((crm-separator (regexp-quote TeX-esc))
+        (fontdecl (mapconcat 'identity
+                             (TeX-completing-read-multiple
+                              (TeX-argument-prompt optional prompt "Font")
+                              LaTeX-theorem-fontdecl nil nil TeX-esc)
+                             TeX-esc)))
+    (TeX-argument-insert fontdecl optional)))
+
 (defun LaTeX-theorem-env-label (environment)
   "Insert ENVIRONMENT, query for an optional argument and prompt
 for label.  AUCTeX users should add ENVIRONMENT to
@@ -133,16 +146,10 @@ make them available as new environments."
                    LaTeX-theorem-theoremstyle-list))
 
     '("theorembodyfont"
-      (TeX-arg-eval mapconcat 'identity
-                   (TeX-completing-read-multiple
-                    "Body font: "
-                    LaTeX-theorem-fontdecl) ""))
+      (LaTeX-arg-theorem-fontdecl "Body font"))
 
     '("theoremheaderfont"
-      (TeX-arg-eval mapconcat 'identity
-                   (TeX-completing-read-multiple
-                    "Header font: "
-                    LaTeX-theorem-fontdecl) ""))
+      (LaTeX-arg-theorem-fontdecl "Header font"))
 
     '("theorempreskipamount"
       (TeX-arg-length "Skip before theorem"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]