;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
;; TODO:
;;
(ly:pt 12)))))))
(add-node 'upright 'normal)
+ (add-node 'caps 'normal)
(add-node 'upright 'bold)
(add-node 'italic 'normal)
(add-node 'italic 'bold))
(define-public (make-cmr-tree factor)
- (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
+ (let*
+ ((n (make-font-tree-node 'font-encoding 'fetaMusic))
+ (module (resolve-module '(scm kpathsea)))
+ (find (eval 'ly:kpathsea-find-file module))
+ )
(add-music-fonts n factor)
(add-cmr-fonts n factor)
- (if (defined? 'ly:kpathsea-find-file)
- (begin
- (if (ly:kpathsea-find-file "lmr10.pfb")
- (add-cork-lm-fonts n factor))
- (if (ly:kpathsea-find-file "ecrm10.pfa")
- (add-ec-fonts n factor))))
+
+ (if (find "lmr10.pfb")
+ (add-cork-lm-fonts n factor))
+ (if (find "ecrm10.pfa")
+ (add-ec-fonts n factor))
n))
"Century Schoolbook L"
"Sans" "Mono" factor))
-(define-public (magstep x)
- (exp (* (/ x 6) (log 2))))
+(define-public (magstep s)
+ (exp (* (/ s 6) (log 2))))
+
+(define-public (magnification->font-size m)
+ (* 6 (/ (log m) (log 2))))