X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frod.hh;h=491b5cff5fe2d3bfbb59e5d8b9c95b9a92b07528;hb=d565eec0e4b9ecbfef333802a28435b1f54e8257;hp=c71b6b3484ebc52a8147622ed2b1669fd46df37c;hpb=77add406027ae5afda409a2e77b35852c5fae4f9;p=lilypond.git

diff --git a/lily/include/rod.hh b/lily/include/rod.hh
index c71b6b3484..491b5cff5f 100644
--- a/lily/include/rod.hh
+++ b/lily/include/rod.hh
@@ -3,35 +3,31 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  (c) 1998--2002 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 (Single_malt_grouping_item*,Single_malt_grouping_item*);
   Rod ();
 };
 
-
 #endif /* ROD_HH */