]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/item.cc
release: 1.2.4
[lilypond.git] / lily / item.cc
index 6ff6400b9925cd378dae57d01f375d1577b060bf..e6798b5be1f70818077b7d2370ca7eb37ba137fe 100644 (file)
@@ -5,43 +5,40 @@
 
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include "dimension-cache.hh"
 
-#include "p-score.hh"
+#include "paper-score.hh"
 #include "debug.hh"
 #include "item.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
 #include "spanner.hh"
+#include "lily-guile.hh"
 
 Item::Item ()
 {
-  unbroken_original_l_ =0;
-  break_priority_i_ = 0;
-  breakable_b_ = false;
-  break_status_dir_ = CENTER;
   broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]=0;
 }
 
 bool
 Item::breakable_b () const
 {
-  return !unbroken_original_l_ 
-    && dynamic_cast<Item*> (parent_l (X_AXIS))->breakable_b ();
+  if (original_l_ )
+    return false;
+  
+  Item * i  =dynamic_cast<Item*> (parent_l (X_AXIS));
+  return (i) ?  i->breakable_b () : get_elt_property( breakable_scm_sym) != SCM_BOOL_F;
 }
 
 void
 Item::do_print() const
 {
-#ifndef NPRINT
-  DOUT << "breakable_b_: " << breakable_b_ << 
-    " break_status_dir_: " << break_status_dir_;
-#endif
 }
 
 
 Real 
 Item::hpos_f() const
 {
-  return absolute_coordinate (X_AXIS);
+  return relative_coordinate (0, X_AXIS);
 }
 
 Line_of_score *
@@ -53,18 +50,13 @@ Item::line_l() const
   return dynamic_cast<Score_element *> (g)-> line_l ();
 }
 
