release: 1.1.29

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

diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh
index 0d792590c68f59a8235049d82fa6fc13cb88e9b9..0465a90b2f39cbcd0fd9436822595edfd8922333 100644 (file)
--- a/lily/include/text-def.hh
+++ b/lily/include/text-def.hh
@@ -1,35 +1,39 @@
 /*
   text-def.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #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 
+{
 public:
-    /**
-      centered , or aligned?
-
-      -1 = raggedright, 0 = center, 1 = raggedleft
-     */
-    int align_i_;
-    Paper_def* pdef_l_;
-    String text_str_;
-    String style_str_;
+  VIRTUAL_COPY_CONS(General_script_def);
+
+  /**
+     Alignment of typeset text wrt center.
+
+     LEFT = raggedright, CENTER = centered, RIGHT = raggedleft
+  */
+  Direction align_dir_;
+
+  String text_str_;
+  String style_str_;
     
-    /* *************** */
-    virtual ~Text_def() {};
-    bool compare(const Text_def&);
-    Text_def();
-    virtual void print() const;
-    Atom create_atom() const;
-    Interval width() const;
+  virtual void do_print() const;
+  virtual Direction staff_dir() const;
+  virtual Molecule get_molecule (Paper_def* p, Direction dir_) const;
+  virtual ~Text_def() {};
+  virtual bool do_equal_b (const General_script_def*) const;
+  Text_def();
+  virtual void print() const;
 };
 
 #endif // TEXT_DEF_HH