* input/mutopia/W.A.Mozart/mozart-hrn-3.ly: Mozart died in 1791

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index ec561cc5abd66b55c36a4c80449041e2261b2086..ffe7b00ce544b5dc95170c4d83bc5fe70bf6b305 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -118,25 +118,23 @@
        ((qual (font-qualifier node))
         (def (font-default node))
         (val (chain-assoc-get qual alist-chain def))
-        (desired-font (lookup-font
-                       (hashq-ref (font-children node)
-                                  val) alist-chain))
-
-        (default (hashq-ref (font-children node) def))
-        (font (if desired-font
-                  desired-font
-                  (g-lookup-font (hashq-ref (font-children node)
-                                          def) alist-chain)))
+        (desired-child (hashq-ref (font-children node) val))
         )
-      font))
+
+    (if desired-child
+       (g-lookup-font desired-child alist-chain)
+       (g-lookup-font (hashq-ref (font-children node) def) alist-chain)
+       )))
 
 (define-method (g-lookup-font (node <Font-tree-leaf>) alist-chain)
   node)
 
+;; two step call  is handy for debugging.
 (define (lookup-font node alist-chain)
   (g-lookup-font node alist-chain))
 
 
+
 (define-public (make-font-tree factor)
   (let*
       ((n (make-font-tree-node 'font-encoding 'music))