use trap to remove tmp directory on failure to avoid hiding mpost

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index 84646d6c3f614e18109540fa1b5ce18ec46518db..d759d60934590614bfb3c070d064d67e82760515 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -167,7 +167,7 @@ Arguments:
 @var{design-size-alist} is a list of @code{(rounded . designsize)}.
 @code{rounded} is a suffix for font filenames, while @code{designsize}
 should be the actual design size.  The latter is used for text fonts
-loaded through pango/fontconfig.
+loaded through pango/@/fontconfig.
 
 @item
 @var{factor} is a size factor relative to the default size that is being
@@ -185,7 +185,7 @@ used.  This is used to select the proper design size for the text fonts.
               ,(list->vector
                 (map (lambda (tup)
                        (cons (ly:pt (cdr tup))
-                             (format "~a-~a ~a"
+                             (format #f "~a-~a ~a"
                                      name
                                      (car tup)
                                      (ly:pt (cdr tup)))))
@@ -194,12 +194,12 @@ used.  This is used to select the proper design size for the text fonts.
                ,(list->vector
                  (map (lambda (size-tup)
                         (delay (ly:system-font-load
-                                (format "~a-~a" name (car size-tup)))))
+                                (format #f "~a-~a" name (car size-tup)))))
                       design-size-alist
                       )))
      (fetaBraces ,(ly:pt 20.0)
                 #(,(delay (ly:system-font-load
-                           (format "~a-brace" name)))))
+                           (format #f "~a-brace" name)))))
      )))
                 
 (define-public (add-pango-fonts node lily-family family factor)
@@ -239,7 +239,7 @@ used.  This is used to select the proper design size for the text fonts.
 
 (define-public (make-century-schoolbook-tree factor)
   (make-pango-font-tree
-    "Century Schoolbook L,serif"
+    "Century Schoolbook L"
     "sans-serif" "monospace" factor))
 
 (define-public all-text-font-encodings