2003 -> 2004

[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 6fefed83d44df7cb8eea19511a09e1b12b0e6c62..6bcd774ed87455cd057543db2b7660878e1d6834 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -16,6 +16,8 @@
 #include "note-spacing.hh"
 #include "group-interface.hh"
 #include "accidental-placement.hh"
+#include "translator-group.hh"
+
 
 struct Spacings
 {
@@ -37,12 +39,13 @@ struct Spacings
   }
 };
 
+
 class Separating_line_group_engraver : public Engraver
 {
 protected:
-  Item * break_malt_;
-  Item * musical_malt_;
-  Item * last_musical_malt_;
+  Item * break_item_;
+  Item * musical_item_;
+  Item * last_musical_item_;
 
   Spacings current_spacings_;
   Spacings last_spacings_;
@@ -50,7 +53,7 @@ protected:
   Spanner * sep_span_;
   
   virtual void acknowledge_grob (Grob_info);
-  virtual void initialize ();
+  virtual void process_music ();
   virtual void finalize ();
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();  
@@ -61,22 +64,28 @@ public:
 Separating_line_group_engraver::Separating_line_group_engraver ()
 {
   sep_span_ = 0;
-  break_malt_ = 0;
-  musical_malt_ =0;
+  break_item_ = 0;
+  musical_item_ =0;
 }
 
 void
-Separating_line_group_engraver::initialize ()
+Separating_line_group_engraver::process_music ()
 {
-  sep_span_ = new Spanner (get_property ("SeparatingGroupSpanner"));
 
-  announce_grob(sep_span_, SCM_EOL);
-  sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-}
+  if (!sep_span_)
+    {
+      sep_span_ = make_spanner ("SeparatingGroupSpanner");
 
+      announce_grob(sep_span_, SCM_EOL);
+      sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
+}
 void
 Separating_line_group_engraver::finalize ()
 {
+  if (!sep_span_)
+    return ;
+  
   SCM ccol = get_property ("currentCommandColumn");
   Grob *column = unsmob_grob (ccol);
   
@@ -120,22 +129,25 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
     }
   
   bool ib =Item::breakable_b (it);
-  Item *&p_ref_ (ib ? break_malt_
-                : musical_malt_);
+  Item *&p_ref_ (ib ? break_item_
+                : musical_item_);
 
   if (!p_ref_)
     {
-      p_ref_ = new Item (get_property ("SeparationItem"));
+      p_ref_ = make_item ("SeparationItem");
 
       if (ib)
-       p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
+       {
+         p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
+         daddy_trans_->set_property ("breakableSeparationItem", p_ref_->self_scm ());
+       }
       announce_grob(p_ref_, SCM_EOL);
 
-      if (p_ref_ == break_malt_)
+      if (p_ref_ == break_item_)
        {
-         Item *it  = new Item (get_property ("StaffSpacing"));
+         Item *it  = make_item ("StaffSpacing");
          current_spacings_.staff_spacing_ = it;
-         it->set_grob_property ("left-items", gh_cons (break_malt_->self_scm (), SCM_EOL));
+         it->set_grob_property ("left-items", gh_cons (break_item_->self_scm (), SCM_EOL));
          
          announce_grob(it, SCM_EOL);
 
@@ -144,14 +156,14 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
              for (; i--;)
                Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
                                                   ly_symbol2scm ("right-items"),
-                                                  break_malt_);
+                                                  break_item_);
                                     
            }
          else if (last_spacings_.staff_spacing_)
            {
              
              last_spacings_.staff_spacing_->set_grob_property ("right-items",
-                                                               gh_cons (break_malt_->self_scm(), SCM_EOL));
+                                                               gh_cons (break_item_->self_scm(), SCM_EOL));
            }
        }
     }
@@ -165,18 +177,18 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
 void
 Separating_line_group_engraver::start_translation_timestep ()
 {
-
+  if (break_item_)
+    daddy_trans_->unset_property (ly_symbol2scm ("breakableSeparationItem"));
+  break_item_ =0;
 }
 
 void
 Separating_line_group_engraver::stop_translation_timestep ()
 {
-  if (break_malt_)
+  if (break_item_)
     {
-      Separating_group_spanner::add_spacing_unit (sep_span_, break_malt_);
-      typeset_grob (break_malt_);
-
-      break_malt_ =0;
+      Separating_group_spanner::add_spacing_unit (sep_span_, break_item_);
+      typeset_grob (break_item_);
     }
   
   if (Item * sp = current_spacings_.staff_spacing_)
@@ -185,9 +197,9 @@ Separating_line_group_engraver::stop_translation_timestep ()
        TODO: should really look at the left-items of following
        note-spacing grobs.
        */
-      if (musical_malt_)
+      if (musical_item_)
        Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"),
-                                          musical_malt_);
+                                          musical_item_);
 
       typeset_grob (sp);
     }
@@ -200,13 +212,13 @@ Separating_line_group_engraver::stop_translation_timestep ()
 
   current_spacings_.clear ();
   
-  if (musical_malt_)
+  if (musical_item_)
     {
-      Separating_group_spanner::add_spacing_unit (sep_span_, musical_malt_);
-      typeset_grob (musical_malt_);
+      Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_);
+      typeset_grob (musical_item_);
     }
   
-  musical_malt_ =0;
+  musical_item_ =0;
 }
 
 
@@ -216,4 +228,4 @@ ENTER_DESCRIPTION(Separating_line_group_engraver,
 /* accepts */     "",
 /* acks  */      "item-interface",
 /* reads */       "",
-/* write */       "");
+/* write */       "breakableSeparationItem");