source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include <stdio.h>
+#include "dot-column.hh"
+
+#include <cstdio>
+#include <cmath>
#include <map>
+using namespace std;
#include "dots.hh"
-#include "dot-column.hh"
#include "rhythmic-head.hh"
-#include "group-interface.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 "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) gh_scm2int (axis);
- assert (a == Y_AXIS);
- me = me->get_parent (X_AXIS);
-
- if (!to_boolean (me->get_grob_property ("positioning-done")))
- {
- me->set_grob_property ("positioning-done", SCM_BOOL_T);
+ Grob *me = unsmob_grob (smob);
+ extract_grob_set (me, "dots", dots);
- do_shifts (me);
- }
- return gh_double2scm (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) gh_scm2int (axis);
- assert (a == X_AXIS);
-
- Grob * stem = unsmob_grob (me->get_grob_property ("stem"));
- if (stem
- && !Stem::get_beam (stem)
- && Stem::duration_log (stem) > 2
- && !Stem::invisible_b (stem)
- )
+ for (vsize i = 0; i < dots.size (); i++)
{
- /*
- trigger stem end & direction calculation.
-
- This will add the stem to the support if a flag collision happens.
- */
- Stem::stem_end_position (stem);
+ 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 Side_position_interface::aligned_side (element_smob, axis);
-}
-
+ return Side_position_interface::x_aligned_side (smob);
+}
struct Dot_position
{
Grob *dot_;
bool extremal_head_;
-
Dot_position ()
{
dot_ = 0;
- pos_ =0;
+ pos_ = 0;
dir_ = CENTER;
}
};
-
-typedef std::map<int, Dot_position> Dot_configuration;
+typedef map<int, Dot_position> Dot_configuration;
/*
Value CFG according.
-
*/
int
-dot_config_badness (Dot_configuration const &cfg)
+dot_config_badness (Dot_configuration const &cfg)
{
int t = 0;
for (Dot_configuration::const_iterator i (cfg.begin ());
if (i->second.extremal_head_)
{
if (i->second.dir_
- && dot_move_dir != i->second.dir_)
+ && dot_move_dir != i->second.dir_)
demerit += 3;
else if (dot_move_dir != UP)
demerit += 2;
}
else if (dot_move_dir != UP)
demerit += 1;
-
+
t += demerit;
}
- return t;
+ return t;
}
void
printf ("dotconf { ");
for (Dot_configuration::const_iterator i (cfg.begin ());
i != cfg.end (); i++)
- printf ("%d, " , i->first);
+ printf ("%d, ", i->first);
printf ("} \n");
}
Shift K and following (preceding) entries up (down) as necessary to
prevent staffline collisions if D is up (down).
- If K is in CFG, then do nothing.
+ If K is in CFG, then do nothing.
*/
Dot_configuration
{
Dot_configuration new_cfg;
int offset = 0;
-
+
if (d > 0)
{
for (Dot_configuration::const_iterator i (cfg.begin ());
int p = i->first;
if (p == k)
{
- if (Staff_symbol_referencer::on_staffline (i->second.dot_, p))
- p += d ;
+ if (Staff_symbol_referencer::on_line (i->second.dot_, p))
+ p += d;
else
p += 2* d;
offset = 2*d;
- new_cfg[p] = i->second;
+ new_cfg[p] = i->second;
}
else
{
if (new_cfg.find (p) == new_cfg.end ())
- {
- offset =0;
- }
+ offset = 0;
new_cfg[p + offset] = i->second;
}
}
Dot_configuration::const_iterator i (cfg.end ());
do
{
- i --;
+ i--;
int p = i->first;
if (p == k)
{
- if (Staff_symbol_referencer::on_staffline (i->second.dot_, p))
- p += d ;
+ if (Staff_symbol_referencer::on_line (i->second.dot_, p))
+ p += d;
else
p += 2* d;
offset = 2*d;
- new_cfg[p] = i->second;
+ new_cfg[p] = i->second;
}
else
{
if (new_cfg.find (p) == new_cfg.end ())
- {
- offset =0;
- }
+ offset = 0;
new_cfg[p + offset] = i->second;
}
}
while (i != cfg.begin ());
}
-
+
return new_cfg;
}
/*
Remove the collision in CFG either by shifting up or down, whichever
is best.
- */
+*/
void
remove_collision (Dot_configuration &cfg, int p)
{
{
Dot_configuration cfg_up = shift_one (cfg, p, UP);
Dot_configuration cfg_down = shift_one (cfg, p, DOWN);
-
- int b_up = dot_config_badness (cfg_up);
+
+ int b_up = dot_config_badness (cfg_up);
int b_down = dot_config_badness (cfg_down);
- cfg = (b_up < b_down) ? cfg_up : cfg_down;
+ cfg = (b_up < b_down) ? cfg_up : cfg_down;
}
}
+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<Grob> dots =
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "dots");
-
- dots.sort (compare_position);
- for (int i = dots.size (); i--;)
- if (!dots[i]->live ())
- dots.del (i);
-
+ Grob *me = unsmob_grob (smob);
+ vector<Grob*> dots
+ = extract_grob_array (me, "dots");
+
+ { /*
+ Trigger note collision resolution first, since that may kill off
+ dots when merging.
+ */
+ Grob *c = 0;
+ for (vsize i = dots.size (); i--;)
+ {
+ Grob *n = dots[i]->get_parent (Y_AXIS);
+ if (c)
+ c = n->common_refpoint (c, X_AXIS);
+ else
+ c = n;
+ }
+ for (vsize i = dots.size (); i--;)
+ {
+ Grob *n = dots[i]->get_parent (Y_AXIS);
+ n->relative_coordinate (c, X_AXIS);
+ }
+ }
+
+ vector_sort (dots, &compare_position);
+ for (vsize i = dots.size (); i--;)
+ if (!dots[i]->is_live ())
+ 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];
- Grob * note = dots[i]->get_parent (Y_AXIS);
+ Grob *note = dots[i]->get_parent (Y_AXIS);
if (note)
{
- Grob *stem = unsmob_grob (note->get_grob_property ("stem"));
+ Grob *stem = unsmob_grob (note->get_object ("stem"));
if (stem)
dp.extremal_head_ = Stem::first_head (stem) == note;
}
-
- int p = int (Staff_symbol_referencer::get_position (dp.dot_));
- dp.pos_= p;
+
+ int p = Staff_symbol_referencer::get_rounded_position (dp.dot_);
+ dp.pos_ = p;
if (dp.extremal_head_)
- dp.dir_ = to_dir (dp.dot_->get_grob_property ("direction"));
+ dp.dir_ = to_dir (dp.dot_->get_property ("direction"));
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++)
{
- Staff_symbol_referencer::set_position (i->second.dot_, i->first);
+ /*
+ 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)
+Dot_column::add_head (Grob *me, Grob *rh)
{
- Grob * d = unsmob_grob (rh->get_grob_property ("dot"));
+ Grob *d = unsmob_grob (rh->get_object ("dot"));
if (d)
{
- Side_position_interface::add_support (me,rh);
+ 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",
- "Interface that groups dots so they form a column",
- "positioning-done direction stem");
+ADD_INTERFACE (Dot_column,
+ "dot-column-interface",
+
+ "Groups dot objects so they form a column, and position dots so they do not "
+ "clash with staff lines ",
+
+ /* properties */
+ "dots "
+ "positioning-done "
+ "direction "
+ );
projects / lilypond.git / blobdiff