X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-column.hh;h=f1cb01e740685bcf11f9463e82a42466501d01f0;hb=ec7f5aca60d3df0c22a51bd0c5b0274e0e5994f3;hp=5e48ff88e544536b944a77dff5cd396f5e159952;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 5e48ff88e5..f1cb01e740 100644
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -29,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 &);
@@ -42,10 +39,10 @@ public:
   virtual System *get_system () const;
   void set_system (System *);
 
-  static int compare (Grob * const &a,
-		      Grob * const &b);
+  static int compare (Grob *const &a,
+                      Grob *const &b);
   static bool less_than (Grob *const &a,
-			 Grob *const &b);
+                         Grob *const &b);
 
   int get_rank () const { return rank_; }
   void set_rank (int);
@@ -53,7 +50,6 @@ public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
 
-  DECLARE_GROB_INTERFACE();
   static int get_rank (Grob const *);
   static bool is_musical (Grob *);
   static Moment when_mom (Grob *);
@@ -61,8 +57,8 @@ 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);
+  static Interval get_interface_extent (Grob *column, SCM iface, Axis a);
 };
 
 #endif // PAPER_COLUMN_HH
-