* buildscripts/gen-emmentaler-scripts.py (i): generate

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index 9c083fac87968ead826f75224a8c031a9774c2d5..bede4008e233863f7dba59c11a58549b7ef0d806 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -137,6 +137,21 @@
                                        ; Each size family is a vector of fonts, loaded with a delay.
                                        ; The vector should be sorted according to ascending design size.
                                        ;
+(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)))))
 
 (define-public (add-music-fonts node factor)
   (for-each
@@ -145,28 +160,8 @@
               (list (cons 'font-encoding (car x)))
               (cons (* factor (cadr x))
                     (caddr x))))
-   `((fetaNumber ,(ly:pt 20)
-                #(,(delay  (ly:font-load "feta-alphabet11"))
-                  ,(delay  (ly:font-load "feta-alphabet13"))
-                  ,(delay  (ly:font-load "feta-alphabet14"))
-                  ,(delay  (ly:font-load "feta-alphabet16"))             
-                  ,(delay  (ly:font-load "feta-alphabet18"))
-                  ,(delay  (ly:font-load "feta-alphabet20"))             
-                  ,(delay  (ly:font-load "feta-alphabet23"))             
-                  ,(delay  (ly:font-load "feta-alphabet26"))))
-     (fetaTest ,(ly:pt 20)
-                #((cons (ly:pt 20)
-                        "Emmentaler 20 7.02799479")))
-     
-     (fetaDynamic ,(ly:pt 20.0)  #(,(delay  (ly:font-load "feta-alphabet11"))
-                                  ,(delay  (ly:font-load "feta-alphabet13"))
-                                  ,(delay  (ly:font-load "feta-alphabet14"))
-                                  ,(delay  (ly:font-load "feta-alphabet16"))
-                                  ,(delay  (ly:font-load "feta-alphabet18"))
-                                  ,(delay  (ly:font-load "feta-alphabet20"))
-                                  ,(delay  (ly:font-load "feta-alphabet23"))
-                                  ,(delay  (ly:font-load "feta-alphabet26"))))
-     
+   `((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:font-load "emmentaler-11"))
                  ,(delay  (ly:font-load "emmentaler-13"))