Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / output-property-engraver.cc

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 76a2b6cb3f1cce306b05d95e4011d45efef509f6..6b450ef864be1d4df4477af91035df008da09da3 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -20,15 +20,16 @@ class Output_property_engraver : public Engraver
   TRANSLATOR_DECLARATIONS (Output_property_engraver);
 protected:
   vector<Stream_event*> props_;
+  
   DECLARE_ACKNOWLEDGER (grob);
-  DECLARE_TRANSLATOR_LISTENER (layout_instruction);
+  DECLARE_TRANSLATOR_LISTENER (apply_output);
 
   void stop_translation_timestep ();
 };
 
-IMPLEMENT_TRANSLATOR_LISTENER (Output_property_engraver, layout_instruction);
+IMPLEMENT_TRANSLATOR_LISTENER (Output_property_engraver, apply_output);
 void
-Output_property_engraver::listen_layout_instruction (Stream_event *ev)
+Output_property_engraver::listen_apply_output (Stream_event *ev)
 {
   /*
     UGH. Only swallow the output property event in the context
@@ -72,9 +73,6 @@ ADD_TRANSLATOR (Output_property_engraver,
                /* create */
                "",
                
-               /* accept */
-               "layout-instruction-event",
-               
                /* read */
                "",