release: 0.1.8

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

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index ba81fce47497de81ae4b8acd3cce6445f587c016..45436405401352897085df8b73715e42120e5a75 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,5 +1,5 @@
 /*
-  text.hh -- part of LilyPond
+  text-item.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */
@@ -9,28 +9,32 @@
 
 #include "text-def.hh"
 #include "item.hh"
+#include "staff-side.hh"
 
 /**
   print a fixed width text above or below the staff.
  */
-class Text_item : public Item {
-    void init(Text_def* tdef_l,int staffsize_i); 
-    Text_def* tdef_p_;
+class Text_item : public Item ,public Staff_side{
+    void init (Text_def* tdef_l); 
+ 
 public:
-    Text_def * tdef_l();
-    int pos_i_;
-    int staffsize_i_;
-    int dir_i_;
-        
+
+    /// do I have width?
+    bool fat_b_;
+    
     /* ***************/
 
-    NAME_MEMBERS(Text_item);
-    virtual void set_default_index();
-    Molecule* brew_molecule_p() const;
-    void do_pre_processing();
-    Text_item(Text_def*,int);
-    Text_item(Text_req*,int);
-    ~Text_item();
+    Text_item (General_script_def*,int dir=0);
+    virtual ~Text_item();
+    DECLARE_MY_RUNTIME_TYPEINFO;
+
+protected:
+    General_script_def * tdef_p_;
+
+    virtual Interval symbol_height()const;
+
+    virtual Molecule* brew_molecule_p() const;
+    virtual void do_pre_processing();
 };