patch::: 1.3.122.mb1

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index b77414dc4f82af21c4430f285a2c1729d336974b..ffa1c28c476eec80037ce81c59e5cafc27d79dfe 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -45,7 +45,8 @@
 (define (filter-field field-name value font-descr-alist)
   "return those descriptions from FONT-DESCR-LIST whose FIELD-NAME matches VALUE"
       (filter-list
-       (lambda (x) (eq? value (font-field field-name (car x))))
+       (lambda (x) (let* (field-value (font-field field-name (car x))) 
+                    (or (eq? field-value '*) (eq? value field-value))))
        font-descr-alist)
       )
 
@@ -101,36 +102,36 @@
     ((-5 medium upright typewriter cmtt 4) . "cmtt4" )
 
     ;; should use the same brace font every where and fix C++ code.
-    ((2 medium upright braces feta-braces 26) . "feta-braces26")
-    ((1 medium upright braces feta-braces 23) . "feta-braces23")
-    ((0 medium upright braces feta-braces 20) . "feta-braces20")
-    ((-1 medium upright braces feta-braces 16) . "feta-braces16")
-    ((-2 medium upright braces feta-braces 13) . "feta-braces13")
-    ((-3 medium upright braces feta-braces 11) . "feta-braces11")
-
-    ((3 bold italic dynamic feta-din 19) . "feta-din19")
-    ((2 bold italic dynamic feta-din 19) . "feta-din19")
-    ((1 bold italic dynamic feta-din 17) . "feta-din17")
-    ((0 bold italic dynamic feta-din 14) . "feta-din14")
-    ((-1 bold italic dynamic feta-din 12) . "feta-din12")
-    ((-2 bold italic dynamic feta-din 9) . "feta-din9")
-    ((-3 bold italic dynamic feta-din 8) . "feta-din8")
-    ((-4 bold italic dynamic feta-din 7) . "feta-din7")
-    ((-5 bold italic dynamic feta-din 6) . "feta-din6")
-
-    ((2 medium upright music feta 26) . "feta26")
-    ((1 medium upright music feta 23) . "feta23")
-    ((0 medium upright music feta 20) . "feta20")
-    ((-0.5 medium upright music feta 20) . "feta19")    
-    ((-1 medium upright music feta 16) . "feta16")
-    ((-2 medium upright music feta 13) . "feta13")
-    ((-3 medium upright music feta 11) . "feta11")
-    ((-4 medium upright music feta 11) . "feta11")
-
-    ((0 medium upright math msam 10) . "msam10")
-    ((-1 medium upright math msam 10) . "msam10")
-    ((-2 medium upright math msam 10) . "msam10")
-    ((-3 medium upright math msam 10) . "msam10")
+    ((2 * * braces feta-braces 26) . "feta-braces26")
+    ((1 * * braces feta-braces 23) . "feta-braces23")
+    ((0 * * braces feta-braces 20) . "feta-braces20")
+    ((-1 * * braces feta-braces 16) . "feta-braces16")
+    ((-2 * * braces feta-braces 13) . "feta-braces13")
+    ((-3 * * braces feta-braces 11) . "feta-braces11")
+
+    ((3 * * dynamic feta-din 19) . "feta-din19")
+    ((2 * * dynamic feta-din 19) . "feta-din19")
+    ((1 * * dynamic feta-din 17) . "feta-din17")
+    ((0 * * dynamic feta-din 14) . "feta-din14")
+    ((-1 * * dynamic feta-din 12) . "feta-din12")
+    ((-2 * * dynamic feta-din 9) . "feta-din9")
+    ((-3 * * dynamic feta-din 8) . "feta-din8")
+    ((-4 * * dynamic feta-din 7) . "feta-din7")
+    ((-5 * * dynamic feta-din 6) . "feta-din6")
+
+    ((2 * * music feta 26) . "feta26")
+    ((1 * * music feta 23) . "feta23")
+    ((0 * * music feta 20) . "feta20")
+    ((-0.5 * * music feta 20) . "feta19")    
+    ((-1 * * music feta 16) . "feta16")
+    ((-2 * * music feta 13) . "feta13")
+    ((-3 * * music feta 11) . "feta11")
+    ((-4 * * music feta 11) . "feta11")
+
+    ((0 * * math msam 10) . "msam10")
+    ((-1 * * math msam 10) . "msam10")
+    ((-2 * * math msam 10) . "msam10")
+    ((-3 * * math msam 10) . "msam10")
    ))
 
 ;; 
@@ -199,7 +200,7 @@
        (script . ((font-family . roman) (font-relative-size . -1)))
        (large . ((font-family . roman) (font-relative-size . 1)))
        (Large . ((font-series . bold) (font-family . roman) (font-relative-size . 2)))
-       (dynamic . ((font-series . bold) (font-family . dynamic) (font-relative-size . 0)))
+       (dynamic . ((font-family . dynamic) (font-relative-size . 0)))
        ))
     (properties-to-font .
                        ,Font_interface::properties_to_font_name)
@@ -212,7 +213,7 @@
      . ((rows . ((align . 0)))
        (lines . ((align . 1)))
        (roman . ((font-family . roman)))
-       (music . ((font-family . music) (font-shape . upright) (lookup . name)))
+       (music . ((font-family . music) (lookup . name)))
        (finger . ((font-style . finger)))
        (bold . ((font-series . bold)))
        (italic . ((font-shape . italic)))
@@ -271,11 +272,11 @@ and warn if the selected font is not unique.
        (display "\ncouldn't find unique font satisfying " err)
        (write qualifiers err)
        (display " found " err)
-         (if (null? fonts)
-             (display "none" err)
-             (write (map cdr  fonts) err))
-         ))
-
+       (if (null? fonts)
+           (display "none" err)
+           (write (map cdr  fonts) err))
+       ))
+  
   (if (null? fonts)
       "cmr10"
       (cdar fonts))    ; return the topmost.