-Direction
-Item::break_status_dir() const
-{
-  return break_status_dir_;
-}
 
 void
 Item::copy_breakable_items()
 {
-  if (broken_to_drul_[LEFT] || broken_to_drul_[RIGHT] 
-      || ! breakable_b ())
-    return;
+  if (broken_to_drul_[LEFT] || broken_to_drul_[RIGHT]
+      || !breakable_b ())
+    return ;
 
   Drul_array<Item *> new_copies;
   Direction  i=LEFT;
@@ -72,8 +64,6 @@ Item::copy_breakable_items()
     {
       Score_element * dolly = clone();
       Item * item_p = dynamic_cast<Item*>(dolly);
-      item_p->unbroken_original_l_ = this;
-      item_p->break_status_dir_ =  i;
       pscore_l_->typeset_element (item_p);
       new_copies[i] =item_p;
     }
@@ -92,17 +82,18 @@ Item::copy_breakable_items()
 void
 Item::try_visibility_lambda ()
 {
-  if (visibility_lambda_)
+  SCM vis = remove_elt_property (visibility_lambda_scm_sym);
+  if (vis != SCM_BOOL_F)
     {
-      SCM args = scm_listify (gh_int2scm (break_status_dir_), SCM_UNDEFINED);
-      SCM result = gh_apply (visibility_lambda_, args);
+      SCM args = scm_listify (gh_int2scm (break_status_dir ()), SCM_UNDEFINED);
+      SCM result = gh_apply ( SCM_CDR(vis), args);
       int trans = gh_scm2bool (gh_car (result));
       int empty = gh_scm2bool (gh_cdr (result));
 
       if (empty)
-       set_empty (true);
+       set_empty (true, X_AXIS, Y_AXIS);
       if (trans)
-       transparent_b_ = true;
+       set_elt_property (transparent_scm_sym, SCM_BOOL_T);
     }
 }
 
@@ -124,7 +115,8 @@ Item::do_breakable_col_processing()
 {
   if (breakable_b ())
     do_break ();
-
+  else
+    try_visibility_lambda ();
 }
 Item*
 Item::find_prebroken_piece (Line_of_score*l) const
@@ -151,10 +143,16 @@ Item::find_prebroken_piece (Direction d) const
 void
 Item::handle_prebroken_dependencies()
 {
-  if (breakable_b_)
+  if (original_l_)
     Score_element::handle_prebroken_dependencies();
 }
 
+bool
+Item::broken_original_b () const
+{
+  return broken_to_drul_[LEFT] || broken_to_drul_[RIGHT];
+}
+
 int
 Item::left_right_compare(Item const *l, Item const *r)
 {
@@ -163,40 +161,6 @@ Item::left_right_compare(Item const *l, Item const *r)
   return p1->rank_i () - p2->rank_i ();
 }
 
-
-bool
-Item::linked_b() const
-{
-  return Score_element::linked_b() || attached_span_l_arr_.size();
-}
-
-void
-Item::do_junk_links()
-{
-  attached_span_l_arr_.set_size(0);
-}
-
-void
-Item::do_unlink()
-{
-  Link_array<Spanner> attached=attached_span_l_arr_;
-  for (int i=0; i < attached.size (); i++)
-    {
-      Spanner *s= attached[i];
-
-      Direction d= LEFT;
-      do {
-       if (s->spanned_drul_[d] == this)
-         s->set_bounds (d, 0);
-       if (unbroken_original_l_
-           && unbroken_original_l_-> broken_to_drul_[d] == this)
-         unbroken_original_l_->broken_to_drul_[d] = 0;
-      } while (flip (&d) != LEFT);
-    }
-  assert (!attached_span_l_arr_.size ());
-  unbroken_original_l_ =0;
-}
-
 Paper_column *
 Item::column_l () const
 {
@@ -206,20 +170,14 @@ Item::column_l () const
 Item::Item (Item const &s)
   : Score_element (s)
 {
-  unbroken_original_l_ = 0;
-  /* do not copy attached_span_l_arr_ */
-  breakable_b_ = s.breakable_b_;
-  visibility_lambda_ = s.visibility_lambda_;
   broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] =0;
-  break_status_dir_ = s.break_status_dir_;
-  break_priority_i_ = s.break_priority_i_;
 }
 
 
 void
 Item::handle_prebroken_dependents ()
 {
-  Item * parent =  dynamic_cast<Item*> (parent_lX_AXIS));
+  Item * parent =  dynamic_cast<Item*> (parent_l (X_AXIS));
   if (breakable_b () && parent)
     {
        if(!(broken_to_drul_[LEFT] || broken_to_drul_[RIGHT]))
@@ -228,11 +186,42 @@ Item::handle_prebroken_dependents ()
       Direction d = LEFT;
       do
        {
-         broken_to_drul_[d]->dim_cache_[X_AXIS].parent_l_ =
-           &parent->broken_to_drul_[d]->dim_cache_[X_AXIS];
-         parent->broken_to_drul_[d]->add_dependency (broken_to_drul_[d]);
+         Item * broken_self = find_prebroken_piece (d);
+         Item * broken_parent = parent->find_prebroken_piece (d);
+
+         broken_self->set_parent (broken_parent, X_AXIS);
+
+         /*
+           ugh. Should do this is after breaking?
+          */
+         if (!broken_self->parent_l (Y_AXIS))
+           {
+             Score_element * yparent =dynamic_cast<Score_element*>(parent_l (Y_AXIS));
+             Item *yparenti = dynamic_cast<Item*> (yparent);
+             Item *broken_yparent = yparenti ?
+               yparenti->find_prebroken_piece (d) : 0;
+             
+             if (!yparent)
+               programming_error ("Vertical refpoint lost!");
+             else if (yparenti)
+               {
+                 broken_self->set_parent (broken_yparent, Y_AXIS);
+               }
+           }
        }
       while ((flip (&d))!=LEFT);
     }
 }
 
+Direction
+Item::break_status_dir () const
+{
+  if (original_l_)
+    {
+      Item * i = dynamic_cast<Item*> (original_l_);
+
+      return (i->broken_to_drul_[LEFT] == this) ? LEFT : RIGHT;
+    }
+  else
+    return CENTER;
+}