release: 0.0.70pre

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

diff --git a/lily/include/script.hh b/lily/include/script.hh
index b48ea8ebd6f98d6671d1b413fd48a24363ff099e..f6d41a2c2ff470446641fdcaef595b4bea1c2595 100644 (file)
--- a/lily/include/script.hh
+++ b/lily/include/script.hh
@@ -8,7 +8,6 @@
 #define SCRIPT_HH
 
 #include "staff-side.hh"
-#include "script-def.hh"
 #include "item.hh"
   
 /**
@@ -18,12 +17,13 @@ class Script : public Item, public Staff_side {
     
     int pos_i_;
     
-    General_script_def *specs_l_;
     Stem *stem_l_;
 
     /* *************** */
 protected:
     Molecule *brew_molecule_p()const;
+    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
+    virtual void do_print() const;
     virtual void do_post_processing();
     virtual void do_pre_processing();
     virtual Interval do_width() const;
@@ -33,8 +33,10 @@ private:
     void set_default_index();
     Symbol symbol()const;
 public:
+    General_script_def *specs_l_;
+    
     static int compare(Script  *const&, Script *const&) ;
-    Script(Script_req*);
+    Script();
     void set_stem(Stem*);
     NAME_MEMBERS();