Merge with master

[lilypond.git] / scm / framework-svg.scm

diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index d2948e9014107197522257472e53ee6eec8b7f5e..2e40558e64d448045218286f58cfcd77ca1d092b 100644 (file)
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -1,13 +1,15 @@
-;;;; framework-svg.scm --
+;;
+;; framework-svg.scm -- structure for SVG output
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-module (scm framework-svg))
 
 (use-modules (guile)
             (lily)
+            (scm page)
             (scm output-svg))
 
 (use-modules (srfi srfi-1)
@@ -17,27 +19,28 @@
 
 (define-public (output-framework basename book scopes fields)
   (let* ((filename (format "~a.svg" basename))
-        (outputter  (ly:make-paper-outputter filename
+        (outputter  (ly:make-paper-outputter (open-file filename "wb")
                                              (ly:output-backend)))
         (dump (lambda (str) (display str (ly:outputter-port outputter))))
         (paper (ly:paper-book-paper book))
-        (unit-length (ly:output-def-lookup paper 'outputscale))
+        (unit-length (ly:output-def-lookup paper 'output-scale))
         (output-scale (* lily-unit->mm-factor
                          unit-length))
-        (pages (ly:paper-book-pages book))
+        (page-stencils (map page-stencil (ly:paper-book-pages book)))
         (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
-        (page-number (1- (ly:output-def-lookup paper 'firstpagenumber)))
-        (page-count (length pages))
-        (hsize (ly:output-def-lookup paper 'hsize))
-        (vsize (ly:output-def-lookup paper 'vsize))
-        (page-width (inexact->exact (ceiling (* output-scale hsize))))
-        (page-height (inexact->exact (ceiling (* output-scale vsize))))
+        (page-number (1- (ly:output-def-lookup paper 'first-page-number)))
+        (page-count (length page-stencils))
+        (paper-width (ly:output-def-lookup paper 'paper-width))
+        (paper-height (ly:output-def-lookup paper 'paper-height))
+        (page-width (inexact->exact (ceiling (* output-scale paper-width))))
+        (page-height (inexact->exact (ceiling (* output-scale paper-height))))
         (page-set? (or (> page-count 1) landscape?)))
 
     (ly:outputter-output-scheme outputter
                                `(begin (set! lily-unit-length ,unit-length) ""))
     (dump (eo 'svg
              '(xmlns . "http://www.w3.org/2000/svg")
+             '(xmlns:xlink . "http://www.w3.org/1999/xlink")
              '(version . "1.2")
 
              ;; Argggghhhh: SVG takes the px <-> mm mapping from the windowing system
@@ -50,13 +53,14 @@
       ;; FIXME: only use pages if there are more than one, pageSet is
       ;; not supported by all SVG applications yet.
       (if page-set? (eo 'pageSet) "")
-      (eo 'g `(transform . ,(format "scale(~a,~a)" output-scale output-scale)))))
+      (eo 'g `(transform . ,(format "scale(~a, ~a) "
+                                   output-scale output-scale)))))
     
     (for-each
      (lambda (page)
        (set! page-number (1+ page-number))
        (dump-page outputter page page-number page-count landscape? page-set?))
-     pages)
+     page-stencils)
     
     (if page-set? (eo 'pageSet) "")
     (dump
@@ -75,7 +79,7 @@
           (eo 'page '(page-orientation . "270"))
           (eo 'page))))
   
-  (dump (string-append (eo 'g)))
+  (dump (string-append (eo 'g )))
   (ly:outputter-dump-stencil outputter page)
   (dump (string-append (ec 'g)))
   (if (or landscape? page-set?)
@@ -95,7 +99,7 @@
                (lambda (x)
                  (let ((file-name (ly:find-file (string-append x ".svg"))))
                    (if file-name (embed-font (cached-file-contents file-name))
-                       (begin (ly:warn "cannot find SVG font ~S" x) ""))))
+                       (begin (ly:warning "cannot find SVG font ~S" x) ""))))
                (filter string? font-names))))
     (entity 'defs (string-join svgs "\n"))))