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 3f7d4332460d4caff2bf8e07c5797bb99941eeeb..0465a90b2f39cbcd0fd9436822595edfd8922333 100644 (file)
--- a/lily/include/text-def.hh
+++ b/lily/include/text-def.hh
@@ -1,7 +1,7 @@
 /*
   text-def.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef TEXT_DEF_HH
@@ -12,28 +12,28 @@
 #include "lily-proto.hh"
 #include "input.hh"
 
-class Text_def : public General_script_def {
-protected:
-    virtual Atom get_atom(Paper_def* p, int dir_i_)const;
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    VIRTUAL_COPY_CONS(Text_def,General_script_def);
+class Text_def : public General_script_def 
+{
 public:
-    /**
-      centered , or aligned?
+  VIRTUAL_COPY_CONS(General_script_def);
 
-      -1 = raggedright, 0 = center, 1 = raggedleft
-     */
-    int align_i_;
+  /**
+     Alignment of typeset text wrt center.
 
-    String text_str_;
-    String style_str_;
+     LEFT = raggedright, CENTER = centered, RIGHT = raggedleft
+  */
+  Direction align_dir_;
+
+  String text_str_;
+  String style_str_;
     
-    virtual void do_print() const;
-    virtual ~Text_def() {};
-    virtual bool do_equal_b(const General_script_def*)const;
-    Text_def();
-    virtual void print() const;
-    Interval width(Paper_def*) 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