release: 0.1.7

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

diff --git a/lily/include/score-grav.hh b/lily/include/score-grav.hh
index 92b659a377c82132f0c2c6f8b735ab4de42c145d..39941cda65ba05c1c88e42f9101eb9e9350812e1 100644 (file)
--- a/lily/include/score-grav.hh
+++ b/lily/include/score-grav.hh
@@ -13,10 +13,15 @@
 #include "engraver-group.hh"
 #include "global-translator.hh"
 
+/**
+  Top level engraver. Puts elements into appropriate columns.
+ */
 class Score_engraver : 
     public Engraver_group_engraver, public Global_translator 
 {
     Line_of_score * scoreline_l_;
+    bool disallow_break_b_;
+    int breaks_i_;
 
     
     Array<Item*> nobreak_item_p_arr_;
@@ -26,11 +31,11 @@ class Score_engraver :
     Score_column* musical_column_l_;
     
     friend class Score;
-    void set_cols(Score_column*,Score_column*);
+    void set_columns(Score_column*,Score_column*);
     void typeset_all();
     
 public:
-    NAME_MEMBERS();
+    DECLARE_MY_RUNTIME_TYPEINFO;
 
     Score_engraver();
 
@@ -50,7 +55,6 @@ protected:
     virtual void do_creation_processing();
     virtual void do_removal_processing();
     virtual void announce_element(Score_elem_info);
-    virtual void typeset_breakable_item(Item * nobreak_p);
     virtual void do_announces();
     virtual void typeset_element(Score_elem*elem_p);
     virtual Paper_def * paper() const;