release: 0.1.11

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

diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh
index 0fff834f857ffb278ac1d0a0aea97514f6be2449..d40a4c7b2778da142c53f7bf1c9070ec47ab0fbf 100644 (file)
--- a/lily/include/text-def.hh
+++ b/lily/include/text-def.hh
@@ -14,8 +14,8 @@
 
 class Text_def : public General_script_def {
 protected:
-    virtual Atom get_atom(Paper_def* p, int dir_i_)const;
-    NAME_MEMBERS();
+    virtual Atom get_atom (Paper_def* p, Direction dir_) const;
+    DECLARE_MY_RUNTIME_TYPEINFO;
     VIRTUAL_COPY_CONS(Text_def,General_script_def);
 public:
     /**
@@ -28,13 +28,12 @@ public:
     String text_str_;
     String style_str_;
     
-    /* *************** */
     virtual void do_print() const;
     virtual ~Text_def() {};
-    bool do_equal_b(const Text_def&)const;
+    virtual bool do_equal_b (const General_script_def*) const;
     Text_def();
     virtual void print() const;
-    Interval width(Paper_def*) const;
+    Interval width (Paper_def*) const;
 };
 
 #endif // TEXT_DEF_HH