X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-svg.scm;h=a4cf2e996055305dbeb36730dc78247b0a1016a4;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=1dea920c8dda9a48f063a97bddbb3f327811408d;hpb=c021c6e22f7a49c4702b9a580427c0d11d5bacbe;p=lilypond.git

diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index 1dea920c8d..a4cf2e9960 100644
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -1,91 +1,199 @@
-;;;; framework-svg.scm --
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c)  2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2004--2015 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                Patrick McCarty <pnorcks@gmail.com>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+
+;;;; 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>
+
+;;;; 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
 
 (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))
-
-;; FIXME: 0.62 to get paper size right
-(define output-scale (* 0.62 scale-to-unit))
-
-(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))
-	 (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?)))
-    
-   (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)))))
-
-(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)))
-  (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)))
-  (ly:outputter-dump-stencil outputter page)
-  (ly:outputter-dump-string outputter (string-append (ec 'g)))
-  (if (or landscape? page-set?)
-      (ly:outputter-dump-string outputter (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:warn "cannot find SVG font ~S" x) ""))))
-		(filter string? font-names))))
-    (entity 'defs (string-join svgs "\n"))))
+(use-modules
+ (guile)
+ (lily)
+ (scm page)
+ (scm paper-system)
+ (scm output-svg)
+ (srfi srfi-1)
+ (srfi srfi-2)
+ (srfi srfi-13)
+ (ice-9 regex))
+
+(define format ergonomic-simple-format)
+
+(define (svg-begin . rest)
+  (eo 'svg
+      '(xmlns . "http://www.w3.org/2000/svg")
+      '(xmlns:xlink . "http://www.w3.org/1999/xlink")
+      '(version . "1.2")
+      `(width . ,(ly:format "~2fmm" (first rest)))
+      `(height . ,(ly:format "~2fmm" (second rest)))
+      `(viewBox . ,(ly:format "~4f ~4f ~4f ~4f"
+                              (third rest) (fourth rest)
+                              (fifth rest) (sixth rest)))))
+
+(define (svg-end)
+  (ec 'svg))
+
+(define (mkdirs dir-name mode)
+  (let loop ((dir-name (string-split dir-name #\/)) (root ""))
+    (if (pair? dir-name)
+        (let ((dir (string-append root (car dir-name))))
+          (if (not (file-exists? dir))
+              (mkdir dir mode))
+          (loop (cdr dir-name) (string-append dir "/"))))))
+
+(define output-dir #f)
+
+(define (svg-define-font font font-name scaling)
+  (let* ((base-file-name (basename (if (list? font) (pango-pf-file-name font)
+                                       (ly:font-file-name font)) ".otf"))
+         (woff-file-name (string-regexp-substitute "([.]otf)?$" ".woff"
+                                                   base-file-name))
+         (woff-file (or (ly:find-file woff-file-name) "/no-such-file.woff"))
+         (url (string-append output-dir "/fonts/" (lilypond-version) "/"
+                             (basename woff-file-name)))
+         (lower-name (string-downcase font-name)))
+    (if (file-exists? woff-file)
+        (begin
+          (if (not (file-exists? url))
+              (begin
+                (ly:message (_ "Updating font into: ~a") url)
+                (mkdirs (string-append output-dir "/" (dirname url)) #o700)
+                (copy-file woff-file url)
+                (ly:progress "\n")))
+          (ly:format
+           "@font-face {
+font-family: '~a';
+font-weight: normal;
+font-style: normal;
+src: url('~a');
+}
+"
+           font-name url))
+        "")))
+
+(define (woff-header paper dir)
+  "TODO:
+      * add (ly:version) to font name
+      * copy woff font with version alongside svg output
+"
+  (set! output-dir dir)
+  (string-append
+   (eo 'defs)
+   (eo 'style '(text . "style/css"))
+   "<![CDATA[
+"
+   (define-fonts paper svg-define-font svg-define-font)
+   "]]>
+"
+   (ec 'style)
+   (ec 'defs)))
+
+(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))))
+         (lookup (lambda (x) (ly:output-def-lookup paper x)))
+         (unit-length (lookup 'output-scale))
+         (output-scale (* lily-unit->mm-factor unit-length))
+         (device-width (lookup 'paper-width))
+         (device-height (lookup 'paper-height))
+         (page-width (* output-scale device-width))
+         (page-height (* output-scale device-height)))
+
+    (if (ly:get-option 'svg-woff)
+        (module-define! (ly:outputter-module outputter) 'paper paper))
+    (dump (svg-begin page-width page-height
+                     0 0 device-width device-height))
+    (if (ly:get-option 'svg-woff)
+        (module-remove! (ly:outputter-module outputter) 'paper))
+    (if (ly:get-option 'svg-woff)
+        (dump (woff-header paper (dirname filename))))
+    (dump (comment (format #f "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 (svg-end))
+    (ly:outputter-close outputter)))
+
+(define (dump-preview paper stencil filename)
+  (let* ((outputter (ly:make-paper-outputter (open-file filename "wb") 'svg))
+         (dump (lambda (str) (display str (ly:outputter-port outputter))))
+         (lookup (lambda (x) (ly:output-def-lookup paper x)))
+         (unit-length (lookup 'output-scale))
+         (x-extent (ly:stencil-extent stencil X))
+         (y-extent (ly:stencil-extent stencil Y))
+         (left-x (car x-extent))
+         (top-y (cdr y-extent))
+         (device-width (interval-length x-extent))
+         (device-height (interval-length y-extent))
+         (output-scale (* lily-unit->mm-factor unit-length))
+         (svg-width (* output-scale device-width))
+         (svg-height (* output-scale device-height)))
+
+    (if (ly:get-option 'svg-woff)
+        (module-define! (ly:outputter-module outputter) 'paper paper))
+    (dump (svg-begin svg-width svg-height
+                     left-x (- top-y) device-width device-height))
+    (if (ly:get-option 'svg-woff)
+        (module-remove! (ly:outputter-module outputter) 'paper))
+    (if (ly:get-option 'svg-woff)
+        (dump (woff-header paper (dirname filename))))
+    (ly:outputter-output-scheme outputter
+                                `(begin (set! lily-unit-length ,unit-length)
+                                        ""))
+    (ly:outputter-dump-stencil outputter stencil)
+    (dump (svg-end))
+    (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 #f "-page-~a" num)))))
+    (for-each
+     (lambda (page)
+       (set! page-number (1+ page-number))
+       (set! filename (format #f "~a~a.svg"
+                              basename
+                              (file-suffix page-number)))
+       (dump-page paper filename page page-number page-count))
+     page-stencils)))
 
+(define (output-preview-framework basename book scopes fields)
+  (let* ((paper (ly:paper-book-paper book))
+         (systems (relevant-book-systems book))
+         (to-dump-systems (relevant-dump-systems systems)))
+    (dump-preview paper
+                  (stack-stencils Y DOWN 0.0
+                                  (map paper-system-stencil
+                                       (reverse to-dump-systems)))
+                  (format #f "~a.preview.svg" basename))))