Fix autobeaming error in partial measures

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

diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index 9efd4f8328d2907118883bf8c3358d14b6a29d8f..3d03aa6e30338b587c296dd9e54941eb311dac11 100644 (file)
--- 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 (* output-scale paper-width))
+        (page-height (* output-scale paper-height))
         (page-set? (or (> page-count 1) landscape?)))
 
     (ly:outputter-output-scheme outputter
@@ -41,64 +44,42 @@
              '(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
-             `(width . ,(format #f "~s" page-width))
-             `(height . ,(format #f "~s" page-height))))
+             `(width . ,(ly:format "~2fmm" page-width))
+             `(height . ,(ly:format "~2fmm" page-height))
+             `(viewBox . ,(ly:format "0 0 ~4f ~4f"
+                                     paper-width paper-height))))
     
-;    (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)))))
+      (if page-set? (eo 'pageSet) "")))
     
     (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
      (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?
           (eo 'page '(page-orientation . "270"))
           (eo 'page))))
   
-  (dump (string-append (eo 'g )))
   (ly:outputter-dump-stencil outputter page)
-  (dump (string-append (ec 'g)))
   (if (or landscape? page-set?)
       (dump (ec 'page))))
-
-(define (embed-font string)
-  (let ((start (string-contains string "<defs>"))
-       (end (string-contains string "</defs>")))
-    (substring string (+ start 7) (- end 1))))
-
-(define (dump-fonts outputter paper)
-  (let* ((fonts (ly:paper-fonts paper))
-        (font-names (uniq-list (sort
-                                (filter string?
-                                        (map ly:font-file-name fonts)) string<?)))
-        (svgs (map
-               (lambda (x)
-                 (let ((file-name (ly:find-file (string-append x ".svg"))))
-                   (if file-name (embed-font (cached-file-contents file-name))
-                       (begin (ly:warning "cannot find SVG font ~S" x) ""))))
-               (filter string? font-names))))
-    (entity 'defs (string-join svgs "\n"))))
-