X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcolumn-x-positions.hh;h=f4ef6a02dc185a4a04d1e4e4a803856166576b8c;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=10487514016568720136f2595f46f270e6f88e81;hpb=d1965f31e75a5e1e9faeb995ef2d37ce5fb3ff85;p=lilypond.git

diff --git a/lily/include/column-x-positions.hh b/lily/include/column-x-positions.hh
index 1048751401..f4ef6a02dc 100644
--- a/lily/include/column-x-positions.hh
+++ b/lily/include/column-x-positions.hh
@@ -1,32 +1,39 @@
 /*
-  column-x-positions.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef COLUMN_X_POSITIONS_HH
 #define COLUMN_X_POSITIONS_HH
 
-#include "parray.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
 
-typedef Link_array<Paper_column>  Line_of_cols;
-
-struct Column_x_positions {
-  Simple_spacer * spacer_l_;
-  Line_of_cols cols_;
-  Array<Real> config_;
-  
-  Real force_f_;
-  Real energy_f_;
-  bool satisfies_constraints_b_;
-
-  ~Column_x_positions();
-  Column_x_positions();
-  void add_paper_column (Paper_column*c);
-  void print() const;
-};
+struct Column_x_positions
+{
+  vector<Grob *> cols_;
+  vector<Grob *> loose_cols_;
+
+  vector<Real> config_;
+  Real force_;
+  bool satisfies_constraints_;
 
+  Column_x_positions ();
+};
 
 #endif // COLUMN_X_POSITIONS_HH