(make-pango-font-tree): new function.

diff --git a/ChangeLog b/ChangeLog
index fb3c65803447360e5424708d91a9288fbfe4a14f..412304cdca647b9e663de054dc71a8200476a970 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
 2005-06-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/font.scm (make-pango-font-tree): new function.
+
        * lily/beam.cc (before_line_breaking): remove warning about less
        than 2 visible stems. We still get a warning when there is only
-       one stem..
+       one stem.
 
 2005-06-01  Werner Lemberg  <wl@gnu.org>
 

diff --git a/scm/font.scm b/scm/font.scm
index 8c2fbea6d886a1ee1a4509bfab349ec3c47acd7b..2dd29cc9d49953672374295207e965bd700969db 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -335,13 +335,22 @@
              (add-ec-fonts n factor))))
     n))
 
-(define-public (make-century-schoolbook-tree factor)
+
+
+
+(define-public (make-pango-font-tree roman-str sans-str typewrite-str factor)
   (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
     (add-music-fonts n factor)
-    (add-pango-fonts n 'roman "Century Schoolbook L" factor)
-    (add-pango-fonts n 'sans "Sans" factor)
-    (add-pango-fonts n 'typewriter "Mono" factor)
+    (add-pango-fonts n 'roman roman-str factor)
+    (add-pango-fonts n 'sans sans-str factor)
+    (add-pango-fonts n 'typewriter typewrite-str factor)
     n))
 
+
+(define-public (make-century-schoolbook-tree factor)
+  (make-pango-font-tree
+    "Century Schoolbook L" 
+    "Sans" "Mono" factor))
+
 (define-public (magstep x)
   (exp (* (/ x 6) (log 2))))