CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/31 15:33:41
Modified files:
. : ChangeLog
scm : font.scm
Log message:
* scm/font.scm (make-century-schoolbook-tree): add Mono as
'typewriter family.
* scm/font.scm (make-century-schoolbook-tree): use Sans for sans
serif.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3693&tr2=1.3694&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/font.scm.diff?tr1=1.116&tr2=1.117&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3693 lilypond/ChangeLog:1.3694
--- lilypond/ChangeLog:1.3693 Tue May 31 15:25:25 2005
+++ lilypond/ChangeLog Tue May 31 15:33:41 2005
@@ -1,5 +1,8 @@
2005-05-31 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * scm/font.scm (make-century-schoolbook-tree): add Mono as
+ 'typewriter family.
+
* lily/score.cc (Score): unprotect copy of Output_def. Plugs
memory leak.
Index: lilypond/scm/font.scm
diff -u lilypond/scm/font.scm:1.116 lilypond/scm/font.scm:1.117
--- lilypond/scm/font.scm:1.116 Tue May 31 13:37:37 2005
+++ lilypond/scm/font.scm Tue May 31 15:33:41 2005
@@ -4,25 +4,14 @@
;;;;
;;;; (c) 2004--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
-;; 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 <Font-tree-element>
())
-
(define-class <Font-tree-leaf> (<Font-tree-element>)
(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)
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
