X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-column.hh;h=01a84d50dfd9a7085dfb7bbb1d13059e208ba507;hb=233fb6a8b3b6e31de1841641dbbd4c4f43423151;hp=f2c94744edbb22a5807bb8a348e10f02d9a479cd;hpb=4ed25cecb67a112bc07147a3b9d32e9a68d41729;p=lilypond.git

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index f2c94744ed..01a84d50df 100644
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -1,45 +1,64 @@
 /*
-  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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2002 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 P_COL_HH
-#define P_COL_HH
+#ifndef PAPER_COLUMN_HH
+#define PAPER_COLUMN_HH
 
 #include "item.hh"
 #include "rod.hh"
 
-
 class Paper_column : public Item
-{ 
+{
+  int rank_;
+  /// if lines are broken then this column is in #line#
+  System *system_;
+
 public:
-  VIRTUAL_COPY_CONS (Grob);
+  Paper_column (SCM);
+  Paper_column (Paper_column const &);
 
-  static bool has_interface (Grob*);
-  int  rank_i_;
+  virtual Grob *clone () const;
   virtual void do_break_processing ();
-  virtual Paper_column *column_l () const;
-  virtual System *line_l () const;
-  
-  /// if lines are broken then this column is in #line#
-  System *line_l_;
-
-  static int rank_i (Grob*);
+  virtual Paper_column *get_column () const;
+  virtual System *get_system () const;
+  void set_system (System *);
 
-  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM));
-  DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM));
-  
-  Paper_column (SCM);
-  static bool musical_b (Grob *);
-  static Moment when_mom (Grob*);
+  static int compare (Grob *const &a,
+                      Grob *const &b);
+  static bool less_than (Grob *const &a,
+                         Grob *const &b);
 
-  static bool used_b (Grob*) ;
+  int get_rank () const { return rank_; }
   void set_rank (int);
+
+  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 *);
+  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 // P_COL_HH
 
+#endif // PAPER_COLUMN_HH