release: 1.5.5

[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 d767d1bade302f61c32628c8e8b8233c2ee95889..0de0777d9d31a2eb43e9b92ebb0e75a93220b758 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -6,7 +6,6 @@
   (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include <iostream.h>
 
 #include "separating-group-spanner.hh"
 #include "separation-item.hh"
@@ -26,8 +25,6 @@ protected:
     
    */
   Item * last_step_musical_malt_p_;
-  Item * last_nonnil_musical_malt_p_;
-  Item * last_nonnil_break_malt_p_;
   
   Spanner * sep_span_p_;
   
@@ -43,9 +40,6 @@ public:
 Separating_line_group_engraver::Separating_line_group_engraver ()
 {
   last_step_musical_malt_p_ = 0;
-  last_nonnil_break_malt_p_ = 0;
-  last_nonnil_musical_malt_p_ = 0;
-  
   sep_span_p_ = 0;
   break_malt_p_ = 0;
   musical_malt_p_ =0;
@@ -102,50 +96,15 @@ Separating_line_group_engraver::stop_translation_timestep ()
   if (break_malt_p_)
     {
       Separating_group_spanner::add_spacing_unit (sep_span_p_, break_malt_p_);
-
+      
       typeset_grob (break_malt_p_);
-
-      last_nonnil_break_malt_p_ = break_malt_p_;
       break_malt_p_ =0;
     }
 
   if (musical_malt_p_)
-    {
+      {
       Separating_group_spanner::add_spacing_unit (sep_span_p_, musical_malt_p_);
 
-
-      /* TODO
-
-        move this mucketry into separation-spanner.
-        
-       */
-      if (last_nonnil_break_malt_p_ && last_nonnil_musical_malt_p_)
-       {
-         cout << now_mom ().str () <<endl;
-         Item *col =     last_nonnil_break_malt_p_->column_l();
-         if (!col)
-           col = dynamic_cast<Item*> (unsmob_grob (get_property ("currentCommandColumn")));
-         
-         SCM between = col->get_grob_property ("between-cols");
-
-         SCM left = last_nonnil_musical_malt_p_->column_l()->self_scm ();
-         SCM right = get_property ("currentMusicalColumn"); // musical_malt_p_->column_l()->self_scm ();
-         if (gh_pair_p (between))
-           {
-             /*
-               ugh. set_..._x ()
-              */
-             if (Paper_column::rank_i (unsmob_grob (gh_car (between))) < Paper_column::rank_i (unsmob_grob (left)))
-               gh_set_car_x (between, left);
-             if (Paper_column::rank_i (unsmob_grob (gh_cdr (between))) > Paper_column::rank_i (unsmob_grob (right)))
-               gh_set_cdr_x (between, right);
-           }
-         else
-           {
-             col->set_grob_property ("between-cols", gh_cons (left, right));
-           }
-       }
-      
       if (last_step_musical_malt_p_)
        {
          Paper_column *col = 
@@ -156,16 +115,13 @@ Separating_line_group_engraver::stop_translation_timestep ()
                                  gh_cons (newtup,
                                           col->get_grob_property ("spacing-sequence")));
        }
-
       
-
-      last_nonnil_break_malt_p_ = 0;
-      last_nonnil_musical_malt_p_ = musical_malt_p_;
       typeset_grob (musical_malt_p_);
-    }
+      }
   last_step_musical_malt_p_ = musical_malt_p_;
   musical_malt_p_ =0;
 
+
 }