merge (2nd try -- argh git.el)

[lilypond.git] / lily / balloon.cc

diff --git a/lily/balloon.cc b/lily/balloon.cc
index 52154535588d58e823d21369594ca18e5fa1d3b7..560a2f667586ec4ca0eb2fd51067f9a0bb98d8b4 100644 (file)
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -3,10 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "grob.hh"
 #include "line-interface.hh"
 #include "lookup.hh"
@@ -19,21 +19,16 @@ 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);
 
-  SCM cb = me->get_property ("balloon-original-callback");
-  SCM stil = SCM_EOL;
-
-  if (ly_c_procedure_p (cb))
-    stil = scm_call_1 (cb, smob);
-
+  SCM stil = me->get_property ("original-stencil");
   if (!unsmob_stencil (stil))
     return stil;
 
@@ -54,16 +49,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_layout ()->self_scm (),
-                                         chain, bt);
+  SCM text = Text_interface::interpret_markup (me->layout ()->self_scm (),
+                                              chain, bt);
 
   Stencil *text_stil = unsmob_stencil (text);
- 
+
   Offset z1;
   for (int i = X_AXIS; i < NO_AXES; i++)
     {
@@ -73,17 +68,23 @@ 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",
               "A collection of routines to put text balloons around an object.",
-              "balloon-padding balloon-text-props balloon-text-offset balloon-text balloon-original-callback");
+
+              /* properties */
+              "balloon-padding "
+              "balloon-text-props "
+              "balloon-text-offset "
+              "balloon-text "
+              "original-stencil ");