auctex-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[AUCTeX-diffs] GNU AUCTeX branch, master, updated. f3cf79dcd7c8eddb2d5f6


From: Mosè Giordano
Subject: [AUCTeX-diffs] GNU AUCTeX branch, master, updated. f3cf79dcd7c8eddb2d5f6a93a3ad035ae2937a34
Date: Wed, 31 Dec 2014 14:54:05 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  f3cf79dcd7c8eddb2d5f6a93a3ad035ae2937a34 (commit)
       via  57344416f1a467464c4e64fe48daa670e15ea5e7 (commit)
       via  18ee3e9bfd0f35a2b7789ebc5dca405a9dd3f062 (commit)
      from  b54c26abd81ae83780fd326a8d1831c291a76475 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f3cf79dcd7c8eddb2d5f6a93a3ad035ae2937a34
Author: Arash Esbati <address@hidden>
Date:   Wed Dec 31 15:51:22 2014 +0100

    Fix a typo.
    
    * style/multirow.el ("multirow"): Fix a typo in the name of a
    variable.
    
    Signed-off-by: Mosè Giordano <address@hidden>

diff --git a/ChangeLog b/ChangeLog
index ef0de5e..c2e24db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-12-30  Arash Esbati  <address@hidden>
 
+       * style/multirow.el ("multirow"): Fix a typo in the name of a
+       variable.
+
        * Makefile.in (STYLESRC): Add new styles.
 
        * style/relsize.el: New file.
diff --git a/style/multirow.el b/style/multirow.el
index 6d00d5e..d025e1f 100644
--- a/style/multirow.el
+++ b/style/multirow.el
@@ -37,7 +37,7 @@
       [ "Big struts" ] "Width" [ "Fixup" ] t)
     "multirowsetup")
 
