patch::: 1.1.37.mb2: Re: LilyPond 1.1.37

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

diff --git a/lily/include/script.hh b/lily/include/script.hh
index b48ea8ebd6f98d6671d1b413fd48a24363ff099e..a09eb7b0f3528761f167e5bb5f05daaf91d66adf 100644 (file)
--- a/lily/include/script.hh
+++ b/lily/include/script.hh
@@ -1,43 +1,41 @@
 /*
   script.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef SCRIPT_HH
 #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 {
-    
-    int pos_i_;
-    
-    General_script_def *specs_l_;
-    Stem *stem_l_;
+  Stem *stem_l_;
 
-    /* *************** */
 protected:
-    Molecule *brew_molecule_p()const;
-    virtual void do_post_processing();
-    virtual void do_pre_processing();
-    virtual Interval do_width() const;
+  Molecule *do_brew_molecule_p() const;
+  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
+  virtual void do_print() const;
+  virtual Interval symbol_height() const;
+  virtual void do_pre_processing();
+  virtual Interval do_width() const;
+  VIRTUAL_COPY_CONS(Score_element);
 private:
 
-    void set_default_dir();
-    void set_default_index();
-    Symbol symbol()const;
+  void set_default_dir();
 public:
-    static int compare(Script  *const&, Script *const&) ;
-    Script(Script_req*);
-    void set_stem(Stem*);
-    NAME_MEMBERS();
-
+  General_script_def *specs_p_;
+
+  static int compare (Script  *const&, Script *const&) ;
+  Script();
+  ~Script ();
+  Script (Script const&);
+   
+  void set_stem (Stem*);
 };