* Documentation/user/tutorial.itely (Running LilyPond): Mention

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index 93fd56addf7ede80a791d610d5524383aa77e35e..f72a401b67884b8c46c480b4c372d55a73b79f5f 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -84,13 +84,17 @@
 
     ((3 medium italic roman 12) . "cmti12")
     ((2 medium italic roman 12) . "cmti12")
-    ((1 medium italic roman 12) . "cmti12")
-    ((0 medium italic roman 10) . "cmti10")
-    ((-1 medium italic roman 8) . "cmti8")    
-    ((-2 medium italic roman 7) . "cmti7")
+    ((1 medium italic roman 12) . "cmti12") ;;; ugh. Should add magnification here! 
+    ((0 medium italic roman 10) . "cmti12")
+    ((-1 medium italic roman 8) . "cmti10")    
+    ((-2 medium italic roman 7) . "cmti8")
     ((-3 medium italic roman 7) . "cmti7")    
 
-    ((2 bold upright roman 12) . "cmbx12")
+    ;;; 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")
@@ -99,6 +103,7 @@
     ((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")
     
@@ -134,7 +139,6 @@
     ((2 * * music 26) . "feta26")
     ((1 * * music 23) . "feta23")
     ((0 * * music 20) . "feta20")
-    ((-0.5 * * music 20) . "feta19")    
     ((-1 * * music 16) . "feta16")
     ((-2 * * music 13) . "feta13")
     ((-3 * * music 11) . "feta11")
@@ -143,7 +147,6 @@
     ((2 * * ancient 26) . "parmesan26")
     ((1 * * ancient 23) . "parmesan23")
     ((0 * * ancient 20) . "parmesan20")
-    ((-0.5 * * ancient 20) . "parmesan19")    
     ((-1 * * ancient 16) . "parmesan16")
     ((-2 * * ancient 13) . "parmesan13")
     ((-3 * * ancient 11) . "parmesan11")
@@ -161,6 +164,13 @@
   (cons (- (car font-desc) decrement) (cdr font-desc))
   )
 
+(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. "
@@ -170,6 +180,7 @@
            (map-alist-keys func (cdr list)))
       ))
  
+
 ;; 
 (define (map-alist-vals func list)
   "map a function FUNC over the vals of  LIST, leaving the keys."
@@ -190,13 +201,19 @@
                  '((paper11 . -3)
                    (paper13 . -2)
                    (paper16 . -1)
-                   (paper19 . -0.5)    
                    (paper20 . 0)
                    (paper23 . 1)
                    (paper26 . 2)
                    ))
   )
 
+(set! font-list-alist
+      (cons
+       (cons
+       'paper19
+       (map (lambda (x) (change-rhs-size x "20" "19"))
+            paper20-style-sheet-alist))
+       font-list-alist))
 
 (define (make-style-sheet sym)
   `((fonts . ,(append paper-style-sheet-alist
@@ -218,7 +235,12 @@
        (mmrest . ((font-family . number) ))
        (mmrest-symbol . ((font-family . music) ))
 
-       (mark . ((font-family . number) (font-relative-size . 1)))
+       (mark-number . ((font-family . number) (font-relative-size . 1)))
+       (mark-letter . ((font-family . roman)
+                       (font-series . bold)
+                       (font-shape . upright)
+                       (font-relative-size . 2)))
+       
        (script . ((font-family . roman) (font-relative-size . -1)))
        (large . ((font-family . roman) (font-relative-size . 1)))
        (Large . ((font-series . bold) (font-family . roman)