release: 1.2.4

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

diff --git a/lily/score-element.cc b/lily/score-element.cc
index 3215b80930d5fc9b811c444133a4a56a9e9606c6..2dab6212bcbf1d4d6445a71d04857c5846148211 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)
@@ -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,
@@ -410,6 +412,11 @@ Score_element::handle_prebroken_dependents()
 {
 }
 
+void
+Score_element::handle_broken_dependents()
+{
+}
+
 
 
 Link_array<Score_element>