release: 0.1.47

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

diff --git a/lily/score-elem.cc b/lily/score-elem.cc
index c06ebd0d2cc014801dee5e1124dac3067078e072..1a6ec4105ef78f8975e9cff4eb42e8009145000d 100644 (file)
--- a/lily/score-elem.cc
+++ b/lily/score-elem.cc
@@ -27,7 +27,7 @@ Score_elem::Score_elem()
 }
 
 Score_elem::Score_elem (Score_elem const&s)
-  : Graphical_element (s)
+  :  Directed_graph_node (s), Graphical_element (s)
 {
   /* called from derived ctor, so most info points to the same deps
      as (Directed_graph_node&)s. Nobody points to us, so don't copy
@@ -135,11 +135,11 @@ void
 Score_elem::calcalute_dependencies (int final, int busy,
                                    Score_elem_method_pointer funcptr)
 {
-   if (status_i_ >= final)
+  if (status_i_ >= final)
     return;
 
-   assert (status_i_!= busy);
-   status_i_= busy;
+  assert (status_i_!= busy);
+  status_i_= busy;
 
   for (int i=0; i < dependency_size(); i++)
     dependency (i)->calcalute_dependencies (final, busy, funcptr);
@@ -157,10 +157,10 @@ Score_elem::calcalute_dependencies (int final, int busy,
 void
 Score_elem::do_brew_molecule () 
 {
-   if (transparent_b_)
+  if (transparent_b_)
     return ;
-   Molecule *output= brew_molecule_p ();
-   pscore_l_->outputter_l_->output_molecule (output, absolute_offset ());
+  Molecule *output= brew_molecule_p ();
+  pscore_l_->outputter_l_->output_molecule (output, absolute_offset ());
 }
 
 /*
@@ -293,8 +293,6 @@ Score_elem::handle_broken_dependencies()
   remove_us_arr.uniq();
   for (int i=0;  i <remove_us_arr.size(); i++)
     remove_dependency (remove_us_arr[i]);
-
-  //  status_i_= BROKEN;
 }
 
 /*
@@ -332,18 +330,15 @@ Score_elem::handle_prebroken_dependencies()
        else 
          {
            new_arr.push (it_l->broken_to_drul_[LEFT]);
-             old_arr.push (0);
-             old_arr.push (0);         
-             new_arr.push (it_l->broken_to_drul_[RIGHT]);              
+           old_arr.push (0);
+           old_arr.push (0);           
+           new_arr.push (it_l->broken_to_drul_[RIGHT]);                
          }
     }
   
   for (int i=0;  i < old_arr.size(); i++)
     if (old_arr[i])
       substitute_dependency (old_arr[i], new_arr[i]);
-       
-       
-  //  status_i_= PREBROKEN;
 }