From 8374725754044a1709cfa8ea63269a0f9b2a77a6 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:23:46 +0000 Subject: [PATCH] lilypond-1.3.65 --- lily/align-note-column-engraver.cc | 2 +- lily/breathing-sign.cc | 4 ++-- lily/chord-tremolo-engraver.cc | 2 +- lily/dot-column.cc | 2 +- lily/dots.cc | 6 +++--- lily/stem-tremolo.cc | 2 +- lily/stem.cc | 10 ++++----- lily/tie-column.cc | 34 ++++++++++++++++++------------ 8 files changed, 35 insertions(+), 27 deletions(-) diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc index 74d165a141..f346fb9191 100644 --- a/lily/align-note-column-engraver.cc +++ b/lily/align-note-column-engraver.cc @@ -60,7 +60,7 @@ Align_note_column_engraver::do_removal_processing () if (isdir_b (al)) { Direction d = to_dir (al); - directional_element (align_item_p_).set (d); + Directional_element_interface (align_item_p_).set (d); } typeset_element (align_item_p_); diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 6c337642d1..c8a7a0c1a2 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -50,11 +50,11 @@ SCM Breathing_sign::member_after_line_breaking () { Real space = staff_symbol_referencer (this).staff_space(); - Direction d = directional_element (this). get (); + Direction d = Directional_element_interface (this). get (); if (!d) { d = UP; - directional_element(this).set (d); + Directional_element_interface (this).set (d); } translate_axis(2.0 * space * d, Y_AXIS); diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 86707e1d8f..5ab38f6f85 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -142,7 +142,7 @@ Chord_tremolo_engraver::acknowledge_element (Score_element_info info) It's amazing Mike: Stem:: type_i () ->first_head ()->get_direction () -> - directional_element (me).set (d); + Directional_element_interface (me).set (d); don't understand this comment. diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 1caf937978..f3d3fccf3f 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -53,7 +53,7 @@ Dot_column::Dot_column (SCM s) { Pointer_group_interface gi (this, "dots"); gi.set_interface (); - directional_element (this).set (RIGHT); + Directional_element_interface (this).set (RIGHT); Axis_group_interface (this).set_interface (); Axis_group_interface (this).set_axes(X_AXIS,X_AXIS); diff --git a/lily/dots.cc b/lily/dots.cc index 9dc8c8b75b..edd64f0144 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -25,13 +25,13 @@ Dots::member_after_line_breaking () SCM d= get_elt_property ("dot-count"); if (gh_number_p (d) && gh_scm2int (d)) { - if (!directional_element (this).get ()) - directional_element (this).set (UP); + if (!Directional_element_interface (this).get ()) + Directional_element_interface (this).set (UP); Staff_symbol_referencer_interface si (this); int p = int (si.position_f ()); if (!(p % 2)) - si.set_position (p + directional_element (this).get ()); + si.set_position (p + Directional_element_interface (this).get ()); } return SCM_UNDEFINED; diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index a209a04a63..0d26fcd52a 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -105,7 +105,7 @@ Stem_tremolo::member_brew_molecule () const int beams_i = stem->beam_count(RIGHT) >? stem->beam_count (LEFT); mol.translate (Offset(stem->relative_coordinate (0, X_AXIS) - relative_coordinate (0, X_AXIS), stem->stem_end_position () * ss / 2 - - directional_element (beam).get () * beams_i * interbeam_f)); + Directional_element_interface (beam).get () * beams_i * interbeam_f)); } else { diff --git a/lily/stem.cc b/lily/stem.cc index e1b53608c8..ab18bcd9b1 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -95,14 +95,14 @@ Stem::stem_end_position () const Direction Stem::get_direction () const { - Direction d = directional_element (this).get (); + Direction d = Directional_element_interface (this).get (); if (!d) { Stem * me = (Stem*) this; d = get_default_dir (); // urg, AAARGH! - directional_element (me).set (d); + Directional_element_interface (me).set (d); } return d ; } @@ -301,7 +301,7 @@ Stem::get_default_stem_end_position () const if (!dir) { dir = get_default_dir (); - directional_element (this).set (dir); + Directional_element_interface (this).set (dir); } /* @@ -533,7 +533,7 @@ Stem::calc_stem_info () const { assert (beam_l ()); - Direction beam_dir = directional_element (beam_l ()).get (); + Direction beam_dir = Directional_element_interface (beam_l ()).get (); if (!beam_dir) { programming_error ("Beam dir not set."); @@ -575,7 +575,7 @@ Stem::calc_stem_info () const Real stem_length = a[multiplicity s = + Link_array ties = Pointer_group_interface__extract_elements (this, (Tie*)0, "ties"); - Direction d = directional_element (this).get (); + Direction d = Directional_element_interface (this).get (); if (d) { - for (int i = s.size (); i--;) - directional_element (s[i]).set (d); + for (int i = ties.size (); i--;) + { + Tie * t = ties[i]; + Directional_element_interface (t).set (d); + } return; } - if (s.size () == 1) + if (ties.size () == 1) { - directional_element (s[0]).set (s[0]->get_default_dir ()); + Tie * t = ties[0]; + Directional_element_interface (t).set (t->get_default_dir ()); return; } - s.sort (tie_compare); - directional_element (s[0]).set (DOWN); - s.del (0); - directional_element (s.pop ()).set (UP); + ties.sort (tie_compare); + Directional_element_interface tie0(ties[0]); + tie0.set (DOWN); + ties.del (0); + + Directional_element_interface tietop(ties.pop ()); + tietop.set (UP); - for (int i=s.size(); i--; ) + for (int i=ties.size(); i--; ) { - Real p = s[i]->position_f (); + Tie * t = ties[i]; + Real p = t->position_f (); Direction d = (Direction) sign (p); if (!d) d = UP; - directional_element (s[i]).set (d); + Directional_element_interface (t).set (d); } } -- 2.39.5