From ee7972f65dddd916a484b871095ffb678444c9cc Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:48:11 +0000
Subject: [PATCH] lilypond-0.0.76

---
 lily/beam.cc           | 8 +++-----
 lily/item.cc           | 2 +-
 lily/local-key-grav.cc | 1 +
 lily/spanner.cc        | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lily/beam.cc b/lily/beam.cc
index 872cfae025..d09eb627f1 100644
--- 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 f1de7827e8..ab0290db9f 100644
--- 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 682e79b917..4c10dc50b6 100644
--- 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 5cc28a1bd9..eb6d16f6fd 100644
--- 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);
 	
-- 
2.39.5