X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-svg.scm;h=d3e04b26e883fba3dd134576191e674e015d9774;hb=5d5ab122005e6b3ed4e1c91d935b25c22b5a8982;hp=80199a1f952871334a18b8dd595e38152c59ba9d;hpb=8370d0245cc227ed2ab9b4e92f0ab220d7de2f21;p=lilypond.git

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index 80199a1f95..d3e04b26e8 100644
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -63,7 +63,8 @@
   "c = close"
   (format "</~S>\n" entity))
 
-
+(define-public (comment s)
+  (string-append "<!-- " s " -->\n"))
 
 (define-public (entity entity string . attributes-alist)
   (if (equal? string "")
@@ -81,7 +82,7 @@
 	(cons (format "~S,~S" (car lst) (cadr lst))
 	      (helper (cddr lst)))))
 
-  (string-join (helper lst) " "))  
+  (string-join (helper lst) " "))
 
 
 (define (svg-bezier lst close)
@@ -111,98 +112,60 @@
   (make-regexp "^(<[a-z]+) (.*>)"))
 
 (define pango-description-regexp-comma
-  (make-regexp "([^,]+), ?([-a-zA-Z_]*) ([0-9.]+)$"))
+  (make-regexp ",( Bold)?( Italic)?( Small-Caps)? ([0-9.]+)$"))
 
 (define pango-description-regexp-nocomma
-  (make-regexp "([^ ]+) ([-a-zA-Z_]*) ?([0-9.]+)$"))
+  (make-regexp "( Bold)?( Italic)?( Small-Caps)? ([0-9.]+)$"))
 
