Merge conflict

1 files changed, 0 insertions, 86 deletions

diff --git a/elpa/auctex-13.1.3/style/booktabs.el b/elpa/auctex-13.1.3/style/booktabs.el
deleted file mode 100644
index 79571ea..0000000
--- a/elpa/auctex-13.1.3/style/booktabs.el
+++ /dev/null
@@ -1,86 +0,0 @@
-;;; booktabs.el -- AUCTeX style for booktabs.sty  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2003, 2004, 2013, 2018, 2020 Free Software Foundation, Inc.
-
-;; Author:   Ralf Angeli <angeli@iwi.uni-sb.de>
-;; Maintainer: auctex-devel@gnu.org
-;; Created:  2003-10-21
-;; 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 `booktabs.sty'.
-
-;;; Code:
-
-(require 'tex)
-
-;; Silence the compiler:
-(declare-function font-latex-add-keywords
-                  "font-latex"
-                  (keywords class))
-
-(defun LaTeX-booktabs-arg-paren (optional prompt)
-  "Prompt for a value and use parentheses when it is inserted.
-If OPTIONAL is non-nil the parameter is labeled as optional.
-PROMPT is the value of the prompt to be shown."
-  (let ((TeX-arg-opening-brace "(")
-        (TeX-arg-closing-brace ")"))
-    (TeX-parse-argument optional prompt)))
-
-(TeX-add-style-hook
- "booktabs"
- (lambda ()
-   ;; Do not append an empty group to toprule, midrule, and bottomrule macros,
-   ;; otherwise one gets a wrong spacing in the table.
-   (setq TeX-insert-braces-alist (append TeX-insert-braces-alist
-                                         '(("toprule" . nil)
-                                           ("midrule" . nil)
-                                           ("bottomrule" . nil))))
-   ;; New symbols
-   (TeX-add-symbols
-    '("toprule" [ "Thickness" ])
-    '("midrule" [ "Thickness" ])
-    '("bottomrule" [ "Thickness" ])
-    ;; The `ignore' resets `TeX-last-optional-rejected' to nil so that the trim
-    ;; argument is prompted also when the thickness is skipped.
-    '("cmidrule" [ "Thickness" ] (ignore) [ LaTeX-booktabs-arg-paren "Trim" ]
-      "Column(s)")
-    '("addlinespace" [ "Height" ])
-    '("morecmidrules")
-    '("specialrule" "Thickness" "Space above" "Space below"))
-
-   ;; Fontification
-   (when (and (featurep 'font-latex)
-              (eq TeX-install-font-lock 'font-latex-setup))
-     (font-latex-add-keywords '(("toprule" "[")
-                                ("midrule" "[")
-                                ("bottomrule" "[")
-                                ("cmidrule" "[({")
-                                ("addlinespace" "[")
-                                ("morecmidrules" "")
-                                ("specialrule" "{{{"))
-                              'function)))
- TeX-dialect)
-
-(defvar LaTeX-booktabs-package-options nil
-  "Package options for the booktabs package.")
-
-;;; booktabs.el ends here