Show how to properly support the Gonville font.

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index f8ab0573d67ab4cc4be6222b7bafba3145dfdd2d..ee5b08a4a298a61232eba079d5e494922d031f5a 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -151,7 +151,17 @@
 
 ;; 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 factor)
+(define-public (add-music-fonts node name family design-size-list factor)
+  "Setup 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.
+"
   (for-each
    (lambda (x)
      (add-font node
@@ -162,25 +172,21 @@
    `((fetaDynamic ,(ly:pt 20.0) ,feta-alphabet-size-vector)
      (fetaNumber ,(ly:pt 20.0) ,feta-alphabet-size-vector)
      (fetaMusic ,(ly:pt 20.0)
-               #(
-                 ,(delay (ly:system-font-load (string-append name "-11")))
-                 ,(delay (ly:system-font-load (string-append name "-13")))
-                 ,(delay (ly:system-font-load (string-append name "-14")))
-                 ,(delay (ly:system-font-load (string-append name "-16")))
-                 ,(delay (ly:system-font-load (string-append name "-18")))
-                 ,(delay (ly:system-font-load (string-append name "-20")))
-                 ,(delay (ly:system-font-load (string-append name "-23")))
-                 ,(delay (ly:system-font-load (string-append name "-26")))
-                 ))
+               ,(list->vector
+                 (map (lambda (size)
+                        (delay (ly:system-font-load (format "~a-~a" name size))))
+                      design-size-list
+                      )))
      (fetaBraces ,(ly:pt 20.0)
                 #(,(delay (ly:system-font-load
-                           ;;; TODO: rename aybabtu to emmentaler-brace
-                           (if (string=? name "emmentaler")
-                               "aybabtu"
-                               (string-append name "-brace"))
-                           )))))))
-
+                           (format "~a-brace" name)))))
+     )))
+                
 (define-public (add-pango-fonts node lily-family family factor)
+  ;; Synchronized with the `text-font-size' variable in
+  ;; layout-set-absolute-staff-size-in-module (see paper.scm).
+  (define text-font-size (ly:pt (* factor 11.0)))
+
   (define (add-node shape series)
     (add-font node
              `((font-family . ,lily-family)
@@ -188,7 +194,7 @@
                (font-series . ,series)
                (font-encoding . latin1) ;; ugh.
                )
-             `(,(ly:pt (* factor 11.0))
+             `(,text-font-size
                . #(,(cons
                     (ly:pt 12)
                     (ly:make-pango-description-string
@@ -205,9 +211,7 @@
 
 (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 factor)
-;; Let's not do this [yet], see input/regression/gonville.ly
-;;    (add-music-fonts n "gonville" 'gonville factor)
+    (add-music-fonts n "emmentaler" 'feta '(11 13 14 16 18 20 23 26) 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)