Hi Mosè,
Mosè Giordano <m...@gnu.org> writes:
> 2015-09-12 20:27 GMT+02:00 Arash Esbati <esb...@gmx.de>:
>> All always, any comments welcome.
>
> Indeed I have a comment: avoid using the name
> "LaTeX-*-package-options" for both a variable and a function, there
> have been problems in the past
[...]
Thanks for your comment. I had the impression it is common practice in
AUCTeX to give the variable and the function the same name.
> Use "LaTeX-*-package-options-list" for the variable instead.
Done. I've also updated `eso-pic.el'. Please find attached the new
change sets.
Best, Arash
>From 86d0667a8ef76b1a612dec3c014c2143da18f3a3 Mon Sep 17 00:00:00 2001
From: Arash Esbati <esb...@gmx.de>
Date: Sun, 13 Sep 2015 20:34:02 +0200
Subject: [PATCH 1/4] Add new style fontenc.el.
* Makefile.in (STYLESRC): Add new style.
* style/fontenc.el: New file.
---
ChangeLog | 6 ++++++
Makefile.in | 2 +-
style/fontenc.el | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 1 deletion(-)
create mode 100644 style/fontenc.el
diff --git a/ChangeLog b/ChangeLog
index f439bec..e1b72a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-13 Arash Esbati <esb...@gmx.de>
+
+ * Makefile.in (STYLESRC): Add new style.
+
+ * style/fontenc.el: New file.
+
2015-09-10 Mosè Giordano <m...@gnu.org>
* style/gloss-italian.el ("gloss-italian"): Fix "textitalian"
diff --git a/Makefile.in b/Makefile.in
index 68b785a..2a11b68 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -151,7 +151,7 @@ STYLESRC = style/prosper.el \
style/newpxtext.el style/newpxmath.el style/pdfpages.el \
style/mnras.el style/environ.el style/polyglossia.el \
style/vwcol.el style/textpos.el style/transparent.el \
- style/gloss-italian.el
+ style/fontenc.el style/gloss-italian.el
STYLEELC = $(STYLESRC:.el=.elc)
diff --git a/style/fontenc.el b/style/fontenc.el
new file mode 100644
index 0000000..3df5e5d
--- /dev/null
+++ b/style/fontenc.el
@@ -0,0 +1,52 @@
+;;; fontenc.el --- AUCTeX style for `fontenc.sty' (v1.99g)
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Arash Esbati <esbati'at'gmx.de>
+;; Maintainer: address@hidden
+;; Created: 2015-09-12
+;; Keywords: tex
+
+;; This file is part of AUCTeX.
+
+;; AUCTeX is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; AUCTeX is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with AUCTeX; see the file COPYING. If not, write to the Free
+;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file adds support for `fontenc.sty' (v1.99g) from 2005/09/27.
+;; `fontenc.sty' is a standard LaTeX package and part of TeXLive.
+
+;;; Code:
+
+(defvar LaTeX-fontenc-package-options-list
+ '(;; 128+ glyph encodings (text)
+ "OT1" "OT2" "OT3" "OT4" "OT6"
+ ;; 256 glyph encodings (text)
+ "T1" "T2A" "T2B" "T2C" "T3" "T4" "T5"
+ ;; 256 glyph encodings (text extended)
+ "X2"
+ ;; Other encodings
+ "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
--
2.5.1
>From 148d0e76f1e8771e9c8bf5520c62593158bba92f Mon Sep 17 00:00:00 2001
From: Arash Esbati <esb...@gmx.de>
Date: Sun, 13 Sep 2015 20:38:04 +0200
Subject: [PATCH 2/4] Add new style Alegreya.el.
* Makefile.in (STYLESRC): Add new style.
* style/Alegreya.el: New file.
---
ChangeLog | 4 +++
Makefile.in | 2 +-
style/Alegreya.el | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 105 insertions(+), 1 deletion(-)
create mode 100644 style/Alegreya.el
diff --git a/ChangeLog b/ChangeLog
index e1b72a6..00424fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
* Makefile.in (STYLESRC): Add new style.
+ * style/Alegreya.el: New file.
+
+ * Makefile.in (STYLESRC): Add new style.
+
* style/fontenc.el: New file.
2015-09-10 Mosè Giordano <m...@gnu.org>
diff --git a/Makefile.in b/Makefile.in
index 2a11b68..b6de1e6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -151,7 +151,7 @@ STYLESRC = style/prosper.el \
style/newpxtext.el style/newpxmath.el style/pdfpages.el \
style/mnras.el style/environ.el style/polyglossia.el \
style/vwcol.el style/textpos.el style/transparent.el \
- style/fontenc.el style/gloss-italian.el
+ style/fontenc.el style/Alegreya.el style/gloss-italian.el
STYLEELC = $(STYLESRC:.el=.elc)
diff --git a/style/Alegreya.el b/style/Alegreya.el
new file mode 100644
index 0000000..e2a444f
--- /dev/null
+++ b/style/Alegreya.el
@@ -0,0 +1,100 @@
+;;; Alegreya.el --- AUCTeX style for `Alegreya.sty' (v2015/09/02)
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Arash Esbati <esbati'at'gmx.de>
+;; Maintainer: auctex-devel@gnu.org
+;; Created: 2015-09-12
+;; Keywords: tex
+
+;; This file is part of AUCTeX.
+
+;; AUCTeX is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; AUCTeX is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with AUCTeX; see the file COPYING. If not, write to the Free
+;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file adds support for `Alegreya.sty' (v2015/09/02).
+;; `Alegreya.sty' is part of TeXLive.
+
+;;; Code:
+
+(TeX-add-style-hook
+ "Alegreya"
+ (lambda ()
+
+ ;; Run style hook for packages loaded by Alegreya
+ (TeX-run-style-hooks "textcomp")
+
+ ;; Load `fontaxes' or `fontspec' dep. on `type1' option:
+ (if (or (LaTeX-provided-package-options-member "Alegreya" "type1")
+ (LaTeX-provided-package-options-member "Alegreya" "type1=true"))
+ (TeX-run-style-hooks "fontaxes")
+ (TeX-run-style-hooks "fontspec"))
+
+ (TeX-add-symbols
+ ;; Should be used in preamble only
+ '("useosf")
+ ;; Text commands
+ '("Alegreya" -1)
+ '("AlegreyaSC" -1)
+ '("AlegreyaBlack" -1)
+ '("AlegreyaLF" -1)
+ '("AlegreyaOsF" -1)
+ '("AlegreyaTLF" -1)
+ '("AlegreyaTOsF" -1)
+ '("textsu" t) ; superior figures
+ '("sufigures" -1) ;
+ '("textin" t) ; inferior figures
+ '("infigures" -1))
+
+ ;; Fontification
+ (when (and (featurep 'font-latex)
+ (eq TeX-install-font-lock 'font-latex-setup))
+ (font-latex-add-keywords '(("textsu" "{")
+ ("textin" "{"))
+ 'type-command)
+ (font-latex-add-keywords '(("Alegreya" "")
+ ("AlegreyaSC" "")
+ ("AlegreyaBlack" "")
+ ("AlegreyaLF" "")
+ ("AlegreyaOsF" "")
+ ("AlegreyaTLF" "")
+ ("AlegreyaTOsF" "")
+ ("sufigures" "")
+ ("infigures" ""))
+ 'type-declaration)))
+ LaTeX-dialect)
+
+(defvar LaTeX-Alegreya-package-options-list
+ '(("lining" ("true" "false"))
+ ("lf" ("true" "false"))
+ ("oldstyle" ("true" "false"))
+ ("osf" ("true" "false"))
+ ("tabular" ("true" "false"))
+ ("tf" ("true" "false"))
+ ("proportional" ("true" "false"))
+ ("pf" ("true" "false"))
+ ("black" ("true" "false"))
+ ("type1" ("true" "false"))
+ ("scaled")
+ ("scale"))
+ "Package options for the Alegreya package.")
+
+(defun LaTeX-Alegreya-package-options ()
+ "Prompt for package options for the Alegreya package."
+ (TeX-read-key-val t LaTeX-Alegreya-package-options-list))
+
+;;; Alegreya.el ends here
--
2.5.1
>From 4d25f382d827da226908b958f9485df6885451a6 Mon Sep 17 00:00:00 2001
From: Arash Esbati <esb...@gmx.de>
Date: Sun, 13 Sep 2015 20:41:38 +0200
Subject: [PATCH 3/4] Add new style AlegreyaSans.el.
* style/AlegreyaSans.el: New file.
* Makefile.in (STYLESRC): Add new style.
---
ChangeLog | 2 +
Makefile.in | 3 +-
style/AlegreyaSans.el | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+), 1 deletion(-)
create mode 100644 style/AlegreyaSans.el
diff --git a/ChangeLog b/ChangeLog
index 00424fe..18cf9d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2015-09-13 Arash Esbati <esb...@gmx.de>
+ * style/AlegreyaSans.el: New file.
+
* Makefile.in (STYLESRC): Add new style.
* style/Alegreya.el: New file.
diff --git a/Makefile.in b/Makefile.in
index b6de1e6..bc30c05 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -151,7 +151,8 @@ STYLESRC = style/prosper.el \
style/newpxtext.el style/newpxmath.el style/pdfpages.el \
style/mnras.el style/environ.el style/polyglossia.el \
style/vwcol.el style/textpos.el style/transparent.el \
- style/fontenc.el style/Alegreya.el style/gloss-italian.el
+ style/fontenc.el style/Alegreya.el style/gloss-italian.el \
+ style/AlegreyaSans.el
STYLEELC = $(STYLESRC:.el=.elc)
diff --git a/style/AlegreyaSans.el b/style/AlegreyaSans.el
new file mode 100644
index 0000000..4d9b497
--- /dev/null
+++ b/style/AlegreyaSans.el
@@ -0,0 +1,112 @@
+;;; AlegreyaSans.el --- AUCTeX style for `AlegreyaSans.sty' (v2015/09/02)
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Arash Esbati <esbati'at'gmx.de>
+;; Maintainer: auctex-devel@gnu.org
+;; Created: 2015-09-12
+;; Keywords: tex
+
+;; This file is part of AUCTeX.
+
+;; AUCTeX is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; AUCTeX is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with AUCTeX; see the file COPYING. If not, write to the Free
+;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file adds support for `AlegreyaSans.sty' (v2015/09/02).
+;; `AlegreyaSans.sty' is part of TeXLive.
+
+;;; Code:
+
+(TeX-add-style-hook
+ "AlegreyaSans"
+ (lambda ()
+
+ ;; Run style hook for packages loaded by AlegreyaSans
+ (TeX-run-style-hooks "textcomp")
+
+ ;; Load `fontaxes' or `fontspec' dep. on `type1' option:
+ (if (or (LaTeX-provided-package-options-member "AlegreyaSans" "type1")
+ (LaTeX-provided-package-options-member "AlegreyaSans" "type1=true"))
+ (TeX-run-style-hooks "fontaxes")
+ (TeX-run-style-hooks "fontspec"))
+
+ (TeX-add-symbols
+ ;; Should be used in preamble only
+ '("useosf")
+ ;; Text commands
+ '("AlegreyaSans" -1)
+ '("AlegreyaSansLF" -1)
+ '("AlegreyaSansOsF" -1)
+ '("AlegreyaSansTLF" -1)
+ '("AlegreyaSansTOsF" -1)
+ '("AlegreyaSansThin" -1)
+ '("AlegreyaSansLight" -1)
+ '("AlegreyaSansMedium" -1)
+ '("AlegreyaSansExtraBold" -1)
+ '("AlegreyaSansBlack" -1)
+ '("AlegreyaSansSC" -1)
+ '("textsu" t) ; superior figures
+ '("sufigures" -1) ;
+ '("textin" t) ; inferior figures
+ '("infigures" -1))
+
+ ;; Fontification
+ (when (and (featurep 'font-latex)
+ (eq TeX-install-font-lock 'font-latex-setup))
+ (font-latex-add-keywords '(("textsu" "{")
+ ("textin" "{"))
+ 'type-command)
+ (font-latex-add-keywords '(("AlegreyaSans" "")
+ ("AlegreyaSansLF" "")
+ ("AlegreyaSansOsF" "")
+ ("AlegreyaSansTLF" "")
+ ("AlegreyaSansTOsF" "")
+ ("AlegreyaSansLight" "")
+ ("AlegreyaSansMedium" "")
+ ("AlegreyaSansExtraBold" "")
+ ("AlegreyaSansBlack" "")
+ ("AlegreyaSansSC" "")
+ ("sufigures" "")
+ ("infigures" ""))
+ 'type-declaration)))
+ LaTeX-dialect)
+
+(defvar LaTeX-AlegreyaSans-package-options-list
+ '(("lining" ("true" "false"))
+ ("lf" ("true" "false"))
+ ("oldstyle" ("true" "false"))
+ ("osf" ("true" "false"))
+ ("tabular" ("true" "false"))
+ ("tf" ("true" "false"))
+ ("proportional" ("true" "false"))
+ ("pf" ("true" "false"))
+ ("black" ("true" "false"))
+ ("extrabold" ("true" "false"))
+ ("thin" ("true" "false"))
+ ("light" ("true" "false"))
+ ("medium" ("true" "false"))
+ ("type1" ("true" "false"))
+ ("sfdefault" ("true" "false"))
+ ("scaled")
+ ("scale"))
+ "Package options for the AlegreyaSans package.")
+
+(defun LaTeX-AlegreyaSans-package-options ()
+ "Prompt for package options for the AlegreyaSans package."
+ (TeX-read-key-val t LaTeX-AlegreyaSans-package-options-list))
+
+;;; AlegreyaSans.el ends here
--
2.5.1
>From bcd7c378629ca4e588ebb0e55134c4b209e2ea9d Mon Sep 17 00:00:00 2001
From: Arash Esbati <esb...@gmx.de>
Date: Sun, 13 Sep 2015 20:49:43 +0200
Subject: [PATCH 4/4] Append `-list' to `LaTeX-eso-pic-package-options'.
* style/eso-pic.el (LaTeX-eso-pic-package-options-list): Rename
from `LaTeX-eso-pic-package-options'.
(LaTeX-eso-pic-package-options): Use renamed variable.
---
ChangeLog | 4 ++++
style/eso-pic.el | 7 +++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 18cf9d1..a7f9ffb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-09-13 Arash Esbati <esb...@gmx.de>
+ * style/eso-pic.el (LaTeX-eso-pic-package-options-list): Rename
+ from `LaTeX-eso-pic-package-options'.
+ (LaTeX-eso-pic-package-options): Use renamed variable.
+
* style/AlegreyaSans.el: New file.
* Makefile.in (STYLESRC): Add new style.
diff --git a/style/eso-pic.el b/style/eso-pic.el
index 8b43535..b1bedb2 100644
--- a/style/eso-pic.el
+++ b/style/eso-pic.el
@@ -72,9 +72,8 @@
"gridSetup" "LenToUnit"))
LaTeX-dialect)
-(defvar LaTeX-eso-pic-package-options
- '(;;
- ("pscoord" ("true" "false"))
+(defvar LaTeX-eso-pic-package-options-list
+ '(("pscoord" ("true" "false"))
("texcoord" ("true" "false"))
("grid" ("true" "false"))
("gridunit" ("mm" "in" "bp" "pt"))
@@ -86,6 +85,6 @@
(defun LaTeX-eso-pic-package-options nil
"Prompt for package options for the eso-pic package."
- (TeX-read-key-val t LaTeX-eso-pic-package-options))
+ (TeX-read-key-val t LaTeX-eso-pic-package-options-list))
;;; eso-pic.el ends here
--
2.5.1
_______________________________________________
auctex-devel mailing list
auctex-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/auctex-devel
