Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

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

diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index 9bc11ae2a3f8f5a2a533756b0a876567365173ab..ad707a7b894f924bf42198fe222345b16761ec14 100644 (file)
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2004--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2004--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                Patrick McCarty <pnorcks@gmail.com>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -58,27 +58,61 @@
 (define (svg-end)
   (ec 'svg))
 
-(define (woff-header)
+(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:
-      * dynamically add fonts based on usage
       * 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[
-        @font-face {
-          font-family: 'emmentaler-20';
-          font-weight: normal;
-          font-style: normal;
-          src: url('emmentaler-20.woff');
-        }
-      ]]>
-   "
+   "<![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))))
@@ -90,11 +124,15 @@
         (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)
-       (dump (woff-header)))
-    (dump (comment (format "Page: ~S/~S" page-number page-count)))
+       (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)
                                        ""))
@@ -117,10 +155,14 @@
         (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)
-       (dump (woff-header)))
+    (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)
                                        ""))
@@ -136,11 +178,11 @@
         (page-count (length page-stencils))
         (filename "")
         (file-suffix (lambda (num)
-                       (if (= page-count 1) "" (format "-page-~a" num)))))
+                       (if (= page-count 1) "" (format #f "-page-~a" num)))))
     (for-each
       (lambda (page)
        (set! page-number (1+ page-number))
-       (set! filename (format "~a~a.svg"
+       (set! filename (format #f "~a~a.svg"
                               basename
                               (file-suffix page-number)))
        (dump-page paper filename page page-number page-count))
@@ -154,4 +196,4 @@
                  (stack-stencils Y DOWN 0.0
                                  (map paper-system-stencil
                                       (reverse to-dump-systems)))
-                 (format "~a.preview.svg" basename))))
+                 (format #f "~a.preview.svg" basename))))