X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fdot-column.hh;h=6c975b1c561963ebae652bec85ab9f49a9929176;hb=36fba3138858ee42ba3f03e3de0efa1d1f49d147;hp=e812875e99da32328b45a0b9064f39c88e173fd6;hpb=40c8e12b8afa8e9c7e44cf6ea3b724295884091b;p=lilypond.git

diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh
index e812875e99..6c975b1c56 100644
--- a/lily/include/dot-column.hh
+++ b/lily/include/dot-column.hh
@@ -1,30 +1,40 @@
 /*
-  dot-column.hh -- declare Dot_column Dot_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 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 DOT_COLUMN_HH
 #define DOT_COLUMN_HH
 
-#include "item.hh"
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
+class Grob;
 
 /**
-  Group dots.  This is needed because, the dots have to be aligned per voice
- */
-class Dot_column : public Item
+   Group dots.  This is needed because, the dots have to be aligned per voice
+*/
+class Dot_column // interface
 {
-  static int compare (Score_element * const&,Score_element * const&);
 public:
-  VIRTUAL_COPY_CONS (Score_element);
-  void add_head (Rhythmic_head*);
-  Dot_column (SCM);
-  
-  static Real force_shift_callback (Score_element const* , Axis);
-  static SCM do_shifts (SCM dotlist);
+  static int compare (Grob *const &, Grob *const &);
+  static void add_head (Grob *dotcol, Grob *rh);
+
+  DECLARE_SCHEME_CALLBACK (side_position, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
 };
 #endif // DOT_COLUMN_HH