branch: elpa
commit 7ea1aa3e86fc72cbc40c62673a5141b21417cd67
Author: Matthew Leach <[email protected]>
Commit: Matthew Leach <[email protected]>
TikZ: Don't allow relative points with \coordinate.
* style/tikz.el (TeX-TikZ-point-function-map): Revert back to simple
point alist.
(TeX-TikZ-relative-point-function-map): New.
(TeX-TikZ-draw-arg-function-map): Use
`TeX-TikZ-relative-point-function-map'.
---
style/tikz.el | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/style/tikz.el b/style/tikz.el
index 52f1d2e..4a2fc03 100644
--- a/style/tikz.el
+++ b/style/tikz.el
@@ -214,20 +214,21 @@ If OPTIONAL is non-nil and the user doesn't provide a
point,
(concat "grid" options)))
(defconst TeX-TikZ-point-function-map
- (let ((point-alist '(("Rect Point" TeX-TikZ-arg-rect-point)
- ("Polar Point" TeX-TikZ-arg-polar-point)
- ("Named Point" TeX-TikZ-arg-named-point))))
- (apply 'append (mapcar
- (lambda (point-map)
- (let ((key (car point-map))
- (value (cadr point-map)))
- `((,key ,value)
- (,(concat "+" key) ,value "+")
- (,(concat "++" key) ,value "++"))))
- point-alist)))
- "An alist of point specification types and their functions.
-A set of base point types along with variants that have \"+\" and
-\"++\" as a prefix." )
+ '(("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 and their functions.")
+
+(defconst TeX-TikZ-relative-point-function-map
+ (apply 'append (mapcar
+ (lambda (point-map)
+ (let ((key (car point-map))
+ (value (cadr point-map)))
+ `((,(concat "+" key) ,value "+")
+ (,(concat "++" key) ,value "++"))))
+ TeX-TikZ-point-function-map))
+ "`TeX-TikZ-point-function-map' with \"+\" and \"++\" as a
+prefix.")
(defconst TeX-TikZ-path-connector-function-map
'(("--" identity)
@@ -239,6 +240,7 @@ A set of base point types along with variants that have
\"+\" and
(defconst TeX-TikZ-draw-arg-function-map
`(,@TeX-TikZ-point-function-map
+ ,@TeX-TikZ-relative-point-function-map
,@TeX-TikZ-path-connector-function-map
("Node" TeX-TikZ-arg-node)
("Circle" TeX-TikZ-arg-circle)