Pass a list of design sizes into add-music-fonts function.

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index 7c5b865a877d2e9a55dac601126d585cc1862260..26abcba884b3115bea246c1fdf77013a1e62cb6e 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -1,8 +1,19 @@
-;;;; font.scm -- construct font trees
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
-;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; TODO:
 ;;
@@ -140,7 +151,8 @@
 
 ;; 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)
+  "Add fonts to NODE.  DESIGN-SIZE-LIST is a list of numbers."
   (for-each
    (lambda (x)
      (add-font node
@@ -151,25 +163,24 @@
    `((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
-                           (string-replace "emmentaler-brace" "aybabtu" 0
-                                           (string-length
-                                             (string-append name "-brace")))
+                           (if (string=? name "emmentaler")
+                               "aybabtu"
+                               (string-append name "-brace"))
                            )))))))
 
 (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)
@@ -177,7 +188,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
@@ -194,7 +205,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)
+    (add-music-fonts n "emmentaler" 'feta '(11 13 14 16 18 20 23 26) factor)
 ;; Let's not do this [yet], see input/regression/gonville.ly
 ;;    (add-music-fonts n "gonville" 'gonville factor)
     (add-pango-fonts n 'roman roman-str factor)