X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-svg.scm;h=b2e0b5604d8edbfd599c0e4af6b5f72ca44451cd;hb=9a2ec61184ccd4598312ce81cf9638ac1784d1f5;hp=9efd4f8328d2907118883bf8c3358d14b6a29d8f;hpb=6eced6a93bbfda6e6af37a7d77a8e75a5052dbee;p=lilypond.git

diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index 9efd4f8328..b2e0b5604d 100644
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -3,12 +3,13 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-module (scm framework-svg))
 
 (use-modules (guile)
 	     (lily)
+	     (scm page)
 	     (scm output-svg))
 
 (use-modules (srfi srfi-1)
@@ -16,23 +17,25 @@
 	     (srfi srfi-13)
 	     (ice-9 regex))
 
+(define format ergonomic-simple-format)
+
 (define-public (output-framework basename book scopes fields)
   (let* ((filename (format "~a.svg" basename))
 	 (outputter  (ly:make-paper-outputter (open-file filename "wb")
-					      (ly:output-backend)))
+					      (ly:get-option '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
@@ -43,10 +46,10 @@
 	      '(version . "1.2")
 
 	      ;; Argggghhhh: SVG takes the px <-> mm mapping from the windowing system
-	      `(width . ,(format #f "~s" page-width))
-	      `(height . ,(format #f "~s" page-height))))
+	      `(width . ,(format "~s" page-width))
+	      `(height . ,(format "~s" page-height))))
     
-;    (dump (dump-fonts outputter paper))
+    (dump (dump-fonts outputter paper))
     (dump
      (string-append
       ;; FIXME: only use pages if there are more than one, pageSet is
@@ -59,19 +62,22 @@
      (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
      (string-append
       (ec 'g)
       (if page-set? (ec 'pageSet) "")
-      (ec 'svg)))))
+      (ec 'svg)))
+    
+    (ly:outputter-close outputter)
+    ))
 
 (define (dump-page outputter page page-number page-count landscape? page-set?)
   (define (dump str) (display str (ly:outputter-port outputter)))
   
-  (dump (comment (format #f "Page: ~S/~S" page-number page-count)))
+  (dump (comment (format "Page: ~S/~S" page-number page-count)))
   (if (or landscape? page-set?)
       (dump
        (if landscape?