From 4c16e437368bdf206e47572ec03b5a8b4f3c2ba4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 15 Jun 2004 23:34:33 +0000 Subject: [PATCH] * scm/framework-gnome.scm (): New class. * scm/output-gnome.scm: Move non-stencil evaluators to framework. --- scm/framework-gnome.scm | 9 +++++++++ scm/output-gnome.scm | 14 +++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm index 38079768a0..2ae6904354 100644 --- 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 () (page-stencils ;;#:init-value '#() #:init-keyword #:page-stencils #:accessor page-stencils) diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm index ffa9d92ef3..b2d2e36625 100644 --- 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))) -- 2.39.5