* scm/framework-svg.scm (output-framework): put scaling in

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

diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index 038873fc7a9051c8ab2ccf267084c14e2f35194f..2cea3735a0f6984b6f2d8911a2adce3ec60c0e1d 100644 (file)
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -6,17 +6,30 @@
 
 (define-module (scm framework-svg))
 
-(use-modules (guile) (lily) (scm output-svg))
-(use-modules (srfi srfi-1) (srfi srfi-2) (srfi srfi-13) (ice-9 regex))
+(use-modules (guile)
+            (lily)
+            (scm output-svg))
 
-;; FIXME: 0.62 to get paper size right
-(define output-scale (* 0.62 scale-to-unit))
+(use-modules (srfi srfi-1)
+            (srfi srfi-2)
+            (srfi srfi-13)
+            (ice-9 regex))
+
+(if #t
+    (begin
+      (debug-enable 'debug)
+      (debug-enable 'backtrace)
+      (read-enable 'positions)))
 
 (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))
+        (dump (lambda (str) (display str (ly:outputter-port outputter))))
+        (paper (ly:paper-book-paper book))
+        (unit-length (ly:output-def-lookup paper 'outputscale))
+        (output-scale (* lily-unit->mm-factor
+                         unit-length))
         (pages (ly:paper-book-pages book))
         (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
         (page-number (1- (ly:output-def-lookup paper 'firstpagenumber)))
@@ -26,50 +39,53 @@
         (page-width (inexact->exact (ceiling (* output-scale hsize))))
         (page-height (inexact->exact (ceiling (* output-scale vsize))))
         (page-set? (or (> page-count 1) landscape?)))
+
+    (ly:outputter-output-scheme outputter
+                               `(set! lily-unit-length ,unit-length))
+    (dump (eo 'svg
+             '(xmlns . "http://www.w3.org/2000/svg")
+             '(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))))
     
-   (ly:outputter-dump-string
-    outputter
-     (eo 'svg
-        '(xmlns . "http://www.w3.org/2000/svg")
-        '(version . "1.2")
-        `(width . ,(format #f "~smm" page-width))
-        `(height . ,(format #f "~smm" page-height))))
-   
-   (ly:outputter-dump-string outputter (dump-fonts outputter paper))
-   (ly:outputter-dump-string
-    outputter
-    (string-append
-     ;; 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)))
-       
-  (for-each
-   (lambda (page)
-     (set! page-number (1+ page-number))
-     (dump-page outputter page page-number page-count landscape? page-set?))
-   pages)
-  
-  (if page-set? (eo 'pageSet) "")
-  (ly:outputter-dump-string
-   outputter
-   (string-append
-    (ec 'g)
-    (if page-set? (ec 'pageSet) "")
-    (ec 'svg)))))
+    (dump (dump-fonts outputter paper))
+    (dump
+     (string-append
+      ;; 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)))))
+    
+    (for-each
+     (lambda (page)
+       (set! page-number (1+ page-number))
+       (dump-page outputter page page-number page-count landscape? page-set?))
+     pages)
+    
+    (if page-set? (eo 'pageSet) "")
+    (dump
+     (string-append
+      (ec 'g)
+      (if page-set? (ec 'pageSet) "")
+      (ec 'svg)))))
 
 (define (dump-page outputter page page-number page-count landscape? page-set?)
-  (ly:outputter-dump-string
-   outputter (comment (format #f "Page: ~S/~S" page-number page-count)))
+  (define (dump str) (display str (ly:outputter-port outputter)))
+  
+  (dump (comment (format #f "Page: ~S/~S" page-number page-count)))
   (if (or landscape? page-set?)
-      (ly:outputter-dump-string
-       outputter
-       (if landscape? (eo 'page '(page-orientation . "270")) (eo 'page))))
-  (ly:outputter-dump-string outputter (string-append (eo 'g)))
+      (dump
+       (if landscape?
+          (eo 'page '(page-orientation . "270"))
+          (eo 'page))))
+  
+  (dump (string-append (eo 'g)))
   (ly:outputter-dump-stencil outputter page)
-  (ly:outputter-dump-string outputter (string-append (ec 'g)))
+  (dump (string-append (ec 'g)))
   (if (or landscape? page-set?)
-      (ly:outputter-dump-string outputter (ec 'page))))
+      (dump (ec 'page))))
 
 (define (embed-font string)
   (let ((start (string-contains string "<defs>"))