Merge branch 'master' into lilypond/translation

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index 539e1aaee21ec42d4629a1c391b6db98b15546f1..73287b6635c8c57edfa33d167619d52aa370f48d 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -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)