release: 1.2.4

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

diff --git a/lily/score-element.cc b/lily/score-element.cc
index f77f9c9e8c7d49f6d003da6fea0c45b6133fe845..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)
@@ -43,7 +45,7 @@ Score_element::Score_element()
   lookup_l_ =0;
   status_i_ = 0;
   original_l_ = 0;
-  element_property_alist_ = SCM_EOL;
+  element_property_alist_ = scm_protect_object (gh_cons (gh_cons (void_scm_sym, SCM_BOOL_T) , SCM_EOL));
 }
 
 Score_element::Score_element (Score_element const&s)
@@ -51,7 +53,7 @@ Score_element::Score_element (Score_element const&s)
 {
   used_b_ = true;
   original_l_ =(Score_element*) &s;
-  element_property_alist_ = scm_list_copy (s.element_property_alist_);
+  element_property_alist_ = scm_protect_object (scm_list_copy (s.element_property_alist_));
   dependency_arr_ = s.dependency_arr_;
   output_p_ =0;
   status_i_ = s.status_i_;
@@ -94,15 +96,15 @@ SCM
 Score_element::remove_elt_property (SCM key)
 {
   SCM s = get_elt_property (key); 
-  element_property_alist_ =  scm_assq_remove_x (element_property_alist_, key);
+  SCM_CDR(element_property_alist_) =  scm_assq_remove_x (SCM_CDR (element_property_alist_), key);
   return s;
 }
 
 void
 Score_element::set_elt_property (SCM s, SCM v)
 {
-  element_property_alist_ =
-    scm_assoc_set_x (element_property_alist_, s, v);
+  SCM_CDR(element_property_alist_) =
+    scm_assoc_set_x (SCM_CDR (element_property_alist_), s, v);
 }
 
 Interval
@@ -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,13 +218,11 @@ 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,
                                            classname(this));
-
-  pscore_l_->schedule_for_delete (this);
 }
 
 /*
@@ -307,9 +307,9 @@ Score_element::add_dependency (Score_element*e)
       e->used_b_ = true;
     }
   else
-    warning("Null dependency added");
-      
+    programming_error ("Null dependency added");
 }
+
 void
 Score_element::substitute_dependency (Score_element* old, Score_element* new_l)
 {
@@ -412,6 +412,11 @@ Score_element::handle_prebroken_dependents()
 {
 }
 
+void
+Score_element::handle_broken_dependents()
+{
+}
+
 
 
 Link_array<Score_element>