From: Han-Wen Nienhuys Date: Mon, 7 Feb 2005 21:13:06 +0000 (+0000) Subject: (make-century-schoolbook-tree): add NCS as X-Git-Tag: release/2.5.14~153 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=08ba1741bac86d9865e2e4f68064fb961084318f;p=lilypond.git (make-century-schoolbook-tree): add NCS as font-family=roman. Add Luxi Sans as sans --- diff --git a/ChangeLog b/ChangeLog index e3e9048526..6679e16843 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-07 Han-Wen Nienhuys + + * scm/font.scm (make-century-schoolbook-tree): add NCS as + font-family=roman. Add Luxi Sans as sans + 2005-02-07 Graham Percival * Documentation/user/notation.itely: add warning about diff --git a/scm/font.scm b/scm/font.scm index 70247b76ac..a2d1bc0484 100644 --- 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)