release: 0.1.8

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

diff --git a/lily/include/script.hh b/lily/include/script.hh
index e55d252ff1a1b0e62c0f6363ad3262a76db76543..c15eae63302a084a5df6a7274a9b48ce21ca06ab 100644 (file)
--- a/lily/include/script.hh
+++ b/lily/include/script.hh
@@ -8,39 +8,33 @@
 #define SCRIPT_HH
 
 #include "staff-side.hh"
-#include "script-def.hh"
 #include "item.hh"
   
 /**
   Accents that are put over a note-group.
  */
 class Script : public Item, public Staff_side {
-     /**
-      Vertical dir of symbol. -1 means invert the symbol.
-     */
-    int symdir_i_;
     
-    int pos_i_;
-    
-    Script_def *specs_l_;
     Stem *stem_l_;
 
-    /* *************** */
 protected:
     Molecule *brew_molecule_p()const;
-    virtual void do_post_processing();
+    virtual void do_substitute_dependency (Score_elem*,Score_elem*);
+    virtual void do_print() const;
+    virtual Interval symbol_height()const;
     virtual void do_pre_processing();
     virtual Interval do_width() const;
+    SCORE_ELEM_CLONE(Script);
 private:
-    void set_symdir();
+
     void set_default_dir();
-    void set_default_index();
-    Symbol symbol()const;
 public:
-    static int compare(Script  *const&, Script *const&) ;
-    Script(Script_req*);
-    void set_stem(Stem*);
-    NAME_MEMBERS(Script);
+    General_script_def *specs_l_;
+    
+    static int compare (Script  *const&, Script *const&) ;
+    Script();
+    void set_stem (Stem*);
+    DECLARE_MY_RUNTIME_TYPEINFO;
 
 };