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

[lilypond.git] / lily / balloon.cc

diff --git a/lily/balloon.cc b/lily/balloon.cc
index 0b4dd2e98d36fe00253c91fda343ba723b58b517..560a2f667586ec4ca0eb2fd51067f9a0bb98d8b4 100644 (file)
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -1,94 +1,90 @@
 /*
-  balloon.cc -- implement Balloon objects
- */
+  balloon.cc -- implement Balloon
 
-#include "text-item.hh"
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "text-interface.hh"
 #include "grob.hh"
 #include "line-interface.hh"
 #include "lookup.hh"
 #include "font-interface.hh"
-#include "stencil.hh"
 #include "lily-guile.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "misc.hh"
 
-struct Balloon_interface
+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);
+  Grob *me = unsmob_grob (smob);
 
-  SCM cb = me->get_property ("balloon-original-callback");
-  SCM scm_mol  =  SCM_EOL;
-
-  if (ly_procedure_p (cb))
-    {
-      scm_mol = scm_call_1 (cb, smob);
-    }
-
-  if (!unsmob_stencil (scm_mol))
-    return scm_mol;
+  SCM stil = me->get_property ("original-stencil");
+  if (!unsmob_stencil (stil))
+    return stil;
 
   SCM scm_off = me->get_property ("balloon-text-offset");
 
   if (!is_number_pair (scm_off))
-    return scm_mol;
+    return stil;
 
   Offset off = ly_scm2offset (scm_off);
-  Stencil * m = unsmob_stencil (scm_mol);
-  Box orig_extent = m->extent_box ();
+  Stencil *s = unsmob_stencil (stil);
+  Box orig_extent = s->extent_box ();
   Box box_extent = orig_extent;
 
-  Real w = robust_scm2double (me->get_property ("balloon-padding"),  .1);
+  Real w = robust_scm2double (me->get_property ("balloon-padding"), .1);
   box_extent.widen (w, w);
-  
-  
-  Stencil fr = Lookup::frame (box_extent, 0.1, 0.05);
-
-  
-  fr.add_stencil (*m);
 
+  // FIXME
+  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->layout ()->self_scm (),
+                                              chain, bt);
 
-  SCM text = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain, bt);
+  Stencil *text_stil = unsmob_stencil (text);
 
-  
-  Stencil *text_mol = unsmob_stencil (text);
-  
   Offset z1;
-
   for (int i = X_AXIS; i < NO_AXES; i++)
     {
-      Axis  a ((Axis)i);
+      Axis a ((Axis)i);
       z1[a] = box_extent [a].linear_combination (sign (off[a]));
-      text_mol->align_to (a, -sign (off[a]));
+      text_stil->align_to (a, -sign (off[a]));
     }
 
   Offset z2 = z1 + off;
-  
+
   fr.add_stencil (Line_interface::line (me, z1, z2));
 
-  text_mol->translate (z2);
-  fr.add_stencil (*text_mol);
-  
-  fr = Stencil (orig_extent, fr.get_expr ());
+  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");
+
+              /* properties */
+              "balloon-padding "
+              "balloon-text-props "
+              "balloon-text-offset "
+              "balloon-text "
+              "original-stencil ");