X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fballoon.cc;h=037abfa43a3b173ee990b0cda58f8bccd63ca858;hb=17efd24bdbf7ed1c5a352ef28eb3c1ccaec2512b;hp=20508d8db3598a13c03125624d91a7f7721ca72c;hpb=6eced6a93bbfda6e6af37a7d77a8e75a5052dbee;p=lilypond.git

diff --git a/lily/balloon.cc b/lily/balloon.cc
index 20508d8db3..037abfa43a 100644
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -1,9 +1,20 @@
 /*
-  balloon.cc -- implement Balloon
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "text-interface.hh"
@@ -19,7 +30,7 @@ class Balloon_interface
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE ();
 };
 
 MAKE_SCHEME_CALLBACK (Balloon_interface, print, 1);
@@ -28,47 +39,33 @@ Balloon_interface::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  SCM cb = me->get_property ("balloon-original-callback");
-  SCM stil = SCM_EOL;
-
-  if (ly_is_procedure (cb))
-    stil = scm_call_1 (cb, smob);
-
-  if (!unsmob_stencil (stil))
-    return stil;
+  Grob *p = me->get_parent (X_AXIS);
+  
+  Offset off (me->relative_coordinate (p, X_AXIS),
+	      me->relative_coordinate (p, Y_AXIS));
 
-  SCM scm_off = me->get_property ("balloon-text-offset");
+  Box b (p->extent (p, X_AXIS),
+	 p->extent (p, Y_AXIS));
 
-  if (!is_number_pair (scm_off))
-    return stil;
-
-  Offset off = ly_scm2offset (scm_off);
-  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);
-  box_extent.widen (w, w);
+  Real padding = robust_scm2double (me->get_property ("padding"), .1);
+  b.widen (padding, padding);
 
   // FIXME
-  Stencil fr = Lookup::frame (box_extent, 0.1, 0.05);
+  Stencil fr = Lookup::frame (b, 0.1, 0.05);
 
-  fr.add_stencil (*s);
-
-  SCM bt = me->get_property ("balloon-text");
+  SCM bt = me->get_property ("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 stencil = Text_interface::interpret_markup (me->layout ()->self_scm (),
+						  chain, bt);
 
-  Stencil *text_stil = unsmob_stencil (text);
+  Stencil *text_stil = unsmob_stencil (stencil);
 
   Offset z1;
   for (int i = X_AXIS; i < NO_AXES; i++)
     {
       Axis a ((Axis)i);
-      z1[a] = box_extent [a].linear_combination (sign (off[a]));
+      z1[a] = b[a].linear_combination (sign (off[a]));
       text_stil->align_to (a, -sign (off[a]));
     }
 
@@ -79,11 +76,16 @@ Balloon_interface::print (SCM smob)
   text_stil->translate (z2);
   fr.add_stencil (*text_stil);
 
-  fr = Stencil (orig_extent, fr.expr ());
+  fr.translate (-off);
   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");
+ADD_INTERFACE (Balloon_interface,
+	       "A collection of routines to put text balloons around an"
+	       " object.",
+
+	       /* properties */
+	       "padding "
+	       "text "
+	       );