release: 0.1.11

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

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 6883dab0b0d4bcd7fb2a74d5f70846eb7ff78a68..edf430aa139de4973efeb92a00908e31fcb32566 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -12,77 +12,81 @@
 #include "text-def.hh"
 #include "debug.hh"
 #include "paper-def.hh"
-
+#include "symbol.hh"
 
 
 void
-Text_spanner::set_support(Directional_spanner*d)
+Text_spanner::set_support (Directional_spanner*d)
 {
-    if (support)
-       remove_dependency(support);
-    
-    support =d;
-    add_dependency(d);
+  if (support_span_l_)
+       remove_dependency (support_span_l_);
+  
+  support_span_l_ =d;
+  add_dependency (d);
 }
 
 Text_spanner::Text_spanner()
 {
-    support = 0;
+  spec_p_ = 0;
+  support_span_l_ = 0;
 }
 
-IMPLEMENT_STATIC_NAME(Text_spanner);
+
+IMPLEMENT_IS_TYPE_B1(Text_spanner,Spanner);
 
 void
 Text_spanner::do_print() const
 {
-    spec.print();
+  spec_p_->print();
 }
 
 void
 Text_spanner::do_post_processing()
 {
-    switch(spec.align_i_) {
-    case 0:
-       text_off_ = support->center() +
-           Offset(0,support->dir_i_ * paper()->internote_f() * 4); // todo
-       break;
-    default:
-       assert(false);
-       break;
-    }    
+  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.create_atom());
-    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->right_col_l_;
-    left_col_l_ = support->left_col_l_;
-    assert(left_col_l_ && right_col_l_);
-    spec.pdef_l_ = paper();
+  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)
+Text_spanner::do_substitute_dependency (Score_elem* o, Score_elem*n)
+{
+  if (support_span_l_ == o) 
+       support_span_l_ = (Directional_spanner*) (n?n->spanner():0);
+}
+
+
+Text_spanner::~Text_spanner()
 {
-    Directional_spanner * old = (Directional_spanner*)o->spanner();
-    if (support == old)
-       support = (Directional_spanner*) n->spanner();
+  delete spec_p_;
 }
 
+Text_spanner::Text_spanner (Text_spanner const&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_;
+}