Imported Upstream version 2.18.0

[lilypond.git] / lily / paper-column-engraver.cc

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 8ff894d8facbc9f402af3d33d2834125d95d97d6..cb39f58d1e2d7e48c473e9f4519b5f62ed36e6e8 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -22,6 +22,7 @@
 #include "international.hh"
 #include "accidental-placement.hh"
 #include "accidental-interface.hh"
+#include "arpeggio.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
 #include "note-spacing.hh"
@@ -49,7 +50,7 @@ void
 Paper_column_engraver::finalize ()
 {
   if (! (breaks_ % 8))
-    progress_indication ("[" + to_string (breaks_) + "]");
+    progress_indication ("[" + ::to_string (breaks_) + "]");
 
   if (!made_columns_)
     {
@@ -241,7 +242,8 @@ Paper_column_engraver::stop_translation_timestep ()
       if (!unsmob_grob (elem->get_object ("axis-group-parent-X")))
         elem->set_object ("axis-group-parent-X", col->self_scm ());
 
-      if (Accidental_placement::has_interface (elem))
+      if (Accidental_placement::has_interface (elem)
+          || Arpeggio::has_interface (elem))
         Separation_item::add_conditional_item (col, elem);
       else if (!Accidental_interface::has_interface (elem))
         Separation_item::add_item (col, elem);
@@ -267,7 +269,7 @@ Paper_column_engraver::stop_translation_timestep ()
       breaks_++;
 
       if (! (breaks_ % 8))
-        progress_indication ("[" + to_string (breaks_) + "]");
+        progress_indication ("[" + ::to_string (breaks_) + "]");
     }
 
   context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak"));