* The grand 2005-2006 replace.

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

diff --git a/lily/include/rod.hh b/lily/include/rod.hh
index 4374f3c4eff242cfb0684e7c3a8939fa9536f3da..163ae847d5d37750ff5aab051cf0f5adcd0b6146 100644 (file)
--- a/lily/include/rod.hh
+++ b/lily/include/rod.hh
@@ -1,36 +1,31 @@
-/*   
+/*
   rod.hh -- declare Rod, Column_rod
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef ROD_HH
 #define ROD_HH
+
 #include "lily-proto.hh"
-#include "direction.hh"
 #include "drul-array.hh"
 
-struct Column_rod
+struct Rod
 {
-  Paper_column *other_l_;
-  Real distance_f_;
+  Drul_array<Item *> item_drul_;
+  Real distance_;
 
-  Column_rod ();
-  static int compare (const Column_rod &r1, const Column_rod &r2);
-  void print () const;
-};
+  /**
+     translate the rod so as to refer to Paper_columns
+  */
+  void columnize ();
 
-
-struct Rod
-{
-  Drul_array <Item*> item_l_drul_;
-  Real distance_f_;
   void add_to_cols ();
 
   Rod ();
 };
+
 #endif /* ROD_HH */