release: 1.3.53

[lilypond.git] / lily / include / paper-column.hh

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 16b05850577f51cff1266e9c54a771ef24e8ee38..8bf231d3f49745ccad5ff0b5dcc896004ea3b574 100644 (file)
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -10,7 +10,7 @@
 #ifndef P_COL_HH
 #define P_COL_HH
 
-#include "axis-group-item.hh"
+#include "item.hh"
 #include "rod.hh"
 #include "spring.hh"
 
@@ -27,11 +27,23 @@
     \end{itemize}
   */
 
-class Paper_column : public Axis_group_item { 
+class Paper_column : public Item
+{ 
 public:
   VIRTUAL_COPY_CONS(Score_element);
-  Drul_array<Array<Column_rod> > minimal_dists_arr_drul_;
-  Drul_array<Array<Column_spring> > spring_arr_drul_;
+
+  /*
+    ugh.
+
+    TODO:
+    
+    * junk these after spacing is done.
+
+    * Put these in Scheme.
+   */
+  
+  Array<Column_rod>  minimal_dists_;
+  Array<Column_spring > springs_;
 
   /// set a minimum distance
   void add_rod (Paper_column * to, Real distance);
@@ -40,11 +52,9 @@ public:
   virtual Paper_column * column_l () const;
   virtual Line_of_score *line_l () const;
 
-
   /// if lines are broken then this column is in #line#
   Line_of_score *line_l_;
 
-
   /// which  one (left =0)
   int rank_i() const;
 
@@ -54,7 +64,6 @@ public:
   bool musical_b () const;
 
   void set_rank (int);
-  virtual void do_print() const;
 private:
     
   /**
@@ -64,10 +73,6 @@ private:
   int rank_i_;
 
 };
-
-
-// #include "compare.hh"
-// INSTANTIATE_COMPARE(Paper_column &, Paper_column::compare);
      
 #endif // P_COL_HH