patch::: 1.3.86.jcn2

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

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 47c37cfcaae516660fc7bd62825c401bde7af358..0a30bea2496d66a366dd9af421d90d2fbe37b8cc 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -54,13 +54,12 @@ Script_column_engraver::do_post_move_processing ()
 }
 
 void
-Script_column_engraver::acknowledge_element( Score_element_info inf) 
+Script_column_engraver::acknowledge_element(Score_element_info inf) 
 {
-  if (Side_position::has_interface (inf.elem_l_))
+  Item *thing = dynamic_cast<Item*> (inf.elem_l_);
+  if (thing && Side_position::has_interface (inf.elem_l_)) // ugh FIXME
     {
-      Item *thing = dynamic_cast<Item*> (inf.elem_l_);
-      if (thing
-         && !thing->breakable_b ()
+      if (!Item::breakable_b (thing)
          && Side_position::get_axis (inf.elem_l_) == Y_AXIS)
        {
          script_l_arr_.push (thing);
@@ -74,9 +73,9 @@ Script_column_engraver::process_acknowledged ()
   if (!scol_p_ && script_l_arr_.size () > 1)
     {
       scol_p_ = new Item (get_property ("basicScriptColumnProperties"));
-      scol_p_->set_elt_property ("scripts", SCM_EOL);  
 
-      announce_element (Score_element_info (scol_p_, 0));
+
+      announce_element (scol_p_, 0);
     }
 
   if (scol_p_)