[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/auctex 324cb5c913 41/76: Simplify implementation of sty
From: |
Tassilo Horn |
Subject: |
[elpa] externals/auctex 324cb5c913 41/76: Simplify implementation of style/hologo.el |
Date: |
Fri, 13 Jan 2023 14:31:03 -0500 (EST) |
branch: externals/auctex
commit 324cb5c9134ae2ed974fa58a6584424c899e7289
Author: Arash Esbati <arash@gnu.org>
Commit: Arash Esbati <arash@gnu.org>
Simplify implementation of style/hologo.el
* style/hologo.el
(LaTeX-hologo--arg-use-region-or-query-logo-name): Reduce
functionality.
(LaTeX-hologo--arg-use-region): New helper function to wrap region
in a pair of braces.
("hologo"): Use new functions in combination with
`TeX-arg-conditional'.
Replace `TeX-arg-eval'.
---
style/hologo.el | 144 +++++++++++++++++++++++++++++---------------------------
1 file changed, 74 insertions(+), 70 deletions(-)
diff --git a/style/hologo.el b/style/hologo.el
index 7e4608939b..edf24dbb25 100644
--- a/style/hologo.el
+++ b/style/hologo.el
@@ -32,6 +32,7 @@
;;; Code:
(require 'tex)
+(require 'latex)
;; Silence the compiler:
(declare-function font-latex-add-keywords
@@ -106,17 +107,18 @@
"space" "hyphen" "runtogether"))) ; plainTeX
"Local key=value options for hologo macros.")
-(defun LaTeX-hologo--arg-use-region-or-query-logo-name (optional)
- (if (and (use-region-p)
- (member (buffer-substring (region-beginning) (region-end))
- LaTeX-hologo-logo-names))
- (progn
- (insert TeX-grop)
- (goto-char (region-end))
- (insert TeX-grcl))
- (TeX-argument-insert
- (completing-read "Logo name: " LaTeX-hologo-logo-names)
- optional)))
+(defun LaTeX-hologo--arg-use-region-or-query-logo-name ()
+ "Check if region is active and over element from `LaTeX-hologo-logo-names'."
+ (and (use-region-p)
+ (member (buffer-substring (region-beginning) (region-end))
+ LaTeX-hologo-logo-names)))
+
+(defun LaTeX-hologo--arg-use-region (_optional)
+ "Wrap region around braces.
+OPTIONAL is ignored."
+ (insert TeX-grop)
+ (goto-char (region-end))
+ (insert TeX-grcl))
(TeX-add-style-hook
"hologo"
@@ -124,35 +126,40 @@
(TeX-add-symbols
;; Insert logo macros
- '("hologo" LaTeX-hologo--arg-use-region-or-query-logo-name)
- '("Hologo" LaTeX-hologo--arg-use-region-or-query-logo-name)
+ `("hologo"
+ (TeX-arg-conditional (LaTeX-hologo--arg-use-region-or-query-logo-name)
+ (LaTeX-hologo--arg-use-region)
+ ((TeX-arg-completing-read LaTeX-hologo-logo-names "Logo name"))))
+ `("Hologo"
+ (TeX-arg-conditional (LaTeX-hologo--arg-use-region-or-query-logo-name)
+ (LaTeX-hologo--arg-use-region)
+ ((TeX-arg-completing-read LaTeX-hologo-logo-names "Logo name"))))
;; Setup macros
'("hologoSetup" (TeX-arg-key-val LaTeX-hologo-key-val-options-global))
- '("hologoLogoSetup"
- (TeX-arg-eval
- (lambda ()
- (let* ((logo (completing-read "Logo name: "
LaTeX-hologo-logo-names))
- (keyval (TeX-read-key-val
- nil
- (cond ((string= logo "BibTeX")
- (append '(("variant" ("sf" "sc")))
- LaTeX-hologo-key-val-options-global))
- ((string= logo "ConTeXt")
- (append '(("variant" ("narrow" "simple")))
- LaTeX-hologo-key-val-options-global))
- ((string= logo "plainTeX")
- (append '(("variant" ("space" "hyphen"
"runtogether")))
- LaTeX-hologo-key-val-options-global))
- ((or (string= logo "SLiTeX")
- (string= logo "SliTeX"))
- (append '(("variant" ("lift" "narrow" "lift")))
- LaTeX-hologo-key-val-options-global))
- (t
- LaTeX-hologo-key-val-options-global)))))
- (TeX-argument-insert logo nil)
- (format "%s" keyval)))))
+ `("hologoLogoSetup"
+ (TeX-arg-completing-read LaTeX-hologo-logo-names "Logo name")
+ (TeX-arg-key-val ,(lambda ()
+ (save-excursion
+ (re-search-backward
"\\\\hologoLogoSetup{\\([^}]+\\)}"
+ (line-beginning-position) t))
+ (let ((logo (match-string-no-properties 1)))
+ (cond ((string= logo "BibTeX")
+ (append '(("variant" ("sf" "sc")))
+
LaTeX-hologo-key-val-options-global))
+ ((string= logo "ConTeXt")
+ (append '(("variant" ("narrow" "simple")))
+
LaTeX-hologo-key-val-options-global))
+ ((string= logo "plainTeX")
+ (append '(("variant" ("space" "hyphen"
"runtogether")))
+
LaTeX-hologo-key-val-options-global))
+ ((or (string= logo "SLiTeX")
+ (string= logo "SliTeX"))
+ (append '(("variant" ("lift" "narrow"
"lift")))
+
LaTeX-hologo-key-val-options-global))
+ (t
+ LaTeX-hologo-key-val-options-global))))))
'("hologoDriverSetup" (TeX-arg-completing-read
("pdftex" "luatex"
@@ -165,47 +172,44 @@
(TeX-arg-key-val (("general") ("bibsf")
("rm") ("sc") ("sf") ("sy") ("logo"))))
- '("hologoLogoFontSetup"
- (TeX-arg-eval
- (lambda ()
- (let* ((logo (completing-read "Logo name: "
- '("BibTeX"
- "ExTeX"
- "SliTeX"
- "AmS"
- "NTS"
- "KOMAScript"
- "METAFONT"
- "METAPOST")))
- (keyval (TeX-read-key-val
- nil
- (cond ((string= logo "BibTeX")
- '(("bibsf") ("sc")))
- ((string= logo "ExTeX")
- '(("rm") ("sy")))
- ((string= logo "SliTeX")
- '(("rm") ("sc")))
- ((or (string= logo "AmS")
- (string= logo "NTS"))
- '(("sy")))
- ((string= logo "KOMAScript")
- '(("sf")))
- ((or (string= logo "METAFONT")
- (string= logo "METAPOST"))
- '(("logo")))
- (t
- nil)))))
- (TeX-argument-insert logo nil)
- (format "%s" keyval)))))
+ `("hologoLogoFontSetup"
+ (TeX-arg-completing-read ("BibTeX" "ExTeX" "SliTeX" "AmS" "NTS"
+ "KOMAScript" "METAFONT" "METAPOST")
+ "Logo name")
+ (TeX-arg-key-val ,(lambda ()
+ (save-excursion
+ (re-search-backward
"\\\\hologoLogoFontSetup{\\([^}]+\\)}"
+ (line-beginning-position) t))
+ (let ((logo (match-string-no-properties 1)))
+ (cond ((string= logo "BibTeX")
+ '(("bibsf") ("sc")))
+ ((string= logo "ExTeX")
+ '(("rm") ("sy")))
+ ((string= logo "SliTeX")
+ '(("rm") ("sc")))
+ ((or (string= logo "AmS")
+ (string= logo "NTS"))
+ '(("sy")))
+ ((string= logo "KOMAScript")
+ '(("sf")))
+ ((or (string= logo "METAFONT")
+ (string= logo "METAPOST"))
+ '(("logo")))
+ (t
+ nil))))))
;; Additional user macros
`("hologoVariant"
- LaTeX-hologo--arg-use-region-or-query-logo-name
+ (TeX-arg-conditional (LaTeX-hologo--arg-use-region-or-query-logo-name)
+ (LaTeX-hologo--arg-use-region)
+ ((TeX-arg-completing-read LaTeX-hologo-logo-names "Logo name")))
(TeX-arg-key-val ,(append LaTeX-hologo-key-val-options-local
LaTeX-hologo-key-val-options-global)))
`("HologoVariant"
- LaTeX-hologo--arg-use-region-or-query-logo-name
+ (TeX-arg-conditional (LaTeX-hologo--arg-use-region-or-query-logo-name)
+ (LaTeX-hologo--arg-use-region)
+ ((TeX-arg-completing-read LaTeX-hologo-logo-names "Logo name")))
(TeX-arg-key-val ,(append LaTeX-hologo-key-val-options-local
LaTeX-hologo-key-val-options-global)))
- [elpa] externals/auctex d3ab64f893 60/76: Reduce redundancy in regexp, (continued)
- [elpa] externals/auctex d3ab64f893 60/76: Reduce redundancy in regexp, Tassilo Horn, 2023/01/13
- [elpa] externals/auctex b2b899a450 66/76: ; * style/pstricks.el (LaTeX-package-parameter-value): Pacify compiler., Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 22fa670915 55/76: ; Fix doc strings, Tassilo Horn, 2023/01/13
- [elpa] externals/auctex f9b378a45c 70/76: Support detached arguments, Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 8984821716 74/76: ; * style/natbib.el ("natbib"): Fontify \citetext., Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 0cea7e107a 21/76: Simplify implementation of style/cleveref.el, Tassilo Horn, 2023/01/13
- [elpa] externals/auctex ba70baec6c 27/76: Fix doc strings regarding to section commands, Tassilo Horn, 2023/01/13
- [elpa] externals/auctex a648993763 22/76: * style/comment.el ("comment"): Replace `TeX-arg-eval'., Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 13c77f998e 28/76: Simplify implementation of style/empheq.el, Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 5b693f4e2e 42/76: ; * style/hyperref.el ("hyperref"): Don't use list inside vector., Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 324cb5c913 41/76: Simplify implementation of style/hologo.el,
Tassilo Horn <=
- [elpa] externals/auctex 8941bd640f 33/76: * style/fontspec.el ("fontspec"): Replace `TeX-arg-eval'., Tassilo Horn, 2023/01/13
- [elpa] externals/auctex a57e627284 59/76: Improve consistency between similar functions, Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 906e57dfb8 68/76: ; * style/physics.el: Write proper date., Tassilo Horn, 2023/01/13
- [elpa] externals/auctex ff65b9b4d0 65/76: Avoid compiler warnings with long function names, Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 4700af5dd4 64/76: ; Delete ineffective string escapes reported by Relint, Tassilo Horn, 2023/01/13
- [elpa] externals/auctex fb9c5645dc 49/76: * style/ltxtable.el ("ltxtable"): Replace `TeX-arg-eval'., Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 83622003aa 46/76: * style/enumitem.el ("enumitem"): Replace `TeX-arg-eval'., Tassilo Horn, 2023/01/13
- [elpa] externals/auctex d43bfae3fa 54/76: Overhaul beamer.el, Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 288665587a 57/76: Use `symbol-value' instead of `eval', Tassilo Horn, 2023/01/13
- [elpa] externals/auctex 6bdb392dfe 01/76: ; * style/theorem.el ("theorem"): Fix last change., Tassilo Horn, 2023/01/13