Fix compile bug, add linewidth info to \justify.

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

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index be1bb04db65d04567b4488c13e74ecba1157a9ed..cf2e539b85f3a52007583afaecc9170db2a6d4ec 100644 (file)
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -59,6 +59,8 @@
   "c = close"
   (format #f "</~S>\n" entity))
 
+
+
 (define-public (entity entity string . attributes-alist)
   (if (equal? string "")
       (apply eoc entity attributes-alist)
@@ -183,64 +185,6 @@
   "")
 
 
-(define (rect-beam width slope thick blot-diameter)
-  (let* ((x width)
-        (y (* slope width))
-        (z (/ y x)))
-    (entity 'rect ""
-           ;; The stroke will stick out.  To use stroke,
-           ;; the stroke-width must be subtracted from all other dimensions.
-           ;;'(stroke-linejoin . "round")
-           ;;'(stroke-linecap . "round")
-           ;;`(stroke-width . ,blot-diameter)
-           ;;'(stroke . "red")
-           ;;'(fill . "orange")
-
-           `(x . 0)
-           `(y . ,(- (/ thick 2)))
-           `(width . ,width)
-           `(height . ,(+ thick (* (abs z) (/ thick 2))))
-           `(rx . ,(/ blot-diameter 2))
-           `(transform . ,(format #f "matrix (1, ~f, 0, 1, 0, 0)"  z)
-                       ))))
-
-(define (beam width slope thick blot-diameter)
-  (let* ((b blot-diameter)
-        (t (- thick b))
-        (w (- width b))
-        (h (* w slope)))
-    (entity 'polygon ""
-           '(stroke-linejoin . "round")
-           '(stroke-linecap . "round")
-           `(stroke-width . ,blot-diameter)
-           '(stroke . "currentColor")
-           '(fill . "currentColor")
-           `(points . ,(string-join
-                        (map offset->point
-                             (list (cons (/ b 2) (/ t 2))
-                                   (cons (+ w (/ b 2)) (+ h (/ t 2)))
-                                   (cons (+ w (/ b 2)) (+ h (- (/ t 2))))
-                                   (cons (/ b 2) (- (/ t 2)))))))
-           )))
-
-(define (path-beam width slope thick blot-diameter)
-  (let* ((b blot-diameter)
-        (t (- thick b))
-        (w (- width b))
-        (h (* w slope)))
-    (entity 'path ""
-           '(stroke-linejoin . "round")
-           '(stroke-linecap . "round")
-           `(stroke-width . ,blot-diameter)
-           '(stroke . "currentColor")
-           '(fill . "currentColor")
-           `(d . ,(format #f "M ~S,~S l ~S,~S l ~S,~S l ~S,~S l ~S,~S"
-                          (/ b 2) (/ t 2)
-                          w (- h)
-                          0 (- t)
-                          (- w) h
-                          0 t))
-           )))
 
 (define (bezier-sandwich lst thick)
   (let* ((first (list-tail lst 4))
@@ -280,9 +224,6 @@
 (define (dashed-line thick on off dx dy)
   (draw-line thick 0 0 dx dy `(style . ,(format "stroke-dasharray:~a,~a;" on off))))
 
-(define (filledbox breapth width depth height)
-  (round-filled-box breapth width depth height 0))
-
 (define (named-glyph font name)
   (dispatch
    `(fontify ,font ,(entity 'tspan
@@ -291,6 +232,7 @@
 
 (define (placebox x y expr)
   (entity 'g
+         
          ;; FIXME -- JCN
          ;;(dispatch expr)
          expr
@@ -339,7 +281,7 @@
 (define (text font string)
   (dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
 
-(define (utf8-string pango-font-description string)
+(define (utf-8-string pango-font-description string)
   (dispatch `(fontify ,pango-font-description ,(entity 'tspan string))))