release: 0.0.78

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

diff --git a/lily/include/script-def.hh b/lily/include/script-def.hh
index 9af312bfa4361ae8bf772ac27f8e5b10547f6809..890ce377bc064b497978dfb752fa20f95a26b0a4 100644 (file)
--- a/lily/include/script-def.hh
+++ b/lily/include/script-def.hh
@@ -1,5 +1,5 @@
 /*
-  script-def.hh -- part of LilyPond
+  script-def.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */
@@ -7,10 +7,15 @@
 #ifndef SCRIPTDEF_HH
 #define SCRIPTDEF_HH
 #include "string.hh"
+#include "general-script-def.hh"
 
 /** The characteristics of a certain kind of accent. It is not the
   accent itself.  */
-struct Script_def {
+class Script_def : public General_script_def {
+    /// invert if below staff?
+    bool invertsym_b_;
+    String symidx_str_;
+    
 
     /// on the other side of the stem?
     int rel_stem_dir_i_;
@@ -24,16 +29,26 @@ struct Script_def {
     /// follow the ball inside staff?
     bool inside_staff_b_;
 
-    /// invert if below staff?
-    bool invertsym_b_;
-    String symidx;
+public:
+    virtual int staff_dir_i()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;
+    DECLARE_MY_RUNTIME_TYPEINFO;
+
+    virtual bool do_equal_b(General_script_def const &)const;
+    virtual void do_print() const;
+    Script_def();
+    void set_from_input(String, bool, int, int ,bool,int );
+protected:
+    VIRTUAL_COPY_CONS(Script_def,General_script_def);
 
-    /* *************** */
-    int compare(Script_def const &);
-    void print() const;
-    Script_def(String, bool, int, int ,bool);
 };
 
 
+
+
+
 #endif // SCRIPTDEF_HH