-(define (pango-description-to-svg-font str)
+(define (pango-description-to-svg-font str expr)
+  (define alist '())
+  (define (set-attribute attr val)
+    (set! alist (assoc-set! alist attr val)))
   (let*
-      ((size 4.0)
-       (family "Helvetica")
-       (style #f)
-       (match-1 (regexp-exec pango-description-regexp-comma str))
-       (match-2 (regexp-exec pango-description-regexp-nocomma str))
-       (match (if match-1
-		  match-1
-		  match-2)))
+    ((match-1 (regexp-exec pango-description-regexp-comma str))
+     (match-2 (regexp-exec pango-description-regexp-nocomma str))
+     (match (if match-1
+		match-1
+		match-2)))
 
     (if (regexp-match? match)
 	(begin
-	  (set! family (match:substring match 1))
-	  (if (< 0 (string-length (match:substring match 2)))
-	      (set! style (match:substring match 2)))
-	  (set! size
-		(string->number (match:substring match 3))))
-
+	  (set-attribute 'font-family (match:prefix match))
+	  (if (string? (match:substring match 1))
+	      (set-attribute 'font-weight "bold"))
+	  (if (string? (match:substring match 2))
+	      (set-attribute 'font-style "italic"))
+	  (if (string? (match:substring match 3))
+	      (set-attribute 'font-variant "small-caps"))
+	  (set-attribute 'font-size
+			 (/ (string->number (match:substring match 4))
+			    lily-unit-length))
+	  (set-attribute 'text-anchor "start")
+	  (set-attribute 'fill "currentColor"))
 	(ly:warning (_ "cannot decypher Pango description: ~a") str))
 
-    (set! style
-	  (if (string? style)
-	      (format "font-style:~a;" style)
-	      ""))
-    
-    (format "font-family:~a;~afont-size:~a;text-anchor:west"
-	    family
-	    style
-	    (/ size lily-unit-length))
-    ))
-
-;;; FONT may be font smob, or pango font string
-(define (svg-font font)
-  (if (string? font)
-      (pango-description-to-svg-font font)
-      (let ((name-style (font-name-style font))
-	    (size (modified-font-metric-font-scaling font))
-	    (anchor "west"))
+    (apply entity 'text expr (reverse! alist))))
 
-	(format "font-family:~a;font-style:~a;font-size:~a;text-anchor:~a;"
-		(car name-style) (cadr name-style)
-		size anchor))))
+(define (font-smob-to-svg-font font expr)
+  (let ((name-style (font-name-style font))
+	(size (modified-font-metric-font-scaling font)))
+
+    (entity 'text expr
+	    ;; FIXME: The cdr of `name-style' cannot select the
+	    ;; correct SVG font, so we ignore this information for now
+	    `(font-family . ,(car name-style))
+	    `(font-size . ,size)
+	    '(text-anchor . "start"))))
 
 (define (fontify font expr)
-  (entity 'text expr
-	  `(style . ,(svg-font font))
-	  '(fill . "currentColor")
-	  ))
+  (if (string? font)
+      (pango-description-to-svg-font font expr)
+      (font-smob-to-svg-font font expr)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; stencil outputters
 ;;;
 
-;;; catch-all for missing stuff
-;;; comment this out to see find out what functions you miss :-)
-
-(if #f
-    (begin
-      (define (dummy . foo) "")
-      (map (lambda (x) (module-define! this-module x dummy))
-	   (append
-	    (ly:all-stencil-expressions)
-	    (ly:all-output-backend-commands)))
-      ))
-
-(define (url-link url x y)
-  (string-append
-   (eo 'a `(xlink:href . ,url))
-   (eoc 'rect
-	`(x . ,(car x))
-	`(y . ,(car y))
-	`(width . ,(- (cdr x) (car x)))
-	`(height . ,(- (cdr y) (car y)))
-	'(fill . "none")
-	'(stroke . "none")
-	'(stroke-width . "0.0"))
-   (ec 'a)))
-
-(define (grob-cause offset grob)
-  "")
-
-(define (no-origin)
-  "")
-
-
-
 (define (bezier-sandwich lst thick)
   (let* ((first (list-tail lst 4))
 	 (first-c0 (car (list-tail first 3)))
@@ -217,13 +180,89 @@
 				  (svg-bezier second first-c0)))
 	    )))
 
+(define (char font i)
+  (dispatch
+   `(fontify ,font ,(entity 'tspan (char->entity (integer->char i))))))
+
+(define (circle radius thick is-filled)
+  (entity
+   'circle ""
+   '(stroke-linejoin . "round")
+   '(stroke-linecap . "round")
+   `(fill . ,(if is-filled "currentColor" "none"))
+   `(stroke . "currentColor")
+   `(stroke-width . ,thick)
+   `(r . ,radius)))
+
+(define (dashed-line thick on off dx dy phase)
+  (draw-line thick 0 0 dx dy `(style . ,(format "stroke-dasharray:~a,~a;" on off))))
+
+(define (draw-line thick x1 y1 x2 y2 . alist)
+  (apply entity 'line ""
+	 (append
+	  `((stroke-linejoin . "round")
+	    (stroke-linecap . "round")
+	    (stroke-width . ,thick)
+	    (stroke . "currentColor")
+	    (x1 . ,x1)
+	    (y1 . ,(- y1))
+	    (x2 . ,x2)
+	    (y2 . ,(- y2)))
+	  alist)))
+
+(define (ellipse x-radius y-radius thick is-filled)
+  (entity
+   'ellipse ""
+   '(stroke-linejoin . "round")
+   '(stroke-linecap . "round")
+   `(fill . ,(if is-filled "currentColor" "none"))
+   `(stroke . "currentColor")
+   `(stroke-width . ,thick)
+   `(rx . ,x-radius)
+   `(ry . ,y-radius)))
+
+(define (embedded-svg string)
+  string)
+
+(define (grob-cause offset grob)
+  "")
+
+(define (named-glyph font name)
+  (dispatch
+   `(fontify ,font ,(entity 'tspan
+			    (integer->entity
+			     (ly:font-glyph-name-to-charcode font name))))))
+
+(define (no-origin)
+  "")
+
+(define (oval x-radius y-radius thick is-filled)
+  (let ((x-max x-radius)
+        (x-min (- x-radius))
+        (y-max y-radius)
+        (y-min (- y-radius)))
+    (entity
+     'path ""
+     '(stroke-linejoin . "round")
+     '(stroke-linecap . "round")
+     `(fill . ,(if is-filled "currentColor" "none"))
+     `(stroke . "currentColor")
+     `(stroke-width . ,thick)
+     `(d . ,(ly:format "M~4f,~4f C~4f,~4f  ~4f,~4f ~4f,~4f S~4f,~4f ~4f,~4f"
+               x-max 0
+               x-max y-max
+               x-min y-max
+               x-min 0
+               x-max y-min
+               x-max 0)))))
+
 (define (path thick commands)
   (define (convert-path-exps exps)
     (if (pair? exps)
 	(let*
 	    ((head (car exps))
 	     (rest (cdr exps))
-	     (arity 
+	     (arity
 	      (cond
 	       ((memq head '(rmoveto rlineto lineto moveto)) 2)
 	       ((memq head '(rcurveto curveto)) 6)
@@ -243,7 +282,7 @@
 			)
 		(convert-path-exps (drop rest arity))))
 	'()))
-  
+
   (entity 'path ""
 	  `(stroke-width . ,thick)
 	  '(stroke-linejoin . "round")
@@ -251,50 +290,23 @@
 	  '(stroke . "currentColor")
 	  '(fill . "none")
 	  `(d . ,(string-join (convert-path-exps commands) " "))))
-  
-(define (char font i)
-  (dispatch
-   `(fontify ,font ,(entity 'tspan (char->entity (integer->char i))))))
-
-(define-public (comment s)
-  (string-append "<!-- " s " !-->\n"))
-
-(define (draw-line thick x1 y1 x2 y2 . alist)
-  
-  (apply entity 'line ""
-	 (append
-	  `((stroke-linejoin . "round")
-	    (stroke-linecap . "round")
-	    (stroke-width . ,thick)
-	    (stroke . "currentColor")
-	    (x1 . ,x1)
-	    (y1 . ,(- y1))
-	    (x2 . ,x2)
-	    (y2 . ,(- y2)))
-	  alist)))
-
-(define (dashed-line thick on off dx dy phase)
-  (draw-line thick 0 0 dx dy `(style . ,(format "stroke-dasharray:~a,~a;" on off))))
-
-(define (named-glyph font name)
-  (dispatch
-   `(fontify ,font ,(entity 'tspan
-			    (integer->entity
-			     (ly:font-glyph-name-to-charcode font name))))))
 
 (define (placebox x y expr)
-  (let*
-    ((match (regexp-exec svg-element-regexp expr))
-     (tagname (match:substring match 1))
-     (attributes (match:substring match 2)))
-
-    (string-append tagname
-		   ;; FIXME: Not using GNU coding standards
-		   ;; [translate ()] here to work around a
-		   ;; bug in Microsoft Internet Explorer 6.0
-		   (ly:format " transform=\"translate(~f, ~f)\" " x (- y))
-		   attributes
-		   "\n")))
+  (if (not (string-null? expr))
+      (let*
+	((match (regexp-exec svg-element-regexp expr))
+	 (tagname (match:substring match 1))
+	 (attributes (match:substring match 2)))
+
+	(string-append tagname
+		       ;; FIXME: Not using GNU coding standards
+		       ;; [translate ()] here to work around a
+		       ;; bug in Microsoft Internet Explorer 6.0
+		       (ly:format " transform=\"translate(~f, ~f)\" "
+				  x (- y))
+		       attributes
+		       "\n"))
+      ""))
 
 (define (polygon coords blot-diameter is-filled)
   (entity
@@ -308,12 +320,8 @@
 		(map offset->point (ly:list->offsets '() coords))))
    ))
 
-;; rotate around given point
-(define (setrotation ang x y)
-  (format "<g transform=\"rotate(~a,~a,~a)\">\n"
-    (number->string (* -1 ang))
-    (number->string x)
-    (number->string (* -1 y))))
+(define (resetcolor)
+  "</g>\n")
 
 (define (resetrotation ang x y)
   "</g>\n")
@@ -333,61 +341,36 @@
 	  `(width . ,(+ breapth width))
 	  `(height . ,(+ depth height))
 	  `(ry . ,(/ blot-diameter 2))
+	  '(fill . "currentColor")
 	  ))
 
-(define (circle radius thick is-filled)
-  (entity
-   'circle ""
-   '(stroke-linejoin . "round")
-   '(stroke-linecap . "round")
-   `(fill . ,(if is-filled "currentColor" "none"))
-   `(stroke . "currentColor")
-   `(stroke-width . ,thick)
-   `(r . ,radius)))
-
-(define (ellipse x-radius y-radius thick is-filled)
-  (entity
-   'ellipse ""
-   '(stroke-linejoin . "round")
-   '(stroke-linecap . "round")
-   `(fill . ,(if is-filled "currentColor" "none"))
-   `(stroke . "currentColor")
-   `(stroke-width . ,thick)
-   `(rx . ,x-radius)
-   `(ry . ,y-radius)))
+(define (setcolor r g b)
+  (format "<g color=\"rgb(~a%,~a%,~a%)\">\n"
+	  (* 100 r) (* 100 g) (* 100 b)
+	  ))
 
-(define (oval x-radius y-radius thick is-filled)
-  (let ((x-max x-radius)
-        (x-min (- x-radius))
-        (y-max y-radius)
-        (y-min (- y-radius)))
-    (entity
-     'path ""
-     '(stroke-linejoin . "round")
-     '(stroke-linecap . "round")
-     `(fill . ,(if is-filled "currentColor" "none"))
-     `(stroke . "currentColor")
-     `(stroke-width . ,thick)
-     `(d . ,(ly:format "M~4f,~4f C~4f,~4f  ~4f,~4f ~4f,~4f S~4f,~4f ~4f,~4f" 
-               x-max 0
-               x-max y-max
-               x-min y-max
-               x-min 0
-               x-max y-min
-               x-max 0)))))
+;; rotate around given point
+(define (setrotation ang x y)
+  (format "<g transform=\"rotate(~a,~a,~a)\">\n"
+    (number->string (* -1 ang))
+    (number->string x)
+    (number->string (* -1 y))))
 
 (define (text font string)
   (dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
 
+(define (url-link url x y)
+  (string-append
+   (eo 'a `(xlink:href . ,url))
+   (eoc 'rect
+	`(x . ,(car x))
+	`(y . ,(car y))
+	`(width . ,(- (cdr x) (car x)))
+	`(height . ,(- (cdr y) (car y)))
+	'(fill . "none")
+	'(stroke . "none")
+	'(stroke-width . "0.0"))
+   (ec 'a)))
+
 (define (utf-8-string pango-font-description string)
   (dispatch `(fontify ,pango-font-description ,(entity 'tspan string))))
-
-
-
-(define (setcolor r g b)
-  (format "<g color=\"rgb(~a%,~a%,~a%)\">\n"
-	  (* 100 r) (* 100 g) (* 100 b)
-	  ))
-
-(define (resetcolor)
-  "</g>\n")