patch::: 1.3.99.jcn1

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index d11a23a3c8c3bc5d689e83a2ce282abc1f49914c..955fe0dcf52b5c9d6f786d39c842f483948040bc 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -10,8 +10,9 @@
   `(
     (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)))
+    (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)))
@@ -60,52 +61,61 @@
 
 (define paper20-style-sheet-alist
   '(
+    ((2 medium upright music feta 26) . "feta26")
+    ((1 medium upright music feta 23) . "feta23")
     ((0 medium upright music feta 20) . "feta20")
     ((-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 music feta 23) . "feta23")
-    ((2 medium upright music feta 26) . "feta26")
+    ((-3 medium upright music feta 11) . "feta11")
+    ((-4 medium upright music feta 11) . "feta11")
+    ((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")
-    ((0 medium italic roman cmti 10) . "cmti10")
+    ((-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")
+    ((2 medium italic roman cmti 12) . "cmti14")
     ((1 medium italic roman cmti 12) . "cmti12")
-    ((3 bold italic dynamic feta 10) . "feta-din13")
-    ((2 bold italic dynamic feta 10) . "feta-din13")
-    ((1 bold italic dynamic feta 10) . "feta-din12")
-    ((0 bold italic dynamic feta 10) . "feta-din10")
-    ((-1 bold italic dynamic feta 10) . "feta-din8")
-    ((-2 bold italic dynamic feta 10) . "feta-din7")
-    ((-3 bold italic dynamic feta 10) . "feta-din6")
-    ((-4 bold italic dynamic feta 10) . "feta-din5")
-    ((-5 bold italic dynamic feta 10) . "feta-din4")
+    ((0 medium italic roman cmti 10) . "cmti10")
+    ((-1 medium italic roman cmti 10) . "cmti8")
+    ((-2 medium italic roman cmti 10) . "cmti7")
+    ((-3 medium italic roman cmti 10) . "cmti6")
+    ((3 bold italic dynamic feta 16) . "feta-din16")
+    ((2 bold italic dynamic feta 16) . "feta-din16")
+    ((1 bold italic dynamic feta 13) . "feta-din13")
+    ((0 bold italic dynamic feta 11) . "feta-din11")
+    ((-1 bold italic dynamic feta 10) . "feta-din10")
+    ((-2 bold italic dynamic feta 8) . "feta-din8")
+    ((-3 bold italic dynamic feta 7) . "feta-din7")
+    ((-4 bold italic dynamic feta 5) . "feta-din5")
+    ((-5 bold italic dynamic feta 4) . "feta-din4")
     ((3 medium upright number feta-nummer 13) . "feta-nummer13")
     ((2 medium upright number feta-nummer 13) . "feta-nummer13")
-    ((1 medium upright number feta-nummer 12) . "feta-nummer12")
+    ((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")
+    ((-2 medium upright number feta-nummer 7) . "feta-nummer7")
     ((-3 medium upright number feta-nummer 5) . "feta-nummer5")
     ((-4 medium upright number feta-nummer 4) . "feta-nummer4")
-    ((0 medium upright roman cmr 10) . "cmr10")
+    ((2 bold upright roman cmbx 14) . "cmbx14")
+    ((1 bold upright roman cmbx 12) . "cmbx12")
     ((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" )
-    ((2 bold upright roman cmbx 10) . "cmbx10")
-    ((1 bold upright roman cmbx 12) . "cmbx12")
-    ((-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")
+    ((-1 medium upright math msam 10) . "msam10")
+    ((-2 medium upright math msam 10) . "msam10")
+    ((-3 medium upright math msam 10) . "msam10")
     ))
 
 
-;; return a FONT-DESCR with relative size incremented by INCREMENT 
-(define (change-relative-size font-desc increment)
-  (cons (+ increment (car font-desc)) (cdr font-desc))
+;; 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))
   )
 
 ;; map a  function FUNC over the keys of an alist LIST, leaving the vals.