X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcoherent-ligature-engraver.hh;h=4009f5704149850376044c44356cb2fbd07c821d;hb=c2a0e17ed7739c43258389149a2d51cda34fb7bd;hp=ede15b3e34c7cc7b7a02df4a682a72d3565db980;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/include/coherent-ligature-engraver.hh b/lily/include/coherent-ligature-engraver.hh
index ede15b3e34..4009f57041 100644
--- a/lily/include/coherent-ligature-engraver.hh
+++ b/lily/include/coherent-ligature-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2006 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2007 Juergen Reuter <reuter@ipd.uka.de>
 */
 #ifndef COHERENT_LIGATURE_ENGRAVER_HH
 #define COHERENT_LIGATURE_ENGRAVER_HH
@@ -18,12 +18,12 @@ public:
 
 protected:
   virtual void build_ligature (Spanner *ligature,
-			       std::vector<Grob_info> primitives) = 0;
+			       vector<Grob_info> primitives) = 0;
   virtual void typeset_ligature (Spanner *ligature,
-				 std::vector<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 *, std::vector<Grob_info>);
+  void collect_accidentals (Spanner *, vector<Grob_info>);
 };
 
 #endif // COHERENT_LIGATURE_ENGRAVER_HH