partial: 0.0.39-1.jcn

[lilypond.git] / hdr / textspanner.hh

diff --git a/hdr/textspanner.hh b/hdr/textspanner.hh
index 4baf832a39ed892aedaa8d6bcf05b30a5eb248fb..dbdea979ad25a1e277bd12643983806adb9472a2 100644 (file)
--- a/hdr/textspanner.hh
+++ b/hdr/textspanner.hh
@@ -8,26 +8,27 @@
 #define TEXTSPANNER_HH
 
 #include "string.hh"
-#include "directionalspanner.hh"
-#include "textdef.hh"
+#include "directional-spanner.hh"
+#include "text-def.hh"
 
-/// a spanner which puts texts on top of other spanners.
+/** a spanner which puts texts on top of other spanners.  Use for
+  triplets, eentweetjes, ottava, etc.  */
 struct Text_spanner : Spanner {
     Text_def spec;
-    Offset tpos;
+    Offset text_off_;
     Directional_spanner*support;
-    /****************/
-    virtual    void do_pre_processing();
-    virtual    void do_post_processing();
-    Molecule* brew_molecule()const;
-    virtual    Interval height() const ;
-    void print() const;
+
+    /* *************** */
+
+    NAME_MEMBERS(Text_spanner);
+    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;
     virtual Spanner* do_break_at(PCol*,PCol*)const;
-    Text_spanner(Directional_spanner*);
+    Text_spanner();
+    void set_support(Directional_spanner*);
 };
-/**
-  Use for triplets, eentweetjes, ottava, etc.
-  */
-
 #endif // TEXTSPANNER_HH