input/regression/bookparts.ly fails at PDF conversion stage

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

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 87df2cbe59e761a5e570e57a6b01855d8011b200..68095c2d6e8e2c2709968dd02c491c076a37d2d5 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -18,7 +18,6 @@
 */
 
 #include "paper-column-engraver.hh"
-#include "system.hh"
 #include "international.hh"
 #include "accidental-placement.hh"
 #include "accidental-interface.hh"
@@ -35,6 +34,8 @@
 
 #include "translator.icc"
 
+using std::string;
+
 Paper_column_engraver::Paper_column_engraver ()
 {
   last_moment_.main_part_ = Rational (-1, 1);
@@ -242,10 +243,10 @@ 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)
-          || Arpeggio::has_interface (elem))
+      if (has_interface<Accidental_placement> (elem)
+          || has_interface<Arpeggio> (elem))
         Separation_item::add_conditional_item (col, elem);
-      else if (!Accidental_interface::has_interface (elem))
+      else if (!has_interface<Accidental_interface> (elem))
         Separation_item::add_item (col, elem);
     }
   items_.clear ();