release: 1.5.13

[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 cb3f54040e7071053ae319e42fcf64aaa1b06599..d36a852911a59c6bded27b26746485e24c05f94d 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -18,7 +18,8 @@ class Separating_line_group_engraver : public Engraver
 {
 protected:
   Item * break_malt_p_;
-  Item * nobreak_malt_p_;
+  Item * musical_malt_p_;
+
   Spanner * sep_span_p_;
   
   virtual void acknowledge_grob (Grob_info);
@@ -26,22 +27,21 @@ protected:
   virtual void finalize ();
   virtual void stop_translation_timestep ();
 public:
-  Separating_line_group_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(Separating_line_group_engraver);
 };
 
 Separating_line_group_engraver::Separating_line_group_engraver ()
 {
   sep_span_p_ = 0;
   break_malt_p_ = 0;
-  nobreak_malt_p_ =0;
+  musical_malt_p_ =0;
 }
 
 void
 Separating_line_group_engraver::initialize ()
 {
   sep_span_p_ = new Spanner (get_property ("SeparatingGroupSpanner"));
-  Separating_group_spanner::set_interface (sep_span_p_);
+
   announce_grob (sep_span_p_, 0);
   sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
 }
@@ -57,23 +57,23 @@ Separating_line_group_engraver::finalize ()
 void
 Separating_line_group_engraver::acknowledge_grob (Grob_info i)
 {
-  Item * it = dynamic_cast <Item *> (i.elem_l_);
+  Item * it = dynamic_cast <Item *> (i.grob_l_);
   if (!it)
     return;
   if (it->parent_l (X_AXIS)
       && it->parent_l (X_AXIS)->has_extent_callback_b
-      (Axis_group_interface::group_extent_callback_proc, X_AXIS))
+ (Axis_group_interface::group_extent_callback_proc, X_AXIS))
     return;
 
   
   bool ib =Item::breakable_b (it);
   Item *&p_ref_ (ib ? break_malt_p_
-                : nobreak_malt_p_);
+                : musical_malt_p_);
 
   if (!p_ref_)
     {
       p_ref_ = new Item
-       (get_property ("SeparationItem"));
+ (get_property ("SeparationItem"));
          
       if (ib)
        p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
@@ -92,15 +92,23 @@ Separating_line_group_engraver::stop_translation_timestep ()
       typeset_grob (break_malt_p_);
       break_malt_p_ =0;
     }
-  if (nobreak_malt_p_)
+
+  if (musical_malt_p_)
     {
-      Separating_group_spanner::add_spacing_unit (sep_span_p_, nobreak_malt_p_);
-      typeset_grob (nobreak_malt_p_);
-      nobreak_malt_p_ =0;
+      Separating_group_spanner::add_spacing_unit (sep_span_p_, musical_malt_p_);
+      typeset_grob (musical_malt_p_);
     }
+
+  musical_malt_p_ =0;
 }
 
 
 
-ADD_THIS_TRANSLATOR(Separating_line_group_engraver);
 
+
+ENTER_DESCRIPTION(Separating_line_group_engraver,
+/* descr */       "Generates objects for computing spacing parameters.",
+/* creats*/       "SeparationItem SeparatingGroupSpanner",
+/* acks  */       "grob-interface",
+/* reads */       "",
+/* write */       "");