X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=fa6835c34092e09307a075f1dfb7c85b07d0f81c;hb=414b03f31a4abc0de62d7909facd5fdbdde0bad6;hp=5e91e34a43751190b80c4fe810988108cbc11359;hpb=b6f63802cb34d04419292c8dd43ef749e8960040;p=lilypond.git

diff --git a/scm/font.scm b/scm/font.scm
index 5e91e34a43..fa6835c340 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -3,7 +3,7 @@
 ;;;
 ;;; source file of the GNU LilyPond music typesetter
 ;;; 
-;;; (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c)  2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 
 (define style-to-font-alist
@@ -18,111 +18,179 @@
 	((eq? name 'font-series) 1)
 	((eq? name 'font-shape) 2)
 	((eq? name 'font-family) 3)
-	((eq? name 'font-name) 4)
-	((eq? name 'font-point-size) 5)
-	(else (ly-warning "unknown font field name"))
+	((eq? name 'font-design-size) 4)
+	(else (ly:warning "unknown font field name"))
 	)
        ))
-  
-;; return that part of LIST for which PRED is true.
-(define (filter-list pred? list)
-  (if (null? list) '()
-      (let* (
-	     (rest  (filter-list pred? (cdr list)))
-	     )
-	(if (pred?  (car list))
-	    (cons (car list)  rest)
-	    rest
-	    )
-	)
-      )
-  )
 
-;;;;;;;;; TODO TODO . (should not use filtering?)
+
+
+;; most of these routines have been reimplemented in C++ 
+
+;; TODO TODO . (should not use filtering?)
 ;; this is bad, since we generate garbage every font-lookup.
 ;; otoh, if the qualifiers is narrow enough , we don't generate much garbage.
 
-
-;; return those descriptions from FONT-DESCR-LIST whose FIELD-NAME matches VALUE
 (define (filter-field field-name value font-descr-alist)
-      (filter-list
-       (lambda (x) (eq? value (font-field field-name (car x))))
+  "return those descriptions from FONT-DESCR-LIST whose FIELD-NAME matches VALUE"
+      (filter
+       (lambda (x) (let* (field-value (font-field field-name (car x))) 
+		     (or (eq? field-value '*) (eq? value field-value))))
        font-descr-alist)
       )
 
+
+(define size-independent-fonts
+  `(
+    ((* * * braces *) . ("feta-braces0"
+			 "feta-braces1"
+			 "feta-braces2"
+			 "feta-braces3"
+			 "feta-braces4"
+			 "feta-braces5"
+			 "feta-braces6"
+			 "feta-braces7"
+			 "feta-braces8") )))
+
+;; FIXME: what about this comment?:
+
+;; font-lookup seems a  little inefficient -- walking this entire list
+;; for a single font.
+;;
+;;   should really have name/pt size at the front of the list.
+;;   (also tried to vary the order of this list, with little effect)
+;;
+;; (font-relative-size font-series font-shape font-family 
+;; font-design-size)
+
 (define paper20-style-sheet-alist
   '(
-    ((3 medium upright number feta-nummer 13) . "feta-nummer13")
-    ((2 medium upright number feta-nummer 13) . "feta-nummer13")
-    ((1 medium upright number feta-nummer 11) . "feta-nummer11")
-    ((0 medium upright number feta-nummer 10) . "feta-nummer10")
-    ((-1 medium upright number feta-nummer 8) . "feta-nummer8")
-    ((-2 medium upright number feta-nummer 6) . "feta-nummer6")
-    ((-3 medium upright number feta-nummer 5) . "feta-nummer5")
-    ((-4 medium upright number feta-nummer 4) . "feta-nummer4")
-    ((2 medium upright roman cmr 14) . "cmr14")
-    ((1 medium upright roman cmr 12) . "cmr12")
-    ((0 medium upright roman cmr 10) . "cmr10")
-    ((-1 medium upright roman cmr 8) . "cmr8" )
-    ((-2 medium upright roman cmr 7) . "cmr7" )
-    ((-3 medium upright roman cmr 6) . "cmr6" )
-    ((-4 medium upright roman cmr 5) . "cmr5" )
-    ((-5 medium upright roman cmr 4) . "cmr4" )
-    ((-3 medium italic roman cmti 5) . "cmti6")    
-    ((-2 medium italic roman cmti 6) . "cmti7")
-    ((-1 medium italic roman cmti 8) . "cmti8")    
-    ((0 medium italic roman cmti 10) . "cmti10")
-    ((1 medium italic roman cmti 12) . "cmti12")
-    ((2 bold upright roman cmbx 14) . "cmbx14")
-    ((1 bold upright roman cmbx 12) . "cmbx12")
-    ((0 bold upright roman cmbx 10) . "cmbx10")
-    ((-1 bold upright roman cmbx 8) . "cmbx8")
-    ((-2 bold upright roman cmbx 7) . "cmbx7")
-    ((-3 medium upright math msam 10) . "msam10")
-    ((-2 medium upright math msam 10) . "msam10")
-    ((-1 medium upright math msam 10) . "msam10")
-    ((0 medium upright math msam 10) . "msam10")
-    ;; should use the same brace font every where and fix C++ code.
-    ((0 medium upright braces feta-braces 20) . "feta-braces20")
-    ((2 medium upright braces feta-braces 26) . "feta-braces26")
-    ((1 medium upright braces feta-braces 23) . "feta-braces23")
-    ((3 bold italic dynamic feta 13) . "feta-din13")
-    ((2 bold italic dynamic feta 13) . "feta-din13")
-    ((1 bold italic dynamic feta 11) . "feta-din11")
-    ((0 bold italic dynamic feta 10) . "feta-din10")
-    ((-1 bold italic dynamic feta 8) . "feta-din8")
-    ((-2 bold italic dynamic feta 7) . "feta-din7")
-    ((-3 bold italic dynamic feta 6) . "feta-din6")
-    ((-4 bold italic dynamic feta 5) . "feta-din5")
-    ((-5 bold italic dynamic feta 4) . "feta-din4")
-    ((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 13) . "feta11")
-    ((-4 medium upright music feta 13) . "feta11")
-    ((-1 medium upright math msam 10) . "msam10")
-    ((-2 medium upright math msam 10) . "msam10")
-    ((-3 medium upright math msam 10) . "msam10")
+    ;; why are font file names strings, not symbols?
+    ((3 medium upright number 13) . "feta-nummer13")
+    ((2 medium upright number 13) . "feta-nummer13")
+    ((1 medium upright number 11) . "feta-nummer11")
+    ((0 medium upright number 10) . "feta-nummer10")
+    ((-1 medium upright number 8) . "feta-nummer8")
+    ((-2 medium upright number 7) . "feta-nummer7")
+    ((-3 medium upright number 6) . "feta-nummer6")
+    ((-4 medium upright number 5) . "feta-nummer5")
+    ((-5 medium upright number 4) . "feta-nummer4")
+
+    ((4 medium upright roman 17) . "cmr17")
+    ((3 medium upright roman 17) . "cmr17")
+    ((2 medium upright roman 12) . "cmr12")
+    ((1 medium upright roman 12) . "cmr12")
+    ((0 medium upright roman 10) . "cmr10")
+    ((-1 medium upright roman 8) . "cmr8" )
+    ((-2 medium upright roman 7) . "cmr7" )
+    ((-3 medium upright roman 6) . "cmr6" )
+    ((-4 medium upright roman 5) . "cmr5" )
+    ((-5 medium upright roman 5) . "cmr5" )
+
+    ((3 medium italic roman 12) . "cmti12")
+    ((2 medium italic roman 12) . "cmti12")
+    ((1 medium italic roman 12) . "cmti12") ;;; ugh. Should add magnification here! 
+    ((0 medium italic roman 10) . "cmti10")
+    ((-1 medium italic roman 8) . "cmti8")    
+    ((-2 medium italic roman 7) . "cmti7")
+    ((-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")
+    
+    ((2 bold upright roman 14) . "cmbx14")
+    ((1 bold upright roman 12) . "cmbx12")
+    ((0 bold upright roman 10) . "cmbx10")
+    ((-1 bold upright roman 8) . "cmbx8")
+    ((-2 bold upright roman 7) . "cmbx7")
+    
+    ((2 bold italic roman 12) . "cmbxti12")
+    ((1 bold italic roman 12) . "cmbxti12")
+    ((0 bold italic roman 10) . "cmbxti10")
+
+    ((-1 bold italic roman 8) . "cmbxti8")
+    ((-2 bold italic roman 7) . "cmbxti7")
+    
+    ((4 medium upright typewriter 17) . "cmtt17")
+    ((3 medium upright typewriter 17) . "cmtt17")
+    ((2 medium upright typewriter 12) . "cmtt12")
+    ((1 medium upright typewriter 12) . "cmtt12")
+    ((0 medium upright typewriter 10) . "cmtt10")
+    ((-1 medium upright typewriter 8) . "cmtt8" )
+    ((-2 medium upright typewriter 7) . "cmtt7" )
+    ((-3 medium upright typewriter 6) . "cmtt6" )
+    ((-4 medium upright typewriter 5) . "cmtt5" )
+    ((-5 medium upright typewriter 5) . "cmtt5" )
+    
+    ((3 medium caps roman 12) . "cmcsc12")
+    ((2 medium caps roman 12) . "cmcsc12")
+    ((1 medium caps roman 12) . "cmcsc12")
+    ((0 medium caps roman 10) . "cmcsc10")
+    ((-1 medium caps roman 8) . "cmcsc8")
+    ((-2 medium caps roman 7) . "cmcsc7")
+    ((-3 medium caps roman 7) . "cmcsc7")
+
+    ((3 * * dynamic 19) . "feta-din19")
+    ((2 * * dynamic 19) . "feta-din19")
+    ((1 * * dynamic 17) . "feta-din17")
+    ((0 * * dynamic 14) . "feta-din14")
+    ((-1 * * dynamic 12) . "feta-din12")
+    ((-2 * * dynamic 9) . "feta-din9")
+    ((-3 * * dynamic 8) . "feta-din8")
+    ((-4 * * dynamic 7) . "feta-din7")
+    ((-5 * * dynamic 6) . "feta-din6")
+
+    ((2 * * music 26) . ("feta26" "parmesan26"))
+    ((1 * * music 23) . ("feta23" "parmesan23"))
+    ((0 * * music 20) . ("feta20" "parmesan20"))
+    ((-1 * * music 16) . ("feta16" "parmesan16"))
+    ((-2 * * music 13) . ("feta13" "parmesan13"))
+    ((-3 * * music 11) . ("feta11" "parmesan11"))
+    ((-4 * * music 11) . ("feta11" "parmesan11"))
+    
+    ((2 * * ancient 26) . ("feta26" "parmesan26"))
+    ((1 * * ancient 23) . ("feta23" "parmesan23"))
+    ((0 * * ancient 20) . ("feta20" "parmesan20"))
+    ((-1 * * ancient 16) . ("feta16" "parmesan16"))
+    ((-2 * * ancient 13) . ("feta13" "parmesan13"))
+    ((-3 * * ancient 11) . ("feta11" "parmesan11"))
+    ((-4 * * ancient 11) . ("feta11" "parmesan11"))
+
+    ((0 * * math 10) . "msam10")
+    ((-1 * * math 10) . "msam10")
+    ((-2 * * math 10) . "msam10")
+    ((-3 * * math 10) . "msam10")
    ))
 
-;; return a FONT-DESCR with relative size decremented by DECREMENT
+;; 
 (define (change-relative-size font-desc decrement)
-  (cons (- (car font-desc) decrement) (cdr font-desc))
+  "return a FONT-DESCR with relative size decremented by DECREMENT"
+
+  (if (number? (car font-desc))
+      (cons (- (car font-desc) decrement) (cdr font-desc))
+      font-desc)
   )
 
-;; map a  function FUNC over the keys of an alist LIST, leaving the vals. 
+(define (change-rhs-size font-desc from to )
+  (cons (car font-desc)
+	(regexp-substitute/global #f from (cdr font-desc) 'pre to 'post))
+
+  )
+  
+;; 
 (define (map-alist-keys func list)
+  "map a  function FUNC over the keys of an alist LIST, leaving the vals. "
   (if (null?  list)
       '()
       (cons (cons (func (caar list)) (cdar list))
 	    (map-alist-keys func (cdr list)))
       ))
  
-;; map a function FUNC over the vals of  LIST, leaving the keys. 
+
+;; 
 (define (map-alist-vals func list)
+  "map a function FUNC over the vals of  LIST, leaving the keys."
   (if (null?  list)
       '()
       (cons (cons  (caar list) (func (cdar list)))
@@ -140,60 +208,30 @@
 		  '((paper11 . -3)
 		    (paper13 . -2)
 		    (paper16 . -1)
-		    (paper19 . -0.5)	
 		    (paper20 . 0)
 		    (paper23 . 1)
 		    (paper26 . 2)
 		    ))
   )
 
+;;
+;; make a kludged up paper-19 style sheet. Broken by virtual fonts.
+;;
+(if #f
+    (set! font-list-alist
+      (cons
+       (cons
+	'paper19
+	(map (lambda (x) (change-rhs-size x "20" "19"))
+	     paper20-style-sheet-alist))
+       font-list-alist)))
+
+(define-public (make-font-list sym)
+  (append size-independent-fonts
+	  (cdr (assoc sym font-list-alist))))
 
-(define (make-style-sheet sym)
-  `((fonts . ,(cdr (assoc sym font-list-alist)))
-    (font-defaults
-     . ((font-family . music)
-	(font-relative-size . 0)
-	(font-shape . upright)
-	(font-series . medium)
-	))
-    (style-alist
-     . ((finger . ((font-family . number) (font-relative-size . -3)))
-	(volta . ((font-family . number) (font-relative-size . -2)))
-	(tuplet . ((font-family . roman) (font-shape . italic) (font-relative-size . -1)))
-	(timesig . ((font-family .  number) (font-relative-size . 0)))
-	(mmrest . ((font-family . number) (font-relative-size . 1)))
-	(mark . ((font-family . number) (font-relative-size . 1)))
-	(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)))
-	))
-    (properties-to-font . ,properties-to-font-name)
-
-    ;; FIXME: this is a not-so-cool idea to use ALIGN
-    ;; RAISE, LOOKUP, since they are not proper elt-properties,
-    ;; and might interfere with them.
-    (markup-to-properties . ,markup-to-properties)
-    (abbreviation-alist
-     . ((rows . ((align . 0)))
-	(lines . ((align . 1)))
-	(roman . ((font-family . roman)))
-	(music . ((font-family . music) (font-shape . upright)))
-	(finger . ((font-style . finger)))
-	(bold . ((font-series . bold)))
-	(italic . ((font-shape . italic)))
-	(named . ((lookup . name)))
-	(super . ((raise . 1) (font-relative-size . -1)))
-	(sub . ((raise . -1) (font-relative-size . -1)))
-	(text . ((lookup . value)))
-	)
-     )
-    
-    )
-  )
-
-;; reduce the font list by successively applying a font-qualifier.
 (define (qualifiers-to-fontnames  qualifiers font-descr-alist)
+  " reduce the font list by successively applying a font-qualifier."
   (if (null? qualifiers)
       font-descr-alist
       
@@ -203,16 +241,17 @@
       )
   ))
 
-
-;; does FONT-DESC satisfy QUALIFIERS?
+(define (wild-eq? x y)
+  (or (eq? x y)
+      (eq? x '*)
+      (eq? y '*)))
+       
 (define (font-qualifies? qualifiers font-desc)
+  "does FONT-DESC satisfy QUALIFIERS?"
   (if (null? qualifiers) #t
-      (if (eq? (font-field (caar qualifiers) font-desc) (cdar qualifiers))
+      (if (wild-eq? (font-field (caar qualifiers) font-desc) (cdar qualifiers))
 	  (font-qualifies? (cdr qualifiers) font-desc)
-	  #f
-	  )
-	)
-  )
+	  #f)))
 
 (define (find-first-font qualifiers fonts)
   (if (null? fonts)
@@ -224,9 +263,10 @@
       ))
 
 
-;; return a single font from FONTS (or a default, if none found)
-;; and warn if the selected font is not unique.
 (define (select-unique-font qualifiers fonts)
+  "return a single font from FONTS (or a default, if none found)
+and warn if the selected font is not unique.
+"
   (let*  (
 	  (err (current-error-port))
 	  )
@@ -237,11 +277,11 @@
 	(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.
@@ -249,58 +289,43 @@
   ))
 
 
-(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))
-	    )
-	)
-      )
-  )
-
-;; TODO
-;; add support for override by font-name
-;; very often-used; hard-code in C++, and use SCM glue code.
-
-(define (properties-to-font-name fonts properties-alist-list)
-  (let*  (
-	  ;; change order to change priorities of qualifiers.
-	  (q-order    '(font-name font-family font-series font-shape font-point-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))	  
-	  )
+; there used to be a Scheme  properties-to-font-name function,
+; but that is  superseeded by the C++ version  out of speed concerns.
 
-    (if (equal? selected "")
-	(begin
-	  (display "\ncouldn't find any font satisfying " err)
-	  (write qualifiers err)
-	  "cmr10"
-	  )
-	selected)	; return the topmost.
-    ))
 
-(define (markup-to-properties sheet markup)
-  ;;(display "markup: `")
-  ;;(write markup)
-  ;;(display "'\n")
+(define-public (markup-to-properties abbrev-alist style-alist markup)
+  "DOCME."
+  ;; (display "markup: `")
+  ;; (write markup)
+  ;; (display "'\n")
+  
   (if (pair? markup)
-      (list markup)
+      ;; This is hairy.  We want to allow:
+      ;;    ((foo bar) "text")
+      ;;    ((foo (bar . 1)) "text")
+      ;;    ((foo . (0 . 1))) 
+      
+      (if (and (symbol? (car markup))
+	       (or (not (pair? (cdr markup)))
+		   (number? (cadr markup))))
+	  (if (equal? '() (cdr markup))
+	      (markup-to-properties abbrev-alist style-alist (car markup))
+	      (list markup))
+	  
+	  (if (equal? '() (cdr markup))
+	      (markup-to-properties abbrev-alist style-alist (car markup))
+	      (append (markup-to-properties abbrev-alist style-alist (car markup))
+		      (markup-to-properties abbrev-alist style-alist (cdr markup)))))
+      
+      ;; markup is single abbreviation
       (let ((entry (assoc markup
 			  ;; assoc-chain?
-			  (append (cdr (assoc 'abbreviation-alist sheet))
-				  (cdr (assoc 'style-alist sheet))))))
+			  (append abbrev-alist style-alist))))
 	(if entry
 	    (cdr entry)
 	    (list (cons markup #t))))))
 
+
 ; fixme, how's this supposed to work?
 ; and why don't we import font-setting from elt?
 (define (style-to-font-name sheet style)
@@ -319,15 +344,37 @@
 	font)	; return the topmost.
     ))
 
+(if #f (begin
+	 (define (test-module)
+	   (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))
+		    )
+	   )
+	 )
+
+
+)
+
+;;; ascii-script font init
+(define as-font-sheet-alist
+  '((as5 . (((* * * braces *) . ("as-braces9"))
+	    ((* * * number *) . "as-number1")
+	    ((0 * * music *) . ("as5"))
+	    ((0 * * roman *) . "as-dummy")))
+    (as9 . (((* * * braces *) . ("as-braces9"))
+	    ((0 medium upright number 10) . "as-number4")
+	    ((* * * number 5) . "as-number1")
+	    ((0 * * music *) . ("as9"))
+	    ((0 * * roman *) . "as-dummy")))))
 
+(define-public (as-make-font-list sym)
+  (set! font-list-alist
+	(append font-list-alist as-font-sheet-alist))
+  (make-font-list sym))
 
-; (define (test-module)
-;  (display (filter-list 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))
-; )