[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 4bcad477 1/2: Simplify handling of package options
|
From: |
Arash Esbati |
|
Subject: |
master 4bcad477 1/2: Simplify handling of package options |
|
Date: |
Mon, 8 May 2023 17:01:10 -0400 (EDT) |
branch: master
commit 4bcad4772d8ea9d25aee087ff8e09ca8b704272a
Author: Arash Esbati <arash@gnu.org>
Commit: Arash Esbati <arash@gnu.org>
Simplify handling of package options
* style/babel.el (LaTeX-babel-package-options): Move loading of
"fontenc" style inside the argument of `TeX-arg-key-val'. Use the
variable `LaTeX-fontenc-package-options' for values.
* style/bicaption.el (LaTeX-bicaption-package-options): Move
loading of "caption" style inside the argument of
`TeX-arg-key-val'.
* style/changes.el (LaTeX-changes-package-options): Move loading
of needed AUCTeX styles inside the argument of `TeX-arg-key-val'.
* style/fontenc.el (LaTeX-fontenc-package-options): Remove
unnecessary function.
(LaTeX-fontenc-package-options): Rename variable from
`LaTeX-fontenc-package-options-list' which now caters for package
options.
* style/parskip.el (LaTeX-parskip-package-options): Prepare
lengths inside the argument of `TeX-arg-key-val'.
* style/subcaption.el (LaTeX-subcaption-package-options): Move
loading of "caption" style inside the argument of
`TeX-arg-key-val'.
---
style/babel.el | 61 +++++++++++++++++++++++++------------------------
style/bicaption.el | 28 +++++++++++------------
style/changes.el | 65 ++++++++++++++++++++++++++---------------------------
style/fontenc.el | 14 ++----------
style/parskip.el | 17 +++++++-------
style/subcaption.el | 9 ++++----
6 files changed, 94 insertions(+), 100 deletions(-)
diff --git a/style/babel.el b/style/babel.el
index 70cc5658..964ff0cf 100644
--- a/style/babel.el
+++ b/style/babel.el
@@ -1,6 +1,6 @@
;;; babel.el --- AUCTeX style for `babel.sty' version 3.31. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2023 Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
;; Maintainer: auctex-devel@gnu.org
@@ -43,6 +43,7 @@
(declare-function LaTeX-fontspec-auto-cleanup
"fontspec"
())
+(defvar LaTeX-fontenc-package-options)
(defvar LaTeX-babel-language-list
'("afrikaans"
@@ -398,33 +399,35 @@
(defun LaTeX-babel-package-options ()
"Prompt for package options for the babel package."
- (TeX-read-key-val
- t
- (append
- '(("KeepShorthandsActive")
- ("activeacute")
- ("activegrave")
- ("shorthands" ("off"))
- ("safe" ("none" "ref" "bib"))
- ("math" ("active" "normal"))
- ("config")
- ("main" LaTeX-babel-language-list)
- ("headfoot" LaTeX-babel-language-list)
- ("noconfigs")
- ("nocase")
- ("silent")
- ("showlanguages")
- ("nocase")
- ("silent")
- ("strings" ("generic" "unicode" "encoded"
- "OT1" "OT2" "OT3" "OT4" "OT6"
- "T1" "T2A" "T2B" "T2C" "T3" "T4" "T5"
- "X2" "LY1" "LV1" "LGR"))
- ("hyphenmap" ("off" "first" "select" "other" "other*"))
- ("bidi" ("default" "basic" "basic-r" "bidi-l" "bidi-r"))
- ("layout" ("sectioning" "counters" "lists" "contents" "footnotes"
- "captions" "columns" "graphics" "extras"))
- ("base"))
- (mapcar #'list LaTeX-babel-language-list))))
+ (TeX-read-key-val t (progn
+ (TeX-load-style "fontenc")
+ (append
+ `(("KeepShorthandsActive")
+ ("activeacute")
+ ("activegrave")
+ ("shorthands" ("off"))
+ ("safe" ("none" "ref" "bib"))
+ ("math" ("active" "normal"))
+ ("config")
+ ("main" ,LaTeX-babel-language-list)
+ ("headfoot" ,LaTeX-babel-language-list)
+ ("noconfigs")
+ ("nocase")
+ ("silent")
+ ("showlanguages")
+ ("nocase")
+ ("silent")
+ ("strings" ,(append
+ LaTeX-fontenc-package-options
+ '("generic" "unicode" "encoded")))
+ ("hyphenmap" ("off" "first" "select"
+ "other" "other*"))
+ ("bidi" ("default" "basic" "basic-r"
+ "bidi-l" "bidi-r"))
+ ("layout" ("sectioning" "counters" "lists"
+ "contents" "footnotes" "captions"
+ "columns" "graphics" "extras"))
+ ("base"))
+ (mapcar #'list LaTeX-babel-language-list)))))
;;; babel.el ends here
diff --git a/style/bicaption.el b/style/bicaption.el
index 245b4541..94c12913 100644
--- a/style/bicaption.el
+++ b/style/bicaption.el
@@ -1,6 +1,6 @@
;;; bicaption.el --- AUCTeX style for `bicaption.sty' (v1.1-158) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2023 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -189,18 +189,18 @@ square brackets."
(defun LaTeX-bicaption-package-options ()
"Prompt for package options for the bicaption package."
- (TeX-load-style "caption")
- (TeX-read-key-val t
- (append
- `(,(list "language"
- (cond ((and (member "babel" (TeX-style-list))
- (LaTeX-babel-active-languages))
- (butlast (LaTeX-babel-active-languages)))
- ((and (member "polyglossia"
(TeX-style-list))
- (LaTeX-polyglossia-active-languages))
- (butlast (LaTeX-babel-active-languages)))
- (t nil))))
- LaTeX-bicaption-key-val-options
- LaTeX-caption-key-val-options)))
+ (TeX-read-key-val t (progn
+ (TeX-load-style "caption")
+ (append
+ `(,(list "language"
+ (cond ((and (member "babel" (TeX-style-list))
+ (LaTeX-babel-active-languages))
+ (butlast
(LaTeX-babel-active-languages)))
+ ((and (member "polyglossia"
(TeX-style-list))
+
(LaTeX-polyglossia-active-languages))
+ (butlast
(LaTeX-babel-active-languages)))
+ (t nil))))
+ LaTeX-bicaption-key-val-options
+ LaTeX-caption-key-val-options))))
;;; bicaption.el ends here
diff --git a/style/changes.el b/style/changes.el
index b0277686..9e43f194 100644
--- a/style/changes.el
+++ b/style/changes.el
@@ -1,6 +1,6 @@
;;; changes.el --- AUCTeX style for `changes.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2021--2022 Free Software Foundation, Inc.
+;; Copyright (C) 2021--2023 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -174,37 +174,36 @@
(defun LaTeX-changes-package-options ()
"Prompt for package options for the changes package."
- (TeX-load-style "xcolor")
- (TeX-load-style "truncate")
- (TeX-load-style "ulem")
- (TeX-read-key-val
- t
- (append
- `(("defaultcolor"
- ,(if (and (fboundp 'LaTeX-xcolor-definecolor-list)
- (LaTeX-xcolor-definecolor-list))
- (mapcar #'car (LaTeX-xcolor-definecolor-list))
- LaTeX-xcolor-base-colors)))
- `(("draft")
- ("final")
- ("commandnameprefix" ("none" "ifneeded" "always"))
- ("markup" ("default" "underlined" "bfit" "nocolor"))
- ("addedmarkup" ("colored" "uline" "uuline" "uwave"
- "dashuline" "dotuline"
- "bf" "it" "sl" "em"))
- ("deletedmarkup" ("sout" "xout" "colored"
- "uline" "uuline" "uwave"
- "dashuline" "dotuline"
- "bf" "it" "sl" "em"))
- ("highlightmarkup" ("background" "uuline" "uwave"))
- ("commentmarkup" ("todo" "margin" "footnote" "uwave"))
- ("authormarkup" ("superscript" "subscript" "brackets"
- "footnote" "none"))
- ("authormarkupposition" ("right" "left"))
- ("authormarkuptext" ("id" "name"))
- ("todonotes")
- ("truncate" ,LaTeX-truncate-package-options)
- ("ulem" ,LaTeX-ulem-package-options)
- ("xcolor" ,LaTeX-xcolor-package-options)))))
+ (TeX-read-key-val t (progn
+ (TeX-load-style "xcolor")
+ (TeX-load-style "truncate")
+ (TeX-load-style "ulem")
+ (append
+ `(("defaultcolor"
+ ,(if (and (fboundp 'LaTeX-xcolor-definecolor-list)
+ (LaTeX-xcolor-definecolor-list))
+ (mapcar #'car (LaTeX-xcolor-definecolor-list))
+ LaTeX-xcolor-base-colors)))
+ `(("draft")
+ ("final")
+ ("commandnameprefix" ("none" "ifneeded" "always"))
+ ("markup" ("default" "underlined" "bfit" "nocolor"))
+ ("addedmarkup" ("colored" "uline" "uuline" "uwave"
+ "dashuline" "dotuline"
+ "bf" "it" "sl" "em"))
+ ("deletedmarkup" ("sout" "xout" "colored"
+ "uline" "uuline" "uwave"
+ "dashuline" "dotuline"
+ "bf" "it" "sl" "em"))
+ ("highlightmarkup" ("background" "uuline" "uwave"))
+ ("commentmarkup" ("todo" "margin" "footnote"
"uwave"))
+ ("authormarkup" ("superscript" "subscript"
"brackets"
+ "footnote" "none"))
+ ("authormarkupposition" ("right" "left"))
+ ("authormarkuptext" ("id" "name"))
+ ("todonotes")
+ ("truncate" ,LaTeX-truncate-package-options)
+ ("ulem" ,LaTeX-ulem-package-options)
+ ("xcolor" ,LaTeX-xcolor-package-options))))))
;;; changes.el ends here
diff --git a/style/fontenc.el b/style/fontenc.el
index ba430db8..abbd6a2a 100644
--- a/style/fontenc.el
+++ b/style/fontenc.el
@@ -1,6 +1,6 @@
;;; fontenc.el --- AUCTeX style for `fontenc.sty' (v1.99g) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2015--2023 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -31,9 +31,7 @@
;;; Code:
-(require 'tex)
-
-(defvar LaTeX-fontenc-package-options-list
+(defvar LaTeX-fontenc-package-options
'(;; 128+ glyph encodings (text)
"OT1" "OT2" "OT3" "OT4" "OT6"
;; 256 glyph encodings (text)
@@ -44,12 +42,4 @@
"LY1" "LV1" "LGR")
"Package options for the fontenc package.")
-(defun LaTeX-fontenc-package-options ()
- "Prompt for package options for the fontenc package."
- (mapconcat #'identity
- (TeX-completing-read-multiple
- "Encoding(s): "
- LaTeX-fontenc-package-options-list)
- ","))
-
;;; fontenc.el ends here
diff --git a/style/parskip.el b/style/parskip.el
index 861d4698..ca077be9 100644
--- a/style/parskip.el
+++ b/style/parskip.el
@@ -1,6 +1,6 @@
;;; parskip.el --- AUCTeX style for `parskip.sty' (v2.0h) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2022 Free Software Foundation, Inc.
+;; Copyright (C) 2022--2023 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -39,12 +39,13 @@
(defun LaTeX-parskip-package-options ()
"Prompt for package options for the parskip package."
- (let ((len (mapcar (lambda (x)
- (concat TeX-esc (car x)))
- (LaTeX-length-list))))
- (TeX-read-key-val t `(("skip" ,len)
- ("tocskip" ,len)
- ("indent" ,len)
- ("parfill" ,len)))))
+ (TeX-read-key-val t (progn
+ (let ((len (mapcar (lambda (x)
+ (concat TeX-esc (car x)))
+ (LaTeX-length-list))))
+ `(("skip" ,len)
+ ("tocskip" ,len)
+ ("indent" ,len)
+ ("parfill" ,len))))))
;;; parskip.el ends here
diff --git a/style/subcaption.el b/style/subcaption.el
index c98596a5..d0dd49a4 100644
--- a/style/subcaption.el
+++ b/style/subcaption.el
@@ -1,6 +1,6 @@
;;; subcaption.el --- AUCTeX style for `subcaption.sty' (v1.3) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015--2022 Free Software Foundation, Inc.
+;; Copyright (C) 2015--2023 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -198,8 +198,9 @@ caption, insert only a caption."
(defun LaTeX-subcaption-package-options ()
"Prompt for package options for the subcaption package."
- (TeX-load-style "caption")
- (TeX-read-key-val t (append LaTeX-subcaption-key-val-options
- LaTeX-caption-key-val-options)))
+ (TeX-read-key-val t (progn
+ (TeX-load-style "caption")
+ (append LaTeX-subcaption-key-val-options
+ LaTeX-caption-key-val-options))))
;;; subcaption.el ends here
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 4bcad477 1/2: Simplify handling of package options,
Arash Esbati <=