release: 1.5.24

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index 6eeaf775031891d37060fd7aea09ff0cbc6ecbbb..4447f3f64f542fb0654e9ac3c5a4ba89482d2123 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -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;
 }
 
@@ -143,7 +143,7 @@ Item::handle_prebroken_dependencies ()
   if (original_l_)
     {
       mutable_property_alist_
-       = handle_broken_smobs (original_l_->mutable_property_alist_,
+       = handle_broken_grobs(original_l_->mutable_property_alist_,
                               gh_int2scm (break_status_dir ()));
     }
   
@@ -160,10 +160,10 @@ Item::handle_prebroken_dependencies ()
   SCM vis = get_grob_property ("visibility-lambda");
   if (gh_procedure_p (vis))
     {
-      SCM args = scm_listify (gh_int2scm (break_status_dir ()), SCM_UNDEFINED);
+      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 ();