X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-gnome.scm;h=ccb6d9d04b110025ee51136964aeba4cc26de72c;hb=272196a953f0b39de8da914f47e9daa8e93925b0;hp=df46b48b61a780eb4b61b06c181e0df26bd30763;hpb=20086a90eeb6a5c80ca6c0b86a86eb3e55f0f518;p=lilypond.git

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index df46b48b61..ccb6d9d04b 100644
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -2,12 +2,10 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
-;;; TODO:
-;;;
-;;;  * font selection: name, size, design size
-;;;  * font scaling
+;;;; TODO:
+;;;;
 ;;;;  * .cff MUST NOT be in fc's fontpath.
 ;;;;    - workaround: remove mf/out from ~/.fonts.conf,
 ;;;;      instead add ~/.fonts and symlink all /mf/out/*otf there.
@@ -81,8 +79,6 @@ lilypond -fgnome input/simple-song.ly
 ;;; point-and-click: (mouse-1) click on a graphical object;
 ;;; grob-property-list: (mouse-3) click on a graphical object.
 
-(debug-enable 'backtrace)
-
 (define-module (scm output-gnome))
 (define this-module (current-module))
 
@@ -104,15 +100,7 @@ lilypond -fgnome input/simple-song.ly
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; helper functions
 
-(define (stderr string . rest)
-  (apply format (cons (current-error-port) (cons string rest)))
-  (force-output (current-error-port)))
-
-(define (debugf string . rest)
-  (if #f
-      (apply stderr (cons string rest))))
-
-(define (utf8 i)
+(define (utf-8 i)
   (cond
    ((< i #x80) (list (integer->char i)))
    ((< i #x800) (map integer->char
@@ -125,42 +113,38 @@ lilypond -fgnome input/simple-song.ly
 	   (list (+ #xe0 x)
 		 (+ #x80 (quotient y #x40))
 		 (+ #x80 (modulo y #x40))))))
-   (else (begin (stderr "programming-error: utf8 too big:~x\n" i)
+   (else (begin (stderr "programming-error: utf-8 too big:~x\n" i)
 		(list (integer->char 32))))))
 
-(define (integer->utf8-string integer)
-  (list->string (utf8 integer)))
+(define (integer->utf-8-string integer)
+  (list->string (utf-8 integer)))
 
-(define (char->utf8-string char)
-  (list->string (utf8 (char->integer char))))
+(define (char->utf-8-string char)
+  (list->string (utf-8 (char->integer char))))
 
-(define (string->utf8-string string)
+(define (string->utf-8-string string)
   (apply
    string-append
-   (map (lambda (x) (char->utf8-string x)) (string->list string))))
+   (map (lambda (x) (char->utf-8-string x)) (string->list string))))
 
 (define (music-font? font)
   (let ((family (car (font-name-style font))))
     (string=? (substring family 0 (min (string-length family) 10))
-	      "emmentaler")))
+	      "Emmentaler")))
 
+;;; FONT may be font smob, or pango font string
 (define (pango-font-name font)
-  (debugf "FONT-NAME:~S:~S\n" (ly:font-name font) (ly:font-design-size font))
-  (debugf (apply format (append '(#f "PANGO-NAME:~a, ~a\n") (font-name-style font))))
-  (apply format (append '(#f "~a, ~a") (font-name-style font))))
-
-(define (pango-font-size font)
-  (let* ((designsize (ly:font-design-size font))
-	 (magnification (* (ly:font-magnification font)))
-	 ;; FIXME
-	 ;;(scaling (* output-scale magnification designsize)))
-	 (scaling (* 1.4 output-scale magnification designsize)))
-    ;;(debugf "OPS:~S\n" ops)
-    (debugf "scaling:~S\n" scaling)
-    (debugf "magnification:~S\n" magnification)
-    (debugf "design:~S\n" designsize)
-    
-    scaling))
+  (if (string? font)
+      (list font "Regular")
+      (apply format (append '(#f "~a, ~a") (font-name-style font)))))
+
+;;; FONT may be font smob, or pango font string
+(define (canvas-font-size font)
+  ;; FIXME: 1.85?
+  (* 1.85
+     (if (string? font)
+	 12
+	 (* output-scale (modified-font-metric-font-scaling font)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Wrappers from guile-gnome TLA
@@ -210,54 +194,6 @@ lilypond -fgnome input/simple-song.ly
       (ly:all-stencil-expressions)
       (ly:all-output-backend-commands)))
 
-(define (beam width slope thick blot)
-  (define cursor '(0 . 0))
-  (define (rmoveto def x y)
-    (set! cursor (cons (+ x (car cursor)) (+ y (cdr cursor))))
-    (moveto def (car cursor) (cdr cursor)))
-  (define (rlineto def x y)
-    (set! cursor (cons (+ x (car cursor)) (+ y (cdr cursor))))
-    (lineto def (car cursor) (cdr cursor)))
-  (let* ((def (make <gnome-canvas-path-def>))
-	 (bezier (make <gnome-canvas-bpath>
-		   #:parent (canvas-root)
-		   #:fill-color "black"
-		   #:outline-color "black"
-		   #:width-units blot
-		   #:join-style 'round))
-	 (t (- thick blot))
-	 (w (- width blot))
-	 (h (* w slope)))
-    
-    (reset def)
-    (rmoveto def (/ blot 2) (/ t 2))
-    (rlineto def w (- h))
-    (rlineto def 0 (- t))
-    (rlineto def (- w) h)
-    (rlineto def 0 t)
-    (closepath def)
-    (set-path-def bezier def)
-    bezier))
-
-(define (square-beam width slope thick blot)
-  (let* ((def (make <gnome-canvas-path-def>))
-	 (y (* (- width) slope))
-	 (props (make <gnome-canvas-bpath>
-		  #:parent (canvas-root)
-		  #:fill-color "black"
-		  #:outline-color "black"
-		  #:width-units 0.0)))
-    
-    (reset def)
-    (moveto def 0 0)
-    (lineto def width y)
-    (lineto def width (- y thick))
-    (lineto def 0 (- thick))
-    (lineto def 0 0)
-    (closepath def)
-    (set-path-def props def)
-    props))
-
 ;; two beziers
 (define (bezier-sandwich lst thick)
   (let* ((def (make <gnome-canvas-path-def>))
@@ -308,43 +244,34 @@ lilypond -fgnome input/simple-song.ly
     (set-path-def props def)
     props))
 
-;; FIXME: naming
-(define (filledbox breapth width depth height)
-  (make <gnome-canvas-rect>
-    #:parent (canvas-root)
-    #:x1 (- breapth) #:y1 depth #:x2 width #:y2 (- height)
-    #:fill-color "black"
-    #:join-style 'miter))
 
 ;; FIXME: the framework-gnome backend needs to see every item that
 ;; gets created.  All items created here must should be put in a group
 ;; that gets returned.
-(define (glyph-string font postscript-font-name x-y-named-glyphs)
+(define (glyph-string font postscript-font-name w-x-y-named-glyphs)
   (for-each
    (lambda (x)
 
      ;; UGR, glyph names not found
      (stderr "GLYPH:~S\n" (caddr x))
      (stderr "ID:~S\n" (ly:font-glyph-name-to-charcode font (caddr x)))
-     (placebox (car x) (cadr x)
+     (placebox (cadr x) (caddr x)
 	       (make <gnome-canvas-text>
 		 #:parent (canvas-root)
+		 ;;#:x 0.0 #:y (if (music-font? font) 0.15 0.69)
 		 #:x 0.0 #:y 0.0
 		 #:anchor 'west
 		 #:font (pango-font-name font)
-		 #:size-points 12
+		 #:size-points (canvas-font-size font)
 		 #:size-set #t
 		 #:text
-		 (integer->utf8-string
-		  (ly:font-glyph-name-to-charcode font (caddr x))))))
-   x-y-named-glyphs))
+		 (integer->utf-8-string
+		  (ly:font-glyph-name-to-charcode font (cadddr x))))))
+   w-x-y-named-glyphs))
 
 (define (grob-cause offset grob)
   grob)
 
-;; WTF is this in every backend?
-(define (horizontal-line x1 x2 thickness)
-  (filledbox (- x1) (- x2 x1) (* .5 thickness) (* .5 thickness)))
 
 (define (named-glyph font name)
   (text font (ly:font-glyph-name-to-charcode font name)))
@@ -389,31 +316,24 @@ lilypond -fgnome input/simple-song.ly
       #:join-style 'round)))
 
 (define (text font s)
-  (debugf "FONT:~S\n" font)
-  (debugf "FONT:~S\n" (pango-font-name font))
-
   (make <gnome-canvas-text>
     #:parent (canvas-root)
-    ;; ugh, experimental placement corections
-    ;; #:x 0.0 #:y 0.0
+    ;;#:x 0.0 #:y 0.0
     #:x 0.0 #:y (if (music-font? font) 0.15 0.69)
     #:anchor (if (music-font? font) 'west 'south-west)
     #:font (pango-font-name font)
-    ;; FIXME: points
-    #:size-points (pango-font-size font)
-    ;;  or pixels?
-;;    #:size (inexact->exact (round (pango-font-size font)))
+    #:size-points (canvas-font-size font)
     #:size-set #t
     #:text (if (integer? s)
-	       (integer->utf8-string s)
-	       (string->utf8-string s))))
+	       (integer->utf-8-string s)
+	       (string->utf-8-string s))))
 
-(define (utf8-string pango-font-description string)
+(define (utf-8-string pango-font-description string)
   (make <gnome-canvas-text>
     #:parent (canvas-root)
     #:x 0.0 #:y 0.0
     #:anchor 'west
     #:font pango-font-description
-    #:size-points 12
+    #:size-points (canvas-font-size pango-font-description)
     #:size-set #t
     #:text string))