Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/scm/output-socket.scm b/scm/output-socket.scm
index 20a16b3bfff361c26da8fa991a3f1f761620f4fd..e992e7c74b095605c4729338a10bdc3bb59f42cb 100644 (file)
--- a/scm/output-socket.scm
+++ b/scm/output-socket.scm
@@ -11,6 +11,7 @@
 (define (dummy . rest)
   "")
 
+(display (ly:all-stencil-expressions))
 (for-each
  (lambda (x) 
    (module-define! (current-module)
@@ -48,13 +49,13 @@
          breapth width depth height blot-diameter
          ))
 
-(define (music-cause grob)
+(define (event-cause grob)
   (let*
       ((cause (ly:grob-property  grob 'cause)))
 
     (cond
-     ((ly:music? cause) cause)
-     ((ly:grob? cause) (music-cause cause))
+     ((ly:stream-event? cause) cause)
+;     ((ly:grob? cause) (music-cause cause))
      (else
       #f))))
 
@@ -82,9 +83,9 @@
 
 (define-public (grob-cause offset grob)
   (let*
-      ((cause (music-cause grob))
-       (tag (if (and cause (integer? (ly:music-property cause 'input-tag)))
-               (ly:music-property cause 'input-tag)
+      ((cause (event-cause grob))
+       (tag (if (and cause (integer? (ly:event-property cause 'input-tag)))
+               (ly:event-property cause 'input-tag)
                -1))
        (name (cdr (assoc 'name (ly:grob-property grob 'meta))))
        )
@@ -113,3 +114,12 @@
          (escape-string string)
          ))
 
+
+(define (bezier-sandwich lst thick)
+  (format
+   #f
+   "bezier_sandwich ~a [~a]"
+   thick
+   (string-append 
+    (string-join (map (lambda (x) (format "(~a,~a)" (car x) (cdr x)))
+                     lst) ","))))