From: Patrick McCarty Date: Mon, 10 Aug 2009 02:12:37 +0000 (-0700) Subject: SVG backend: the output-scale must come from \paper X-Git-Tag: release/2.13.4-1~179^2~138 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a5ca2a1c6de0c82e2c251e797ae9621b08293321;p=lilypond.git SVG backend: the output-scale must come from \paper I removed this in a previous patch, but that was a mistake. This patch readds the procedure that exports the correct value of output-scale to the output-svg module. --- diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm index 5418d69014..22cd6160e1 100644 --- a/scm/framework-svg.scm +++ b/scm/framework-svg.scm @@ -32,9 +32,8 @@ (define format ergonomic-simple-format) -(define (svg-header paper) +(define (svg-header paper unit-length) (let* ((lookup (lambda (x) (ly:output-def-lookup paper x))) - (unit-length (lookup 'output-scale)) (output-scale (* lily-unit->mm-factor unit-length)) (paper-width (lookup 'paper-width)) (paper-height (lookup 'paper-height)) @@ -51,10 +50,15 @@ (define (dump-page paper filename page page-number page-count) (let* ((outputter (ly:make-paper-outputter (open-file filename "wb") 'svg)) - (dump (lambda (str) (display str (ly:outputter-port outputter))))) + (dump (lambda (str) (display str (ly:outputter-port outputter)))) + (unit-length (ly:output-def-lookup paper 'output-scale))) - (dump (apply eo 'svg (svg-header paper))) + (dump (apply eo 'svg (svg-header paper unit-length))) (dump (comment (format "Page: ~S/~S" page-number page-count))) + (ly:outputter-output-scheme outputter + `(begin (set! lily-unit-length + ,unit-length) + "")) (ly:outputter-dump-stencil outputter page) (dump (ec 'svg)) (ly:outputter-close outputter)))