X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-gnome.scm;h=ccb6d9d04b110025ee51136964aeba4cc26de72c;hb=21f723292cdb8154f0255494360c25d48422dff6;hp=a29fc395a1fef8d868df0e4e9f53f9db7a82725a;hpb=7eef86d25802574816e33e83e495a813a4a48444;p=lilypond.git

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index a29fc395a1..ccb6d9d04b 100644
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -2,10 +2,16 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
-;;; TODO:
-;;;
+;;;; 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.
+;;;;    - bug in fontconfig/freetype/pango?
+
+;;;  * check: blot+scaling
 ;;;  * Figure out and fix font scaling and character placement
 ;;;  * EC font package: add missing X font directories and AFMs
 ;;;  * User-interface, keybindings
@@ -73,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))
 
@@ -96,21 +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 (list->offsets accum coords)
-  (if (null? coords)
-      accum
-      (cons (cons (car coords) (cadr coords))
-	    (list->offsets accum (cddr coords)))))
-
-(define (utf8 i)
+(define (utf-8 i)
   (cond
    ((< i #x80) (list (integer->char i)))
    ((< i #x800) (map integer->char
@@ -125,34 +115,36 @@ lilypond -fgnome input/simple-song.ly
 		 (+ #x80 (modulo y #x40))))))
    (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 (char->utf8-string char)
-  (list->string (utf8 (char->integer char))))
-  
-(define (string->utf8-string string)
+
+(define (integer->utf-8-string integer)
+  (list->string (utf-8 integer)))
+
+(define (char->utf-8-string char)
+  (list->string (utf-8 (char->integer char))))
+
+(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 ((encoding (ly:font-encoding font))
-	(family (font-family font)))
-    (or (memq encoding '(fetaMusic fetaBraces))
-	(string=? (substring family 0 (min (string-length family) 9))
-		  "bigcheese"))))
-
-;; FIXME
-(define-public (otf-name-mangling font family)
-  ;; Hmm, family is bigcheese20/26?
-  (if (string=? (substring family 0 (min (string-length family) 9))
-		"bigcheese")
-      (string-append "LilyPond " (substring family 9))
-      (if (string=? family "aybabtu")
-	  "LilyPondBraces"
-	  family)))
+  (let ((family (car (font-name-style font))))
+    (string=? (substring family 0 (min (string-length family) 10))
+	      "Emmentaler")))
+
+;;; FONT may be font smob, or pango font string
+(define (pango-font-name font)
+  (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
@@ -202,55 +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>))
@@ -267,16 +210,16 @@ lilypond -fgnome input/simple-song.ly
     ;; cl cr r l  0 1 2 3 
     ;; cr cl l r  4 5 6 7
     
-     (moveto def (car (list-ref lst 3)) (- (cdr (list-ref lst 3))))
-     (curveto def (car (list-ref lst 0)) (- (cdr (list-ref lst 0)))
+    (moveto def (car (list-ref lst 3)) (- (cdr (list-ref lst 3))))
+    (curveto def (car (list-ref lst 0)) (- (cdr (list-ref lst 0)))
  	     (car (list-ref lst 1)) (- (cdr (list-ref lst 1)))
  	     (car (list-ref lst 2)) (- (cdr (list-ref lst 2))))
 
-     (lineto def (car (list-ref lst 7)) (- (cdr (list-ref lst 7))))
-     (curveto def (car (list-ref lst 4)) (- (cdr (list-ref lst 4)))
+    (lineto def (car (list-ref lst 7)) (- (cdr (list-ref lst 7))))
+    (curveto def (car (list-ref lst 4)) (- (cdr (list-ref lst 4)))
  	     (car (list-ref lst 5)) (- (cdr (list-ref lst 5)))
  	     (car (list-ref lst 6)) (- (cdr (list-ref lst 6))))
-     (lineto def (car (list-ref lst 3)) (- (cdr (list-ref lst 3))))
+    (lineto def (car (list-ref lst 3)) (- (cdr (list-ref lst 3))))
 
     (closepath def)
     (set-path-def bezier def)
@@ -285,20 +228,53 @@ lilypond -fgnome input/simple-song.ly
 (define (char font i)
   (text font (ly:font-index-to-charcode font i)))
 
-;; 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))
+(define (dashed-line thick on off dx dy)
+  (draw-line thick 0 0 dx dy))
+
+(define (draw-line thick x1 y1 x2 y2)
+  (let* ((def (make <gnome-canvas-path-def>))
+	 (props (make <gnome-canvas-bpath>
+		  #:parent (canvas-root)
+		  #:fill-color "black"
+		  #:outline-color "black"
+		  #:width-units thick)))
+    (reset def)
+    (moveto def x1 (- y1))
+    (lineto def x2 (- y2))
+    (set-path-def props def)
+    props))
+
 
-(define (grob-cause grob)
+;; 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 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 (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 (canvas-font-size font)
+		 #:size-set #t
+		 #:text
+		 (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)))
 
 (define (placebox x y expr)
   (let ((item expr))
@@ -311,47 +287,23 @@ lilypond -fgnome input/simple-song.ly
 	  item)
 	#f)))
 
-(define (dashed-line thick on off dx dy)
-  (draw-line thick 0 0 dx dy)) 
-
-(define (draw-line thick fx fy tx ty)
-  (let*
-      ((def (make <gnome-canvas-path-def>))
-       (props (make <gnome-canvas-bpath>
-		   #:parent (canvas-root)
-		   #:fill-color "black"
-		   #:outline-color "black"
-		   #:width-units thick)))
+(define (polygon coords blot-diameter)
+  (let* ((def (make <gnome-canvas-path-def>))
+	 (props (make <gnome-canvas-bpath>
+		  #:parent (canvas-root)
+		  #:fill-color "black"
+		  #:outline-color "black"
+		  #:join-style 'round)
+		#:width-units blot-diameter)
+	 (points (ly:list->offsets '() coords))
+	 (last-point (car (last-pair points))))
     
-    (reset def)
-    (moveto def fx (- fy))
-    (lineto def tx (- ty))
-    (set-path-def props def)
-    props))
-
-(define (named-glyph font name)
-  (text font (ly:font-glyph-name-to-charcode font name)))
-
-(define (polygon coords blotdiameter)
-  (let*
-      ((def (make <gnome-canvas-path-def>))
-       (props (make <gnome-canvas-bpath>
-		   #:parent (canvas-root)
-		   #:fill-color "black"
-		   #:outline-color "black"
-		   #:width-units blotdiameter))
-       (points (list->offsets '() coords))
-       (last-point (car (last-pair points))))
-
     (reset def)
     (moveto def (car last-point) (cdr last-point))
-    (for-each (lambda (x)
-		(lineto def (car x) (cdr x))
-		) points)
+    (for-each (lambda (x) (lineto def (car x) (cdr x))) points)
     (closepath def)
     (set-path-def props def)
     props))
-    
 
 (define (round-filled-box breapth width depth height blot-diameter)
   (let ((r (/ blot-diameter 2)))
@@ -364,46 +316,24 @@ lilypond -fgnome input/simple-song.ly
       #:join-style 'round)))
 
 (define (text font s)
-
-  (define (pango-font-name font)
-    (debugf "FONT-NAME:~S:~S\n" (ly:font-name font) (ly:font-design-size font))
-    (debugf "FONT-FAMILY:~S:~S\n" (font-family font) (otf-name-mangling font (font-family font)))
-    (otf-name-mangling font (font-family font)))
-
-  (define (pango-font-size font)
-    (let* ((designsize (ly:font-design-size font))
-	   (magnification (* (ly:font-magnification font)))
-	   
-	   ;;font-name: "GNU-LilyPond-feta-20"
-	   ;;font-file-name: "feta20"
-	   ;;pango-font-name: "lilypond-feta, regular 32"
-	   ;;OPS:2.61
-	   ;;scaling:29.7046771653543
-	   ;;magnification:0.569055118110236
-	   ;;design:20.0
-  
-	   ;; ugh, experimental sizing
-	   ;; where does factor ops come from?
-	   ;; Hmm, design size: 26/20 
-	   (ops 2.60)
-	   
-	   (scaling (* ops magnification designsize)))
-      (debugf "OPS:~S\n" ops)
-      (debugf "scaling:~S\n" scaling)
-      (debugf "magnification:~S\n" magnification)
-      (debugf "design:~S\n" designsize)
-      
-      scaling))
-
   (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)
-    #:size-points (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 (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 (canvas-font-size pango-font-description)
+    #:size-set #t
+    #:text string))