[Maxima-commits] CVS: maxima/share/draw grcommon.lisp,1.2,1.2.2.1

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

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

Modified Files:
      Tag: RELEASE-5_23-BRANCH
	grcommon.lisp 
Log Message:
Updating fixes in 5-23 branch

Index: grcommon.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/share/draw/grcommon.lisp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- grcommon.lisp	2 Dec 2010 21:13:26 -0000	1.2
+++ grcommon.lisp	7 Jan 2011 00:07:25 -0000	1.2.2.1
@@ -328,10 +328,12 @@
 (defvar *draw-terminal-number* "")
 
 (defun update-terminal (val)
-  (let ((terms '($screen $png $jpg $gif $eps $eps_color $svg
+  (let ((terms '($screen $png $pngcairo $jpg $gif $eps $eps_color $svg
                  $pdf $pdfcairo $wxt $animated_gif $aquaterm)))
      (cond
        ((member val terms)
+          (when (and (eq val '$png) $draw_use_pngcairo)
+            (setq val '$pngcairo))
           (setf (gethash '$terminal *gr-options*) val
                 *draw-terminal-number* ""))
        ((and ($listp val)
@@ -548,11 +550,11 @@
       ((and ($listp val)
             (= ($length val) 2))
          (setf cls (rest val))
-         (if (every #'(lambda (z) (> z 0)) cls)
+         (if (every #'(lambda (z) (and (numberp z) (> z 0))) cls)
              (setf (gethash '$dimensions *gr-options*) cls)
-             (merror "draw: illegal width specification ~M" val)))
+             (merror "draw: illegal dimensions")))
       (t
-         (merror "draw: illegal height specification ~M" val)))))
+         (merror "draw: illegal dimensions format ~M" val)))))
 
 
 
@@ -838,10 +840,10 @@
         (update-dimensions (list '(mlist) (first (gethash '$dimensions *gr-options*)) val)))
       (($eps_width $pdf_width)
         ($print "WARNING: 'eps_width' is deprecated, using 'dimensions' instead...")
-        (update-dimensions (list '(mlist) val (second (gethash '$dimensions *gr-options*)))))
+        (update-dimensions (list '(mlist) (* 100 val) (second (gethash '$dimensions *gr-options*)))))
       (($eps_height $pdf_height)
         ($print "WARNING: 'eps_height' is deprecated, using 'dimensions' instead...")
-        (update-dimensions (list '(mlist) (first (gethash '$dimensions *gr-options*)) val)))
+        (update-dimensions (list '(mlist) (first (gethash '$dimensions *gr-options*)) (* 100 val))))
 
       (otherwise (merror "draw: unknown option ~M " opt))  ) )