release: 0.0.70pre

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

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 2858a28641481b78220eabb4afa57fccdfeeba99..10bbb0b0fa5db74ac8d88042a85ea2b5420accb4 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -1,50 +1,56 @@
+/*
+  text-spanner.cc -- implement Text_spanner
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
 #include "molecule.hh"
 #include "boxes.hh"
 #include "text-spanner.hh"
 #include "text-def.hh"
 #include "debug.hh"
 #include "paper-def.hh"
-
+#include "symbol.hh"
 
 
 void
 Text_spanner::set_support(Directional_spanner*d)
 {
-    support = 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() * 4); // todo
-       break;
-    default:
-       assert(false);
-       break;
-    }    
+    text_off_ = support_span_l_->center() +
+       Offset(0,support_span_l_->dir_i_ * paper()->internote_f() * 4); // todo
 }
 
 Molecule*
 Text_spanner::brew_molecule_p() const
 {
-    Atom tsym (spec.create_atom());
+    Atom tsym (spec_p_->get_atom(paper(),0));
     tsym.translate(text_off_);
 
     Molecule*output = new Molecule;
@@ -55,10 +61,9 @@ Text_spanner::brew_molecule_p() const
 void
 Text_spanner::do_pre_processing()
 {
-    right_col_l_ = support->right_col_l_;
-    left_col_l_ = support->left_col_l_;
+    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_);
-    spec.pdef_l_ = paper();
 }
 
 Interval
@@ -67,8 +72,23 @@ Text_spanner::height()const
     return brew_molecule_p()->extent().y;
 }
 
-Spanner*
-Text_spanner::do_break_at(PCol*c1, PCol*c2)const
+void
+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()
+{
+    delete spec_p_;
+}
+
+Text_spanner::Text_spanner(Text_spanner const&s)
+    : Spanner( s)
 {
-    return new Text_spanner(*this); // todo
+    support_span_l_ = s.support_span_l_;
+    spec_p_ = s.spec_p_? s.spec_p_->clone() : 0;
+    text_off_ = s.text_off_;
 }