release: 0.1.11

[lilypond.git] / lily / text-spanner.cc

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 0e6226bf1f318ca37406b45d43a6ba7ec5e51ac2..edf430aa139de4973efeb92a00908e31fcb32566 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -18,17 +18,17 @@
 void
 Text_spanner::set_support (Directional_spanner*d)
 {
-    if (support_span_l_)
+  if (support_span_l_)
        remove_dependency (support_span_l_);
-    
-    support_span_l_ =d;
-    add_dependency (d);
+  
+  support_span_l_ =d;
+  add_dependency (d);
 }
 
 Text_spanner::Text_spanner()
 {
-    spec_p_ = 0;
-    support_span_l_ = 0;
+  spec_p_ = 0;
+  support_span_l_ = 0;
 }
 
 
@@ -37,58 +37,56 @@ IMPLEMENT_IS_TYPE_B1(Text_spanner,Spanner);
 void
 Text_spanner::do_print() const
 {
-    spec_p_->print();
+  spec_p_->print();
 }
 
 void
 Text_spanner::do_post_processing()
 {
-    text_off_ = support_span_l_->center() +
-       Offset (0,support_span_l_->dir_i_ * paper()->internote_f () * 4); // todo
+  text_off_ = support_span_l_->center() +
+       Offset (0,support_span_l_->dir_ * paper()->internote_f () * 4); // todo
 }
 
 Molecule*
 Text_spanner::brew_molecule_p() const
 {
-    Atom tsym (spec_p_->get_atom (paper(),0));
-    tsym.translate (text_off_);
+  Atom tsym (spec_p_->get_atom (paper(),CENTER));
+  tsym.translate (text_off_);
 
-    Molecule*output = new Molecule;
-    output->add (tsym);
-    return output;
+  Molecule*output = new Molecule;
+  output->add (tsym);
+  return output;
 }
 
 void
 Text_spanner::do_pre_processing()
 {
-    right_col_l_ = support_span_l_->right_col_l_;
-    left_col_l_ = support_span_l_->left_col_l_;
-    assert (left_col_l_ && right_col_l_);
+  spanned_drul_ = support_span_l_->spanned_drul_;
 }
 
 Interval
-Text_spanner::height()const
+Text_spanner::height() const
 {
-    return brew_molecule_p()->extent ().y ();
+  return brew_molecule_p()->extent ().y ();
 }
 
 void
 Text_spanner::do_substitute_dependency (Score_elem* o, Score_elem*n)
 {
-    if (support_span_l_ == o) 
+  if (support_span_l_ == o) 
        support_span_l_ = (Directional_spanner*) (n?n->spanner():0);
 }
 
 
 Text_spanner::~Text_spanner()
 {
-    delete spec_p_;
+  delete spec_p_;
 }
 
 Text_spanner::Text_spanner (Text_spanner const&s)
-    : Spanner (s)
+  : Spanner (s)
 {
-    support_span_l_ = s.support_span_l_;
-    spec_p_ = s.spec_p_? s.spec_p_->clone() : 0;
-    text_off_ = s.text_off_;
+  support_span_l_ = s.support_span_l_;
+  spec_p_ = s.spec_p_? s.spec_p_->clone() : 0;
+  text_off_ = s.text_off_;
 }