[AUCTeX-diffs] Changes to auctex/style/multicol.el,v

[Ralf Angeli]

CVSROOT:        /cvsroot/auctex
Module name:    auctex
Changes by:     Ralf Angeli <angeli>    11/03/13 20:01:23

Index: multicol.el
===================================================================
RCS file: /cvsroot/auctex/auctex/style/multicol.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- multicol.el 13 Mar 2011 19:52:33 -0000      1.1
+++ multicol.el 13 Mar 2011 20:01:23 -0000      1.2
@@ -1,10 +1,29 @@
 ;;; multicol.el --- AUCTeX style for `multicol.sty'
 
-;; Author: Mads Jensen <address@hidden>
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Mads Jensen <address@hidden>
 ;; Maintainer: address@hidden
 ;; Created: 2011-01-24
 ;; 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 `multicol.sty'.
@@ -15,35 +34,29 @@
  "multicol"
  (lambda ()
    (LaTeX-add-environments 
-    '("multicols" (lambda (env &rest ignore)
-                    (LaTeX-insert-environment
-                     env (format "{%i}" (read-string "Number of columns: ")))))
-    '("multicols*" (lambda (env &rest ignore)
-                     (LaTeX-insert-environment
-                      env (format "{%i}" (read-string "Number of columns: 
"))))))
-
-   ;; not sure whether stuff like \columnseprulecolor and \columnseprule
-   ;; should be added, and if so, as what? I couldn't find any sensible
-   ;; snippet from the other style-files which matched the criteria
-   (TeX-add-symbols 
-    '("columnseprule" TeX-arg-macro "Length"))
+    '("multicols" "Number of columns" [ "Text across columns" ]
+      [ "Local value for \\premulticols" ])
+    '("multicols*" "Number of columns" [ "Text across columns" ]
+      [ "Local value for \\premulticols" ]))
 
-   (add-to-list 'LaTeX-indent-environment-list
-               '("multicols*" current-indentation)
-                '("multicols" current-indentation))
-
-   ;; Fontification
-   (when (and (featurep 'font-latex)
-             (eq TeX-install-font-lock 'font-latex-setup))
-     ;; Tell font-lock about the update.
-     (font-latex-add-keywords '("columnbreak") 'function)
-     (font-latex-add-keywords '("columnseprule") 'function)
-     (font-latex-add-keywords '("columnseprulecolor") 'function)     
-     (setq font-lock-set-defaults nil)
-     (font-lock-set-defaults))))
+   (TeX-add-symbols
+    '("multicoltolerance" 0)
+    '("multicolpretolerance" 0)
+    '("premulticols" 0)
+    '("postmulticols" 0)
+    '("multicolsep" 0)
+    '("multicolbaselineskip" 0)
+    '("multicolovershoot" 0)
+    '("multicolundershoot" 0)
+    '("columnsep" 0)
+    '("columnseprule" 0)
+    '("columnseprulecolor" 0)
+    '("raggedcolumns" 0)
+    '("flushcolumns" 0)
+    "columnbreak")))
 
-;; there weren't any mentioned in the manual; I might have missed them
-(defvar LaTeX-multicol-package-options nil
+(defvar LaTeX-multicol-package-options
+  '("errorshow" "infoshow" "balancingshow" "markshow" "debugshow" "grid")
   "Package options for the multicol package.")
 
 ;;; multicol.el ends here
\ No newline at end of file