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

diff --git a/lily/include/rod.hh b/lily/include/rod.hh
index c71b6b3484..d89b34f802 100644
--- a/lily/include/rod.hh
+++ b/lily/include/rod.hh
@@ -1,37 +1,26 @@
-/*   
+/*
   rod.hh -- declare Rod, Column_rod
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
-  
- */
+
+  (c) 1998--2009 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 {
-  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_;
-  void add_to_cols ();
+  Drul_array<Item *> item_drul_;
+  Real distance_;
 
-  Rod (Single_malt_grouping_item*,Single_malt_grouping_item*);
+  void columnize ();
+  void add_to_cols ();
   Rod ();
 };
 
-
 #endif /* ROD_HH */