Merge conflict

1 files changed, 0 insertions, 90 deletions

diff --git a/elpa/auctex-13.1.3/style/eso-pic.el b/elpa/auctex-13.1.3/style/eso-pic.el
deleted file mode 100644
index 2ee93d0..0000000
--- a/elpa/auctex-13.1.3/style/eso-pic.el
+++ /dev/null
@@ -1,90 +0,0 @@
-;;; eso-pic.el --- AUCTeX style for `eso-pic.sty' (v3.0a)  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2014, 2020, 2021 Free Software Foundation, Inc.
-
-;; Author: Arash Esbati <arash@gnu.org>
-;; Maintainer: auctex-devel@gnu.org
-;; Created: 2014-10-29
-;; 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 `eso-pic.sty' (v3.0a) from 2020/10/14.
-;; `eso-pic.sty' is part of TeXLive.
-
-;;; Code:
-
-(require 'tex)
-(require 'latex)
-
-(TeX-add-style-hook
- "eso-pic"
- (lambda ()
-
-   (TeX-add-symbols
-    ;; Basic commands
-    '("AddToShipoutPictureBG"   t)
-    '("AddToShipoutPictureBG*"  t)
-    '("AddToShipoutPictureFG"   t)
-    '("AddToShipoutPictureFG*"  t)
-    '("ClearShipoutPictureBG"   0)
-    '("ClearShipoutPictureFG"   0)
-
-    ;; Helper macros
-    '("AtPageUpperLeft"         t)
-    '("AtPageLowerLeft"         t)
-    '("AtPageCenter"            t)
-    '("AtTextUpperLeft"         t)
-    '("AtTextLowerLeft"         t)
-    '("AtTextCenter"            t)
-    '("AtStockUpperLeft"        t)
-    '("AtStockLowerLeft"        t)
-    '("AtStockCenter"           t)
-
-    ;; Aux. commands
-    '("LenToUnit"               t)
-    '("gridSetup"
-      [ "Grid unit name" ]  "Grid unit"    "Label factor"
-      "Grid delta"          "Grid Delta"   "Gap"))
-
-   ;; Declare expert macro
-   (TeX-declare-expert-macros
-    "eso-pic"
-    "gridSetup" "LenToUnit"))
- TeX-dialect)
-
-(defvar LaTeX-eso-pic-package-options-list
-  '(("pscoord"      ("true" "false"))
-    ("texcoord"     ("true" "false"))
-    ("grid"         ("true" "false"))
-    ("gridBG"       ("true" "false"))
-    ("gridunit"     ("mm" "in" "bp" "pt"))
-    ("gridcolor")
-    ("subgridcolor")
-    ("subgridstyle" ("solid" "dotted"))
-    ("colorgrid"    ("true" "false"))
-    ("dvips"        ("true" "false")))
-  "Package options for the eso-pic package.")
-
-(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-list))
-
-;;; eso-pic.el ends here