release: 1.3.16

[lilypond.git] / lily / rhythmic-column-engraver.cc

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 152352ac82ae6b9d93a45caf95c12714dc6516a4..2709b60a82568c89481782773b4994b45759896c 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -6,11 +6,12 @@
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "dimension-cache.hh"
+#include "slur.hh"
 #include "rhythmic-column-engraver.hh"
 #include "note-head.hh"
 #include "stem.hh"
 #include "note-column.hh"
-#include "script.hh"
 #include "dot-column.hh"
 #include "musical-request.hh"
 
@@ -35,7 +36,8 @@ Rhythmic_column_engraver::process_acknowledged ()
 
       for (int i=0; i < rhead_l_arr_.size (); i++)
        {
-         ncol_p_->add_head (rhead_l_arr_[i]);
+         if (!rhead_l_arr_[i]->parent_l(X_AXIS))
+           ncol_p_->add_head (rhead_l_arr_[i]);
        }
       rhead_l_arr_.set_size (0);
     }
@@ -43,52 +45,61 @@ Rhythmic_column_engraver::process_acknowledged ()
   
   if (ncol_p_)
     {
-      if (dotcol_l_)
+      if (dotcol_l_
+         && !dotcol_l_->parent_l(X_AXIS))
        {
          ncol_p_->set_dotcol (dotcol_l_);
        }
 
-      if (stem_l_)
+      if (stem_l_
+         && !stem_l_->parent_l(X_AXIS))
        {
          ncol_p_->set_stem (stem_l_);
          stem_l_ = 0;
        }
-      
-      for (int i=0; i < script_l_arr_.size(); i++) 
-       {
-         if (ncol_p_)
-           ncol_p_->add_script (script_l_arr_[i]);
-       }
-  
-      script_l_arr_.clear();
+
+      SCM wg = get_property ("weAreGraceContext",0);
+      bool wegrace = to_boolean (wg);
+
+      if (!wegrace)
+       for (int i=0; i < grace_slur_endings_.size(); i++)
+         grace_slur_endings_[i]->add_column (ncol_p_);
+      grace_slur_endings_.clear ();
     }
 }
 
 void
 Rhythmic_column_engraver::acknowledge_element (Score_element_info i)
 {
+  SCM wg = get_property ("weAreGraceContext",0);
+  bool wegrace = to_boolean (wg);
+  if ((wegrace !=
+      (i.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED))
+    && !dynamic_cast<Slur*> (i.elem_l_))
+    return ;
+  
   Item * item =  dynamic_cast <Item *> (i.elem_l_);
-  if (!item)
-    return;
-  if (Script *s=dynamic_cast<Script *> (item))
-    {
-      if (i.req_l_)
-       {
-         script_l_arr_.push (s);
-       }
-    }
-  else if (Stem*s=dynamic_cast<Stem *> (item))
+  if (Stem*s=dynamic_cast<Stem *> (item))
     {
       stem_l_ = s;
     }
-      else if (Rhythmic_head*r=dynamic_cast<Rhythmic_head *> (item))
+  else if (Rhythmic_head*r=dynamic_cast<Rhythmic_head *> (item))
     {
       rhead_l_arr_.push (r);
     }
-      else if (Dot_column*d =dynamic_cast<Dot_column *> (item))
+  else if (Dot_column*d =dynamic_cast<Dot_column *> (item))
     {
       dotcol_l_ = d;
     }
+  else if (Slur *s = dynamic_cast<Slur*> (i.elem_l_))
+    {
+      /*
+       end slurs starting on grace notes
+       */
+      
+      if (s->get_elt_property ("grace") != SCM_UNDEFINED)
+       grace_slur_endings_.push (s);
+   }
 }
 
 void
@@ -96,15 +107,6 @@ Rhythmic_column_engraver::do_pre_move_processing()
 {
   if (ncol_p_) 
     {
-      // egcs
-      if (get_property ("hshift", 0).operator bool ())
-       {
-         ncol_p_->set_elt_property (horizontal_shift_scm_sym, SCM_BOOL_T);
-       }
-      
-      if (! ncol_p_->dir_)
-       ncol_p_->dir_ =(Direction) int(get_property ("ydirection", 0));
-
       typeset_element (ncol_p_);
       ncol_p_ =0;
     }
@@ -113,13 +115,10 @@ Rhythmic_column_engraver::do_pre_move_processing()
 void
 Rhythmic_column_engraver::do_post_move_processing()
 {
-  script_l_arr_.clear();
+  grace_slur_endings_.clear ();
   dotcol_l_ =0;
   stem_l_ =0;
 }
 
-
-
-
-
 ADD_THIS_TRANSLATOR(Rhythmic_column_engraver);
+