Imported Upstream version 2.14.2

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

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 719e7d5e4945dbe4e7eade5cd74ed8d9c884c2c4..bc2eec12c22d400cb7d1c3c37152a4f5fbd8c7bc 100644 (file)
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -1,9 +1,20 @@
 /*
-  paper-column.hh -- declare  Paper_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 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 PAPER_COLUMN_HH
@@ -18,9 +29,6 @@ class Paper_column : public Item
   /// if lines are broken then this column is in #line#
   System *system_;
 
-  // ugh: friend declarations.
-  friend void set_loose_columns (System *which, Column_x_positions const *posns);
-  friend class System;
 public:
   Paper_column (SCM);
   Paper_column (Paper_column const &);
@@ -50,8 +58,7 @@ public:
   static bool is_breakable (Grob *);
   static bool is_extraneous_column_from_ligature (Grob *);
   static Real minimum_distance (Grob *l, Grob *r);
-  static Interval break_align_width (Grob *me);
+  static Interval break_align_width (Grob *me, SCM align_sym);
 };
 
 #endif // PAPER_COLUMN_HH
-