release: 1.3.94

[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 53293ceddedcba74cfdd71632faf310f3fca8d13..63b66cc2f4289c572d5c787341c641d19e5530a8 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -1,19 +1,33 @@
 /*   
-  separating-line-group-grav.cc --  implement Separating_line_group_engraver
+  separating-line-group-engraver.cc --  implement Separating_line_group_engraver
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 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 "separation-item.hh"
 #include "paper-column.hh"
 #include "paper-def.hh"
+#include "engraver.hh"
 
-ADD_THIS_TRANSLATOR (Separating_line_group_engraver);
+class Separating_line_group_engraver : public Engraver
+{
+protected:
+  Item * break_malt_p_;
+  Item * nobreak_malt_p_;
+  Spanner * sep_span_p_;
+  
+  virtual void acknowledge_element (Score_element_info);
+  virtual void do_creation_processing ();
+  virtual void do_removal_processing ();
+  virtual void do_pre_move_processing ();
+public:
+  Separating_line_group_engraver ();
+  VIRTUAL_COPY_CONS (Translator);
+};
 
 Separating_line_group_engraver::Separating_line_group_engraver ()
 {
@@ -25,15 +39,16 @@ 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 Spanner (get_property ("SeparatingGroupSpanner"));
+  Separating_group_spanner::set_interface (sep_span_p_);
+  announce_element (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;
 }
@@ -44,18 +59,20 @@ 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))
     {
-      bool ib =it->breakable_b ();
-      Single_malt_grouping_item *&p_ref_ (ib ? break_malt_p_
-                                         : nobreak_malt_p_);
+      bool ib =Item::breakable_b (it);
+      Item *&p_ref_ (ib ? break_malt_p_
+                             : nobreak_malt_p_);
 
       if (!p_ref_)
        {
-         p_ref_ = new Single_malt_grouping_item;
+         p_ref_ = new Item
+           (get_property ("SeparationItem"));
+         
          if (ib)
            p_ref_->set_elt_property ("breakable", SCM_BOOL_T);
-         announce_element (Score_element_info (p_ref_, 0));
+         announce_element (p_ref_, 0);
        }
-      p_ref_->add_item (it);
+      Separation_item::add_item (p_ref_,it);
     }
 }
 
@@ -64,16 +81,20 @@ Separating_line_group_engraver::do_pre_move_processing ()
 {
   if (break_malt_p_)
     {
-      sep_span_p_->add_spacing_unit (break_malt_p_);
+      Separating_group_spanner::add_spacing_unit (sep_span_p_, break_malt_p_);
       
       typeset_element (break_malt_p_);
       break_malt_p_ =0;
     }
   if (nobreak_malt_p_)
     {
-      sep_span_p_->add_spacing_unit (nobreak_malt_p_);
+      Separating_group_spanner::add_spacing_unit (sep_span_p_, nobreak_malt_p_);
       typeset_element (nobreak_malt_p_);
       nobreak_malt_p_ =0;
     }
 }
 
+
+
+ADD_THIS_TRANSLATOR(Separating_line_group_engraver);
+