release: 1.3.65

[lilypond.git] / lily / separating-line-group-engraver.cc

diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index 43b83ff33e4c0c29dbe097526d56b2048e0c01ce..a46608d0ab18c928013f5706acdde44f98473830 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -3,14 +3,15 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "separating-line-group-engraver.hh"
 #include "separating-group-spanner.hh"
 #include "single-malt-grouping-item.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
+#include "paper-def.hh"
 
 Separating_line_group_engraver::Separating_line_group_engraver ()
 {
@@ -22,15 +23,15 @@ Separating_line_group_engraver::Separating_line_group_engraver ()
 void
 Separating_line_group_engraver::do_creation_processing ()
 {
-  sep_span_p_ = new Separating_group_spanner;
-  announce_element ( Score_element_info (sep_span_p_, 0));
-  sep_span_p_->set_bounds (LEFT, get_staff_info ().command_pcol_l ());
+  sep_span_p_ = new Separating_group_spanner (SCM_EOL);
+  announce_element (Score_element_info (sep_span_p_, 0));
+  sep_span_p_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn")));
 }
 
 void
 Separating_line_group_engraver::do_removal_processing ()
 {
-  sep_span_p_->set_bounds (RIGHT, get_staff_info ().command_pcol_l ());
+  sep_span_p_->set_bound (RIGHT, unsmob_element (get_property ("currentCommandColumn")));
   typeset_element (sep_span_p_);
   sep_span_p_ =0;
 }
@@ -41,13 +42,18 @@ Separating_line_group_engraver::acknowledge_element (Score_element_info i)
   Item * it = dynamic_cast <Item *> (i.elem_l_);
   if (it && !it->parent_l (X_AXIS))
     {
-      Single_malt_grouping_item *&p_ref_ (it->breakable_b_
-                                         ? break_malt_p_ : nobreak_malt_p_);
+      bool ib =it->breakable_b ();
+      Single_malt_grouping_item *&p_ref_ (ib ? break_malt_p_
+                                         : nobreak_malt_p_);
 
       if (!p_ref_)
        {
-         p_ref_ = new Single_malt_grouping_item;
-         p_ref_->breakable_b_ = it->breakable_b_;
+         p_ref_
+           = new Single_malt_grouping_item
+           (get_property ("basicSingleMaltGroupingItemProperties"));
+         
+         if (ib)
+           p_ref_->set_elt_property ("breakable", SCM_BOOL_T);
          announce_element (Score_element_info (p_ref_, 0));
        }
       p_ref_->add_item (it);
@@ -75,3 +81,4 @@ Separating_line_group_engraver::do_pre_move_processing ()
 
 
 ADD_THIS_TRANSLATOR( Separating_line_group_engraver);
+