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

[Matthew Leach]

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  c49b54777ee1bf91eecfb5cd8357fda0970102b1 (commit)
       via  0f8baf6ab7bd330096b0a9533ca8c23f714c9115 (commit)
       via  4a1728bd5ef5004e8411eb37ce6258d739af688a (commit)
      from  f23fbd66c507b18c4210561406fa5d2facefa26b (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 c49b54777ee1bf91eecfb5cd8357fda0970102b1
Author: Matthew Leach <address@hidden>
Date:   Tue Mar 29 18:22:13 2016 +0100

    TikZ: Rename 'text' to 'label' to be consistent with TikZ terminology.
    
    * style/tikz.el (TeX-TikZ-arg-label): Rename from `TeX-TikZ-arg-text'
      and prompt for a 'Label' rather than 'Text'.
      (TeX-TikZ-arg-node): Use new function name.
      (TeX-TikZ-node-arg): Likewise.

diff --git a/style/tikz.el b/style/tikz.el
index 9e2ff97..5091e8d 100644
--- a/style/tikz.el
+++ b/style/tikz.el
@@ -76,14 +76,14 @@ doesn't provide any input."
         (TeX-TikZ-get-opt-arg-string name "(" ")")
       (concat "(" name ")"))))
 
-(defun TeX-TikZ-arg-text (optional)
-  "Prompt the user for TikZ text.
+(defun TeX-TikZ-arg-label (optional)
+  "Prompt the user for TikZ label.
 If OPTIONAL is non-nil always return `TeX-grop' and `TeX-grcl',
 even if the user doesn't provide any input."
-  (let ((text (TeX-read-string (TeX-argument-prompt optional nil "Text" ))))
+  (let ((label (TeX-read-string (TeX-argument-prompt optional nil "Label" ))))
     (if optional
-        (TeX-TikZ-get-opt-arg-string text TeX-grop TeX-grcl)
-      (concat TeX-grop text TeX-grcl))))
+        (TeX-TikZ-get-opt-arg-string label TeX-grop TeX-grcl)
+      (concat TeX-grop label TeX-grcl))))
 
 (defun TeX-TikZ-arg-node (_ignored)
   "Prompt the user for the deatils of a node.
@@ -91,8 +91,8 @@ Ask the user for the name and text for a node and return the
 string \"node[OPTIONS](NAME){TEXT}\"."
   (let ((options (TeX-TikZ-arg-options t))
         (name (TeX-TikZ-arg-name t))
-        (text (TeX-TikZ-arg-text nil)))
-    (concat "node" options name text " ")))
+        (label (TeX-TikZ-arg-label nil)))
+    (concat "node" options name label " ")))
 
 (defun TeX-TikZ-get-arg-type (types &optional prompt)
   "Prompt the user for an argument type.
@@ -204,8 +204,8 @@ them as a list of strings, dropping the '()'."
         (name (TeX-TikZ-arg-name nil))
         (point (TeX-TikZ-single-macro-arg TeX-TikZ-point-function-map
                                           "Node point type: "))
-        (text (TeX-TikZ-arg-text nil)))
-    (insert options " " name  " at" point text ";")))
+        (label (TeX-TikZ-arg-label nil)))
+    (insert options " " name  " at" point label ";")))
 
 (TeX-add-style-hook
  "tikz"

commit 0f8baf6ab7bd330096b0a9533ca8c23f714c9115
Author: Matthew Leach <address@hidden>
Date:   Tue Mar 29 18:17:59 2016 +0100

    TikZ: Ignore case when prompting for argument types.
    
    * style/tikz.el (TeX-TikZ-get-arg-type): Let-bind
      `completion-ignore-case' to t when prompting the user.

diff --git a/style/tikz.el b/style/tikz.el
index 8447b7b..9e2ff97 100644
--- a/style/tikz.el
+++ b/style/tikz.el
@@ -98,7 +98,8 @@ string \"node[OPTIONS](NAME){TEXT}\"."
   "Prompt the user for an argument type.
 TYPES is a list of possible types that the user can specify.  If
 PROMPT is non-nil use that prompt instead."
-  (let ((prompt (if prompt
+  (let ((completion-ignore-case t)
+        (prompt (if prompt
                     prompt
                   "Next argument type (RET to finish): ")))
     (completing-read prompt types nil t)))

commit 4a1728bd5ef5004e8411eb37ce6258d739af688a
Author: Matthew Leach <address@hidden>
Date:   Tue Mar 29 17:37:03 2016 +0100

    TikZ: Apply suggestions from checkdoc.
    
    * style/tikz.el (TeX-TikZ-point-function-map): Make documentation
      consistent with checkdoc.
      (TeX-TikZ-draw-arg-function-map): Likewise.
      (TeX-TikZ-draw-arg): Likewise and rename parameter to '_ignored'.
      (TeX-TikZ-coordinate-arg): Likewise.
      (TeX-TikZ-node-arg): Likewise.

diff --git a/style/tikz.el b/style/tikz.el
index abcb0bb..8447b7b 100644
--- a/style/tikz.el
+++ b/style/tikz.el
@@ -144,8 +144,7 @@ is finished."
 
 (defcustom TeX-TikZ-point-name-regexp
   "(\\([A-Za-z0-9]+\\))"
-  "A regexp that matches TikZ names, i.e. alpha-numeric
-  characters enclosed in a ()."
+  "A regexp that matches TikZ names."
   :type 'regexp
   :group 'auctex-tikz)
 
@@ -177,21 +176,20 @@ them as a list of strings, dropping the '()'."
   '(("Rect Point" TeX-TikZ-arg-rect-point)
     ("Polar Point" TeX-TikZ-arg-polar-point)
     ("Named Point" TeX-TikZ-arg-named-point))
-  "An alist of point specification types to their respective
-functions.")
+  "An alist of point specification types and their functions." )
 
 (defconst TeX-TikZ-draw-arg-function-map
   `(,@TeX-TikZ-point-function-map
     ("Node" TeX-TikZ-arg-node)
     ("--" identity)
     ("-+" identity))
-  "An alist of argument type names to their respecitve functions
-  for TikZ's \draw macro.")
+  "An alist of argument names and functoins for TikZ's \draw.")
 
-(defun TeX-TikZ-draw-arg (optional)
+(defun TeX-TikZ-draw-arg (_ignored)
+  "Prompt the user for the arguments to a TikZ draw macro."
   (TeX-TikZ-macro-arg TeX-TikZ-draw-arg-function-map))
 
-(defun TeX-TikZ-coordinate-arg (optional)
+(defun TeX-TikZ-coordinate-arg (_ignored)
   "Prompt the user for the arguments to a TikZ coordinate macro."
   (let ((options (TeX-TikZ-arg-options t))
         (name (TeX-TikZ-arg-name nil))
@@ -199,7 +197,7 @@ functions.")
                                           "Coordinate point type: ")))
     (insert options " " name " at" point ";")))
 
-(defun TeX-TikZ-node-arg (optional)
+(defun TeX-TikZ-node-arg (_ignored)
   "Prompt the user for the arguments to a TikZ node macro."
   (let ((options (TeX-TikZ-arg-options t))
         (name (TeX-TikZ-arg-name nil))
@@ -217,3 +215,5 @@ functions.")
     '("node" (TeX-TikZ-node-arg)))
    (LaTeX-add-environments
     '("tikzpicture"))))
+
+;;; tikz.el ends here

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

Summary of changes:
 style/tikz.el |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX