(make-century-schoolbook-tree): add NCS as

font-family=roman. Add Luxi Sans as sans

diff --git a/ChangeLog b/ChangeLog
index e3e9048526485ab436db3185f899bb2acd6437d0..6679e1684389191ac1ea2369e27c2b6cf23a612f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/font.scm (make-century-schoolbook-tree): add NCS as
+       font-family=roman. Add Luxi Sans as sans
+
 2005-02-07  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/notation.itely: add warning about

diff --git a/scm/font.scm b/scm/font.scm
index 70247b76ac19c76d6dc3185caf531299f5551214..a2d1bc04842d13c831d827b756b31457897b8645 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -306,10 +306,10 @@
                  ,(delay (ly:font-load "ectt10"))
                  ,(delay (ly:font-load "ectt12"))))))))
 
-(define-public (add-pango-fonts node family factor)
+(define-public (add-pango-fonts node lily-family family factor)
   (define (add-node shape series)
     (add-font node
-             `((font-family . ,family)
+             `((font-family . ,lily-family)
                (font-shape . ,shape)
                (font-series . ,series)
                (font-encoding . latin1) ;; ugh.
@@ -343,7 +343,8 @@
 (define-public (make-century-schoolbook-tree factor)
   (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
     (add-music-fonts n factor)
-    (add-pango-fonts n "Century Schoolbook L" factor)
+    (add-pango-fonts n 'roman "Century Schoolbook L" factor)
+    (add-pango-fonts n 'sans "Luxi Sans" factor)
     n))
 
 (define-public (magstep x)