trim duplicate headers.

[lilypond.git] / lily / include / text-spanner.hh

diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh
index ab81d9099ebde543ce227da6ba5cfa6e1eb7fbce..06034b1870f91d51e6711fcf4d5ebf0cb914a181 100644 (file)
--- a/lily/include/text-spanner.hh
+++ b/lily/include/text-spanner.hh
@@ -1,38 +1,22 @@
 /*
-  textspanner.hh -- part of GNU LilyPond
+  text-spanner.hh -- declare Text_spanner
 
-  (c) 1996,97 Han-Wen Nienhuys
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#ifndef TEXTSPANNER_HH
-#define TEXTSPANNER_HH
+#ifndef TEXT_SPANNER_HH
+#define TEXT_SPANNER_HH
 
-#include "string.hh"
-#include "directional-spanner.hh"
-#include "text-def.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
-/** a spanner which puts texts on top of other spanners.  Use for
-  triplets, volta, ottava, etc.  */
-class Text_spanner : public Spanner {
+class Text_spanner
+{
 public:
-  Directional_spanner * support_span_l_;
-  General_script_def * spec_p_;
-  Offset text_off_;
-  DECLARE_MY_RUNTIME_TYPEINFO;
-
-  void set_support (Directional_spanner*);
-  Text_spanner();
-  Text_spanner (Text_spanner const&);
-protected:
-  SCORE_ELEM_CLONE(Text_spanner);
-  ~Text_spanner();
-  virtual void do_add_processing ();
-  virtual void do_substitute_dependency (Score_elem*,Score_elem*);
-  virtual void do_pre_processing();
-  virtual void do_post_processing();
-  virtual Interval height() const ;
-  virtual Molecule* brew_molecule_p() const;
-  virtual void do_print() const;
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_GROB_INTERFACE();
 };
-#endif // TEXTSPANNER_HH
 
+#endif /* TEXT_SPANNER_HH */