Run `make grand-replace'.

[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 8321e727eef3a78bbe7bc8e5516595014115ae02..879f6ba5db0e8a1f0635f72535caa0a54f9c5e04 100644 (file)
--- a/lily/include/coherent-ligature-engraver.hh
+++ b/lily/include/coherent-ligature-engraver.hh
@@ -1,11 +1,10 @@
-/*   
+/*
   coherent-ligature-engraver.hh -- declare Coherent_ligature_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2003 Juergen Reuter <reuter@ipd.uka.de>
-  
- */
+
+  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
+*/
 #ifndef COHERENT_LIGATURE_ENGRAVER_HH
 #define COHERENT_LIGATURE_ENGRAVER_HH
 
@@ -13,19 +12,18 @@
 
 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> primitives) = 0;
   virtual void typeset_ligature (Spanner *ligature,
-                                Array<Grob_info> primitives);
-  virtual void get_set_column (Item *, Paper_column *);
-
+                                vector<Grob_info> 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>);
 };
 
 #endif // COHERENT_LIGATURE_ENGRAVER_HH