* config.make.in (HAVE_LIBKPATHSEA_SO):

[lilypond.git] / lily / balloon.cc

diff --git a/lily/balloon.cc b/lily/balloon.cc
index 272be12b7fa861eb263a0fe57e91a39f375339a9..2a2594ee92f7be678644dcc5262d6b7afe47aad8 100644 (file)
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "text-item.hh"
@@ -11,7 +11,6 @@
 #include "line-interface.hh"
 #include "lookup.hh"
 #include "font-interface.hh"
-#include "stencil.hh"
 #include "lily-guile.hh"
 #include "output-def.hh"
 #include "misc.hh"
@@ -20,12 +19,12 @@ class Balloon_interface
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  static bool has_interface (Grob*);
+  static bool has_interface (Grob *);
 };
 
 MAKE_SCHEME_CALLBACK (Balloon_interface, print, 1);
 SCM
-Balloon_interface::print (SCM smob) 
+Balloon_interface::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
@@ -55,16 +54,16 @@ Balloon_interface::print (SCM smob)
   Stencil fr = Lookup::frame (box_extent, 0.1, 0.05);
 
   fr.add_stencil (*s);
-  
+
   SCM bt = me->get_property ("balloon-text");
   SCM chain = Font_interface::text_font_alist_chain (me);
   chain = scm_cons (me->get_property ("balloon-text-props"), chain);
 
-  SCM text = Text_interface::interpret_markup (me->get_paper ()->self_scm (),
-                                         chain, bt);
+  SCM text = Text_interface::interpret_markup (me->get_layout ()->self_scm (),
+                                              chain, bt);
 
   Stencil *text_stil = unsmob_stencil (text);
- 
+
   Offset z1;
   for (int i = X_AXIS; i < NO_AXES; i++)
     {
@@ -74,17 +73,17 @@ Balloon_interface::print (SCM smob)
     }
 
   Offset z2 = z1 + off;
- 
+
   fr.add_stencil (Line_interface::line (me, z1, z2));
 
   text_stil->translate (z2);
   fr.add_stencil (*text_stil);
- 
+
   fr = Stencil (orig_extent, fr.expr ());
   return fr.smobbed_copy ();
 }
 
-ADD_INTERFACE (Balloon_interface,"text-balloon-interface",
+ADD_INTERFACE (Balloon_interface, "text-balloon-interface",
               "A collection of routines to put text balloons around an object.",
               "balloon-padding balloon-text-props balloon-text-offset balloon-text balloon-original-callback");