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

[Mosè Giordano]

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  e90e050804ceb97518239c262f37541e61ecf163 (commit)
       via  d6b107e74ecbe532016bbbbf93be18790a9688c5 (commit)
      from  40c2c26c0be82fb9ae164db40c96efea50cd3d8f (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 e90e050804ceb97518239c262f37541e61ecf163
Author: Arash Esbati <address@hidden>
Date:   Mon May 9 11:41:24 2016 +0200

    Insert braces after some macros and \relax after \ProcessOptions
    
    * style/ltx-base.el ("ltx-base"): Insert a pair of braces after
    "DeclareOption*", "AtEndOfPackage", "AtEndOfClass",
    "AtBeginDocument" and "AtEndDocument".
    Insert a "\relax" after "ProcessOptions".
    
    Signed-off-by: Mosè Giordano <address@hidden>

diff --git a/style/ltx-base.el b/style/ltx-base.el
index a586a7a..12f9234 100644
--- a/style/ltx-base.el
+++ b/style/ltx-base.el
@@ -1,6 +1,6 @@
 ;;; ltx-base.el --- AUCTeX style for basic LaTeX commands.
 
-;; Copyright (C) 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2016 Free Software Foundation, Inc.
 
 ;; Author: Frank Küster <address@hidden>
 ;; Maintainer: address@hidden
@@ -48,20 +48,20 @@
      '("DeclareOption" "option" t)
      ;; would be great if DeclareOption RET * RET would give
      ;; \DeclareOption*!
-     "DeclareOption*"
+     '("DeclareOption*" t)
      '("CurrentOption" 0)
      '("PassOptionsToPackage" "option list" "package")
      '("ExecuteOptions" "option list")
-     "ProcessOptions"
+     '("ProcessOptions" (TeX-arg-literal "\\relax"))
      "ProcessOptions*"
      '("OptionNotUsed" 0)
       ;; candidate for opt/mand toggling
      '("RequirePackage" [ "option list" ] "package" [ "release" ])
      '("LoadClass" [ "option list" ] "class" [ "release" ])
-     "AtEndOfPackage"
-     "AtEndOfClass"
-     "AtBeginDocument"
-     "AtEndDocument"
+     '("AtEndOfPackage" t)
+     '("AtEndOfClass" t)
+     '("AtBeginDocument" t)
+     '("AtEndDocument" t)
      '("IfFileExists" "filename" 2)
      '("InputIfFileExists" "filename" 2)
      '("PackageWarning" "name" t)

commit d6b107e74ecbe532016bbbbf93be18790a9688c5
Author: Arash Esbati <address@hidden>
Date:   Mon May 9 11:36:22 2016 +0200

    Improve style/doc.el
    
    * style/doc.el ("doc"): Do not indent the content inside the "macro"
    environment.
    Insert a pair of braces after "DoNotIndex", "StopEventually",
    "MacroFont", "AltMacroFont".
    Prefix the string read with TeX-esc when inserting
    "DescribeMacro", "cmd".
    Ask for an argument ("parg", "oarg", "marg", "meta").
    Add missing macro "cs".
    Delete dups ("MacroFont", "AltMacroFont", "theCodelineNo").
    Ask for .fdd and .dtx files to input or include ("DocInput",
    "DocInclude").
    Add lengths "MacrocodeTopsep", "MacroTopsep", "MacroIndent".
    
    Signed-off-by: Mosè Giordano <address@hidden>

diff --git a/style/doc.el b/style/doc.el
index 3176368..abd248d 100644
--- a/style/doc.el
+++ b/style/doc.el
@@ -1,6 +1,6 @@
 ;;; doc.el --- AUCTeX style for `doc.sty'
 
-;; Copyright (C) 2004, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2008, 2016 Free Software Foundation, Inc.
 
 ;; Author: Frank Küster <address@hidden>
 ;; Maintainer: address@hidden
@@ -62,6 +62,8 @@
                '("macrocode" current-indentation))
    (add-to-list 'LaTeX-indent-environment-list
                '("macrocode*" current-indentation))
+   (add-to-list 'LaTeX-indent-environment-list
+               '("macro" current-indentation))
    (add-hook 'LaTeX-after-insert-env-hooks 'LaTeX-doc-after-insert-macrocode
             nil t)
    (LaTeX-add-environments
@@ -72,24 +74,33 @@
    (TeX-add-symbols
     "EnableCrossrefs"
     "DisableCrossrefs"
-    "DoNotIndex"
+    '("DoNotIndex" t)
     "DontCheckModules"
     "CheckModules"
     "Module"
-    '("DescribeMacro" "Macro")
+    '("DescribeMacro" (TeX-arg-eval
+                      (lambda ()
+                        (let ((name (TeX-read-string
+                                     (TeX-argument-prompt optional nil "Macro")
+                                     TeX-esc)))
+                          (format "%s" name)))))
     '("DescribeEnv" "Environment")
     "verbatim"
     "verb"
-    "parg"
-    "oarg"
-    "marg"
-    "meta"
-    "cmd"
+    '("parg" "Argument")
+    '("oarg" "Argument")
+    '("marg" "Argument")
+    '("meta" "Text")
+    '("cs" "Name")
+    '("cmd" (TeX-arg-eval
+            (lambda ()
+              (let ((name (TeX-read-string
+                           (TeX-argument-prompt optional nil "Name")
+                           TeX-esc)))
+                (format "%s" name)))))
     "makelabel"
-    "MacroFont"
-    "MacroFont"
-    "AltMacroFont"
-    "AltMacroFont"
+    '("MacroFont" t)
+    '("AltMacroFont" t)
     "PrintMacroName"
     "PrintDescribeMacro"
     "PrintDescribeEnv"
@@ -126,7 +137,7 @@
     "GlossaryParms"
     "PrintChanges"
     "AlsoImplementation"
-    "StopEventually"
+    '("StopEventually" t)
     "OnlyDescription"
     "Finale"
     "IndexInput"
@@ -142,16 +153,34 @@
     "CodelineIndex"
     "PageIndex"
     "theCodelineNo"
-    "theCodelineNo"
     "DocstyleParms"
     "MakePercentIgnore"
     "MakePercentComment"
-    "DocInput"
-    "DocInclude"
+    '("DocInput"
+      (TeX-arg-eval
+       (lambda ()
+        (let ((file (file-relative-name
+                     (read-file-name
+                      "File to input: " nil nil nil nil
+                      (lambda (x)
+                        (string-match "\\.fdd$\\|\\.dtx$" x)))
+                     (TeX-master-directory))))
+          (format "%s" file)))))
+    '("DocInclude"
+      (TeX-arg-eval
+       (lambda ()
+        (let ((file (file-relative-name
+                     (read-file-name
+                      "File to include: " nil nil nil nil
+                      (lambda (x)
+                        (string-match "\\.fdd$\\|\\.dtx$" x)))
+                     (TeX-master-directory))))
+          (format "%s" file)))))
     "GetFileInfo"
     "filename"
     "fileinfo")
-   (TeX-run-style-hooks "shortvrb"))
+   (TeX-run-style-hooks "shortvrb")
+   (LaTeX-add-lengths "MacrocodeTopsep" "MacroTopsep" "MacroIndent"))
  LaTeX-dialect)
 
 ;; Local Variables:

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

Summary of changes:
 style/doc.el      |   63 ++++++++++++++++++++++++++++++++++++++---------------
 style/ltx-base.el |   14 ++++++------
 2 files changed, 53 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX