add vcs lines to debian/control

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

diff --git a/scm/output-socket.scm b/scm/output-socket.scm
index 74451f3aa89a2cfa69ed8b60c104ca284e12b1c1..c86047815ade2ecc0a9ea9aec2074a91a58f77ef 100644 (file)
--- a/scm/output-socket.scm
+++ b/scm/output-socket.scm
@@ -1,88 +1,106 @@
+;;;; output-socket.scm
+;;;;
+;;;; implement network-based output (socket) in Scheme
 
 (define-module (scm output-socket)
-  #:re-export (quote)
-  )
+  #:re-export (quote))
 
 (use-modules (guile)
             (srfi srfi-1)
             (srfi srfi-13)
             (lily))
 
-(define (dummy . rest)
-  "")
 
-(for-each
- (lambda (x) 
-   (module-define! (current-module)
-                  x
-                  dummy))
- 
- (ly:all-stencil-expressions))
+(define format ergonomic-simple-format)
 
-
-(define-public (draw-line thick x1 y1 x2 y2)
-  (format "drawline ~a ~a ~a ~a ~a"
-         thick x1 y2 x2 y2))
-
-
-(define-public (named-glyph font glyph)
-  (format "glyphshow ~a \"~a\" ~a"
-         (ly:font-glyph-name-to-charcode font glyph)
-         (ly:font-name font)
-         (modified-font-metric-font-scaling font)
-         ))
-
-(define-public (placebox x y s) 
-  (format "at ~a ~a ~a\n" x y s))
-
-(define-public (round-filled-box  breapth width depth height blot-diameter)
-  (format "draw_round_box ~a ~a ~a ~a ~a"
-         breapth width depth height blot-diameter
-         ))
-
-(define (music-cause grob)
+(define (event-cause grob)
   (let*
-      ((cause (ly:grob-property  grob 'cause)))
+    ((cause (ly:grob-property grob 'cause)))
 
-    (cond
-     ((ly:music? cause) cause)
-     ((ly:grob? cause) (music-cause cause))
-     (else
-      #f))))
+    (if (ly:stream-event? cause)
+       cause
+       #f)))
 
 (define (grob-bbox grob offset)
   (let*
-      ((x-ext (ly:grob-extent grob grob X))
-       (y-ext (ly:grob-extent grob grob Y))
-       (x (car offset))
-       (y (cdr offset))
-       )
+    ((x-ext (ly:grob-extent grob grob X))
+     (y-ext (ly:grob-extent grob grob Y))
+     (x (car offset))
+     (y (cdr offset)))
+
+    (if (interval-empty? x-ext)
+       (set! x-ext '(0 . 0)))
+
+    (if (interval-empty? y-ext)
+       (set! y-ext '(0 . 0)))
 
     (list (+ x (car x-ext))
          (+ y (car y-ext))
          (+ x (cdr x-ext))
-         (+ y (cdr y-ext)))
-    ))
+         (+ y (cdr y-ext)))))
+
+(define (escape-string str)
+  (string-regexp-substitute
+    " " "\\040"
+    (string-regexp-substitute "\"" "\\\"" str)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; stencil commands
+;;;
+
+(define (bezier-sandwich lst thick)
+  (format "bezier_sandwich ~a [~a]"
+         thick
+         (string-append
+           (string-join (map
+                          (lambda (x)
+                            (format "(~a,~a)" (car x) (cdr x)))
+                          lst)
+                        ","))))
+
+(define (draw-line thick x1 y1 x2 y2)
+  (format "drawline ~a ~a ~a ~a ~a"
+         thick x1 y2 x2 y2))
 
-(define-public (no-origin)
+(define (grob-cause offset grob)
+  (let*
+    ((cause (event-cause grob))
+     (tag (if (and cause (integer? (ly:event-property cause 'input-tag)))
+             (ly:event-property cause 'input-tag)
+             -1))
+     (name (assoc-get 'name (ly:grob-property grob 'meta))))
+
+    (apply format
+          (append (list "cause ~a \"~a\" ~a ~a ~a ~a\n" tag name)
+                  (grob-bbox grob offset)))))
+
+(define (named-glyph font glyph)
+  (format "glyphshow ~a \"~a\" ~a \"~a\""
+         (ly:font-glyph-name-to-charcode font glyph)
+         (ly:font-name font)
+         (modified-font-metric-font-scaling font)
+         glyph))
+
+(define (no-origin)
   "nocause\n")
 
-(define-public (grob-cause offset grob)
-  (let*
-      ((cause (music-cause grob)))
-  (if (and cause (integer? (ly:music-property cause 'input-tag)))
-      (apply format
-            (append
-             (list "cause ~a ~a ~a ~a ~a\n" (ly:music-property cause 'input-tag))
-             (grob-bbox grob offset)
-            ))
-      "")))
-
-(define-public (glyph-string
-        postscript-font-name
-        size cid?
-        x-y-named-glyphs)
-  
-  (format "text \"~a\" ~a ~a " postscript-font-name size
-         (string-join (map (lambda (xyn) (caddr xyn))
-                           x-y-named-glyphs))))
+(define (placebox x y s)
+  (if (not (string-null? s))
+      (format "at ~a ~a ~a\n" x y s)
+      ""))
+
+(define (polygon xy-coords blot do-fill)
+  (format "polygon ~a ~a ~a"
+         blot
+         (if do-fill "True" "False")
+         (string-join (map number->string xy-coords))))
+
+(define (round-filled-box breapth width depth height blot-diameter)
+  (format "draw_round_box ~a ~a ~a ~a ~a"
+         breapth width depth height blot-diameter))
+
+(define (utf-8-string descr string)
+  (format "utf-8 \"~a\" \"~a\""
+         (escape-string descr)
+         ;; don't want unescaped spaces.
+         (escape-string string)))