release: 1.3.24

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index d18cdbf12f6287ee7f000abd281afeaec4a66746..2e218d5b09cd844f20b193946f773ba14790ca57 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -346,12 +346,9 @@
      "\\placebox{"
      (number->dim y) "}{" (number->dim x) "}{" s "}\n"))
 
-
-
   (define (bezier-sandwich l thick)
     (embedded-ps ((ps-scm 'bezier-sandwich) l thick)))
 
-
   (define (start-line ht)
     (begin
       (string-append"\\vbox to " (number->dim ht) "{\\hbox{%\n"))
@@ -509,16 +506,15 @@
      (numbers->string (list w h (inexact->exact cont) thick))
      " draw_crescendo"))
 
+  ;; what the heck is this interface ?
   (define (dashed-slur thick dash l)
     (string-append 
      (apply string-append (map control->string l)) 
      (number->string thick) 
      " [ "
-     (if (> 1 dash)
-        (number->string (- (* thick dash) thick))
-        "0")
+     (number->string dash)
      " "
-     (number->string (* 2 thick))
+     (number->string (* 10 thick))     ;UGH.  10 ?
      " ] 0 draw_dashed_slur"))
 
   (define (decrescendo thick w h cont)
@@ -771,3 +767,13 @@
    )
      
 
+(define (slur-ugly ind ht)
+  (if (and
+;       (< ht 4.0)
+       (< ht (* 4 ind))
+       (> ht (* 0.4 ind))
+       (> ht (+ (* 2 ind) -4))
+       (< ht (+ (* -2 ind) 8)))
+      #f
+      (cons ind  ht)
+  ))