release: 0.1.11

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

diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh
index a91d8d96910d3c49e1afe7cb4400ab4645823360..c5c9cae052809a4a38cb95d6af34686c62429dd4 100644 (file)
--- a/lily/include/text-spanner.hh
+++ b/lily/include/text-spanner.hh
@@ -15,21 +15,22 @@
   triplets, eentweetjes, ottava, etc.  */
 class Text_spanner : public Spanner {
 public:
-    Directional_spanner * support;
-    Text_def spec;
+    Directional_spanner * support_span_l_;
+    General_script_def * spec_p_;
     Offset text_off_;
-    NAME_MEMBERS(Text_spanner);
+    DECLARE_MY_RUNTIME_TYPEINFO;
 
-    void set_support(Directional_spanner*);
+    void set_support (Directional_spanner*);
     Text_spanner();
+    Text_spanner (Text_spanner const&);
 protected:
-    SPANNER_CLONE(Text_spanner)
-
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
+    SCORE_ELEM_CLONE(Text_spanner);
+    ~Text_spanner();
+    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 Molecule* brew_molecule_p() const;
     virtual void do_print() const;
 };
 #endif // TEXTSPANNER_HH