Merge conflict

1 files changed, 0 insertions, 88 deletions

diff --git a/elpa/auctex-13.1.3/style/baskervaldx.el b/elpa/auctex-13.1.3/style/baskervaldx.el
deleted file mode 100644
index a4cba48..0000000
--- a/elpa/auctex-13.1.3/style/baskervaldx.el
+++ /dev/null
@@ -1,88 +0,0 @@
-;;; baskervaldx.el --- AUCTeX style for `baskervaldx.sty' (v1.07)  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2014--2021 Free Software Foundation, Inc.
-
-;; Author: Arash Esbati <arash@gnu.org>
-;; Maintainer: auctex-devel@gnu.org
-;; Created: 2014-11-18
-;; 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 `baskervaldx.sty' (v1.07) from 2015/04/06.
-;; `baskervaldx.sty' is part of TeXLive.
-
-;;; Code:
-
-(require 'tex)
-
-;; Silence the compiler:
-(declare-function font-latex-add-keywords
-                  "font-latex"
-                  (keywords class))
-
-(TeX-add-style-hook
- "baskervaldx"
- (lambda ()
-
-   ;; Run style hook for various packages loaded by baskervaldx
-   (TeX-run-style-hooks "textcomp" "fontaxes")
-
-   ;; New symbols
-   (TeX-add-symbols
-
-    ;; Only preamble commands
-    '("useosf"  0)
-
-    ;; Text commands
-    '("lfstyle"   -1)   ; lf declaration
-    '("tlfstyle"  -1)   ; tlf declaration
-    '("osfstyle"  -1)   ; osf declaration
-    '("tosfstyle" -1)   ; tosf declaration
-    '("sufigures" -1)   ; superior figures declaration
-    '("textlf"     t)   ; proportional lining figures
-    '("texttlf"    t)   ; tabular lining figures
-    '("textosf"    t)   ; proportional oldstyle figures
-    '("texttosf"   t)   ; tabular oldstyle figures
-    '("textsu"     t))   ; superior figures
-
-   ;; Fontification
-   (when (and (featurep 'font-latex)
-              (eq TeX-install-font-lock 'font-latex-setup))
-     (font-latex-add-keywords '(("textlf"    "{")
-                                ("texttlf"   "{")
-                                ("textosf"   "{")
-                                ("texttosf"  "{")
-                                ("textsu"    "{"))
-                              'type-command)
-     (font-latex-add-keywords '(("lfstyle"   "")
-                                ("tlfstyle"  "")
-                                ("osfstyle"  "")
-                                ("tosfstyle" "")
-                                ("sufigures" ""))
-                              'type-declaration)))
- TeX-dialect)
-
-(defvar LaTeX-baskervaldx-package-options
-  '("lining" "lf" "oldstyle" "osf" "tabular" "proportional" "p"
-    "scale" "scaled" "sups" "swash")
-  "Package options for the baskervaldx package.")
-
-;;; baskervaldx.el ends here