Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -953,14 +953,13 @@
   (+ yoffset (* y scalef)))
 
 ;; sizex, sizey     - canvas size
 ;; originx, originy - canvas origin
 ;;
-(define (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records)
-  (let* ((dot-data ;; (map cdr (filter
-		   ;; 	  (lambda (x)(equal? "node" (car x)))
-	  (map string-split (tests:lazy-dot test-records "plain" sizex sizey))) ;; (tests:easy-dot test-records "plain")))
+(define (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy
+				    tests-draw-state sorted-testnames test-records)
+  (let* ((dot-data       (tests:lazy-dot test-records "plain" sizex sizey 'munged))
 	 (xoffset	 (dcommon:get-xoffset tests-draw-state sizex xadj))
 	 (yoffset        (dcommon:get-yoffset tests-draw-state sizey yadj))
 	 (no-dot         (configf:lookup *configdat* "setup" "nodot"))
 	 (boxh           15)
 	 (boxw           10)

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -1794,27 +1794,34 @@
       (close-input-port inp)
       res)))
 
 ;; read data from tmp file or create if not exists
 ;; if exists regen in background
+;; mode: raw (return data as read) or munged (convert to list of lists and remove " from strings)
 ;;
-(define (tests:lazy-dot testrecords  outtype sizex sizey)
+(define (tests:lazy-dot testrecords  outtype sizex sizey mode)
   (let ((dfile (conc "/tmp/." (current-user-name) "-" (server:mk-signature) ".dot"))
 	(fname (conc "/tmp/." (current-user-name) "-" (server:mk-signature) ".dotdat")))
     (tests:write-dot-file testrecords dfile sizex sizey)
-    (if (common:file-exists? fname)
-	(let ((res (with-input-from-file fname
-		     (lambda ()
-		       (read-lines)))))
-	  (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname "&"))
-	  res)
-	(begin
-	  (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname))
-	  (with-input-from-file fname
-	    (lambda ()
-	      (read-lines)))))))
-	  
+    (let ((data (if (common:file-exists? fname)
+		    (let ((res (with-input-from-file fname
+				 (lambda ()
+				   (read-lines)))))
+		      (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname "&"))
+		      res)
+		    (begin
+		      (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname))
+		      (with-input-from-file fname
+			(lambda ()
+			  (read-lines)))))))
+      (if (eq? mode 'raw)
+	  data
+	  (map (lambda (inl)
+		 (map (lambda (s)
+			(string-substitute "\"" "" s #t))
+		      (string-split inl)))
+	       data)))))
 
 ;; for each test:
 ;;   
 (define (tests:filter-non-runnable run-id testkeynames testrecordshash)
   (let ((runnables '()))