X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcoherent-ligature-engraver.hh;h=78bfef8897e626c20daaf07353f3b6243c8f5348;hb=ef9512388b15e1e5e2b3592299ffe489ac43abb4;hp=c90677aac736961647ae2f1e984fc1cdd1fa60e1;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/include/coherent-ligature-engraver.hh b/lily/include/coherent-ligature-engraver.hh
index c90677aac7..78bfef8897 100644
--- a/lily/include/coherent-ligature-engraver.hh
+++ b/lily/include/coherent-ligature-engraver.hh
@@ -1,9 +1,20 @@
 /*
-  coherent-ligature-engraver.hh -- declare Coherent_ligature_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2003--2015 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2003--2005 Juergen Reuter <reuter@ipd.uka.de>
+  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 COHERENT_LIGATURE_ENGRAVER_HH
 #define COHERENT_LIGATURE_ENGRAVER_HH
@@ -13,16 +24,19 @@
 class Coherent_ligature_engraver : public Ligature_engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS (Coherent_ligature_engraver);
+  // no TRANSLATOR_DECLARATIONS (Coherent_ligature_engraver) needed
+  // since this class is abstract
+  TRANSLATOR_INHERIT (Ligature_engraver);
+  DECLARE_TRANSLATOR_CALLBACKS (Coherent_ligature_engraver);
 
 protected:
   virtual void build_ligature (Spanner *ligature,
-			       Array<Grob_info> primitives); /* abstract */
+                               vector<Grob_info> const &primitives) = 0;
   virtual void typeset_ligature (Spanner *ligature,
-				 Array<Grob_info> primitives);
-  virtual void get_set_column (Item *, Paper_column *);
+                                 vector<Grob_info> const &primitives);
+  virtual void move_related_items_to_column (Item *, Paper_column *, Real);
 private:
-  void collect_accidentals (Spanner *, Array<Grob_info>);
+  void collect_accidentals (Spanner *, vector<Grob_info> const &);
 };
 
 #endif // COHERENT_LIGATURE_ENGRAVER_HH