X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-svg.scm;h=2e40558e64d448045218286f58cfcd77ca1d092b;hb=ee95bfc817f230721c7c040f8bd43251d17f3e93;hp=49841f25c5cd57f5f64f14c97400c245bc2c1a9b;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index 49841f25c5..2e40558e64 100644
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -9,6 +9,7 @@
 
 (use-modules (guile)
 	     (lily)
+	     (scm page)
 	     (scm output-svg))
 
 (use-modules (srfi srfi-1)
@@ -22,17 +23,17 @@
 					      (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
@@ -59,7 +60,7 @@
      (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