From: hanwen <hanwen> Date: Sat, 8 Jan 2005 12:40:51 +0000 (+0000) Subject: (output-framework): change calling convention. X-Git-Tag: release/2.5.23~702 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7d4bfd466898e062de3eed495d3a1be718304296;p=lilypond.git (output-framework): change calling convention. --- diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index e0b80c953e..875fd624b8 100644 --- 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 e67eb90526..6b9e346ead 100644 --- 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 259fde045f..0335a64917 100644 --- 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"))))