Import Upstream version 3a4upstream/3a4

1 files changed, 10 insertions, 8 deletions

diff --git a/grapheps.scm b/grapheps.scm
index d64262f..857829c 100644
--- a/grapheps.scm
+++ b/grapheps.scm
@@ -437,13 +437,13 @@
   (scheme->ps x-coord " (" text ") " tick-width " rule-vertical"))
 
 ;;@body
-;;Draws a horizontal ruler with X coordinate @1 and labeled with
-;;string @2.  If @3 is positive, then the ticks are @3 long on the
-;;right side of @1; and @2 and numeric legends are on the left.  If @3
-;;is negative, then the ticks are -@3 long on the left side of @1; and
-;;@2 and numeric legends are on the right.
-(define (rule-horizontal x-coord text tick-height)
-  (scheme->ps x-coord " (" text ") " tick-height " rule-horizontal"))
+;;Draws a horizontal ruler with Y coordinate @1 and labeled with
+;;string @2.  If @3 is positive, then the ticks are @3 long on the top
+;;side of @1; and @2 and numeric legends are on the bottom.  If @3 is
+;;negative, then the ticks are -@3 long on the bottom side of @1; and
+;;@2 and numeric legends are on the top.
+(define (rule-horizontal y-coord text tick-height)
+  (scheme->ps y-coord " (" text ") " tick-height " rule-horizontal"))
 
 ;;@body
 ;;Draws the y-axis.
@@ -541,7 +541,9 @@
    (lambda (tmp)
      (cond ((procedure? (car args))
 	    (apply graph:plot-function tmp args))
-	   ((array? (car args))
+	   ((or (array? (car args))
+		(and (pair? (car args))
+		     (pair? (caar args))))
 	    (apply graph:plot tmp args))
 	   (else (let ((dats (apply functions->array args)))
 		   (graph:plot tmp dats "" ""))))