From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 14 Jun 2004 23:56:18 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.2.3~1^2~29
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0445fdfeac099c2ddcdaa9bc7568fa616e4e549e;p=lilypond.git

*** empty log message ***
---

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index aafbb0c998..30ccabda81 100644
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -122,7 +122,7 @@ Paper_book::output (String outname)
   /* Generate all stencils to trigger font loads.  */
   pages ();
   
-  SCM formats = ly_output_formats();
+  SCM formats = ly_output_formats ();
   for (SCM s = formats; ly_c_pair_p (s); s = ly_cdr (s)) 
     {
       String format = ly_scm2string (ly_car (s));
diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index d3e7dd181b..8857f55b5c 100644
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -9,8 +9,12 @@
 
 (use-modules 
  (gnome gtk)
- (gnome gtk gdk-event)
- (gnome gw canvas))
+ (gnome gtk gdk-event))
+ 
+;; the name of the module will change to canvas rsn
+(if (resolve-module '(gnome gw canvas))
+    (use-modules (gnome gw canvas))
+    (use-modules (gnome gw libgnomecanvas)))
 
 (define-public (output-framework-gnome outputter book scopes fields basename)
   (let* ((bookpaper (ly:paper-book-book-paper book))
diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index d62b82e557..b82ba60531 100644
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -163,26 +163,6 @@ setup_pango (GtkWidget *canvas)
     (use-modules (gnome gw canvas))
     (use-modules (gnome gw libgnomecanvas)))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; module entry
-(define-public (gnome-output-expression expr port)
-  (display (dispatch expr) port))
-
-(define (dispatch expr)
-  (if (pair? expr)
-      (let ((keyword (car expr)))
-	(cond
-	 ((eq? keyword 'some-func) "")
-	 ;;((eq? keyword 'placebox) (dispatch (cadddr expr)))
-	 (else
-	  (if (module-defined? this-module keyword)
-	      (apply (eval keyword this-module) (cdr expr))
-	      (begin
-		(display
-		 (string-append "undefined: " (symbol->string keyword) "\n"))
-		"")))))
-      expr))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Lily output interface --- fix silly names and docme
 "
@@ -207,7 +187,7 @@ setup_pango (GtkWidget *canvas)
  The Bare minimum interface for \score { \notes c } } should
  implement:
 
-    INTERFACE-output-expression
+    output-framework-INTERFACE (see framework-INTERFACE)
     char
     filledbox
     placebox