X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-svg.scm;h=830bba9ab274e73ed358793d29d7c765c0e8c2d8;hb=4b769ac72e76940dd0aa40d257a1279441926f2f;hp=cecb165d67160101ca4115f2e83016628029427b;hpb=bb2d6bdb2722964cb55faf82523bb35884030037;p=lilypond.git

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index cecb165d67..830bba9ab2 100644
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -17,7 +17,6 @@
 ;;;;  * inkscape SVG-font support
 ;;;;    - use fontconfig/fc-cache for now, see output-gnome.scm
 
-(debug-enable 'backtrace)
 (define-module (scm output-svg))
 (define this-module (current-module))
 
@@ -39,8 +38,7 @@
       (if (module-defined? this-module keyword)
 	  (apply (eval keyword this-module) (cdr expr))
 	  (begin
-	    (display
-	     (string-append "undefined: " (symbol->string keyword) "\n"))
+	    (ly:warning (_ "undefined: ~S") keyword)
 	    ""))))))
 
 ;; Helper functions
@@ -50,12 +48,15 @@
 	      attributes-alist)))
 
 (define-public (eo entity . attributes-alist)
+  "o = open"
   (format #f "<~S~a>\n" entity (attributes attributes-alist)))
 
 (define-public (eoc entity . attributes-alist)
+  " oc = open/close"
   (format #f "<~S~a/>\n" entity (attributes attributes-alist)))
 
 (define-public (ec entity)
+  "c = close"
   (format #f "</~S>\n" entity))
 
 (define-public (entity entity string . attributes-alist)
@@ -65,7 +66,7 @@
        (apply eo (cons entity attributes-alist)) string (ec entity))))
 
 (define (offset->point o)
-  (format #f " ~S,~S" (car o) (cdr o)))
+  (format #f " ~S,~S" (car o)  (- (cdr o))))
 
 (define (svg-bezier lst close)
   (let* ((c0 (car (list-tail lst 3)))
@@ -90,15 +91,22 @@
   (apply string-append
 	 (map (lambda (x) (char->entity x)) (string->list string))))
 
-(define pango-description-regexp
-  (make-regexp "^([^,]+)+, ?([-a-zA-Z_]*) ([0-9.]+)$"))
+(define pango-description-regexp-comma
+  (make-regexp "^([^,]+), ?([-a-zA-Z_]*) ([0-9.]+)$"))
+
+(define pango-description-regexp-nocomma
+  (make-regexp "^([^ ]+) ([-a-zA-Z_]*) ?([0-9.]+)$"))
 
 (define (pango-description-to-svg-font str)
   (let*
       ((size 4.0)
        (family "Helvetica")
        (style #f)
-       (match (regexp-exec pango-description-regexp str)))
+       (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
@@ -108,7 +116,7 @@
 	  (set! size
 		(string->number (match:substring match 3))))
 
-	(display (format "Cannot decypher Pango description:  ~a\n" str)))
+	(ly:warning (_ "can't decypher Pango description: ~a") str))
 
     (set! style
 	  (if (string? style)
@@ -134,7 +142,9 @@
 		size anchor))))
 
 (define (fontify font expr)
-  (entity 'text expr (cons 'style (svg-font font))))
+  (entity 'text expr
+	  `(style . ,(svg-font font))
+	  ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; stencil outputters
@@ -142,11 +152,35 @@
 
 ;;; catch-all for missing stuff
 ;;; comment this out to see find out what functions you miss :-)
-(define (dummy . foo) "")
-(map (lambda (x) (module-define! this-module x dummy))
-     (append
-      (ly:all-stencil-expressions)
-      (ly:all-output-backend-commands)))
+
+(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 (rect-beam width slope thick blot-diameter)
   (let* ((x width)
@@ -166,8 +200,8 @@
 	    `(width . ,width)
 	    `(height . ,(+ thick (* (abs z) (/ thick 2))))
 	    `(rx . ,(/ blot-diameter 2))
-	    `(transform . ,(format #f "matrix (1, ~f, 0, 1, 0, 0)" (- z))
-			   ))))
+	    `(transform . ,(format #f "matrix (1, ~f, 0, 1, 0, 0)"  z)
+			))))
 
 (define (beam width slope thick blot-diameter)
   (let* ((b blot-diameter)
@@ -205,7 +239,7 @@
 			   0 (- t)
 			   (- w) h
 			   0 t))
-	  )))
+	    )))
 
 (define (bezier-sandwich lst thick)
   (let* ((first (list-tail lst 4))
@@ -219,7 +253,7 @@
 	    '(fill . "black")
 	    `(d . ,(string-append (svg-bezier first #f)
 				  (svg-bezier second first-c0)))
-	  )))
+	    )))
 
 (define (char font i)
   (dispatch
@@ -228,21 +262,23 @@
 (define-public (comment s)
   (string-append "<!-- " s " !-->\n"))
 
-(define (dashed-line thick on off dx dy)
-  (draw-line thick 0 0 dx dy))
+(define (draw-line thick x1 y1 x2 y2 . alist)
+  
+  (apply entity 'line ""
+	 (append
+	  `((stroke-linejoin . "round")
+	    (stroke-linecap . "round")
+	    (stroke-width . ,thick)
+	    (stroke . "black")
+	    ;;'(fill . "black")
+	    (x1 . ,x1)
+	    (y1 . ,y1)
+	    (x2 . ,x2)
+	    (y2 . ,y2))
+	  alist)))
 
-(define (draw-line thick x1 y1 x2 y2)
-  (entity 'line ""
-	  '(stroke-linejoin . "round")
-	  '(stroke-linecap . "round")
-	  `(stroke-width . ,thick)
-	  '(stroke . "black")
-	  ;;'(fill . "black")
-	  `(x1 . ,x1)
-	  `(y1 . ,y1)
-	  `(x2 . ,x2)
-	  `(y2 . ,y2)
-	  ))
+(define (dashed-line thick on off dx dy)
+  (draw-line thick 0 0 dx dy `(style . ,(format "stroke-dasharray:~a,~a;" on off))))
 
 ;; WTF is this in every backend?
 (define (horizontal-line x1 x2 th)
@@ -263,8 +299,8 @@
 	  ;;(dispatch expr)
 	  expr
 	  `(transform . ,(format #f "translate (~f, ~f)"
-				 x
-				 (-  y)))))
+				 x (- y)))))
+
 
 (define (polygon coords blot-diameter)
   (entity 'polygon ""