X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-svg.scm;h=1868057b25fcf4cf6309fceb6051ba834098da2c;hb=5507e6b9805037fb91f1a137dcd7f99f969bc8a2;hp=c514619daa8e1682ac149f18a0049733c1a4fc76;hpb=bf256b06cd11a7c7b554cf981e76c7f22b9f8d5e;p=lilypond.git

diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index c514619daa..1868057b25 100644
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -1,102 +1,81 @@
-;;;; framework-svg.scm --
+;;;; framework-svg.scm -- structure for SVG output
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;
+;;;; (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                Patrick McCarty <pnorcks@gmail.com>
 
-(define-module (scm framework-svg))
+;;;; Recommendations:
+;;;; http://www.w3.org/TR/SVG11/
+;;;; http://www.w3.org/TR/SVGTiny12/
+;;;;
+;;;; Working draft:
+;;;; http://www.w3.org/TR/SVGPrint/ -- for <pageSet> and <page>
 
-(use-modules (guile)
-	     (lily)
-	     (scm output-svg))
+;;;; TODO:
+;;;; * Once <pageSet> and <page> are supported by Inkscape and
+;;;;   other user agents, add a -d option (-dsvg-multiple-page)
+;;;;   that will create a single SVG file containing all pages
+;;;;   of output.  --pmccarty
 
-(use-modules (srfi srfi-1)
-	     (srfi srfi-2)
-	     (srfi srfi-13)
-	     (ice-9 regex))
+(define-module (scm framework-svg))
 
-(define-public (output-framework basename book scopes fields)
-  (let* ((filename (format "~a.svg" basename))
-	 (outputter  (ly:make-paper-outputter filename
-					      (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))
-	 (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)))
-	 (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-set? (or (> page-count 1) landscape?)))
+(use-modules
+  (guile)
+  (lily)
+  (scm page)
+  (scm output-svg)
+  (srfi srfi-1)
+  (srfi srfi-2)
+  (srfi srfi-13)
+  (ice-9 regex))
 
-    (ly:outputter-output-scheme outputter
-				`(begin (set! lily-unit-length ,unit-length) ""))
-    (dump (eo 'svg
-	      '(xmlns . "http://www.w3.org/2000/svg")
-	      '(version . "1.2")
+(define format ergonomic-simple-format)
 
-	      ;; Argggghhhh: SVG takes the px <-> mm mapping from the windowing system
-	      `(width . ,(format #f "~s" page-width))
-	      `(height . ,(format #f "~s" page-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)))))
-    
-    (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 (svg-header paper unit-length)
+  (let* ((lookup (lambda (x) (ly:output-def-lookup paper x)))
+	 (output-scale (* lily-unit->mm-factor unit-length))
+	 (paper-width (lookup 'paper-width))
+	 (paper-height (lookup 'paper-height))
+	 (page-width (* output-scale paper-width))
+	 (page-height (* output-scale paper-height)))
 
-(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)))
-  (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))))
+    `((xmlns . "http://www.w3.org/2000/svg")
+      (xmlns:xlink . "http://www.w3.org/1999/xlink")
+      (version . "1.2")
+      (width . ,(ly:format "~2fmm" page-width))
+      (height . ,(ly:format "~2fmm" page-height))
+      (viewBox . ,(ly:format "0 0 ~4f ~4f"
+			     paper-width paper-height)))))
 
-(define (embed-font string)
-  (let ((start (string-contains string "<defs>"))
-	(end (string-contains string "</defs>")))
-    (substring string (+ start 7) (- end 1))))
+(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))))
+	 (unit-length (ly:output-def-lookup paper 'output-scale)))
 
-(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:warn "cannot find SVG font ~S" x) ""))))
-		(filter string? font-names))))
-    (entity 'defs (string-join svgs "\n"))))
+    (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)))
 
+(define (output-framework basename book scopes fields)
+  (let* ((paper (ly:paper-book-paper book))
+	 (page-stencils (map page-stencil (ly:paper-book-pages book)))
+	 (page-number (1- (ly:output-def-lookup paper 'first-page-number)))
+	 (page-count (length page-stencils))
+	 (filename "")
+	 (file-suffix (lambda (num)
+			(if (= page-count 1) "" (format "-page-~a" num)))))
+
+    (for-each
+      (lambda (page)
+	(set! page-number (1+ page-number))
+	(set! filename (format "~a~a.svg"
+			       basename
+			       (file-suffix page-number)))
+	(dump-page paper filename page page-number page-count))
+      page-stencils)))