*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 40126909da6c3afc1bac97d6f11bfb84717417bf..b7f7638a5d2d304fe2323be9ebd69551c1541ddd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,11 @@
 
 2004-11-14  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-       * scm/output-gnome.scm (bezier-sandwich): New function.
+       * lily/pangofc-afm-decoder.cc (main): Test more feta fonts.
+
+       * scm/output-gnome.scm (bezier-sandwich): New function.  Reset
+       path-def before using.  Fixes muchtomany slurs in wrong places
+       bug.
 
 2004-11-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 

diff --git a/lily/pangofc-afm-decoder.cc b/lily/pangofc-afm-decoder.cc
index 5d0fca87a96f2f02e7eef06dd6612940ea16c724..5da779c5f5e7c0479675d61accfdd9027f0f1add 100644 (file)
--- a/lily/pangofc-afm-decoder.cc
+++ b/lily/pangofc-afm-decoder.cc
@@ -301,8 +301,8 @@ main (int argc, char **argv)
 
   /* Register GNU LilyPond FETA AFM decoders.  */
   pango_fc_afm_add_decoder ("lilypond-feta");
-  pango_fc_afm_add_decoder ("lilypond-braces");
-  pango_fc_afm_add_decoder ("lilypond-dyn");
+  pango_fc_afm_add_decoder ("lilypond-feta-braces-f");
+  pango_fc_afm_add_decoder ("lilypond-din");
   pango_fc_afm_add_decoder ("lilypond-parmesan");
 
   int text_item = gnome_canvas_text_get_type ();
@@ -312,6 +312,8 @@ main (int argc, char **argv)
   gnome_canvas_text (45.0, 122.5, "LilyPond-feta-nummer 16", "3");
   gnome_canvas_text (45.0, 142.5, "LilyPond-feta-nummer, r 16", "4");
   gnome_canvas_text (10.0, 142.0, "LilyPond-feta, 32", g_clef_utf8);
+  gnome_canvas_text (10.0, 162.0, "LilyPond-feta-din, 32", "fmsrpz");
+  gnome_canvas_text (5.0, 142.0, "LilyPond-feta-braces-f, 32", "AZ");
 
   gtk_main ();
   return 0;

diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index 21650136529ff400bad39830913b2df4ea4b9fa6..c213ffd7338c06b7d9a8995a924dc943e461b947 100644 (file)
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -199,8 +199,17 @@
 
     (map ly:pango-add-afm-decoder
         '("lilypond-feta"
-          "lilypond-braces"
-          "lilypond-dyn"
+          "lilypond-feta-braces-a"
+          "lilypond-feta-braces-b"
+          "lilypond-feta-braces-c"
+          "lilypond-feta-braces-d"
+          "lilypond-feta-braces-d"
+          "lilypond-feta-braces-e"
+          "lilypond-feta-braces-f"
+          "lilypond-feta-braces-g"
+          "lilypond-feta-braces-h"
+          "lilypond-feta-braces-i"
+          "lilypond-feta-din"
           "lilypond-parmesan"))
 
     (dump-page go 0)

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index d15c9951d70d9f4453c81bb2ec72012acccd7a7e..517715e000cc06a5f8f01eac2dee6585ea69ede6 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -113,6 +113,8 @@ lilypond -fgnome input/simple-song.ly
        (gnome-canvas-path-def-lineto (get-def this) x y))
       (define-method (closepath (this <gnome-canvas-path-def>))
        (gnome-canvas-path-def-closepath (get-def this)))
+      (define-method (reset (this <gnome-canvas-path-def>))
+       (gnome-canvas-path-def-reset (get-def this)))
       
       (define -set-path-def set-path-def)
       (define -get-path-def get-path-def)
@@ -199,6 +201,8 @@ lilypond -fgnome input/simple-song.ly
                   #:fill-color "black"
                   #:outline-color "black"
                   #:width-units thick)))
+
+    (reset def)
     
     ;; cl cr r l  0 1 2 3 
     ;; cr cl l r  4 5 6 7
@@ -219,7 +223,8 @@ lilypond -fgnome input/simple-song.ly
     bezier))
 
 (define (char font i)
-  (text font (utf8 i)))
+  ;;(text font (utf8 i)))
+  (text font (list->string (list (integer->char i))))); (utf8 i)))
 
 (define (placebox x y expr)
   (debugf "item: ~S\n" expr)
@@ -240,15 +245,25 @@ lilypond -fgnome input/simple-song.ly
   ;; FIXME: blot?
   (draw-rectangle (- breapth) depth width (- height) "black" blot-diameter))
 
+(define pango-font-name-alist
+  '(("GNU-LilyPond-feta-20" . "lilypond-feta, regular 32")
+    ("GNU-LilyPond-feta-nummer-5.5" . "lilypond-feta-nummer, regular 32")
+    ("GNU-LilyPond-feta-din-14" . "lilypond-feta-din, 25")
+    ("GNU-LilyPond-feta-14.14" . "lilypond-feta, regular 25")
+    ("GNU-LilyPond-feta-12.6" .  "lilypond-feta, regular 22")
+    ("GNU-LilyPond-feta-braces-f-90" . "LilyPond-feta-braces-f, 32")
+    ))
+
 (define (pango-font-name font)
-  (cond
-   ((equal? (ly:font-name font) "GNU-LilyPond-feta-20")
-    "lilypond-feta, regular 32")
-   (else
-    ;; FIXME
-    "ecrm12")))
-    ;;(ly:font-name font))))
-    ;;(ly:font-filename font))))
+  (let ((pango-font (assoc-get (ly:font-name font) pango-font-name-alist #f)))
+    (if pango-font
+       pango-font
+       (begin
+         (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-size: ~S\n" (pango-font-size font))
+       "ecrm12"))))
 
 (define (pango-font-size font)
   (let* ((designsize (ly:font-design-size font))
@@ -280,15 +295,6 @@ lilypond -fgnome input/simple-song.ly
 ;;design:20.0
 
 (define (text font string)
-  (if #f
-      (begin
-       (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))))
-  
   (make <gnome-canvas-text>
     #:parent (canvas-root)