X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=a07dfcde116c132bd7aa1e64958ca22896da9dd2;hb=936cf9ea496f7340c91f92a7c0ddda91960bf960;hp=ec981b63bc9c5957640297a4e1937d7c12a3a24a;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index ec981b63bc..a07dfcde11 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,67 +3,57 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ #include "dot-column.hh" #include -#include +#include #include +using namespace std; #include "dots.hh" +#include "dot-column.hh" #include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" #include "directional-element-interface.hh" #include "side-position-interface.hh" #include "axis-group-interface.hh" #include "stem.hh" +#include "grob.hh" +#include "pointer-group-interface.hh" /* TODO: let Dot_column communicate with stem via Note_column. */ -MAKE_SCHEME_CALLBACK (Dot_column, force_shift_callback, 2); +MAKE_SCHEME_CALLBACK (Dot_column, side_position, 1); SCM -Dot_column::force_shift_callback (SCM element_smob, SCM axis) +Dot_column::side_position (SCM smob) { - Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (axis); - assert (a == Y_AXIS); - me = me->get_parent (X_AXIS); - - if (!to_boolean (me->get_property ("positioning-done"))) + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "dots", dots); + + for (vsize i = 0; i < dots.size (); i++) { - me->set_property ("positioning-done", SCM_BOOL_T); - - do_shifts (me); + Grob *head = dots[i]->get_parent (Y_AXIS); + Grob *stem = head ? unsmob_grob (head->get_object ("stem")) : 0; + if (stem + && !Stem::get_beam (stem) + && Stem::duration_log (stem) > 2 + && !Stem::is_invisible (stem)) + { + /* + trigger stem end & direction calculation. + + This will add the stem to the support if a flag collision happens. + */ + stem->get_property ("stem-end-position"); + } } - return scm_make_real (0.0); -} - -MAKE_SCHEME_CALLBACK (Dot_column, side_position, 2); -SCM -Dot_column::side_position (SCM element_smob, SCM axis) -{ - Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (axis); - assert (a == X_AXIS); - - Grob *stem = unsmob_grob (me->get_property ("stem")); - if (stem - && !Stem::get_beam (stem) - && Stem::duration_log (stem) > 2 - && !Stem::is_invisible (stem)) - { - /* - trigger stem end & direction calculation. - This will add the stem to the support if a flag collision happens. - */ - Stem::stem_end_position (stem); - } - return Side_position_interface::aligned_side (element_smob, axis); + return Side_position_interface::x_aligned_side (smob, SCM_EOL); } struct Dot_position @@ -78,10 +68,11 @@ struct Dot_position dot_ = 0; pos_ = 0; dir_ = CENTER; + extremal_head_ = false; } }; -typedef std::map < int, Dot_position> Dot_configuration; +typedef map Dot_configuration; /* Value CFG according. @@ -146,7 +137,7 @@ shift_one (Dot_configuration const &cfg, int p = i->first; if (p == k) { - if (Staff_symbol_referencer::on_staffline (i->second.dot_, p)) + if (Staff_symbol_referencer::on_line (i->second.dot_, p)) p += d; else p += 2* d; @@ -158,9 +149,7 @@ shift_one (Dot_configuration const &cfg, else { if (new_cfg.find (p) == new_cfg.end ()) - { - offset = 0; - } + offset = 0; new_cfg[p + offset] = i->second; } } @@ -175,7 +164,7 @@ shift_one (Dot_configuration const &cfg, int p = i->first; if (p == k) { - if (Staff_symbol_referencer::on_staffline (i->second.dot_, p)) + if (Staff_symbol_referencer::on_line (i->second.dot_, p)) p += d; else p += 2* d; @@ -187,9 +176,7 @@ shift_one (Dot_configuration const &cfg, else { if (new_cfg.find (p) == new_cfg.end ()) - { - offset = 0; - } + offset = 0; new_cfg[p + offset] = i->second; } @@ -221,18 +208,20 @@ remove_collision (Dot_configuration &cfg, int p) } } +MAKE_SCHEME_CALLBACK(Dot_column, calc_positioning_done, 1); SCM -Dot_column::do_shifts (Grob *me) +Dot_column::calc_positioning_done (SCM smob) { - Link_array dots - = extract_grob_array (me, ly_symbol2scm ("dots")); + Grob *me = unsmob_grob (smob); + vector dots + = extract_grob_array (me, "dots"); { /* Trigger note collision resolution first, since that may kill off dots when merging. */ Grob *c = 0; - for (int i = dots.size (); i--;) + for (vsize i = dots.size (); i--;) { Grob *n = dots[i]->get_parent (Y_AXIS); if (c) @@ -240,20 +229,20 @@ Dot_column::do_shifts (Grob *me) else c = n; } - for (int i = dots.size (); i--;) + for (vsize i = dots.size (); i--;) { Grob *n = dots[i]->get_parent (Y_AXIS); n->relative_coordinate (c, X_AXIS); } } - dots.sort (compare_position); - for (int i = dots.size (); i--;) + vector_sort (dots, position_less); + for (vsize i = dots.size (); i--;) if (!dots[i]->is_live ()) - dots.del (i); + dots.erase (dots.begin () + i); Dot_configuration cfg; - for (int i = 0;i < dots.size (); i++) + for (vsize i = 0;i < dots.size (); i++) { Dot_position dp; dp.dot_ = dots[i]; @@ -261,7 +250,7 @@ Dot_column::do_shifts (Grob *me) Grob *note = dots[i]->get_parent (Y_AXIS); if (note) { - Grob *stem = unsmob_grob (note->get_property ("stem")); + Grob *stem = unsmob_grob (note->get_object ("stem")); if (stem) dp.extremal_head_ = Stem::first_head (stem) == note; } @@ -274,36 +263,43 @@ Dot_column::do_shifts (Grob *me) remove_collision (cfg, p); cfg[p] = dp; - if (Staff_symbol_referencer::on_staffline (dp.dot_, p)) + if (Staff_symbol_referencer::on_line (dp.dot_, p)) remove_collision (cfg, p); } for (Dot_configuration::const_iterator i (cfg.begin ()); i != cfg.end (); i++) { + /* + Junkme? + */ Staff_symbol_referencer::set_position (i->second.dot_, i->first); } - - return SCM_UNSPECIFIED; + return SCM_BOOL_T; } void Dot_column::add_head (Grob *me, Grob *rh) { - Grob *d = unsmob_grob (rh->get_property ("dot")); + Grob *d = unsmob_grob (rh->get_object ("dot")); if (d) { Side_position_interface::add_support (me, rh); Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d); - d->add_offset_callback (Dot_column::force_shift_callback_proc, Y_AXIS); + d->set_property ("Y-offset", Grob::x_parent_positioning_proc); Axis_group_interface::add_element (me, d); } } - -ADD_INTERFACE (Dot_column, "dot-column-interface", +ADD_INTERFACE (Dot_column, + "Groups dot objects so they form a column, and position dots so they do not " "clash with staff lines ", - "positioning-done direction stem"); + + /* properties */ + "dots " + "positioning-done " + "direction " + );