*** empty log message ***

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

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index fa3659f4055b3be4386fffd682ec321830c46994..85e1adc114574d4f3e932fe3cf2ac6c0678456b1 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -92,23 +92,13 @@
 
 ;;; end of tablature functions
 
+(define-public (make-stencil-boxer thickness padding callback)
+  "Return function that adds a box around the grob passed as argument."
+  (lambda (grob) (box-stencil (callback grob) thickness padding)))
 
-(define-public (make-stencil-boxer line-thick x-padding y-padding callback)
-  "Makes a routine that adds a box around the grob parsed as argument"
-  (define (stencil-boxer grob)
-    (let* ((mol (callback grob))
-          (x-ext (interval-widen (ly:stencil-extent mol 0) x-padding))
-          (y-ext (interval-widen (ly:stencil-extent mol 1) y-padding))
-          (x-rule (make-filled-box-stencil (interval-widen x-ext line-thick)
-                                           (cons 0 line-thick)))
-          (y-rule (make-filled-box-stencil (cons 0 line-thick) y-ext)))
-      
-      (set! mol (ly:stencil-combine-at-edge mol 0 1 y-rule x-padding))
-      (set! mol (ly:stencil-combine-at-edge mol 0 -1 y-rule x-padding))
-      (set! mol (ly:stencil-combine-at-edge mol 1 1 x-rule 0))  
-      (set! mol (ly:stencil-combine-at-edge mol 1 -1 x-rule 0))
-      mol))
-  stencil-boxer)
+(define-public (make-stencil-circler thickness padding callback)
+  "Return function that adds a circle around the grob passed as argument."
+  (lambda (grob) (circle-stencil (callback grob) thickness padding)))
 
 (define-public (arg->string arg)
   (cond ((number? arg) (ly:inexact->string arg 10))
@@ -252,7 +242,7 @@ centered, X==1 is at the right, X == -1 is at the left."
                         ("bracket" . (() . "bracket"))  ))))
 
     (if (equal? result #f)
-       (ly:warn "Unknown bar glyph: `~S'" glyph)
+       (ly:warning (_ "unknown bar glyph: `~S'" glyph))
        (index-cell (cdr result) dir))))
 
 (define-public (shift-right-at-line-begin g)