[elpa] externals/auctex 45d9b8d 41/62: ; Fix byte-compiler warnings in styles

[Tassilo Horn]

branch: externals/auctex
commit 45d9b8d0d62ca74d20d250b4e239852045f7a69b
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>

    ; Fix byte-compiler warnings in styles
---
 style/fancyhdr.el     |   3 +
 style/fancynum.el     |   2 +
 style/fancyref.el     | 153 +++++++++++++++++++++++++-------------------------
 style/fbb.el          |   2 +
 style/fbox.el         |   4 ++
 style/filecontents.el |   3 +
 style/flashcards.el   |   3 +
 style/foils.el        |   2 +
 style/fontaxes.el     |   2 +
 style/fontenc.el      |   2 +
 style/fontspec.el     |   4 ++
 style/footmisc.el     |   2 +
 style/framed.el       |   3 +
 style/francais.el     |   2 +
 style/french.el       |   4 +-
 style/frenchb.el      |  30 +++++-----
 style/fvextra.el      |   3 +
 17 files changed, 134 insertions(+), 90 deletions(-)

diff --git a/style/fancyhdr.el b/style/fancyhdr.el
index 646e8a2..0ec2ee0 100644
--- a/style/fancyhdr.el
+++ b/style/fancyhdr.el
@@ -29,6 +29,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/fancynum.el b/style/fancynum.el
index d6d1ddf..52ba702 100644
--- a/style/fancynum.el
+++ b/style/fancynum.el
@@ -29,6 +29,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 (TeX-add-style-hook
  "fancynum"
  (lambda ()
diff --git a/style/fancyref.el b/style/fancyref.el
index 89c0814..cf6555f 100644
--- a/style/fancyref.el
+++ b/style/fancyref.el
@@ -24,86 +24,89 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
                  (keywords class))
 
-(TeX-add-style-hook "fancyref"
-   (lambda ()
-     
-     (TeX-add-symbols
-
-      ;; The macros with label arguments
-      '("fref" [ TeX-arg-fancyref-format ] TeX-arg-ref)
-      '("Fref" [ TeX-arg-fancyref-format ] TeX-arg-ref)
-
-      ;; The macros which define new prefixes and formats
-      '("fancyrefchangeprefix" TeX-arg-macro "Prefix")
-      '("Frefformat" TeX-arg-fancyref-format TeX-arg-macro "Output")
-      '("frefformat" TeX-arg-fancyref-format TeX-arg-macro "Output")
-
-      ;; The delimiter
-      "fancyrefargdelim"
-
-      ;; All those names and abbreviations.
-      ;; Part
-      "fancyrefpartlabelprefix" 
-      "Frefpartname" "frefpartname"   
-      ;; Chapter
-      "fancyrefchalabelprefix"
-      "Frefchaname" "frefchaname"   
-      ;; Section
-      "fancyrefseclabelprefix"
-      "Frefsecname" "frefsecname"
-      ;; Equation
-      "fancyrefeqlabelprefix"
-      "Frefeqname" "frefeqname"   
-      ;; Figure
-      "fancyreffiglabelprefix"
-      "Freffigname" "freffigname" "Freffigshortname"
-      ;; Footnote
-      "fancyreffnlabelprefix"
-      "Freffnname" "freffnname"   
-      ;; Item
-      "fancyrefitemlabelprefix"
-      "Frefitemname" "frefitemname" 
-      ;; Table
-      "fancyreftablabelprefix"
-      "Freftabname" "freftabname" "Freftabshortname"
-      ;; Page
-      "Frefpgname" "frefpgname" "Frefpgshortname"
-      ;; On
-      "Frefonname" "frefonname" 
-      ;; See
-      "Frefseename" "frefseename"
-
-      ;; The spacing macros
-      "fancyrefloosespacing" "fancyreftightspacing" "fancyrefdefaultspacing"
-
-      ;; And the hook
-      "fancyrefhook")
-
-     ;; Insatall completion for labels and formats
-     (setq TeX-complete-list
-          (append
-           '(("\\\\[fF]ref\\(\\[[^]]*\\]\\)?{\\([^{}\n\r\\%,]*\\)" 
-              2 LaTeX-label-list "}")
-             ("\\\\[fF]ref\\[\\([^{}\n\r\\%,]*\\)" 
-              1 LaTeX-fancyref-formats "]")
-             ("\\\\[fF]refformat{\\([^{}\n\r\\%,]*\\)"
-              1 LaTeX-fancyref-formats "}"))
-           TeX-complete-list))
-     ;; Fontification
-     (when (and (featurep 'font-latex)
-               (eq TeX-install-font-lock 'font-latex-setup))
-       (font-latex-add-keywords '(("fref" "[{") ("Fref" "[{")) 'reference))
-
-     ;; Activate RefTeX reference style.
-     (and LaTeX-reftex-ref-style-auto-activate
-         (fboundp 'reftex-ref-style-activate)
-         (reftex-ref-style-activate "Fancyref")))
-   TeX-dialect)
+(TeX-add-style-hook
+ "fancyref"
+ (lambda ()
+   (TeX-add-symbols
+
+    ;; The macros with label arguments
+    '("fref" [ TeX-arg-fancyref-format ] TeX-arg-ref)
+    '("Fref" [ TeX-arg-fancyref-format ] TeX-arg-ref)
+
+    ;; The macros which define new prefixes and formats
+    '("fancyrefchangeprefix" TeX-arg-macro "Prefix")
+    '("Frefformat" TeX-arg-fancyref-format TeX-arg-macro "Output")
+    '("frefformat" TeX-arg-fancyref-format TeX-arg-macro "Output")
+
+    ;; The delimiter
+    "fancyrefargdelim"
+
+    ;; All those names and abbreviations.
+    ;; Part
+    "fancyrefpartlabelprefix" 
+    "Frefpartname" "frefpartname"   
+    ;; Chapter
+    "fancyrefchalabelprefix"
+    "Frefchaname" "frefchaname"   
+    ;; Section
+    "fancyrefseclabelprefix"
+    "Frefsecname" "frefsecname"
+    ;; Equation
+    "fancyrefeqlabelprefix"
+    "Frefeqname" "frefeqname"   
+    ;; Figure
+    "fancyreffiglabelprefix"
+    "Freffigname" "freffigname" "Freffigshortname"
+    ;; Footnote
+    "fancyreffnlabelprefix"
+    "Freffnname" "freffnname"   
+    ;; Item
+    "fancyrefitemlabelprefix"
+    "Frefitemname" "frefitemname" 
+    ;; Table
+    "fancyreftablabelprefix"
+    "Freftabname" "freftabname" "Freftabshortname"
+    ;; Page
+    "Frefpgname" "frefpgname" "Frefpgshortname"
+    ;; On
+    "Frefonname" "frefonname" 
+    ;; See
+    "Frefseename" "frefseename"
+
+    ;; The spacing macros
+    "fancyrefloosespacing" "fancyreftightspacing" "fancyrefdefaultspacing"
+
+    ;; And the hook
+    "fancyrefhook")
+
+   ;; Insatall completion for labels and formats
+   (setq TeX-complete-list
+        (append
+         '(("\\\\[fF]ref\\(\\[[^]]*\\]\\)?{\\([^{}\n\r\\%,]*\\)" 
+            2 LaTeX-label-list "}")
+           ("\\\\[fF]ref\\[\\([^{}\n\r\\%,]*\\)" 
+            1 LaTeX-fancyref-formats "]")
+           ("\\\\[fF]refformat{\\([^{}\n\r\\%,]*\\)"
+            1 LaTeX-fancyref-formats "}"))
+         TeX-complete-list))
+   ;; Fontification
+   (when (and (featurep 'font-latex)
+             (eq TeX-install-font-lock 'font-latex-setup))
+     (font-latex-add-keywords '(("fref" "[{") ("Fref" "[{")) 'reference))
+
+   ;; Activate RefTeX reference style.
+   (and LaTeX-reftex-ref-style-auto-activate
+       (fboundp 'reftex-ref-style-activate)
+       (reftex-ref-style-activate "Fancyref")))
+ TeX-dialect)
 
 ;; The following list keeps a list of available format names
 ;; Note that this list is only updated when a format is used, not
diff --git a/style/fbb.el b/style/fbb.el
index f05c777..e1f5796 100644
--- a/style/fbb.el
+++ b/style/fbb.el
@@ -31,6 +31,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/fbox.el b/style/fbox.el
index f79e2c0..367d042 100644
--- a/style/fbox.el
+++ b/style/fbox.el
@@ -29,6 +29,10 @@
 ;; This file adds support for `fbox.sty' (v0.04) from 2020/01/03.
 ;; `fbox.sty' is part of TeXLive.
 
+;;; Code
+
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/filecontents.el b/style/filecontents.el
index 33ed0fa..cb4ac56 100644
--- a/style/filecontents.el
+++ b/style/filecontents.el
@@ -33,6 +33,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 (TeX-add-style-hook
  "filecontents"
  (lambda ()
diff --git a/style/flashcards.el b/style/flashcards.el
index b8f5b45..0df4cbf 100644
--- a/style/flashcards.el
+++ b/style/flashcards.el
@@ -30,6 +30,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/foils.el b/style/foils.el
index ec3ebef..15b940c 100644
--- a/style/foils.el
+++ b/style/foils.el
@@ -23,6 +23,8 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
 (require 'timezone)
 
 (TeX-add-style-hook "foils"
diff --git a/style/fontaxes.el b/style/fontaxes.el
index 26be0a0..1765dfc 100644
--- a/style/fontaxes.el
+++ b/style/fontaxes.el
@@ -34,6 +34,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/fontenc.el b/style/fontenc.el
index b1911e1..6bb6132 100644
--- a/style/fontenc.el
+++ b/style/fontenc.el
@@ -31,6 +31,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 (defvar LaTeX-fontenc-package-options-list
   '(;; 128+ glyph encodings (text)
     "OT1" "OT2" "OT3" "OT4" "OT6"
diff --git a/style/fontspec.el b/style/fontspec.el
index ec6bf38..cd3cd40 100644
--- a/style/fontspec.el
+++ b/style/fontspec.el
@@ -34,6 +34,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
@@ -41,6 +44,7 @@
 
 (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
diff --git a/style/footmisc.el b/style/footmisc.el
index 6fad9f9..49ce381 100644
--- a/style/footmisc.el
+++ b/style/footmisc.el
@@ -29,6 +29,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/framed.el b/style/framed.el
index 1b81766..03160ba 100644
--- a/style/framed.el
+++ b/style/framed.el
@@ -31,6 +31,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 (TeX-add-style-hook
  "framed"
  (lambda ()
diff --git a/style/francais.el b/style/francais.el
index f8d88a5..53da6f3 100644
--- a/style/francais.el
+++ b/style/francais.el
@@ -33,6 +33,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 (TeX-add-style-hook
  "francais"
  (lambda ()
diff --git a/style/french.el b/style/french.el
index 9d76f88..f664f83 100644
--- a/style/french.el
+++ b/style/french.el
@@ -29,13 +29,15 @@
 ;; Set up AUCTeX for editing French text in connection with the
 ;; `french' babel option.  The file basically loads the style file for
 ;; the `frenchb' babel option.
-;; 
+;;
 ;; Support for the FrenchPro package by Bernard Gaulle is _not_
 ;; included.  If the presence of FrenchPro is detected, the `frenchb'
 ;; support is not loaded.
 
 ;;; Code:
 
+(require 'tex)
+
 (TeX-add-style-hook
  "french"
  (lambda ()
diff --git a/style/frenchb.el b/style/frenchb.el
index 7625f8c..a59432d 100644
--- a/style/frenchb.el
+++ b/style/frenchb.el
@@ -38,6 +38,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 (TeX-add-style-hook
  "frenchb"
  (lambda ()
@@ -52,20 +54,20 @@
     "ieme"
     "iemes"
     '("bsc" t)
-     "primo"
-     "secundo"
-     "tertio"
-     "quarto"
-     "No"
-     "no"
-     "degre"
-     "degres"
-     "DecimalMathComma"
-     "StandardMathComma"
-     '("nombre" "Nombre")
-     "ThinSpaceInFrenchNumbers"
-     "FrenchLayout"
-     "StandardLayout")
+    "primo"
+    "secundo"
+    "tertio"
+    "quarto"
+    "No"
+    "no"
+    "degre"
+    "degres"
+    "DecimalMathComma"
+    "StandardMathComma"
+    '("nombre" "Nombre")
+    "ThinSpaceInFrenchNumbers"
+    "FrenchLayout"
+    "StandardLayout")
    (unless (eq (car TeX-quote-language) 'override)
      (setq TeX-quote-language
           `("french" "\\og "
diff --git a/style/fvextra.el b/style/fvextra.el
index 1cfb29b..71a4ab8 100644
--- a/style/fvextra.el
+++ b/style/fvextra.el
@@ -31,6 +31,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Needed for compiling `cl-pushnew':
 (eval-when-compile
   (require 'cl-lib))