(print-circled-text-callback): draw circle

around text using make-circle-markup.

diff --git a/ChangeLog b/ChangeLog
index a1c40b2c09efd4a593c6c2de498979a6e2219555..e68c39c3933f06fa148ec39dfdcfb1057c017627 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/output-lib.scm (print-circled-text-callback): draw circle
+       around text using make-circle-markup.
+
        * Documentation/user/*: strip out-www from paths.
 
 2005-12-05  Heikki Junes  <hjunes@cc.hut.fi>

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index cbbc623152f43cfbd002a149db655f0d0b775822..0d8c59785e8c7219db0e27ec11d188502c9c74a4 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -76,14 +76,13 @@
 
 (define-public (print-circled-text-callback grob)
   (let* ((text (ly:grob-property grob 'text))
+        
         (layout (ly:grob-layout grob))
         (defs (ly:output-def-lookup layout 'text-font-defaults))
         (props (ly:grob-alist-chain grob defs))
         (circle (Text_interface::interpret_markup
-                 layout props (make-draw-circle-markup 0.8 0.1 #f)))
-        (text-stencil (Text_interface::interpret_markup layout props text)))
-    
-    (ly:stencil-add (centered-stencil text-stencil) circle)))
+                 layout props (make-circle-markup text))))
+    circle))
 
 
 ;;(define (mm-to-pt x)