* GNUmakefile.in: remove no kpathsea hack.

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index 0d1cd0f5faf629db2cc1a6d353c0589ef958c70b..02a408038bff35a9f7ea57fd747554d824dc5e86 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -33,7 +33,7 @@
 
 (define (filter-field field-name value font-descr-alist)
   "return those descriptions from FONT-DESCR-LIST whose FIELD-NAME matches VALUE"
-      (filter-list
+      (filter
        (lambda (x) (let* (field-value (font-field field-name (car x))) 
                     (or (eq? field-value '*) (eq? value field-value))))
        font-descr-alist)
@@ -42,15 +42,15 @@
 
 (define size-independent-fonts
   `(
-    ((* * * braces *) . ("feta-braces0"
-                        "feta-braces1"
-                        "feta-braces2"
-                        "feta-braces3"
-                        "feta-braces4"
-                        "feta-braces5"
-                        "feta-braces6"
-                        "feta-braces7"
-                        "feta-braces8") )))
+    ((* * * braces *) . ("feta-braces00"
+                        "feta-braces10"
+                        "feta-braces20"
+                        "feta-braces30"
+                        "feta-braces40"
+                        "feta-braces50"
+                        "feta-braces60"
+                        "feta-braces70"
+                        "feta-braces80") )))
 
 ;; FIXME: what about this comment?:
 
@@ -96,8 +96,8 @@
     ((-3 medium italic roman 7) . "cmti7")    
 
     ;;; cmbx17 is sauter, not commonly available as Type1.
-    ((4 bold upright roman 17) . "cmr17") 
-    ((3 bold upright roman 17) . "cmr17")
+    ((4 bold upright roman 17) . "cmbx17") 
+    ((3 bold upright roman 17) . "cmbx17")
     
     ((2 bold upright roman 14) . "cmbx14")
     ((1 bold upright roman 12) . "cmbx12")
@@ -289,39 +289,9 @@ and warn if the selected font is not unique.
   ))
 
 
-(define (chain-assoc x alist-list)
-  (if (null? alist-list)
-      #f
-      (let* ((handle (assoc x (car alist-list))))
-       (if (pair? handle)
-           handle
-           (chain-assoc x (cdr alist-list))))))
+; there used to be a Scheme  properties-to-font-name function,
+; but that is  superseeded by the C++ version  out of speed concerns.
 
-;; TODO
-;; the C++ version  in font-interface.cc is usually used.
-;;
-;; FIXME: this has silently been broken by the introduction
-;;        of wildcards in the font list.    
-(define (properties-to-font-name fonts properties-alist-list)
-  (let*  (
-         ;; change order to change priorities of qualifiers.
-         (q-order '(font-family font-series font-shape
-                              font-design-size font-relative-size))
-         (rawqualifiers (map (lambda (x)
-                               (chain-assoc x properties-alist-list))
-                             q-order))
-         (qualifiers (filter-list pair? rawqualifiers))
-         (selected (find-first-font qualifiers fonts))
-         (err (current-error-port)))
-
-    (if (equal? selected "")
-       (begin
-         (display "\ncouldn't find any font satisfying " err)
-         (write qualifiers err)
-         "cmr10"
-         )
-       selected)       ; return the topmost.
-    ))
 
 (define-public (markup-to-properties abbrev-alist style-alist markup)
   "DOCME."
@@ -376,17 +346,12 @@ and warn if the selected font is not unique.
 
 (if #f (begin
         (define (test-module)
-          (display (filter-list pair? '(1 2 (1 2) (1 .2)))
+          (display (filter pair? '(1 2 (1 2) (1 .2)))
                    (display (filter-field 'font-name 'cmbx paper20-style-sheet-alist))
                    
                    (display (qualifiers-to-fontname '((font-name . cmbx)) paper20-style-sheet-alist))
-                   (display (style-to-font-name 'paper20 'large))
-                   )
-          )
-        )
-
-
-)
+                   (display (style-to-font-name 'paper20 'large)))
+          )))
 
 ;;; ascii-script font init
 (define as-font-sheet-alist