X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-socket.scm;h=3532fc97325728e0e843ccbd5667d429083ee14a;hb=HEAD;hp=74451f3aa89a2cfa69ed8b60c104ca284e12b1c1;hpb=e249f3c55170776943a2e2fbd943e516bcacfec6;p=lilypond.git

diff --git a/scm/output-socket.scm b/scm/output-socket.scm
index 74451f3aa8..3532fc9732 100644
--- a/scm/output-socket.scm
+++ b/scm/output-socket.scm
@@ -1,88 +1,96 @@
+;;;; 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))
+             (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))
-       )
+       (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 (car y-ext))
+          (+ x (cdr x-ext))
+          (+ y (cdr y-ext)))))
 
-(define-public (no-origin)
-  "nocause\n")
+(define (escape-string str)
+  (string-regexp-substitute
+   " " "\\040"
+   (string-regexp-substitute "\"" "\\\"" str)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; stencil commands
+;;;
 
-(define-public (grob-cause offset grob)
+(define (draw-line thick x1 y1 x2 y2)
+  (format #f "drawline ~a ~a ~a ~a ~a"
+          thick x1 y2 x2 y2))
+
+(define (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))))
+      ((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 #f
+           "cause ~a \"~a\" ~a ~a ~a ~a\n" tag name
+           (grob-bbox grob offset))))
+
+(define (named-glyph font glyph)
+  (format #f "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 (placebox x y s)
+  (if (not (string-null? s))
+      (format #f "at ~a ~a ~a\n" x y s)
+      ""))
+
+(define (polygon xy-coords blot do-fill)
+  (format #f "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 #f "draw_round_box ~a ~a ~a ~a ~a"
+          breapth width depth height blot-diameter))
+
+(define (utf-8-string descr string)
+  (format #f "utf-8 \"~a\" \"~a\""
+          (escape-string descr)
+          ;; don't want unescaped spaces.
+          (escape-string string)))