release: 1.0.15

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

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index 16bffcd0d89f4ae4466a912f1e1dc8a0660ab3d0..b0ffa91f33d701ab10438bd12d7ff931e88d71c1 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,7 +1,7 @@
 /*
   text-item.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1998 Han-Wen Nienhuys
 */
 
 #ifndef TEXT_ITEM_HH
@@ -14,29 +14,31 @@
 /**
   print a fixed width text above or below the staff.
  */
-class Text_item : public Item ,public Staff_side{
-    void init(Text_def* tdef_l); 
- 
+class Text_item : public Item ,public Staff_side
+{
 public:
 
-    int pos_i_;
-
     /// do I have width?
     bool fat_b_;
     
-    /* ***************/
 
-    Text_item(General_script_def*,int dir=0);
-    virtual ~Text_item();
-    NAME_MEMBERS();
+    Text_item (General_script_def* ,Direction dir=CENTER);
+    virtual ~Text_item ();
+    DECLARE_MY_RUNTIME_TYPEINFO;
 
+//protected:
+    // ugh: so, are we a text-def, or can this vary?
+    General_script_def* tdef_p_;
 protected:
-    General_script_def * tdef_p_;
 
-    virtual void set_default_index();
-    virtual Molecule* brew_molecule_p() const;
-    virtual void do_post_processing();
-    virtual void do_pre_processing();
+    virtual Interval symbol_height () const;
+
+    virtual Molecule* brew_molecule_p () const;
+    virtual void do_pre_processing ();
+    virtual Real get_position_f () const;
+
+private:
+//    void init (Text_def* tdef_l); 
 };