auctex-diffs
[Top][All Lists]
Advanced

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

[AUCTeX-diffs] GNU AUCTeX branch, master, updated. b8661101b955c7c62a79a


From: Arash Esbati
Subject: [AUCTeX-diffs] GNU AUCTeX branch, master, updated. b8661101b955c7c62a79a696893a50da3450dde2
Date: Wed, 3 Nov 2021 05:21:49 -0400 (EDT)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  b8661101b955c7c62a79a696893a50da3450dde2 (commit)
      from  6433dc38e49ab79a4341ad515d1bf8986be3b9c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b8661101b955c7c62a79a696893a50da3450dde2
Author: Arash Esbati <arash@gnu.org>
Date:   Wed Nov 3 10:20:36 2021 +0100

    Autoload `TeX-check-engine-add-engines' in tex.el
    
    * style/arabxetex.el ("arabxetex"):
    * style/babel.el ("babel"):
    * style/bidi.el ("bidi"):
    * style/fontspec.el ("fontspec"):
    * style/polyglossia.el ("polyglossia"): Don't require tex-buf.el
    in the style hook.
    
    * tex.el (TeX-check-engine-add-engines): Autoload the function so
    the styles using it don't have to require tex-buf.el.

diff --git a/style/arabxetex.el b/style/arabxetex.el
index 05068a4..897b9cd 100644
--- a/style/arabxetex.el
+++ b/style/arabxetex.el
@@ -1,6 +1,6 @@
 ;;; arabxetex.el --- AUCTeX style for `arabxetex.sty' (v1.2.1)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2017--2020 Free Software Foundation, Inc.
+;; Copyright (C) 2017--2021 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
@@ -38,9 +38,6 @@
 (declare-function font-latex-add-keywords
                   "font-latex"
                   (keywords class))
