Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index 4173aa424269b79281269354cb1056538fa1f183..65ee3fec13c6c751b24e03785130eeb77822ebd7 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; TODO:
 ;;
@@ -34,7 +34,7 @@
 (define-method (display (leaf <Font-tree-leaf>) port)
   (map (lambda (x) (display x port))
        (list
-       "#<Font-size-family: \n"
+       "#<Font-size-family:\n"
        (slot-ref leaf 'default-size) 
        (slot-ref leaf 'size-vector)
        "#>"
@@ -47,7 +47,7 @@
      (display x port))
 
    (list
-    "Font_node { \nqual: "
+    "Font_node {\nqual: "
     (font-qualifier node)
     "(def: "
     (font-default node)
@@ -59,7 +59,7 @@
      (display "=" port)
      (display (cdr x) port))
    (hash-table->alist (font-children node)))
-  (display "} } \n"))
+  (display "} }\n"))
 
 
 (define default-qualifier-order
@@ -322,6 +322,7 @@
                       (ly:pt 12)))))))
 
   (add-node 'upright 'normal) 
+  (add-node 'caps 'normal) 
   (add-node 'upright 'bold) 
   (add-node 'italic 'normal)
   (add-node 'italic 'bold))
@@ -358,5 +359,8 @@
     "Century Schoolbook L" 
     "Sans" "Mono" factor))
 
-(define-public (magstep x)
-  (exp (* (/ x 6) (log 2))))
+(define-public (magstep s)
+  (exp (* (/ s 6) (log 2))))
+
+(define-public (magnification->font-size m)
+  (* 6 (/ (log m) (log 2))))