* scm/framework-gnome.scm (<gnome-outputter>): New class.

* scm/output-gnome.scm: Move non-stencil evaluators to framework.

diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index 38079768a0bcdc9e7643dc1e6f51cb4c00925b6f..2ae69043542023368e135092950b3d516b3a81d6 100644 (file)
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -39,6 +39,15 @@
        (apply format (cons (current-error-port) (cons string rest)))
        (force-output (current-error-port)))))
 
+
+;; Hmm, actually, the only vars really needed by output-gnome are
+;; * (root (canvas go))
+;; * location
+;; * item-locations
+;; * pixels-per-unit
+;; * text-items
+;;
+;; so this class could be split in two parts / records?
 (define-class <gnome-outputter> ()
   (page-stencils ;;#:init-value '#()
    #:init-keyword #:page-stencils #:accessor page-stencils)

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index ffa9d92ef3bc058a5dfd2fbed79569d8abad001e..b2d2e366255fad01dd1197bd750d3530556cc999 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -207,8 +207,8 @@ lilypond-bin -fgnome input/simple-song.ly
          (affine-relative item output-scale 0 0 output-scale 0 0)
          
          (gtype-instance-signal-connect item 'event item-event)
-         (if location
-             (hashq-set! item-locations item location))
+         (if (location go)
+             (hashq-set! (item-locations go) item (location go)))
          item)
        #f)))
 
@@ -302,8 +302,8 @@ lilypond-bin -fgnome input/simple-song.ly
 ;; origin -- bad name
 (define (define-origin file line col)
   ;; ughr, why is this not passed as [part of] stencil object
-  (set! location (if (procedure? point-and-click)
-                    ;; duh, only silly string append
-                    ;; (point-and-click line col file)
-                    (list line col file)
-                    #f)))
+  (set! (location go) (if (procedure? point-and-click)
+                         ;; duh, only silly string append
+                         ;; (point-and-click line col file)
+                         (list line col file)
+                         #f)))