-(declare-function TeX-check-engine-add-engines
-                  "tex-buf"
-                  (&rest engines))
 
 (TeX-add-style-hook
  "arabxetex"
@@ -50,8 +47,6 @@
    (TeX-run-style-hooks "amsmath" "fontspec" "bidi")
 
    ;; We need xelatex, so check for the engine here:
-   (unless (featurep 'tex-buf)
-     (require 'tex-buf))
    (TeX-check-engine-add-engines 'xetex)
 
    ;; New macros & environments:
diff --git a/style/babel.el b/style/babel.el
index 9206dac..bf4f745 100644
--- a/style/babel.el
+++ b/style/babel.el
@@ -286,10 +286,11 @@
     '("useshorthands"  "Character")
     '("useshorthands*" "Character")
     '("defineshorthand"
-      [ TeX-arg-eval mapconcat #'identity
-        (TeX-completing-read-multiple
-         (TeX-argument-prompt t nil "Language(s)")
-         (LaTeX-babel-active-languages)) ""]
+      [TeX-arg-eval mapconcat #'identity
+                    (TeX-completing-read-multiple
+                     (TeX-argument-prompt t nil "Language(s)")
+                     (LaTeX-babel-active-languages))
+                    ""]
       t nil)
     '("aliasshorthand"   "Original" "Alias")
     '("languageshorthands" TeX-arg-babel-lang)
@@ -305,32 +306,30 @@
 
     ;; 1.14 Selecting fonts
     '("babelfont"
-      [ TeX-arg-eval mapconcat #'identity
-        (TeX-completing-read-multiple
-         (TeX-argument-prompt t nil "Language(s)")
-         LaTeX-babel-language-list)
-        "," ]
+      [TeX-arg-eval mapconcat #'identity
+                    (TeX-completing-read-multiple
+                     (TeX-argument-prompt t nil "Language(s)")
+                     LaTeX-babel-language-list)
+                    ","]
       (TeX-arg-eval let ((fontfam (completing-read
                                    (TeX-argument-prompt nil nil "font family")
                                    '("rm" "sf" "tt"))))
-                    ;; Make sure `tex-buf.el' is also loaded otherwise
-                    ;; `TeX-check-engine-add-engines' is not defined.
-                    ;; Then load `fontspec.el' and make sure the
-                    ;; key-vals are up to date.
+                    ;; Run `TeX-check-engine-add-engines' and then
+                    ;; load `fontspec.el' if not already loaded and
+                    ;; make sure the key-vals are up to date.
                     (unless (member "fontspec" (TeX-style-list))
-                      (require 'tex-buf)
                       (TeX-check-engine-add-engines 'luatex 'xetex)
                       (TeX-run-style-hooks "fontspec")
                       (LaTeX-fontspec-auto-cleanup))
                     (LaTeX-add-babel-babelfonts fontfam)
                     (LaTeX-babel-cleanup-babelfont)
                     (format "%s" fontfam))
-      [ TeX-arg-key-val LaTeX-fontspec-font-features-local]
+      [TeX-arg-key-val LaTeX-fontspec-font-features-local]
       LaTeX-fontspec-arg-font)
 
     ;; 1.16 Creating a language
     '("babelprovide"
-      [ TeX-arg-key-val LaTeX-babel-babelprovide-key-val-options ]
+      [TeX-arg-key-val LaTeX-babel-babelprovide-key-val-options]
       (TeX-arg-eval completing-read
                     (TeX-argument-prompt nil nil "Language")
                     LaTeX-babel-language-list))
@@ -350,11 +349,11 @@
                     '("soft" "hard" "repeat" "empty")))
 
     '("babelhyphenation"
-      [ TeX-arg-eval mapconcat #'identity
-        (TeX-completing-read-multiple
-         (TeX-argument-prompt nil nil "Language(s)")
-         LaTeX-babel-language-list)
-        "," ]
+      [TeX-arg-eval mapconcat #'identity
+                    (TeX-completing-read-multiple
+                     (TeX-argument-prompt nil nil "Language(s)")
+                     LaTeX-babel-language-list)
+                    ","]
       t)
 
     ;; 1.20 Selecting scripts
diff --git a/style/bidi.el b/style/bidi.el
index 6f1f0b3..1b17d60 100644
--- a/style/bidi.el
+++ b/style/bidi.el
@@ -1,6 +1,6 @@
 ;;; bidi.el --- AUCTeX style for the (XeLaTeX) bidi package  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2021 Free Software Foundation, Inc.
 
 ;; Author: Uwe Brauer <oub@mat.ucm.es>
 ;; Created: 2016-03-06
@@ -36,9 +36,6 @@
 (declare-function font-latex-add-keywords
                   "font-latex"
                   (keywords class))
-(declare-function TeX-check-engine-add-engines
-                  "tex-buf"
-                  (&rest engines))
 
 (defvar LaTeX-bidi-package-options
   '("RTLdocument" "rldocument" "extrafootnotefeatures")
@@ -55,9 +52,8 @@
 (TeX-add-style-hook
  "bidi"
  (lambda ()
+
    ;; bidi.sty requires xelatex, so set the engine
-   (unless (featurep 'tex-buf)
-     (require 'tex-buf))
    (TeX-check-engine-add-engines 'xetex)
 
    ;; 1.4 Turning TeX--XeT features on and off
diff --git a/style/fontspec.el b/style/fontspec.el
index a618ca9..26ab420 100644
--- a/style/fontspec.el
+++ b/style/fontspec.el
@@ -1,6 +1,6 @@
 ;;; fontspec.el --- AUCTeX style for `fontspec.sty' version 2.6a.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2013, 2017, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2013--2021 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <mose@gnu.org>
@@ -44,7 +44,6 @@
 
 (declare-function LaTeX-color-definecolor-list "color" ())
 (declare-function LaTeX-xcolor-definecolor-list "xcolor" ())
-(declare-function TeX-check-engine-add-engines "tex-buf" (&rest engines))
 
 (defvar LaTeX-fontspec-font-features
   '(;; 5 Font selection
@@ -257,8 +256,7 @@ to retrieve the list of fonts."
 (TeX-add-style-hook
  "fontspec"
  (lambda ()
-   (unless (featurep 'tex-buf)
-     (require 'tex-buf))
+
    (TeX-check-engine-add-engines 'luatex 'xetex)
    (TeX-run-style-hooks "expl3" "xparse")
 
diff --git a/style/polyglossia.el b/style/polyglossia.el
index f17eeab..4bfb93e 100644
--- a/style/polyglossia.el
+++ b/style/polyglossia.el
@@ -238,8 +238,6 @@ argument, otherwise as a mandatory one."
 (TeX-add-style-hook
  "polyglossia"
  (lambda ()
-   (unless (featurep 'tex-buf)
-     (require 'tex-buf))
    (TeX-check-engine-add-engines 'luatex 'xetex)
    (TeX-auto-add-regexp
     `(,LaTeX-polyglossia-lang-regexp (3 1 2) LaTeX-auto-polyglossia-lang))
diff --git a/tex.el b/tex.el
index 70a6d4a..968579e 100644
--- a/tex.el
+++ b/tex.el
@@ -702,6 +702,7 @@ sure \"%p\" is the first entry."
 (autoload 'LaTeX-command-run-all-section "tex-buf" nil t)
 (autoload 'LaTeX-command-section "tex-buf" nil t)
 (autoload 'TeX-active-master "tex-buf")
+(autoload 'TeX-check-engine-add-engines "tex-buf")
 (autoload 'TeX-command "tex-buf")
 (autoload 'TeX-command-buffer "tex-buf" nil t)
 (autoload 'TeX-command-expand "tex-buf")

-----------------------------------------------------------------------

Summary of changes:
 style/arabxetex.el   |  7 +------
 style/babel.el       | 41 ++++++++++++++++++++---------------------
 style/bidi.el        |  8 ++------
 style/fontspec.el    |  6 ++----
 style/polyglossia.el |  2 --
 tex.el               |  1 +
 6 files changed, 26 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX



reply via email to

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