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 d1d322af164c393165b26b3418c30ea5f3256fe5..2709b60a82568c89481782773b4994b45759896c 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -6,6 +6,7 @@
   (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"
@@ -35,7 +36,7 @@ Rhythmic_column_engraver::process_acknowledged ()
 
       for (int i=0; i < rhead_l_arr_.size (); i++)
        {
-         if (!rhead_l_arr_[i]->dim_cache_[X_AXIS]->parent_l_)
+         if (!rhead_l_arr_[i]->parent_l(X_AXIS))
            ncol_p_->add_head (rhead_l_arr_[i]);
        }
       rhead_l_arr_.set_size (0);
@@ -45,23 +46,22 @@ Rhythmic_column_engraver::process_acknowledged ()
   if (ncol_p_)
     {
       if (dotcol_l_
-         && !dotcol_l_->dim_cache_[X_AXIS]->parent_l_)
+         && !dotcol_l_->parent_l(X_AXIS))
        {
          ncol_p_->set_dotcol (dotcol_l_);
        }
 
       if (stem_l_
-         && !stem_l_->dim_cache_[X_AXIS]->parent_l_)
+         && !stem_l_->parent_l(X_AXIS))
        {
          ncol_p_->set_stem (stem_l_);
          stem_l_ = 0;
        }
 
-      /*
-       since ncol_p_ is announced, it already has its grace_scm_sym set, if we're
-       in a Grace context.
-       */
-      if (ncol_p_->get_elt_property (grace_scm_sym) == SCM_BOOL_F)
+      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 ();
@@ -71,8 +71,11 @@ Rhythmic_column_engraver::process_acknowledged ()
 void
 Rhythmic_column_engraver::acknowledge_element (Score_element_info i)
 {
-  if (get_property ("weAreGraceContext",0).to_bool () !=
-      (i.elem_l_->get_elt_property (grace_scm_sym) != SCM_BOOL_F))
+  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_);
@@ -94,7 +97,7 @@ Rhythmic_column_engraver::acknowledge_element (Score_element_info i)
        end slurs starting on grace notes
        */
       
-      if (s->get_elt_property (grace_scm_sym) != SCM_BOOL_F)
+      if (s->get_elt_property ("grace") != SCM_UNDEFINED)
        grace_slur_endings_.push (s);
    }
 }
@@ -104,14 +107,6 @@ Rhythmic_column_engraver::do_pre_move_processing()
 {
   if (ncol_p_) 
     {
-      Scalar sh = get_property ("horizontalNoteShift", 0);
-      // egcs
-      if (sh.to_bool () && sh.isnum_b ())
-       {
-         ncol_p_->set_elt_property (horizontal_shift_scm_sym,
-                                    gh_int2scm (int (sh)));
-       }
-
       typeset_element (ncol_p_);
       ncol_p_ =0;
     }
@@ -125,8 +120,5 @@ Rhythmic_column_engraver::do_post_move_processing()
   stem_l_ =0;
 }
 
-
-
-
-
 ADD_THIS_TRANSLATOR(Rhythmic_column_engraver);
+