patch::: 1.1.25.jcn1: jcn1

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

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 1e4a53b2fbf0a071f104b91bf55da9e333aec4a1..4768d9f96e9dde07bbc0fb67d8174b486f36e36e 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "molecule.hh"
-#include "boxes.hh"
+#include "box.hh"
 #include "text-spanner.hh"
 #include "text-def.hh"
 #include "debug.hh"
@@ -39,7 +39,7 @@ Text_spanner::Text_spanner()
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Text_spanner,Spanner);
+
 
 void
 Text_spanner::do_print() const
@@ -55,13 +55,13 @@ Text_spanner::do_post_processing()
 }
 
 Molecule*
-Text_spanner::brew_molecule_p() const
+Text_spanner::do_brew_molecule_p() const
 {
   Atom tsym (spec_p_->get_atom (paper(),CENTER));
   tsym.translate (text_off_);
 
   Molecule*output = new Molecule;
-  output->add (tsym);
+  output->add_atom (tsym);
   return output;
 }
 
@@ -74,14 +74,14 @@ Text_spanner::do_pre_processing()
 Interval
 Text_spanner::height() const
 {
-  return brew_molecule_p()->extent ().y ();
+  return do_brew_molecule_p()->extent ().y ();
 }
 
 void
-Text_spanner::do_substitute_dependency (Score_elem* o, Score_elem*n)
+Text_spanner::do_substitute_dependency (Score_element* o, Score_element*n)
 {
   if (support_span_l_ == o) 
-       support_span_l_ = (Directional_spanner*) (n?n->spanner():0);
+       support_span_l_ = (Directional_spanner*) (n?dynamic_cast <Spanner *> (n):0);
 }