release: 0.1.11

[lilypond.git] / lily / include / score-grav.hh

diff --git a/lily/include/score-grav.hh b/lily/include/score-grav.hh
index 5cb3936bb5118ef03211ac643c2a0db201420cc0..6328c9bd26f9a8c4b6482123ef4ceee67cc840be 100644 (file)
--- a/lily/include/score-grav.hh
+++ b/lily/include/score-grav.hh
@@ -17,48 +17,44 @@
   Top level engraver. Puts elements into appropriate columns.
  */
 class Score_engraver : 
-    public Engraver_group_engraver, public Global_translator 
+  public Engraver_group_engraver, public Global_translator 
 {
-    Line_of_score * scoreline_l_;
-    bool disallow_break_b_;
-    int breaks_i_;
+  Line_of_score * scoreline_l_;
+  bool disallow_break_b_;
+  int breaks_i_;
 
+  Link_array<Score_elem> elem_p_arr_;
     
-    Array<Item*> nobreak_item_p_arr_;
-    Link_array<Score_elem> musical_item_p_arr_;
+  Score_column* command_column_l_;
+  Score_column* musical_column_l_;
     
-    Score_column* command_column_l_;
-    Score_column* musical_column_l_;
-    
-    friend class Score;
-    void set_columns (Score_column*,Score_column*);
-    void typeset_all();
+  void set_columns (Score_column*,Score_column*);
+  void typeset_all();
     
 public:
-    DECLARE_MY_RUNTIME_TYPEINFO;
-
-    Score_engraver();
+  Paper_score * pscore_p_;
+  DECLARE_MY_RUNTIME_TYPEINFO;
 
+  Score_engraver();
+  virtual Music_output *get_output_p ();  
 protected:   
-    /* Global_translator interface */
-    virtual void set_score (Score * score_l);
-    virtual void prepare (Moment);
-    virtual void finish();
-    virtual void process();
-    virtual int depth_i() const { return Global_translator::depth_i ();}
-    virtual Translator* ancestor_l (int l) { return Global_translator::ancestor_l (l);}
+  virtual void prepare (Moment);
+  virtual void finish();
+  virtual void process();
+  virtual int depth_i() const { return Global_translator::depth_i ();}
+  virtual Translator* ancestor_l (int l) { return Global_translator::ancestor_l (l);}
 
 protected:
-    /* Engraver_group_engraver interface */
-    virtual Staff_info get_staff_info()const;
-    virtual bool do_try_request (Request*);
-    virtual void do_creation_processing();
-    virtual void do_removal_processing();
-    virtual void announce_element (Score_elem_info);
-    virtual void do_announces();
-    virtual void typeset_element (Score_elem*elem_p);
-    virtual Paper_def * paper() const;
-    virtual void do_pre_move_processing();
+  /* Engraver_group_engraver interface */
+  virtual Staff_info get_staff_info() const;
+  virtual bool do_try_request (Request*);
+  virtual void do_creation_processing();
+  virtual void do_removal_processing();
+  virtual void announce_element (Score_elem_info);
+  virtual void do_announces();
+  virtual void typeset_element (Score_elem*elem_p);
+  virtual Paper_def * paper() const;
+  virtual void do_pre_move_processing();
 };
 
 #endif // SCORE_GRAV_HH