* input/regression/breathing-sign.ly: tiny fixes

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

diff --git a/scm/output-sodipodi.scm b/scm/output-sodipodi.scm
index 52efd40e57c41a99695f2c18e7a505ed60d9c4db..a14102659708d4e0add46c0198bc168fe0324120 100644 (file)
--- a/scm/output-sodipodi.scm
+++ b/scm/output-sodipodi.scm
@@ -221,29 +221,6 @@
                                   (* -1 (/ y z))
                                   1 1)))))
 
-;; TODO: bezier-ending, see ps.scm
-(define (bezier-bow urg-l thick)
-  
-  (define (bezier-ending z0 z1 z2)
-    (let ((x0 (car z0))
-         (y0 (cdr z0))
-         (x1 (car z1))
-         (y1 (cdr z1))
-         (x2 (car z2))
-         (y2 (cdr z2)))
-      (let ((r (/ (sqrt (+ (* (- x1 x2) (- x1 x2))
-                         (* (- y1 y2) (- y1 y2)))) 2)))
-      (tagify "circle" ""
-             `(fill . "#000000;")
-             `(cx . ,(number->string (* output-scale x0)))
-             `(cy . ,(number->string (* output-scale (- 0 y0))))
-             `(r . ,(number->string (* output-scale r)))))))
-  
-  (let ((l (eval urg-l this-module)))
-    (string-append
-     (bezier-sandwich l thick)
-     (bezier-ending (list-ref l 3) (list-ref l 0) (list-ref l 5))
-     (bezier-ending (list-ref l 7) (list-ref l 0) (list-ref l 5)))))
 
 (define (bezier-sandwich l thick)
   (let* (;;(l (eval urg-l this-module))
@@ -276,8 +253,12 @@
 (define (end-output)
   "</g></svg>")
 
+;;TODO
+;(define (horizontal-line x1 x2 th)
+;  (draw-line th x1  0 x2 0))
+
 (define (filledbox breapth width depth height)
-  (roundfilledbox breapth width depth height line-thickness))
+  (round-filled-box breapth width depth height line-thickness))
 
 (define font-cruft
   "fill:black;stroke:none;text-anchor:start;writing-mode:lr;font-weight:normal;")
@@ -352,7 +333,7 @@
                        (number->string (- 0 (* output-scale y)))
                        ")"))))
 
-(define (roundfilledbox breapth width depth height blot-diameter)
+(define (round-filled-box breapth width depth height blot-diameter)
   (tagify "rect" ""
          ;;'(style . "fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;")
            `(style . ,(format "fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-opacity:1;stroke-width:~f;stroke-linejoin:miter;stroke-linecap:butt;" line-thickness))