release: 1.5.24

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index d9531c6dfb100eeb69c759b34ffaa4ce7c4d09c5..4447f3f64f542fb0654e9ac3c5a4ba89482d2123 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -16,7 +16,7 @@
 #include "line-of-score.hh"
 
 Item::Item (SCM s)
-  : Score_element (s)
+  : Grob (s)
 {
   broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]=0;
 }
@@ -25,52 +25,53 @@ Item::Item (SCM s)
    Item copy ctor.  Copy nothing: everything should be a elt property
    or a special purpose pointer (such as broken_to_drul_[]) */
 Item::Item (Item const &s)
-  : Score_element (s)
+  : Grob (s)
 {
   broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] =0;
 }
 
 
 bool
-Item::breakable_b (Score_element*me) 
+Item::breakable_b (Grob*me) 
 {
   if (me->original_l_)
     return false;
 
-  if (!dynamic_cast<Item*>(me))
+  if (!dynamic_cast<Item*> (me))
     programming_error ("only items can be breakable.");
   
-  Item * i  =dynamic_cast<Item*> (me->parent_l (X_AXIS));
-  return (i) ?  Item::breakable_b (i) : to_boolean (me->get_elt_property ("breakable"));
+  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
 {
-  return dynamic_cast<Item*> (parent_l (X_AXIS))->column_l ();
+  Item *parent = dynamic_cast<Item*> (get_parent (X_AXIS));
+  return parent ? parent->column_l () : 0;
 }
 
 Line_of_score *
-Item::line_l() const
+Item::line_l () const
 {
-  Score_element *g = parent_l (X_AXIS);
+  Grob *g = get_parent (X_AXIS);
   return g ?  g->line_l () : 0;
 }
 
 
 void
-Item::copy_breakable_items()
+Item::copy_breakable_items ()
 {
   Drul_array<Item *> new_copies;
   Direction  i=LEFT;
   do 
     {
-      Score_element * dolly = clone();
-      Item * item_p = dynamic_cast<Item*>(dolly);
-      pscore_l_->line_l_->typeset_element (item_p);
+      Grob * dolly = clone ();
+      Item * item_p = dynamic_cast<Item*> (dolly);
+      pscore_l_->line_l_->typeset_grob (item_p);
       new_copies[i] =item_p;
     }
-  while (flip(&i) != LEFT);
+  while (flip (&i) != LEFT);
   broken_to_drul_= new_copies;
 }
 
@@ -86,24 +87,24 @@ Item::broken_b () const
   Generate items for begin and end-of line.
  */
 void
-Item::discretionary_processing()
+Item::discretionary_processing ()
 {
   if (broken_b ())
     return;
 
   if (Item::breakable_b (this))
-    copy_breakable_items();
+    copy_breakable_items ();
 }
 
-Score_element*
+Grob*
 Item::find_broken_piece (Line_of_score*l) const
 {
-  if (line_l() == l) 
-    return (Item*)(this);
+  if (line_l () == l) 
+    return (Item*) (this);
 
   Direction d = LEFT;
   do {
-    Score_element *s = broken_to_drul_[d];
+    Grob *s = broken_to_drul_[d];
     if (s && s->line_l () == l)
       return s;
   }
@@ -142,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 ()));
     }
   
@@ -156,23 +157,23 @@ Item::handle_prebroken_dependencies ()
     the function can do more complicated things.
     
   */
-  SCM vis = get_elt_property ("visibility-lambda");
+  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 ();
       else if (empty)
        {
-         set_extent_callback (0, X_AXIS);
-         set_extent_callback (0,  Y_AXIS);
+         set_extent_callback (SCM_EOL, X_AXIS);
+         set_extent_callback (SCM_EOL, Y_AXIS);
        }
       else if (trans)
-       set_elt_property ("molecule-callback", SCM_BOOL_T);
+       set_grob_property ("molecule-callback", SCM_BOOL_T);
     }
 }
 
@@ -180,8 +181,8 @@ SCM
 Item::do_derived_mark ()
 {
   if (broken_to_drul_[LEFT])
-    scm_gc_mark (broken_to_drul_[LEFT]->self_scm_);
+    scm_gc_mark (broken_to_drul_[LEFT]->self_scm ());
   if (broken_to_drul_[RIGHT])
-    scm_gc_mark (broken_to_drul_[RIGHT]->self_scm_);
+    scm_gc_mark (broken_to_drul_[RIGHT]->self_scm ());
   return SCM_EOL;
 }