release: 0.1.1

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 2aee51cc2e56dbd4fe80ee951e2dc96244baa31d..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.
@@ -37,14 +35,19 @@ public:
     PCol *left_col_l_, *right_col_l_;
     
     /* *************** */
-    NAME_MEMBERS();
+    DECLARE_MY_RUNTIME_TYPEINFO;
     virtual Spanner* spanner() { return this; }    
     Spanner();
     bool broken_b() const;
     Spanner* find_broken_piece(Line_of_score*)const;
 protected:
-    SCORE_ELEM_CLONE(Spanner)
-    virtual void break_into_pieces();
+    void set_my_columns();
+    SCORE_ELEM_CLONE(Spanner);
+
+    /**
+      this is virtual; for instance, Line_of_score overrides it.
+     */
+    virtual void break_into_pieces(bool);
 
     Link_array<Spanner> broken_into_l_arr_;