lilypond-0.1.1

diff --git a/lily/include/scoreline.hh b/lily/include/scoreline.hh
index ef95d6d078e53de999c74954c8c059ff52c1fbea..abde4af7a2a46105df1d99dccfa945d2c5f8df8d 100644 (file)
--- a/lily/include/scoreline.hh
+++ b/lily/include/scoreline.hh
@@ -17,7 +17,6 @@ public:
     bool error_mark_b_;
     virtual String TeX_string() const;    
     
-
     DECLARE_MY_RUNTIME_TYPEINFO;
     Line_of_score();
     
@@ -28,9 +27,9 @@ public:
     
     Link_array<Line_of_score> get_lines()const;
     void set_breaking(Array<Col_hpositions> const&);
-    
+
 protected:
-    virtual void break_into_pieces();
+    virtual void break_into_pieces(bool);
     virtual Interval do_width()const;
     virtual void do_print() const;
     SCORE_ELEM_CLONE(Line_of_score);

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index f2afbfb241cefb531bfb4225328893ab07de6ae0..30a72290c0e5dc42035e1550559d97d005548214 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -10,8 +10,6 @@
 #include "lily-proto.hh"
 #include "score-elem.hh"
 
-
-
 /** a symbol which is attached between two columns. A spanner is a
   symbol which spans across several columns, so its final appearance
   can only be calculated after the breaking problem is solved.
@@ -43,8 +41,13 @@ public:
     bool broken_b() const;
     Spanner* find_broken_piece(Line_of_score*)const;
 protected:
+    void set_my_columns();
     SCORE_ELEM_CLONE(Spanner);
-    virtual void break_into_pieces();
+
+    /**
+      this is virtual; for instance, Line_of_score overrides it.
+     */
+    virtual void break_into_pieces(bool);
 
     Link_array<Spanner> broken_into_l_arr_;
        

diff --git a/lily/scoreline.cc b/lily/scoreline.cc
index 64a7df296d3859fcd2daeff4e92c359764c00575..d4951dbb8317fd9a28ff85a2951043d5546cf0e5 100644 (file)
--- a/lily/scoreline.cc
+++ b/lily/scoreline.cc
@@ -101,6 +101,7 @@ Line_of_score::set_breaking(Array<Col_hpositions> const &breaking)
        
        if (breaking.size() >1) {
            line_p = (Line_of_score*)clone()->spanner();
+           line_p->copy_dependencies( *this );
            line_l = line_p;
        } else 
            line_l =  this;
@@ -122,7 +123,7 @@ Line_of_score::set_breaking(Array<Col_hpositions> const &breaking)
 }
 
 void
-Line_of_score::break_into_pieces()
+Line_of_score::break_into_pieces(bool)
 {
 }
 
@@ -131,7 +132,7 @@ Line_of_score::get_lines()const
 {
     Link_array<Line_of_score> ret;
 
-    if(broken_into_l_arr_.size())
+    if (broken_into_l_arr_.size())
        for (int i=0; i < broken_into_l_arr_.size(); i++) {
            ret.push((Line_of_score*)broken_into_l_arr_[i]);
        }