Run `make grand-replace'.

[lilypond.git] / lily / script-row-engraver.cc

diff --git a/lily/script-row-engraver.cc b/lily/script-row-engraver.cc
index 3f81f54380639ed551d9bd744cfbb8b6d534630e..91d92f4cd742dccbb084c92ac7d9a9a3ffbe7ca2 100644 (file)
--- a/lily/script-row-engraver.cc
+++ b/lily/script-row-engraver.cc
@@ -3,12 +3,14 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
-
 #include "engraver.hh"
+
+#include "accidental-placement.hh"
+#include "item.hh"
 #include "script-column.hh"
 #include "side-position-interface.hh"
 
@@ -27,6 +29,7 @@ class Script_row_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Script_row_engraver);
 protected:
+  DECLARE_ACKNOWLEDGER (accidental_placement);
   DECLARE_ACKNOWLEDGER (side_position);
   void process_acknowledged ();
   void stop_translation_timestep ();
@@ -43,7 +46,8 @@ Script_row_engraver::stop_translation_timestep ()
   if (script_row_)
     {
       for (vsize i = 0; i < scripts_.size (); i++)
-       if (Side_position_interface::get_axis (scripts_[i]) == X_AXIS)
+       if (Accidental_placement::has_interface (scripts_[i])
+           || Side_position_interface::get_axis (scripts_[i]) == X_AXIS)
          Script_column::add_side_positioned (script_row_, scripts_[i]);
     }
 
@@ -62,6 +66,14 @@ Script_row_engraver::acknowledge_side_position (Grob_info inf)
     }
 }
 
+
+void
+Script_row_engraver::acknowledge_accidental_placement (Grob_info inf)
+{
+  scripts_.push_back (inf.grob ());
+}
+
+
 void
 Script_row_engraver::process_acknowledged ()
 {
@@ -70,9 +82,18 @@ Script_row_engraver::process_acknowledged ()
 }
 
 
+ADD_ACKNOWLEDGER (Script_row_engraver, accidental_placement);
 ADD_ACKNOWLEDGER (Script_row_engraver, side_position);
 ADD_TRANSLATOR (Script_row_engraver,
-               /* doc */ "Determine order in horizontal side position elements. ",
-               /* create */ "ScriptRow ",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Determine order in horizontal side position elements.",
+
+               /* create */
+               "ScriptRow ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );