(try_music): add moments for

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index 057155b52bbb0674b6db481449931a178c0ecd04..f857ff55917f038a80652eb9136da4d41ed5c1ab 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -33,7 +33,7 @@ Item::Item (Item const &s)
 
 
 bool
-Item::breakable_b (Grob*me) 
+Item::is_breakable (Grob*me) 
 {
   if (me->original_)
     return false;
@@ -41,8 +41,8 @@ Item::breakable_b (Grob*me)
   if (!dynamic_cast<Item*> (me))
     me->programming_error ("only items can be breakable.");
   
-  Item * i  =dynamic_cast<Item*> (me->get_parent (X_AXIS));
-  return (i) ?  Item::breakable_b (i) : to_boolean (me->get_grob_property ("breakable"));
+  Item * i = dynamic_cast<Item*> (me->get_parent (X_AXIS));
+  return (i) ? Item::is_breakable (i) : to_boolean (me->get_property ("breakable"));
 }
 
 Paper_column *
@@ -78,7 +78,7 @@ Item::copy_breakable_items ()
 
 
 bool
-Item::broken_b () const
+Item::is_broken () const
 {
   return broken_to_drul_[LEFT] || broken_to_drul_[RIGHT];
 }
@@ -90,10 +90,10 @@ Item::broken_b () const
 void
 Item::discretionary_processing ()
 {
-  if (broken_b ())
+  if (is_broken ())
     return;
 
-  if (Item::breakable_b (this))
+  if (Item::is_breakable (this))
     copy_breakable_items ();
 }
 
@@ -152,13 +152,13 @@ Item::handle_prebroken_dependencies ()
     give the item to break-visibility itself, so the function can do
     more complicated things.
   */
-  SCM vis = get_grob_property ("break-visibility");
-  if (gh_procedure_p (vis))
+  SCM vis = get_property ("break-visibility");
+  if (ly_c_procedure_p (vis))
     {
-      SCM args = scm_list_n (gh_int2scm (break_status_dir ()), SCM_UNDEFINED);
-      SCM result = gh_apply (vis, args);
-      bool trans = gh_scm2bool (ly_car (result));
-      bool empty = gh_scm2bool (ly_cdr (result));
+      SCM args = scm_list_n (scm_int2num (break_status_dir ()), SCM_UNDEFINED);
+      SCM result = scm_apply_0 (vis, args);
+      bool trans = ly_scm2bool (ly_car (result));
+      bool empty = ly_scm2bool (ly_cdr (result));
       
       if (empty && trans)
        suicide ();
@@ -168,7 +168,7 @@ Item::handle_prebroken_dependencies ()
          set_extent (SCM_EOL, Y_AXIS);
        }
       else if (trans)
-       set_grob_property ("print-function", SCM_EOL);
+       set_property ("print-function", SCM_EOL);
     }
 }
 
@@ -190,7 +190,7 @@ unsmob_item (SCM s )
 
 
 
-ADD_INTERFACE(Item,
+ADD_INTERFACE (Item,
              "item-interface",
              "\n"
              "\n"