release: 1.5.29

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index eeed9d86ccaddd7a928a78a13eaacc76a39bc48c..e92ac8ac90afbffcb934c820e656808513545b60 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -40,21 +40,21 @@ Item::breakable_b (Grob*me)
   if (!dynamic_cast<Item*> (me))
     programming_error ("only items can be breakable.");
   
-  Item * i  =dynamic_cast<Item*> (me->parent_l (X_AXIS));
+  Item * i  =dynamic_cast<Item*> (me->get_parent (X_AXIS));
   return (i) ?  Item::breakable_b (i) : to_boolean (me->get_grob_property ("breakable"));
 }
 
 Paper_column *
 Item::column_l () const
 {
-  Item *parent = dynamic_cast<Item*> (parent_l (X_AXIS));
+  Item *parent = dynamic_cast<Item*> (get_parent (X_AXIS));
   return parent ? parent->column_l () : 0;
 }
 
 Line_of_score *
 Item::line_l () const
 {
-  Grob *g = parent_l (X_AXIS);
+  Grob *g = get_parent (X_AXIS);
   return g ?  g->line_l () : 0;
 }
 
@@ -162,8 +162,8 @@ Item::handle_prebroken_dependencies ()
     {
       SCM args = scm_list_n (gh_int2scm (break_status_dir ()), SCM_UNDEFINED);
       SCM result = gh_apply (vis, args);
-      bool trans = gh_scm2bool (gh_car (result));
-      bool empty = gh_scm2bool (gh_cdr (result));
+      bool trans = gh_scm2bool (ly_car (result));
+      bool empty = gh_scm2bool (ly_cdr (result));
       
       if (empty && trans)
        suicide ();
@@ -186,3 +186,9 @@ Item::do_derived_mark ()
     scm_gc_mark (broken_to_drul_[RIGHT]->self_scm ());
   return SCM_EOL;
 }
+
+Item*
+unsmob_item (SCM s )
+{
+  return dynamic_cast<Item*> (unsmob_grob (s));
+}