release: 0.1.44

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

diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh
index 0d792590c68f59a8235049d82fa6fc13cb88e9b9..185ea715c799928ffe233bfa14235b760cf56234 100644 (file)
--- a/lily/include/text-def.hh
+++ b/lily/include/text-def.hh
@@ -7,29 +7,36 @@
 #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:
+//     huh? move to public
+//    virtual Atom get_atom (Paper_def* p, Direction dir_) const;
+    DECLARE_MY_RUNTIME_TYPEINFO;
+    VIRTUAL_COPY_CONS(Text_def,General_script_def);
 public:
     /**
       centered , or aligned?
 
       -1 = raggedright, 0 = center, 1 = raggedleft
      */
-    int align_i_;
-    Paper_def* pdef_l_;
+    Direction align_i_;
+
     String text_str_;
     String style_str_;
     
-    /* *************** */
+    virtual void do_print() const;
+    virtual Direction staff_dir() const;
+    virtual Atom get_atom (Paper_def* p, Direction dir_) const;
     virtual ~Text_def() {};
-    bool compare(const Text_def&);
+    virtual bool do_equal_b (const General_script_def*) const;
     Text_def();
     virtual void print() const;
-    Atom create_atom() const;
-    Interval width() const;
+    Interval width (Paper_def*) const;
 };
 
 #endif // TEXT_DEF_HH