2003 -> 2004

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

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