lilypond-0.0.76

diff --git a/lily/beam.cc b/lily/beam.cc
index 872cfae025dc661b0ff2d79650fd987bdad0cebf..d09eb627f115df578a15e1974ff978f4b3a0eaf2 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -366,7 +366,7 @@ Beam::brew_molecule_p() const
        sb.translate(Offset(x, (x * slope  + left_pos)* inter_f));
        mol_p->add(sb);
     }
-    mol_p->translate_x(x0 - left_col_l_->hpos);
+    mol_p->translate_x(x0 - left_col_l_->hpos_f_);
     return mol_p;
 }
 
@@ -381,11 +381,9 @@ Beam::do_print()const
     Spanner::do_print();
 #endif
 }
-/*
-  duh. The stem is not a dependency but a dependent
- */
+
 void
-Beam::do_substitute_dependency(Score_elem*o,Score_elem*n)
+Beam::do_substitute_dependent(Score_elem*o,Score_elem*n)
 {
     if (o->is_type_b( Stem::static_name() )) {
        stems.substitute( (Stem*)o->item(),  n?(Stem*) n->item():0);

diff --git a/lily/item.cc b/lily/item.cc
index f1de7827e8951b9fd35bd7cc9392bb5710336cee..ab0290db9f4fd2f5e61aff3024152212f3abf7c4 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -33,7 +33,7 @@ Item::do_print() const
 Real 
 Item::hpos_f()const
 {
-    return pcol_l_->hpos + offset().x;
+    return pcol_l_->hpos_f_ + offset().x;
 }
 
 

diff --git a/lily/local-key-grav.cc b/lily/local-key-grav.cc
index 682e79b917f0eecdb6a5c92e350ced9b4037233c..4c10dc50b65642b148b7e66ca9b66cffa26cc547 100644 (file)
--- a/lily/local-key-grav.cc
+++ b/lily/local-key-grav.cc
@@ -53,6 +53,7 @@ Local_key_engraver::do_pre_move_processing()
        for(int i=0; i < support_l_arr_.size(); i++)
            key_item_p->add_support(support_l_arr_[i]);
        
+       announce_element(Score_elem_info(key_item_p, 0)); // ugh ugh ugh
        typeset_element(key_item_p);
     }
     

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 5cc28a1bd94d81301481d708ae2432d925482894..eb6d16f6fdb3c4e691cbcc2d91f42e6bf638dc03 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -100,8 +100,8 @@ Spanner::Spanner()
 Interval
 Spanner::do_width()const
 {
-    Real r = right_col_l_->hpos;
-    Real l = left_col_l_->hpos;
+    Real r = right_col_l_->hpos_f_;
+    Real l = left_col_l_->hpos_f_;
     assert(*left_col_l_ < *right_col_l_);
     assert(r>=l);