release: 1.2.11

[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 4545618efe41a21d0c24908b6a8cda169b72d8f6..99fc66a9079781895152b86121988dfa59511576 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--1999 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 ()
 {
@@ -23,13 +24,23 @@ void
 Separating_line_group_engraver::do_creation_processing ()
 {
   sep_span_p_ = new Separating_group_spanner;
-  announce_element ( Score_element_info (sep_span_p_, 0));
+  announce_element (Score_element_info (sep_span_p_, 0));
   sep_span_p_->set_bounds (LEFT, get_staff_info ().command_pcol_l ());
 }
 
 void
 Separating_line_group_engraver::do_removal_processing ()
 {
+  Scalar sz (get_property ("postBreakPadding", 0));
+  if (!sz.empty_b () && sz.isnum_b ())
+    {
+      sep_span_p_->padding_f_ = Real(sz);
+    }
+  else
+    {
+      sep_span_p_->padding_f_ = paper_l ()->get_realvar (ly_symbol ("postBreakPadding"));
+    }
+
   sep_span_p_->set_bounds (RIGHT, get_staff_info ().command_pcol_l ());
   typeset_element (sep_span_p_);
   sep_span_p_ =0;
@@ -39,15 +50,17 @@ void
 Separating_line_group_engraver::acknowledge_element (Score_element_info i)
 {
   Item * it = dynamic_cast <Item *> (i.elem_l_);
-  if (it && !it->axis_group_l_a_[X_AXIS])
+  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_;
+         if (ib)
+           p_ref_->set_elt_property (breakable_scm_sym, SCM_BOOL_T);
          announce_element (Score_element_info (p_ref_, 0));
        }
       p_ref_->add_item (it);