unsmob_pitch -> Pitch::unsmob and related

[lilypond.git] / lily / balloon.cc

diff --git a/lily/balloon.cc b/lily/balloon.cc
index b9872b2cd5835ae45501c8c496a45cb0bc16f1ae..4740a7291c6930eb31a0bfd27e13d1ab0ed996de 100644 (file)
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -42,7 +42,7 @@ MAKE_SCHEME_CALLBACK (Balloon_interface, print, 1);
 SCM
 Balloon_interface::print (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = Grob::unsmob (smob);
 
   if (Item *item = dynamic_cast<Item *> (me))
     if (!Item::break_visible (item))
@@ -51,7 +51,7 @@ Balloon_interface::print (SCM smob)
   Grob *p = me->get_parent (X_AXIS);
 
   Offset off (me->relative_coordinate (p, X_AXIS),
-             me->relative_coordinate (p, Y_AXIS));
+              me->relative_coordinate (p, Y_AXIS));
 
   return internal_balloon_print (me, p, off);
 }
@@ -65,24 +65,23 @@ Balloon_interface::print_spanner (SCM smob)
 
   if (orig)
     {
-      Direction spanner_placement =  robust_scm2dir (me->get_property ("spanner-placement"), LEFT);
+      Direction spanner_placement = robust_scm2dir (me->get_property ("spanner-placement"), LEFT);
 
       Spanner *wanted = (spanner_placement != RIGHT)
-                         ? orig->broken_intos_[0]
-                         : orig->broken_intos_.back ();
+                        ? orig->broken_intos_[0]
+                        : orig->broken_intos_.back ();
 
       if (me != wanted)
         return SCM_EOL;
     }
 
-
   Spanner *p = dynamic_cast<Spanner *> (me->get_parent (Y_AXIS));
 
   if (!p)
     return SCM_EOL;
 
   Offset off (me->relative_coordinate (me->get_bound (LEFT), X_AXIS),
-             me->relative_coordinate (p, Y_AXIS));
+              me->relative_coordinate (p, Y_AXIS));
   return internal_balloon_print (me, p, off);
 }
 
@@ -90,7 +89,7 @@ SCM
 Balloon_interface::internal_balloon_print (Grob *me, Grob *p, Offset off)
 {
   Box b (p->extent (p, X_AXIS),
-        p->extent (p, Y_AXIS));
+         p->extent (p, Y_AXIS));
   Real padding = robust_scm2double (me->get_property ("padding"), .1);
   b.widen (padding, padding);
 
@@ -103,8 +102,8 @@ Balloon_interface::internal_balloon_print (Grob *me, Grob *p, Offset off)
   SCM chain = Font_interface::text_font_alist_chain (me);
   SCM stencil = Text_interface::interpret_markup (me->layout ()->self_scm (),
                                                   chain, bt);
-  Stencil *text_stil = unsmob_stencil (stencil);
-  
+  Stencil *text_stil = Stencil::unsmob (stencil);
+
   Offset z1;
 
   for (int i = X_AXIS; i < NO_AXES; i++)
@@ -127,14 +126,14 @@ Balloon_interface::internal_balloon_print (Grob *me, Grob *p, Offset off)
 }
 
 ADD_INTERFACE (Balloon_interface,
-              "A collection of routines to put text balloons around an"
-              " object.",
-
-              /* properties */
-              "annotation-balloon "
-              "annotation-line "
-              "padding "
-              "spanner-placement "
-              "text "
-              );
+               "A collection of routines to put text balloons around an"
+               " object.",
+
+               /* properties */
+               "annotation-balloon "
+               "annotation-line "
+               "padding "
+               "spanner-placement "
+               "text "
+              );