From: fred <fred>
Date: Sun, 24 Mar 2002 19:45:25 +0000 (+0000)
Subject: lilypond-0.0.67
X-Git-Tag: release/1.5.59~4607
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5556185b5aff65ee6218e7638cedd6d42c923d38;p=lilypond.git

lilypond-0.0.67
---

diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh
index 0d792590c6..0cc584f742 100644
--- a/lily/include/text-def.hh
+++ b/lily/include/text-def.hh
@@ -7,11 +7,16 @@
 #ifndef TEXT_DEF_HH
 #define TEXT_DEF_HH
 
+#include "general-script-def.hh"
 #include "string.hh"
 #include "lily-proto.hh"
 #include "input.hh"
 
-class Text_def : public Input {
+class Text_def : public General_script_def {
+protected:
+    virtual Atom get_atom(Paper_def* p, int dir_i_)const;
+    NAME_MEMBERS();
+    VIRTUAL_COPY_CONS(Text_def,General_script_def)
 public:
     /**
       centered , or aligned?
@@ -19,17 +24,16 @@ public:
       -1 = raggedright, 0 = center, 1 = raggedleft
      */
     int align_i_;
-    Paper_def* pdef_l_;
+
     String text_str_;
     String style_str_;
     
     /* *************** */
     virtual ~Text_def() {};
-    bool compare(const Text_def&);
+    bool do_equal_b(const Text_def&)const;
     Text_def();
     virtual void print() const;
-    Atom create_atom() const;
-    Interval width() const;
+    Interval width(Paper_def*) const;
 };
 
 #endif // TEXT_DEF_HH