lilypond-0.1.52

diff --git a/lily/include/p-col.hh b/lily/include/p-col.hh
index c297bb78430b8a0ddc5cd718144c69601611f60a..0a5487a13868e90b5361edcc39c99eac271f6e65 100644 (file)
--- a/lily/include/p-col.hh
+++ b/lily/include/p-col.hh
@@ -12,6 +12,8 @@
 
 #include "horizontal-group-item.hh"
 #include "plist.hh"
+#include "rod.hh"
+
 
 /**
    stuff grouped vertically.
@@ -30,6 +32,11 @@ class Paper_column : public Horizontal_group_item {
 public:
   DECLARE_MY_RUNTIME_TYPEINFO;
   SCORE_ELEM_CLONE(Paper_column);
+  Drul_array< Array<Column_rod> > minimal_dists_arr_drul_;
+
+  void preprocess ();
+  /// set a minimum distance
+  void add_rod (Paper_column * to, Real distance, Direction d);
   
   /** prebreak is put before end of line.
     if broken here, then (*this) column is discarded, and prebreak
@@ -39,7 +46,8 @@ public:
 
   /// postbreak at beginning of the new line
   Paper_column *postbreak_l() const;
-    
+
+  virtual Paper_column * column_l () const;
   /// if lines are broken then this column is in #line#
   Line_of_score *line_l_;
 

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index ad205fcbf01b122590c68ed87ca9152be857d89f..0559dce40dd6a5841a625f290f065911c522357d 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -10,6 +10,7 @@
 #include "lily-proto.hh"
 #include "score-elem.hh"
 #include "drul-array.hh"
+#include "rod.hh"
 
 /** A symbol which is attached between two columns. A spanner is a
   symbol which spans across several columns, so its final appearance
@@ -41,7 +42,7 @@ public:
   virtual Spanner* spanner() { return this; }    
   Spanner();
   bool broken_b() const;
-
+  virtual Array<Rod> get_rods () const;
   Spanner* find_broken_piece (Line_of_score*) const;
 protected:
   void set_my_columns();
@@ -57,6 +58,7 @@ protected:
   virtual void do_unlink();
   virtual void do_junk_links();
   virtual void do_brew_molecule ();
+  virtual void do_space_processing ();
   virtual void do_break_processing();
   virtual Interval do_width() const;
   virtual void do_print() const;