-   (if (not (boundp 'LaTeX-bigstruct-package-options))
+   (if (not (boundp 'LaTeX-bigstrut-package-options))
        (TeX-add-symbols "bigstrutjot"))
 
    ;; Fontification

commit 57344416f1a467464c4e64fe48daa670e15ea5e7
Author: Arash Esbati <address@hidden>
Date:   Wed Dec 31 15:48:37 2014 +0100

    Add new styles.
    
    * Makefile.in (STYLESRC): Add new styles.
    
    * style/relsize.el: New file.
    
    * style/wrapfig.el: New file.
    
    Signed-off-by: Mosè Giordano <address@hidden>

diff --git a/ChangeLog b/ChangeLog
index 72dbba8..ef0de5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2014-12-30  Arash Esbati  <address@hidden>
 
+       * Makefile.in (STYLESRC): Add new styles.
+
+       * style/relsize.el: New file.
+
+       * style/wrapfig.el: New file.
+
        * style/hyperref.el ("hyperref"): Add `Form' environment needed
        for PDF and HTML forms.
        (LaTeX-hyperref-forms-options): New variable for key-val options
diff --git a/Makefile.in b/Makefile.in
index 998e730..39402e7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -142,7 +142,8 @@ STYLESRC = style/prosper.el \
           style/XCharter.el  style/zlmtt.el     style/ifluatex.el \
           style/luatextra.el style/erewhon.el   style/baskervaldx.el \
           style/fbb.el       style/newtxmath.el style/newtxsf.el \
-          style/newtxtext.el style/newtxttt.el  style/minted.el
+          style/newtxtext.el style/newtxttt.el  style/minted.el \
+          style/wrapfig.el   style/relsize.el
 STYLEELC = $(STYLESRC:.el=.elc)
 
 ifeq (@preview_enabled@,yes)
diff --git a/style/relsize.el b/style/relsize.el
new file mode 100644
index 0000000..20dc975
--- /dev/null
+++ b/style/relsize.el
@@ -0,0 +1,69 @@
+;;; relsize.el --- AUCTeX style for `relsize.sty' version v4.1
+
+;; Copyright (C) 2014 Free Software Foundation, Inc.
+
+;; Author: Arash Esbati <esbati'at'gmx.de>
+;; Maintainer: address@hidden
+;; Created: 2014-12-14
+;; 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 `relsize.sty' version v4.1 from
+;; 2013/03/29.  `relsize.sty' is part of TeXLive.
+
+;;; Code:
+
+(TeX-add-style-hook
+ "relsize"
+ (lambda ()
+   (TeX-add-symbols
+    ;; Declarations and commands
+    '("relsize"     "Steps"                    )
+    '("relscale"    "Scale factor"             )
+    '("larger"      [ "Steps (default: 1)" ] -1)
+    '("smaller"     [ "Steps (default: 1)" ] -1)
+    '("textlarger"  [ "Steps" ]               t)
+    '("textsmaller" [ "Steps" ]               t)
+    '("textscale"   "Scale factor"            t)
+    '("mathlarger"                            t)
+    '("mathsmaller"                           t))
+
+   ;; Fontification
+   (when (and (featurep 'font-latex)
+             (eq TeX-install-font-lock 'font-latex-setup))
+     ;; This is not easy, are the first 2 'variable oder rather
+     ;; 'type-declaration?  I start with 'type-declaration, let the
+     ;; users decide
+     (font-latex-add-keywords '(("relsize"            "")
+                               ("relscale"           "")
+                               ("larger"             "")
+                               ("smaller"            ""))
+                             'type-declaration)
+     (font-latex-add-keywords '(("textlarger"         "[{")
+                               ("textsmaller"        "[{")
+                               ("textscale"          "{{"))
+                             'type-command)))
+ LaTeX-dialect)
+
+(defvar LaTeX-relsize-package-options nil
+  "Package options for the relsize package.")
+
+;;; relsize.el ends here
diff --git a/style/wrapfig.el b/style/wrapfig.el
new file mode 100644
index 0000000..bcb90c2
--- /dev/null
+++ b/style/wrapfig.el
@@ -0,0 +1,107 @@
+;;; wrapfig.el --- AUCTeX style for `wrapfig.sty' version v3.6
+
+;; Copyright (C) 2014 Free Software Foundation, Inc.
+
+;; Author: Arash Esbati <esbati'at'gmx.de>
+;; Maintainer: address@hidden
+;; Created: 2014-12-13
+;; 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 `wrapfig.sty' version v3.6 from
+;; 2003/01/31.  `wrapfig.sty' is part of TeXLive.
+
+;;; Code:
+
+(TeX-add-style-hook
+ "wrapfig"
+ (lambda ()
+   (LaTeX-add-environments
+    ;; \begin{wrapfigure}[No.lines]{Placement}[Overhang]{Width} ... 
\end{wrapfigure}
+    '("wrapfigure"
+      (lambda (env &rest ignore)
+       (LaTeX-insert-environment
+        env
+        (let ((narrow    (read-string "(Optional) Number of narrow lines: "))
+              (placement (completing-read
+                          "Placement: " '(("r") ("R")
+                                          ("l") ("L")
+                                          ("i") ("I")
+                                          ("o") ("O"))))
+              (overhang  (read-string "(Optional) Overhang: "))
+              (width     (read-string "Width: ")))
+          (concat
+           (unless (string= narrow "")
+             (format "[%s]" narrow))
+           (format "{%s}" placement)
+           (unless (string= overhang "")
+             (format "[%s]" overhang))
+           (format "{%s}" width))))))
+    ;;
+    ;; \begin{wraptable}[No.lines]{Placement}[Overhang]{Width} ... 
\end{wraptable}
+    '("wraptable"
+      (lambda (env &rest ignore)
+       (LaTeX-insert-environment
+        env
+        (let ((narrow    (read-string "(Optional) Number of narrow lines: "))
+              (placement (completing-read
+                          "Placement: " '(("r") ("R")
+                                          ("l") ("L")
+                                          ("i") ("I")
+                                          ("o") ("O"))))
+              (overhang  (read-string "(Optional) Overhang: "))
+              (width     (read-string "Width: ")))
+          (concat
+           (unless (string= narrow "")
+             (format "[%s]" narrow))
+           (format "{%s}" placement)
+           (unless (string= overhang "")
+             (format "[%s]" overhang))
+           (format "{%s}" width))))))
+    ;;
+    ;; \begin{wrapfloat}{<Type>}[No.lines]{Placement}[Overhang]{Width} ... 
\end{wrapfloat}
+    '("wrapfloat"
+      (lambda (env &rest ignore)
+       (LaTeX-insert-environment
+        env
+        (let ((floattype (read-string "Float type: "))
+              (narrow    (read-string "(Optional) Number of narrow lines: "))
+              (placement (completing-read
+                          "Placement: " '(("r") ("R")
+                                          ("l") ("L")
+                                          ("i") ("I")
+                                          ("o") ("O"))))
+              (overhang  (read-string "(Optional) Overhang: "))
+              (width     (read-string "Width: ")))
+          (concat
+           (format "{%s}" floattype)
+           (unless (string= narrow "")
+             (format "[%s]" narrow))
+           (format "{%s}" placement)
+           (unless (string= overhang "")
+             (format "[%s]" overhang))
+           (format "{%s}" width))))))))
+ LaTeX-dialect)
+
+(defvar LaTeX-wrapfig-package-options '("verbose")
+  "Package options for the wrapfig package.")
+
+;;; wrapfig.el ends here

commit 18ee3e9bfd0f35a2b7789ebc5dca405a9dd3f062
Author: Arash Esbati <address@hidden>
Date:   Wed Dec 31 15:46:11 2014 +0100

    Add `Form' environment needed for PDF and HTML forms.
    
    * style/hyperref.el ("hyperref"): Add `Form' environment needed
    for PDF and HTML forms.
    (LaTeX-hyperref-forms-options): New variable for key-val options
    used in form related macros (`TextField', `CheckBox',
    `ChoiceMenu', `PushButton', `Submit', `Reset').
    
    Signed-off-by: Mosè Giordano <address@hidden>

diff --git a/ChangeLog b/ChangeLog
index d874f66..72dbba8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-30  Arash Esbati  <address@hidden>
+
+       * style/hyperref.el ("hyperref"): Add `Form' environment needed
+       for PDF and HTML forms.
+       (LaTeX-hyperref-forms-options): New variable for key-val options
+       used in form related macros (`TextField', `CheckBox',
+       `ChoiceMenu', `PushButton', `Submit', `Reset').
+
 2014-12-22  Tassilo Horn  <address@hidden>
 
        * doc/changes.texi: Document addition of LaTeX-command-section and
diff --git a/style/hyperref.el b/style/hyperref.el
index ad1c628..a1eee7c 100644
--- a/style/hyperref.el
+++ b/style/hyperref.el
@@ -1,6 +1,6 @@
 ;;; hyperref.el --- AUCTeX style for `hyperref.sty' v6.83m
 
-;; Copyright (C) 2008, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2013, 2014 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <address@hidden>
 ;; Maintainer: address@hidden
@@ -153,6 +153,64 @@
     ("nextactionraw"))
   "Key=value options for href macro of the hyperref package.")
 
+;; See http://www.tug.org/applications/hyperref/ftp/doc/manual.html#x1-220006.2
+
+(defvar LaTeX-hyperref-forms-options
+  '(("accesskey")
+    ("align"          ("0" "1" "2"))
+    ("altname")
+    ("backgroundcolor")
+    ("bordercolor")
+    ("bordersep")
+    ("borderwidth")
+    ;; "borderstyle" is not mentioned in the original hyperref-doc, it
+    ;; can be seen in action in
+    ;; http://mirrors.ctan.org/macros/latex/contrib/hyperref/test/testform.tex
+    ;; S=Solid (default), D=Dashed, B=Beveled, I=Inset, U=Underline
+    ("borderstyle"    ("S" "D" "B" "I" "U"))
+    ("calculate")
+    ("charsize")
+    ("checkboxsymbol" ("true" "false"))
+    ("checked")
+    ("color")
+    ("combo"          ("true" "false"))
+    ("default")
+    ("disabled"       ("true" "false"))
+    ("format")
+    ("height")
+    ("hidden"         ("true" "false"))
+    ("keystroke")
+    ("mappingname")
+    ("maxlen")
+    ("menulength")
+    ("multiline"      ("true" "false"))
+    ("name")
+    ("onblur")
+    ("onchange")
+    ("onclick")
+    ("ondblclick")
+    ("onfocus")
+    ("onkeydown")
+    ("onkeypress")
+    ("onkeyup")
+    ("onmousedown")
+    ("onmousemove")
+    ("onmouseout")
+    ("onmouseover")
+    ("onmouseup")
+    ("onselect")
+    ("password"       ("true" "false"))
+    ("popdown"        ("true" "false"))
+    ("radio"          ("true" "false"))
+    ("radiosymbol")
+    ("readonly"       ("true" "false"))
+    ("rotation")
+    ("tabkey")
+    ("validate")
+    ("value")
+    ("width"))
+  "Key=value options for Forms related macros of the hyperref package.")
+
 (TeX-add-style-hook
  "hyperref"
  (lambda ()
@@ -184,12 +242,15 @@
     '("texorpdfstring" "TeX string" "PDF string")
     '("hypercalcbp" t)
     '("Acrobatmenu" "Menu option" "Text")
-    '("TextField" ["Parameters"] "Label")
-    '("CheckBox" ["Parameters"] "Label")
-    '("ChoiceMenu" ["Parameters"] "Label" "Choices")
-    '("PushButton" ["Parameters"] "Label")
-    '("Submit" ["Parameters"] "Label")
-    '("Reset" ["Parameters"] "Label")
+    ;; The next 6 macros take Key-vals defined in
+    ;; "LaTeX-hyperref-forms-options".  For an example, see
+    ;; http://mirrors.ctan.org/macros/latex/contrib/hyperref/test/testform.tex
+    '("TextField"  [ (TeX-arg-key-val LaTeX-hyperref-forms-options) ] "Label")
+    '("CheckBox"   [ (TeX-arg-key-val LaTeX-hyperref-forms-options) ] "Label")
+    '("ChoiceMenu" [ (TeX-arg-key-val LaTeX-hyperref-forms-options) ] "Label" 
"Choices")
+    '("PushButton" [ (TeX-arg-key-val LaTeX-hyperref-forms-options) ] "Label")
+    '("Submit"     [ (TeX-arg-key-val LaTeX-hyperref-forms-options) ] "Label")
+    '("Reset"      [ (TeX-arg-key-val LaTeX-hyperref-forms-options) ] "Label")
     '("LayoutTextField" "Label" "Field")
     '("LayoutChoiceField" "Label" "Field")
     '("LayoutCheckField" "Label" "Field")
@@ -199,6 +260,12 @@
     '("MakeChoiceField" "Width" "Height")
     '("MakeButtonField" "Text"))
 
+   ;; Form fields must be inside a "Form"-env, one per file is allowed, cf.
+   ;; http://www.tug.org/applications/hyperref/ftp/doc/manual.html#x1-200006
+   ;; It is up to user to insert [<options>] after \begin{Form}
+   (LaTeX-add-environments
+    '("Form"))
+
    (add-to-list 'LaTeX-verbatim-macros-with-braces-local "nolinkurl")
    (add-to-list 'LaTeX-verbatim-macros-with-braces-local "hyperbaseurl")
    (add-to-list 'LaTeX-verbatim-macros-with-braces-local "hyperimage")

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   17 ++++++++
 Makefile.in       |    3 +-
 style/hyperref.el |   81 ++++++++++++++++++++++++++++++++++++---
 style/multirow.el |    2 +-
 style/relsize.el  |   69 ++++++++++++++++++++++++++++++++++
 style/wrapfig.el  |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 270 insertions(+), 9 deletions(-)
 create mode 100644 style/relsize.el
 create mode 100644 style/wrapfig.el


hooks/post-receive
-- 
GNU AUCTeX



reply via email to

[Prev in Thread] Current Thread [Next in Thread]