Merge remote-tracking branch 'origin/translation'

[lilypond.git] / lily / include / coherent-ligature-engraver.hh

diff --git a/lily/include/coherent-ligature-engraver.hh b/lily/include/coherent-ligature-engraver.hh
index 11e647608f615d7cd092e48edbd919db91128749..a2b780a5d6e7bf307bc0e4e5fcfeead411688771 100644 (file)
--- a/lily/include/coherent-ligature-engraver.hh
+++ b/lily/include/coherent-ligature-engraver.hh
@@ -1,11 +1,21 @@
-/*   
-  coherent-ligature-engraver.hh -- declare Coherent_ligature_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2003--2005 Juergen Reuter <reuter@ipd.uka.de>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2003--2014 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
 
@@ -14,16 +24,17 @@
 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
 
 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