[Maxima-commits] CVS: maxima/share/draw draw.lisp,1.87,1.88

[Mario R. R. <rio...@us...>]

Update of /cvsroot/maxima/maxima/share/draw
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25846

Modified Files:
	draw.lisp 
Log Message:
draw functions admit nested lists as arguments

Index: draw.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/share/draw/draw.lisp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- draw.lisp	16 Nov 2010 19:48:24 -0000	1.87
+++ draw.lisp	21 Nov 2010 07:10:50 -0000	1.88
@@ -3382,15 +3382,16 @@
 
 ;; transforms arguments to make-scene-2d, make-scene-3d
 ;; and draw to a unique list. With this piece of code,
-;; gr2d, gr3d and draw admit as arguments lists of options
-;; and graphic objects.
+;; gr2d, gr3d and draw admit as arguments nested lists
+;; of options and graphic objects
 (defmacro make-list-of-arguments ()
-   '(setf largs (rest ($tree_reduce 
-                        '$append
-                        (cons '(mlist)
-                              (map 
-                                'list #'(lambda (z) (if ($listp z) z (list '(mlist) z)))
-                                args))))))
+   '(setf largs (rest ($flatten
+                        ($tree_reduce 
+                          '$append
+                          (cons '(mlist)
+                                (map 
+                                  'list #'(lambda (z) (if ($listp z) z (list '(mlist) z)))
+                                  args)))))))
 
 (defvar *2d-graphic-objects* (make-hash-table))