Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -652,55 +652,52 @@
     ;; (debug:print 0 "test-box-info=" test-box-info)
     ;; (debug:print 0 "test-record=" test-record)
     ))
 
 (define (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records)
-      (let* ((scalef (hash-table-ref/default tests-draw-state 'scalef 8))
-	     (test-browse-xoffset (hash-table-ref tests-draw-state 'test-browse-xoffset))
-	     (test-browse-yoffset (hash-table-ref tests-draw-state 'test-browse-yoffset))
-	     (xtorig (+ test-browse-xoffset (* (/ sizex 2) scalef (- 0.5 xadj)))) ;;  (- xadj 1))))
-	     (ytorig (+ test-browse-yoffset (* (/ sizey 2) scalef (- yadj 0.5))))
-	     (boxw   90) ;; default, overriden by length estimate below
-	     (boxh   25)
-	     (gapx   20)
-	     (gapy   30)
-	     (tests-hash     (hash-table-ref tests-draw-state 'tests-info))
-	     (selected-tests (hash-table-ref tests-draw-state 'selected-tests )))
-	(hash-table-set! tests-draw-state 'xtorig xtorig)
-	(hash-table-set! tests-draw-state 'ytorig ytorig)
-	(let ((longest-str   (if (null? sorted-testnames) "         " (car (sort sorted-testnames (lambda (a b)(>= (string-length a)(string-length b))))))))
-	  (let-values (((x-max y-max) (canvas-text-size cnv longest-str)))
-             (if (> x-max boxw)(set! boxw (+ 10 x-max)))))
-	;; (print "sizex: " sizex " sizey: " sizey " font: " (canvas-font cnv) " originx: " originx " originy: " originy " xtorig: " xtorig " ytorig: " ytorig " xadj: " xadj " yadj: " yadj)
-	(if (not (null? sorted-testnames))
-	    (let loop ((hed (car (reverse sorted-testnames)))
-		       (tal (cdr (reverse sorted-testnames)))
-		       (llx xtorig)
-		       (lly ytorig)
-		       (urx (+ xtorig boxw))
-		       (ury (+ ytorig boxh)))
+  (let* ((dot-data ;; (map cdr (filter
+		   ;; 	  (lambda (x)(equal? "node" (car x)))
+	  (map string-split (tests:easy-dot test-records "plain")))
+	 (scalef (hash-table-ref/default tests-draw-state 'scalef 8))
+	 (test-browse-xoffset (hash-table-ref tests-draw-state 'test-browse-xoffset))
+	 (test-browse-yoffset (hash-table-ref tests-draw-state 'test-browse-yoffset))
+	 (xtorig (+ test-browse-xoffset (* (/ sizex 2) scalef (- 0.5 xadj)))) ;;  (- xadj 1))))
+	 (ytorig (+ test-browse-yoffset (* (/ sizey 2) scalef (- yadj 0.5))))
+	 (boxw   10)
+	 (tests-hash     (hash-table-ref tests-draw-state 'tests-info))
+	 (selected-tests (hash-table-ref tests-draw-state 'selected-tests )))
+    (print "dot-data=" dot-data)
+    (hash-table-set! tests-draw-state 'xtorig xtorig)
+    (hash-table-set! tests-draw-state 'ytorig ytorig)
+    (let ((longest-str   (if (null? sorted-testnames) "         " (car (sort sorted-testnames (lambda (a b)(>= (string-length a)(string-length b))))))))
+      (let-values (((x-max y-max) (canvas-text-size cnv longest-str)))
+	(if (> x-max boxw)(set! boxw (+ 10 x-max)))))
+    ;; (print "sizex: " sizex " sizey: " sizey " font: " (canvas-font cnv) " originx: " originx " originy: " originy " xtorig: " xtorig " ytorig: " ytorig " xadj: " xadj " yadj: " yadj)
+    (if (not (null? sorted-testnames))
+	(let loop ((hed (car (reverse sorted-testnames)))
+		   (tal (cdr (reverse sorted-testnames))))
+	  (let* ((nodedat (filter (lambda (x)
+				    (if (equal? (car x) "node")
+					(equal? hed (cadr x))
+					#f))
+				  dot-data))
+		 (llx  (* (string->number (list-ref nodedat 2)) scalef))
+		 (lly  (* (string->number (list-ref nodedat 3)) scalef))
+		 (boxw (* (string->number (list-ref nodedat 4)) scalef))
+		 (boxh (* (string->number (list-ref nodedat 5)) scalef)))
 					; (print "hed " hed " llx " llx " lly " lly " urx " urx " ury " ury)
-	      (dcommon:draw-test cnv llx lly boxw boxh hed (hash-table-ref/default selected-tests hed #f))
-	      ;; data used by mouse click calc. keep the wacky order for now.
-	      (hash-table-set! tests-hash hed  (list llx urx (- sizey ury)(- sizey lly) lly boxw boxh)) 
-	      ;; (list llx lly boxw boxh)) ;; NB// Swap ury and lly
-	      (if (not (null? tal))
-		  ;; leave a column of space to the right to list items
-		  (let ((have-room 
-			 (if #t ;; put "auto" here where some form of auto rearanging can be done
-			     (> (* 3 (+ boxw gapx)) (- urx xtorig))
-			     (< urx (- sizex boxw gapx boxw)))))  ;; is there room for another column?
-		    (loop (car tal)
-			  (cdr tal)
-			  (if have-room (+ llx boxw gapx) xtorig) ;; have room, 
-			  (if have-room lly (+ lly boxh gapy))
-			  (if have-room (+ urx boxw gapx) (+ xtorig boxw))
-			  (if have-room ury (+ ury boxh gapy)))))))
-	(for-each
-	 (lambda (testname)
-	   (dcommon:draw-arrows cnv testname tests-hash test-records))
-	 sorted-testnames)))
+	  (dcommon:draw-test cnv llx lly boxw boxh hed (hash-table-ref/default selected-tests hed #f))
+	  ;; data used by mouse click calc. keep the wacky order for now.
+	  (hash-table-set! tests-hash hed  (list llx urx (- sizey ury)(- sizey lly) lly boxw boxh)) 
+	  ;; (list llx lly boxw boxh)) ;; NB// Swap ury and lly
+	  (if (not (null? tal))
+	      (loop (car tal)
+		    (cdr tal))))))
+    (for-each
+     (lambda (testname)
+       (dcommon:draw-arrows cnv testname tests-hash test-records))
+     sorted-testnames)))
 
 (define (dcommon:redraw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records)
   (let* ((scalef (hash-table-ref/default tests-draw-state 'scalef 8))
 	 (test-browse-xoffset (hash-table-ref tests-draw-state 'test-browse-xoffset))
 	 (test-browse-yoffset (hash-table-ref tests-draw-state 'test-browse-yoffset))