release: 1.0.13

[lilypond.git] / lily / include / general-script-def.hh

diff --git a/lily/include/general-script-def.hh b/lily/include/general-script-def.hh
index c7c7207d74196d971844c6f3962ecc1ecc58a836..cc6b1e6adcb55c0cea200fd7a39831095a74e75c 100644 (file)
--- a/lily/include/general-script-def.hh
+++ b/lily/include/general-script-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -13,25 +13,28 @@
 #include "lily-proto.hh"
 #include "input.hh"
 #include "virtual-methods.hh"
+#include "direction.hh"
+
 /**
   Definition of anything that is put aside staff/notes.
  */
 class General_script_def : public Input {
 public:
-    VIRTUAL_COPY_CONS(General_script_def,General_script_def)
-    NAME_MEMBERS();
-    virtual int staff_dir_i()const;
-    void print() const;
-    virtual int rel_stem_dir_i()const;
-    virtual int priority_i()const;
-    virtual bool inside_b()const;
-    virtual Atom get_atom(Paper_def* p, int dir_i_)const;
-    bool equal_b(General_script_def const&)const;
-    virtual ~General_script_def() {}
+  VIRTUAL_COPY_CONS(General_script_def,General_script_def);
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  virtual Direction staff_dir() const;
+  void print() const;
+  virtual Direction rel_stem_dir() const;
+  virtual int priority_i() const;
+  virtual bool inside_b() const;
+  virtual Atom get_atom (Paper_def* p, Direction dir_) const;
+  bool equal_b (General_script_def const&) const;
+  virtual ~General_script_def() {}
     
+  virtual Interval width (Paper_def *) const;
 protected:
-    virtual bool do_equal_b(General_script_def const &)const;
-    virtual void do_print()const;
+  virtual bool do_equal_b (General_script_def const *) const;
+  virtual void do_print() const;
 };
 
 #endif // GENERAL_SCRIPT_DEF_HH