patch::: 1.3.58.jcn2

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

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 914a2c2ecfdefa1577e9f4757a5c861e07d5671a..ad0c6acbdd92790e7d79b34d8f06684b022d03ca 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dimension-cache.hh"
@@ -30,7 +30,7 @@ Rhythmic_column_engraver::process_acknowledged ()
     {
       if (!ncol_p_)
        {
-         ncol_p_ = new Note_column;
+         ncol_p_ = new Note_column (SCM_EOL);
          announce_element (Score_element_info (ncol_p_, 0));
        }
 
@@ -58,8 +58,8 @@ Rhythmic_column_engraver::process_acknowledged ()
          stem_l_ = 0;
        }
 
-      SCM wg = get_property ("weAreGraceContext",0);
-      bool wegrace = gh_boolean_p (wg) && gh_scm2bool (wg);
+      SCM wg = get_property ("weAreGraceContext");
+      bool wegrace = to_boolean (wg);
 
       if (!wegrace)
        for (int i=0; i < grace_slur_endings_.size(); i++)
@@ -71,10 +71,10 @@ Rhythmic_column_engraver::process_acknowledged ()
 void
 Rhythmic_column_engraver::acknowledge_element (Score_element_info i)
 {
-  SCM wg = get_property ("weAreGraceContext",0);
-  bool wegrace = gh_boolean_p (wg) && gh_scm2bool (wg);
+  SCM wg = get_property ("weAreGraceContext");
+  bool wegrace = to_boolean (wg);
   if ((wegrace !=
-      (i.elem_l_->get_elt_property (grace_scm_sym) != SCM_BOOL_F))
+      (i.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED))
     && !dynamic_cast<Slur*> (i.elem_l_))
     return ;
   
@@ -97,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 (to_boolean (s->get_elt_property ("grace")))
        grace_slur_endings_.push (s);
    }
 }
@@ -107,18 +107,6 @@ Rhythmic_column_engraver::do_pre_move_processing()
 {
   if (ncol_p_) 
     {
-      SCM sh = get_property ("horizontalNoteShift", 0);
-      if (SCM_NUMBERP(sh))
-       {
-         ncol_p_->set_elt_property (horizontal_shift_scm_sym, sh);
-       }
-
-      sh = get_property ("forceHorizontalShift" ,0);
-      if (SCM_NUMBERP(sh))
-       {
-         ncol_p_->set_elt_property (force_hshift_scm_sym, sh);
-       }
-
       typeset_element (ncol_p_);
       ncol_p_ =0;
     }
@@ -133,3 +121,4 @@ Rhythmic_column_engraver::do_post_move_processing()
 }
 
 ADD_THIS_TRANSLATOR(Rhythmic_column_engraver);
+