(output-framework): change calling convention.

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index e0b80c953e875ed2f6c00b38e2d40582cc798cd9..875fd624b8fb3559682fa98df70ffb25b5e48978 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -9,9 +9,9 @@
 @itemize @bullet
 
 @item
-LilyPond now optionally uses Pango and FontConfig for selecting and
-rendering internationalized text. This is supported for backends other
-than @TeX{}. A font may be selected by using a FontConfig name,
+LilyPond now uses Pango and FontConfig for selecting and rendering
+internationalized text in non-@TeX{} backends. A font may be selected
+by using a FontConfig name,
 
 @example
 \override TextScript #'font-name = #"Serif"
@@ -19,10 +19,10 @@ than @TeX{}. A font may be selected by using a FontConfig name,
 
 
 @noindent
-or by setting individual properties,
+or using the classic font selection mechanism
 
 @example
-\override TextScript #'font-family = #'Times
+\override TextScript #'font-family = #'roman
 \override TextScript #'font-series = #'bold
 @end example
 

diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index e67eb9052670ccab9ff4201d2616b6b3568729ba..6b9e346ead47d8e8678b64c3af7c13daa1e6eb8e 100644 (file)
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -18,7 +18,7 @@
  (gnome gtk gdk-event)
  (gnome gw canvas))
 
-(define-public (output-framework outputter book scopes fields basename)
+(define-public (output-framework basename book scopes fields )
   (gnome-main book basename))
 
 (define SCROLLBAR-SIZE 20)

diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index 259fde045f6c5b12adc59fecd634bb5d5478093b..0335a6491793da2e4d47d62de539c8476d8c1082 100644 (file)
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -12,8 +12,11 @@
 ;; FIXME: 0.62 to get paper size right
 (define output-scale (* 0.62 scale-to-unit))
 
-(define-public (output-framework outputter book scopes fields basename)
-  (let* ((paper (ly:paper-book-paper book))
+(define-public (output-framework basename book scopes fields)
+  (let* ((filename (format "~a.svg" basename))
+        (outputter  (ly:make-paper-outputter filename
+                                             (ly:output-backend)))
+        (paper (ly:paper-book-paper book))
         (pages (ly:paper-book-pages book))
         (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
         (page-number (1- (ly:output-def-lookup paper 'firstpagenumber)))
@@ -75,7 +78,9 @@
 
 (define (dump-fonts outputter paper)
   (let* ((fonts (ly:paper-fonts paper))
-        (font-names (uniq-list (sort (map ly:font-file-name fonts) string<?)))
+        (font-names (uniq-list (sort
+                                (filter string?
+                                        (map ly:font-file-name fonts)) string<?)))
         (svgs (map
                (lambda (x)
                  (let ((file-name (ly:find-file (string-append x ".svg"))))