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 50bb98105c88567b26af165e4a1073437556217a..185ea715c799928ffe233bfa14235b760cf56234 100644 (file)
--- a/lily/include/text-def.hh
+++ b/lily/include/text-def.hh
@@ -1,29 +1,43 @@
 /*
-  text-def.hh -- part of LilyPond
+  text-def.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */
 
-#ifndef TEXTDEF_HH
-#define TEXTDEF_HH
+#ifndef TEXT_DEF_HH
+#define TEXT_DEF_HH
 
+#include "general-script-def.hh"
 #include "string.hh"
-#include "proto.hh"
+#include "lily-proto.hh"
+#include "input.hh"
+
+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
+     */
+    Direction align_i_;
 
-struct Text_def  {
-    int align_i_;
     String text_str_;
     String style_str_;
-    char const* defined_ch_C_;
-  
-
-    /* *************** */
+    
+    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;
-    virtual Atom create_atom(Paper_def*) const;
+    Interval width (Paper_def*) const;
 };
 
-#endif // TEXTDEF_HH
+#endif // TEXT_DEF_HH