X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-column.hh;h=c1638a2539f45bf47121886f31c7b2a2f6cf294c;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=630d0acaf911a3b196a59929946e20c5e2183974;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 630d0acaf9..c1638a2539 100644
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -1,11 +1,21 @@
 /*
-  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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.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
 #define PAPER_COLUMN_HH
@@ -13,35 +23,42 @@
 #include "item.hh"
 #include "rod.hh"
 
-
 class Paper_column : public Item
-{ 
-public:
-  int  rank_;
+{
+  int rank_;
   /// if lines are broken then this column is in #line#
   System *system_;
 
-  Paper_column (SCM, Object_key const*);
-  Paper_column (Paper_column const&, int count);
-  
-  virtual Grob *clone (int count) const;
+public:
+  Paper_column (SCM);
+  Paper_column (Paper_column const &);
 
-  static bool has_interface (Grob*);
+  virtual Grob *clone () const;
   virtual void do_break_processing ();
   virtual Paper_column *get_column () const;
   virtual System *get_system () const;
-  
-  static int get_rank (Grob*);
-  
+  void set_system (System *);
+
+  static int compare (Grob *const &a,
+                      Grob *const &b);
+  static bool less_than (Grob *const &a,
+                         Grob *const &b);
+
+  int get_rank () const { return rank_; }
+  void set_rank (int);
+
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
-  
-  static bool is_musical (Grob *);
-  static Moment when_mom (Grob*);
 
-  static bool is_used (Grob*) ;
-  void set_rank (int);
+  DECLARE_GROB_INTERFACE ();
+  static int get_rank (Grob const *);
+  static bool is_musical (Grob *);
+  static Moment when_mom (Grob *);
+  static bool is_used (Grob *);
+  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, SCM align_sym);
 };
-     
-#endif // PAPER_COLUMN_HH
 
+#endif // PAPER_COLUMN_HH