Fix loading of the Aybabtu font

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index c29258860c2a6cabedf3623a3ec7c25da3fb21d8..7c5b865a877d2e9a55dac601126d585cc1862260 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -1,7 +1,7 @@
 ;;;; font.scm -- construct font trees
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
+;;;;
 ;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; TODO:
@@ -28,14 +28,14 @@
         qualifier default)
   (make <Font-tree-node>
     #:qualifier qualifier
-    #:default default 
+    #:default default
     #:children (make-hash-table 11)))
 
 (define-method (display (leaf <Font-tree-leaf>) port)
   (map (lambda (x) (display x port))
        (list
        "#<Font-size-family:\n"
-       (slot-ref leaf 'default-size) 
+       (slot-ref leaf 'default-size)
        (slot-ref leaf 'size-vector)
        "#>"
        )))
@@ -50,7 +50,7 @@
     "(def: "
     (font-default node)
     ") {\n"))
-  (for-each 
+  (for-each
    (lambda (x)
      (display "\n")
      (display (car x) port)
@@ -65,7 +65,7 @@
 (define-method (add-font (node <Font-tree-node>) fprops size-family)
   (define (assoc-delete key alist)
     (assoc-remove! (list-copy alist) key))
-  
+
   (define (make-node fprops size-family)
     (if (null? fprops)
        (make-font-tree-leaf (car size-family) (cdr size-family))
@@ -140,26 +140,34 @@
 
 ;; 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 factor)
+(define-public (add-music-fonts node name family factor)
   (for-each
    (lambda (x)
      (add-font node
-              (list (cons 'font-encoding (car x)))
+              (list (cons 'font-encoding (car x))
+                    (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)
      (fetaMusic ,(ly:pt 20.0)
-               #(,(delay (ly:system-font-load "emmentaler-11"))
-                 ,(delay (ly:system-font-load "emmentaler-13"))                  
-                 ,(delay (ly:system-font-load "emmentaler-14"))
-                 ,(delay (ly:system-font-load "emmentaler-16"))                  
-                 ,(delay (ly:system-font-load "emmentaler-18"))
-                 ,(delay (ly:system-font-load "emmentaler-20"))                  
-                 ,(delay (ly:system-font-load "emmentaler-23"))                  
-                 ,(delay (ly:system-font-load "emmentaler-26"))))
+               #(
+                 ,(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")))
+                 ))
      (fetaBraces ,(ly:pt 20.0)
-                #(,(delay (ly:system-font-load "aybabtu")))))))
+                #(,(delay (ly:system-font-load
+                           ;;; TODO: rename aybabtu to emmentaler-brace
+                           (string-replace "emmentaler-brace" "aybabtu" 0
+                                           (string-length
+                                             (string-append name "-brace")))
+                           )))))))
 
 (define-public (add-pango-fonts node lily-family family factor)
   (define (add-node shape series)
@@ -178,15 +186,17 @@
                          (font-shape . ,shape)))
                       (ly:pt 12)))))))
 
-  (add-node 'upright 'normal) 
-  (add-node 'caps 'normal) 
-  (add-node 'upright 'bold) 
+  (add-node 'upright 'normal)
+  (add-node 'caps 'normal)
+  (add-node 'upright 'bold)
   (add-node 'italic 'normal)
   (add-node 'italic 'bold))
 
 (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 factor)
+    (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-pango-fonts n 'roman roman-str factor)
     (add-pango-fonts n 'sans sans-str factor)
     (add-pango-fonts n 'typewriter typewrite-str factor)
@@ -194,8 +204,17 @@
 
 (define-public (make-century-schoolbook-tree factor)
   (make-pango-font-tree
-    "Century Schoolbook L" 
-    "Sans" "Mono" factor))
+    "Century Schoolbook L,serif"
+    "sans-serif" "monospace" factor))
+
+(define-public all-text-font-encodings
+  '(latin1))
+
+(define-public all-music-font-encodings
+  '(fetaBraces
+    fetaDynamic
+    fetaMusic
+    fetaNumber))
 
 (define-public (magstep s)
   (exp (* (/ s 6) (log 2))))