patch::: 1.3.108.jcn3

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index ed980734523d879b369b112e630d80f462cc4c7b..811ed663e07d1918d8b076ca70b0ea8a3fb99c7e 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -6,7 +6,7 @@
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "dimension-cache.hh"
+
 #include "paper-score.hh"
 #include "debug.hh"
 #include "item.hh"
@@ -15,7 +15,8 @@
 #include "lily-guile.hh"
 #include "line-of-score.hh"
 
-Item::Item ()
+Item::Item (SCM s)
+  : Score_element (s)
 {
   broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]=0;
 }
@@ -30,15 +31,23 @@ Item::Item (Item const &s)
 }
 
 
-
 bool
-Item::breakable_b () const
+Item::breakable_b (Score_element*me) 
 {
-  if (original_l_ )
+  if (me->original_l_)
     return false;
+
+  if (!dynamic_cast<Item*>(me))
+    programming_error ("only items can be breakable.");
   
-  Item * i  =dynamic_cast<Item*> (parent_l (X_AXIS));
-  return (i) ?  i->breakable_b () : to_boolean (get_elt_property ("breakable"));
+  Item * i  =dynamic_cast<Item*> (me->parent_l (X_AXIS));
+  return (i) ?  Item::breakable_b (i) : to_boolean (me->get_elt_property ("breakable"));
+}
+
+Paper_column *
+Item::column_l () const
+{
+  return dynamic_cast<Item*> (parent_l (X_AXIS))->column_l ();
 }
 
 Line_of_score *
@@ -82,7 +91,7 @@ Item::discretionary_processing()
   if (broken_b ())
     return;
 
-  if (breakable_b ())
+  if (Item::breakable_b (this))
     copy_breakable_items();
 }
 
@@ -113,11 +122,6 @@ Item::find_prebroken_piece (Direction d) const
   return dynamic_cast<Item*> (broken_to_drul_[d]);
 }
 
-Paper_column *
-Item::column_l () const
-{
-  return dynamic_cast<Item*> (parent_l (X_AXIS))->column_l ();
-}
 
 Direction
 Item::break_status_dir () const
@@ -137,29 +141,47 @@ Item::handle_prebroken_dependencies ()
 {
   if (original_l_)
     {
-      element_property_alist_
-       = handle_broken_smobs (original_l_->element_property_alist_,
+      mutable_property_alist_
+       = handle_broken_smobs (original_l_->mutable_property_alist_,
                               gh_int2scm (break_status_dir ()));
     }
   
   /*
     Can't do this earlier, because try_visibility_lambda () might set
     the elt property transparent, which would then be copied.
+
+    TODO:
+
+    handle visibility-lambda the item itself iso. breakstatusdir, so
+    the function can do more complicated things.
+    
   */
-  SCM vis = remove_elt_property ("visibility-lambda");
+  SCM vis = get_elt_property ("visibility-lambda");
   if (gh_procedure_p (vis))
     {
       SCM args = scm_listify (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));
-
-      if (empty)
+      
+      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);
        }
-      if (trans)
-       set_elt_property ("transparent", SCM_BOOL_T);
+      else if (trans)
+       set_elt_property ("molecule-callback", SCM_BOOL_T);
     }
 }
+
+SCM
+Item::do_derived_mark ()
+{
+  if (broken_to_drul_[LEFT])
+    scm_gc_mark (broken_to_drul_[LEFT]->self_scm ());
+  if (broken_to_drul_[RIGHT])
+    scm_gc_mark (broken_to_drul_[RIGHT]->self_scm ());
+  return SCM_EOL;
+}