* scm/output-gnome.scm: Add ec-fonts-mftraced to ~/.fonts.conf.

Grok ec-fonts, braces and dynamics.

* scm/framework-gnome.scm (gnome-main): Register braces with pango.

diff --git a/ChangeLog b/ChangeLog
index b7f7638a5d2d304fe2323be9ebd69551c1541ddd..b71ab97d764d65bca351fea880e021eb8b720437 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-14  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/output-gnome.scm: Add ec-fonts-mftraced to ~/.fonts.conf.
+       Grok ec-fonts, braces and dynamics.
+
+       * scm/framework-gnome.scm (gnome-main): Register braces with pango.
+
 2004-11-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/output-gnome.scm (text): comment dribble.

diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index c213ffd7338c06b7d9a8995a924dc943e461b947..37cf4bcb5572355cc4e865cf86b0a1eb8d13f2c3 100644 (file)
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -209,6 +209,7 @@
           "lilypond-feta-braces-g"
           "lilypond-feta-braces-h"
           "lilypond-feta-braces-i"
+          ;; is this necessary?
           "lilypond-feta-din"
           "lilypond-parmesan"))
 

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 517715e000cc06a5f8f01eac2dee6585ea69ede6..91cfdfff80844be8c685a93cc80d866db495601f 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -44,6 +44,7 @@
 cat > ~/.fonts.conf << EOF
 <fontconfig>
 <dir>~/cvs/savannah/lilypond/mf/out</dir>
+<dir>/usr/share/texmf/fonts/type1/public/ec-fonts-mftraced</dir>
 </fontconfig>
 EOF
 "
@@ -79,6 +80,7 @@ lilypond -fgnome input/simple-song.ly
 
 (use-modules
  (guile)
+ (ice-9 regex)
  (srfi srfi-13)
  (lily)
  (gnome gtk))
@@ -223,8 +225,7 @@ lilypond -fgnome input/simple-song.ly
     bezier))
 
 (define (char font i)
-  ;;(text font (utf8 i)))
-  (text font (list->string (list (integer->char i))))); (utf8 i)))
+  (text font (utf8 i)))
 
 (define (placebox x y expr)
   (debugf "item: ~S\n" expr)
@@ -245,25 +246,16 @@ 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)
-  (let ((pango-font (assoc-get (ly:font-name font) pango-font-name-alist #f)))
-    (if pango-font
-       pango-font
+  (let ((name (ly:font-name font)))
+    (if name
+       (regexp-substitute/global #f "^GNU-(.*)-[.0-9]*$" name 'pre 1 'post)
        (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"))))
+         "ecrm12"))))
 
 (define (pango-font-size font)
   (let* ((designsize (ly:font-design-size font))