release: 1.2.13

[lilypond.git] / lily / score-element.cc

diff --git a/lily/score-element.cc b/lily/score-element.cc
index 3215b80930d5fc9b811c444133a4a56a9e9606c6..bdb4f4bd3067cb7228dad3c3453066ba30e6394d 100644 (file)
--- a/lily/score-element.cc
+++ b/lily/score-element.cc
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include "p-score.hh"
+#include "paper-score.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
 #include "molecule.hh"
@@ -18,10 +18,12 @@
 #include "spanner.hh"
 #include "line-of-score.hh"
 #include "item.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
 #include "molecule.hh"
 #include "misc.hh"
 #include "paper-outputter.hh"
+#include "dimension-cache.hh"
+
 
 Interval
 Score_element::dim_cache_callback (Dimension_cache*c)
@@ -135,16 +137,16 @@ void
 Score_element::print() const
 {
 #ifndef NPRINT
-  DOUT << classname(this) << "{\n";
-  if (check_debug && !monitor->silent_b ("Score_element"))
+  DEBUG_OUT << classname(this) << "{\n";
+  if (flower_dstream && !flower_dstream->silent_b ("Score_element"))
     ly_display_scm (element_property_alist_);
-  DOUT << "dependencies: " << dependency_size();
+  DEBUG_OUT << "dependencies: " << dependency_size();
   if (original_l_)
-    DOUT << "Copy ";
+    DEBUG_OUT << "Copy ";
   Graphical_element::do_print ();
   do_print();
   
-  DOUT <<  "}\n";
+  DEBUG_OUT <<  "}\n";
 #endif
 }
 
@@ -159,13 +161,13 @@ Score_element::lookup_l () const
 {
   if (!lookup_l_)
     {
-      Score_element * me = (Score_element*)this;
-      SCM sz = me->remove_elt_property (fontsize_scm_sym);
+      Score_element * urg = (Score_element*)this;
+      SCM sz = urg->remove_elt_property (fontsize_scm_sym);
       int i = (sz != SCM_BOOL_F)
        ? gh_scm2int (SCM_CDR (sz))
        : 0;
 
-      me->lookup_l_ =  pscore_l_->paper_l_->lookup_l (i);
+      urg->lookup_l_ =  (Lookup*)pscore_l_->paper_l_->lookup_l (i);
     }
   return lookup_l_;
 }
@@ -216,7 +218,7 @@ Score_element::output_processing ()
     delete output_p_;
   
   output_p_ = do_brew_molecule_p ();
-  Offset o (absolute_coordinate (X_AXIS), absolute_coordinate (Y_AXIS));
+  Offset o (relative_coordinate (0, X_AXIS), relative_coordinate (0, Y_AXIS));
   
   pscore_l_->outputter_l_->output_molecule (output_p_,
                                            o,
@@ -280,22 +282,6 @@ Score_element::line_l() const
   return 0;
 }
 
-/*
-  
-  DEPENDENCIES
-
-  */
-
-void
-Score_element::remove_dependency (Score_element*e)
-{
-  int i;
-  while ((i = dependency_arr_.find_i (e)) >=0 )
-    dependency_arr_.unordered_del (i);
-
-  substitute_dependency (e, 0);
-}
-
 void
 Score_element::add_dependency (Score_element*e)
 {
@@ -322,38 +308,27 @@ Score_element::handle_broken_dependencies()
   if (!line)
     return;
 
-  Link_array<Score_element> remove_us_arr;
+  do_substitute_arrays ();
+
+  Link_array<Score_element> new_deps;
+
   for (int i=0; i < dependency_size(); i++) 
     {
       Score_element * elt = dependency (i);
       if (elt->line_l() != line)
        {
-         if (Spanner *sp = dynamic_cast<Spanner *> (elt)) 
-           {
-             Spanner * broken = sp->find_broken_piece (line);
-             substitute_dependency (sp, broken);
-
-             if (broken)
-               add_dependency (broken);
-           }
-         else if (Item *original = dynamic_cast <Item *> (elt))
-           {
-             Item * my_item = original->find_prebroken_piece (line);
-               
-             substitute_dependency (elt, my_item);
-             if (my_item)
-               add_dependency (my_item);
-           }
-         remove_us_arr.push (elt);
+         Score_element * broken = elt->find_broken_piece (line);
+         substitute_dependency (elt, broken);
+         elt  = broken ;
        }
+      if (elt)
+       new_deps.push (elt);
     }
+  dependency_arr_ = new_deps;
 
-  remove_us_arr.default_sort();
-  remove_us_arr.uniq();
-  for (int i=0;  i <remove_us_arr.size(); i++)
-    remove_dependency (remove_us_arr[i]);
 }
 
+
 /*
   This sux.
 
@@ -366,6 +341,9 @@ Score_element::handle_broken_dependencies()
   span: item1 item2 item3
 
   How to let span (a derived class) know that this happened?
+
+
+  TODO: cleanify.
  */
 void
 Score_element::handle_prebroken_dependencies()
@@ -383,7 +361,7 @@ Score_element::handle_prebroken_dependencies()
       if (it_l && it_l->broken_original_b ())
        if (Item *me = dynamic_cast<Item*> (this) )
          {
-           Score_element *new_l = it_l->find_prebroken_piece (me->break_status_dir ());
+           Score_element *new_l = it_l->find_broken_piece (me->break_status_dir ());
            if (new_l != elt) 
              {
                new_arr.push (new_l);
@@ -395,7 +373,7 @@ Score_element::handle_prebroken_dependencies()
            Direction d = LEFT;
            do {
              old_arr.push (0);
-             new_arr.push (it_l->find_prebroken_piece (d));
+             new_arr.push (it_l->find_broken_piece (d));
            } while (flip(&d)!= LEFT);
          }
     }
@@ -410,6 +388,11 @@ Score_element::handle_prebroken_dependents()
 {
 }
 
+void
+Score_element::handle_broken_dependents()
+{
+}
+
 
 
 Link_array<Score_element>
@@ -429,3 +412,15 @@ void
 Score_element::do_print () const
 {
 }
+
+void
+Score_element::do_substitute_arrays ()
+{
+}
+
+
+Score_element*
+Score_element::find_broken_piece (Line_of_score*) const
+{
+  return 0;
+}