From a5ba65c12dc61e06dc6e430955e75dbbe2d37b05 Mon Sep 17 00:00:00 2001 From: hanwen Date: Tue, 31 May 2005 15:33:41 +0000 Subject: [PATCH] * scm/font.scm (make-century-schoolbook-tree): add Mono as 'typewriter family. * scm/font.scm (make-century-schoolbook-tree): use Sans for sans serif. --- ChangeLog | 3 +++ scm/font.scm | 21 ++++----------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index e77c4a37a1..52ac01a242 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-05-31 Han-Wen Nienhuys + * scm/font.scm (make-century-schoolbook-tree): add Mono as + 'typewriter family. + * lily/score.cc (Score): unprotect copy of Output_def. Plugs memory leak. diff --git a/scm/font.scm b/scm/font.scm index d1ffe9a913..8c2fbea6d8 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -4,25 +4,14 @@ ;;;; ;;;; (c) 2004--2005 Han-Wen Nienhuys -;; As an excercise, do it with records. -;; Should use GOOPS, really. - ;; TODO: ;; ;; lookup-font should be written in C. ;; -;; should dump tree to .texi as internal documentation -;; -;; * should extract design sizes from fonts: fonts should -;; be read off the disk, on demand, something like: -;; -;; cmr -> ((font-load "cmr6") (font-load "cmr8") .. ) -;; (define-class ()) - (define-class () (default-size #:init-keyword #:default-size) (size-vector #:init-keyword #:size-vector)) @@ -133,10 +122,8 @@ (define (lookup-font node alist-chain) (g-lookup-font node alist-chain)) - ; - ; Each size family is a vector of fonts, loaded with a delay. - ; The vector should be sorted according to ascending design size. - ; +;; Each size family is a vector of fonts, loaded with a delay. The +;; vector should be sorted according to ascending design size. (define feta-alphabet-size-vector (if (defined? 'ly:kpathsea-find-file) `#(,(delay (ly:font-load "feta-alphabet11")) @@ -334,8 +321,7 @@ (add-node 'upright 'normal) (add-node 'upright 'bold) (add-node 'italic 'normal) - (add-node 'italic 'bold) - ) + (add-node 'italic 'bold)) (define-public (make-cmr-tree factor) (let ((n (make-font-tree-node 'font-encoding 'fetaMusic))) @@ -354,6 +340,7 @@ (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) n)) (define-public (magstep x) -- 2.39.5