From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 12 Jun 2004 23:07:59 +0000 (+0000)
Subject: Do not load output-gnome.
X-Git-Tag: release/2.3.4~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6dd87f6108cfd24625d05197f789ca2c50ac891a;p=lilypond.git

Do not load output-gnome.
(framework-gnome): Invoke output-gnome::header and
output-gnome::end-output as faked stencils.  Fixes experimental
gnome output.
---

diff --git a/ChangeLog b/ChangeLog
index 70190456c2..f6bcc431d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-13  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* scm/framework-gnome.scm: Do not load output-gnome.
+	(framework-gnome): Invoke output-gnome::header and
+	output-gnome::end-output as faked stencils.  Fixes experimental
+	gnome output.
+
 2004-06-13  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* lily/system.cc (get_line): extract page-penalty from the left
diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index b8001002b6..f505236d58 100644
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -8,8 +8,7 @@
 
 (use-modules
  (guile)
- (lily)
- (scm output-gnome))
+ (lily))
 
 ;; dump?
 (define (dump-page outputter page page-number page-count)
@@ -21,13 +20,19 @@
 	 (page-number 0)
 	 (page-count (length pages)))
 
+    ;;(header)
+    ;; FIXME: should output command, not stencil?
+    ;;(ly:outputter-dump-string outputter '(header))
+    ;; hmm, probably need (ly:outputter-command but its too late for that
+    ;; kind of elegancy now :-)
+    (ly:outputter-dump-stencil outputter (ly:make-stencil '(header)
+							  '(0 . 0) '(0 . 0)))
+
     (for-each
      (lambda (page)
        (set! page-number (1+ page-number))
        (dump-page outputter page page-number page-count))
-     pages)))
-
-
-
-
+     pages)
 
+    (ly:outputter-dump-stencil outputter (ly:make-stencil '(end-output)
+							  '(0 . 0) '(0 . 0)))))
diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 9b02f97fef..e254e89d7a 100644
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -45,7 +45,7 @@ export LD_LIBRARY_PATH=$HOME/usr/pkg/g-wrap/lib:$HOME/usr/pkg/guile-gnome/lib
 ;;;
 ;;;
 ;;;      todo: hmm --output-base broken?
-;;;   ### cd mf && mftrace --encoding=$(kpsewhich cork.enc) --autotrace --output-base=feta-cork-20 feta20.mf && mf feta20.pfa out
+;;;   ### cd mf && mftrace --encoding=$(kpsewhich cork.enc) --autotrace --output-base=feta-cork-20 feta20.mf && mv feta20.pfa out
 
 ;;; TODO:
 ;;;  * pango+feta font (see archives gtk-i18n-list@gnome.org and
@@ -146,7 +146,9 @@ guile -s ../src/libgnomecanvas/examples/canvas.scm
 
 (debug-enable 'backtrace)
 
-(define-module (scm output-gnome))
+(define-module (scm output-gnome)
+  #:export (header))
+
 (define this-module (current-module))
 
 (use-modules
@@ -368,8 +370,11 @@ guile -s ../src/libgnomecanvas/examples/canvas.scm
   (text font (utf8 i)))
 
 (define (placebox x y expr)
+  (stderr "item: ~S\n" expr)
   (let ((item expr))
-    (if item
+    ;;(if item
+    ;; FIXME ugly hack to skip #unspecified ...
+    (if (and item (not (eq? item (if #f #f))))
 	(begin
 	  (move item
 		(* output-scale (+ (car system-origin) x))
@@ -386,7 +391,7 @@ guile -s ../src/libgnomecanvas/examples/canvas.scm
   ;; FIXME: no rounded corners on rectangle
   (make <gnome-canvas-rect>
     #:parent canvas-root
-    #:x1 (- breapth) #:y1 (- depth) #:x2 width #:y2 height
+    #:x1 (- breapth) #:y1 depth #:x2 width #:y2 (- height)
     #:fill-color "black" #:width-units blot-diameter))
 
 (define (fontify font expr)
@@ -446,6 +451,9 @@ guile -s ../src/libgnomecanvas/examples/canvas.scm
   (stderr "font-name: ~S\n" (ly:font-name font))
   ;; TODO s/filename/file-name/
   (stderr "font-filename: ~S\n" (ly:font-filename font))
+  
+  (stderr "pango-font-name: ~S\n" (pango-font-name font))
+  (stderr "pango-font-size: ~S\n" (pango-font-size font))
   (set!
    text-items
    (cons
@@ -464,7 +472,8 @@ guile -s ../src/libgnomecanvas/examples/canvas.scm
       ;;#:scale-set #t
       
       #:fill-color "black"
-      #:text string)
+      #:text string
+      #:anchor 'west)
     text-items))
   (car text-items))