Merge branch 'master' of /home/jcharles/GIT/Lily/. into 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 0aad39c110899eb122f9516ed46d27468a19f211..78bfef8897e626c20daaf07353f3b6243c8f5348 100644 (file)
--- a/lily/include/coherent-ligature-engraver.hh
+++ b/lily/include/coherent-ligature-engraver.hh
@@ -26,15 +26,17 @@ class Coherent_ligature_engraver : public Ligature_engraver
 public:
   // 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,
-                               std::vector<Grob_info> const &primitives) = 0;
+                               vector<Grob_info> const &primitives) = 0;
   virtual void typeset_ligature (Spanner *ligature,
-                                 std::vector<Grob_info> const &primitives);
+                                 vector<Grob_info> const &primitives);
   virtual void move_related_items_to_column (Item *, Paper_column *, Real);
 private:
-  void collect_accidentals (Spanner *, std::vector<Grob_info> const &);
+  void collect_accidentals (Spanner *, vector<Grob_info> const &);
 };
 
 #endif // COHERENT_LIGATURE_ENGRAVER_HH