X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=d759d60934590614bfb3c070d064d67e82760515;hb=623fac8d645e4078af36758af5d437c5eb39e793;hp=ee5b08a4a298a61232eba079d5e494922d031f5a;hpb=fc5ab26e3d13884e92981243219bd04d3fb921fa;p=lilypond.git diff --git a/scm/font.scm b/scm/font.scm index ee5b08a4a2..d759d60934 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -1,6 +1,6 @@ ;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; Copyright (C) 2004--2010 Han-Wen Nienhuys +;;;; Copyright (C) 2004--2012 Han-Wen Nienhuys ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify ;;;; it under the terms of the GNU General Public License as published by @@ -20,6 +20,13 @@ ;; lookup-font should be written in C. ;; +;; We have a tree, where each level of the tree is a qualifier +;; (eg. encoding, family, shape, series etc.) this defines the levels +;; in the tree. The first one is encoding, so we can directly select +;; between text or music in the first step of the selection. +(define default-qualifier-order + '(font-encoding font-family font-shape font-series)) + (define-class ()) @@ -70,8 +77,6 @@ (hash-table->alist (font-children node))) (display "} }\n")) -(define default-qualifier-order - '(font-encoding font-family font-shape font-series)) (define-method (add-font (node ) fprops size-family) (define (assoc-delete key alist) @@ -128,40 +133,46 @@ (define (lookup-font node alist-chain) (g-lookup-font node alist-chain)) - -;; Ugh. Currently, we load the PFB Feta fonts for `fetaDynamic' with -;; Pango. This should be changed to load the Emmentaler fonts instead -;; (with Pango too), but then we need support for a `font-style' -;; property which isn't implemented yet. -(define feta-alphabet-size-vector - (list->vector - (map (lambda (tup) - (cons (ly:pt (cdr tup)) - (format "feta-alphabet~a ~a" - (car tup) - (ly:pt (cdr tup))))) - '((11 . 11.22) - (13 . 12.60) - (14 . 14.14) - (16 . 15.87) - (18 . 17.82) - (20 . 20) - (23 . 22.45) - (26 . 25.20))))) +;; TODO - we could actually construct this by loading all OTFs and +;; inspecting their design size fields. +(define-public feta-design-size-mapping + '((11 . 11.22) + (13 . 12.60) + (14 . 14.14) + (16 . 15.87) + (18 . 17.82) + (20 . 20) + (23 . 22.45) + (26 . 25.20))) ;; Each size family is a vector of fonts, loaded with a delay. The ;; vector should be sorted according to ascending design size. -(define-public (add-music-fonts node name family design-size-list factor) - "Setup music fonts. +(define-public (add-music-fonts node name family design-size-alist factor) + "Set up music fonts. Arguments: - NODE the font tree to modify. - NAME is the basename for the music font. NAME-DESIGNSIZE.otf should be the music font, - NAME-brace.otf should have piano braces. - DESIGN-SIZE-LIST is a list of numbers, used as suffix for font filenames - FACTOR is size factor relative to default size that is being used. This is used - to select the proper design size for text fonts. -" +@itemize +@item +@var{node} is the font tree to modify. + +@item +@var{name} is the basename for the music font. +@file{@var{name}-.otf} should be the music font, +@file{@var{name}-brace.otf} should have piano braces. + +@item +@var{family} is the family name of the music font. + +@item +@var{design-size-alist} is a list of @code{(rounded . designsize)}. +@code{rounded} is a suffix for font filenames, while @code{designsize} +should be the actual design size. The latter is used for text fonts +loaded through pango/@/fontconfig. + +@item +@var{factor} is a size factor relative to the default size that is being +used. This is used to select the proper design size for the text fonts. +@end itemize" (for-each (lambda (x) (add-font node @@ -169,17 +180,26 @@ Arguments: (cons 'font-family family)) (cons (* factor (cadr x)) (caddr x)))) - `((fetaDynamic ,(ly:pt 20.0) ,feta-alphabet-size-vector) - (fetaNumber ,(ly:pt 20.0) ,feta-alphabet-size-vector) + + `((fetaText ,(ly:pt 20.0) + ,(list->vector + (map (lambda (tup) + (cons (ly:pt (cdr tup)) + (format #f "~a-~a ~a" + name + (car tup) + (ly:pt (cdr tup))))) + design-size-alist))) (fetaMusic ,(ly:pt 20.0) ,(list->vector - (map (lambda (size) - (delay (ly:system-font-load (format "~a-~a" name size)))) - design-size-list + (map (lambda (size-tup) + (delay (ly:system-font-load + (format #f "~a-~a" name (car size-tup))))) + design-size-alist ))) (fetaBraces ,(ly:pt 20.0) #(,(delay (ly:system-font-load - (format "~a-brace" name))))) + (format #f "~a-brace" name))))) ))) (define-public (add-pango-fonts node lily-family family factor) @@ -211,7 +231,7 @@ Arguments: (define-public (make-pango-font-tree roman-str sans-str typewrite-str factor) (let ((n (make-font-tree-node 'font-encoding 'fetaMusic))) - (add-music-fonts n "emmentaler" 'feta '(11 13 14 16 18 20 23 26) factor) + (add-music-fonts n "emmentaler" 'feta feta-design-size-mapping factor) (add-pango-fonts n 'roman roman-str factor) (add-pango-fonts n 'sans sans-str factor) (add-pango-fonts n 'typewriter typewrite-str factor) @@ -219,7 +239,7 @@ Arguments: (define-public (make-century-schoolbook-tree factor) (make-pango-font-tree - "Century Schoolbook L,serif" + "Century Schoolbook L" "sans-serif" "monospace" factor)) (define-public all-text-font-encodings @@ -227,9 +247,8 @@ Arguments: (define-public all-music-font-encodings '(fetaBraces - fetaDynamic fetaMusic - fetaNumber)) + fetaText)) (define-public (magstep s) (exp (* (/ s 6) (log 2))))