source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
#include "rest-collision.hh"
-#include "rest-column.hh"
#include "note-column.hh"
#include "stem.hh"
#include "note-head.hh"
IMPLEMENT_IS_TYPE_B1(Rest_collision,Item);
void
-Rest_collision::add (Note_column *nc_l)
+Rest_collision::add_column (Note_column *nc_l)
{
add_dependency (nc_l);
if (nc_l->rest_b ())
int dir_i = rest_l_arr_[0]->dir_;
int midpos = 4;
-#if 1
// ugh
int stem_length_i = 7 - 2;
// ugh, Stem::stem_start vs Stem::stem_end
int pos = (int)(stem_l->stem_end_f() - midpos) - dir_i * stem_length_i;
-#else // nogo: stem_start not set for rests?
- int pos = (stem_l->stem_start_f() - midpos) + dir_i * 2;
-#endif
+ /*
+ nogo: stem_start not set for rests?
+ int pos = (stem_l->stem_begin_f() - midpos) + dir_i * 2;
+
+ WHY IS THIS STILL HERE? --hwn
+ */
rest_l_arr_[0]->translate_rests (pos);
}
// meisjes met jongetjes
else
{
-#if 0 // breendet: rests go always under
- // geen gemug, trug op je rug
- int dir_i = -1;
- rest_l_arr_[0]->translate_rests (dir_i * 3);
-#else
// int dir_i = - ncol_l_arr_[0]->dir_;
int dir_i = rest_l_arr_[0]->dir_;
// hope it's 4: if it works->doco
- int midpos = 4;
+ int midpos = 0;
// minimum move
int minpos = 4;
(ncol_l_arr_[i]->head_l_arr_[j]->position_i_ -midpos) + sep_i;
}
rest_l_arr_[0]->translate_rests (dir_i * minpos);
-#endif
}
}
}
void
-Rest_collision::do_substitute_dependency (Score_elem*o,Score_elem*n)
+Rest_collision::do_substitute_dependency (Score_element*o,Score_element*n)
{
- Item*o_l = o->item();
-
-
- if (o_l&&o_l->is_type_b (Note_column::static_name ()))
+ if (Note_column *onl = dynamic_cast<Note_column *> (o))
{
- Note_column *n_l = n?(Note_column*)n->item():0;
- rest_l_arr_.substitute ((Note_column*)o_l, n_l);
- ncol_l_arr_.substitute ((Note_column*)o_l, n_l);
+ Note_column *n_l = n?dynamic_cast<Note_column *> (n):0;
+ rest_l_arr_.substitute (onl, n_l);
+ ncol_l_arr_.substitute (onl, n_l);
}
}
Rest_collision::Rest_collision()
{
transparent_b_ = true;
- empty_b_ = true;
+ set_empty (true);
}