source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "dot-column.hh"
#include <cstdio>
#include <cmath>
#include <map>
+#include <set>
+
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"
+#include "dot-configuration.hh"
+#include "note-head.hh"
+#include "skyline.hh"
+#include "dot-formatting-problem.hh"
-/*
- TODO: let Dot_column communicate with stem via Note_column.
-*/
-
-MAKE_SCHEME_CALLBACK (Dot_column, side_position, 1);
+MAKE_SCHEME_CALLBACK (Dot_column, calc_positioning_done, 1);
SCM
-Dot_column::side_position (SCM smob)
-{
- Grob *me = unsmob_grob (smob);
- extract_grob_set (me, "dots", dots);
-
- for (vsize i = 0; i < dots.size (); i++)
- {
- 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::x_aligned_side (smob, SCM_EOL);
-}
-
-struct Dot_position
+Dot_column::calc_positioning_done (SCM smob)
{
- int pos_;
- Direction dir_;
- Grob *dot_;
- bool extremal_head_;
-
- Dot_position ()
- {
- dot_ = 0;
- pos_ = 0;
- dir_ = CENTER;
- extremal_head_ = false;
- }
-};
+ Grob *me = unsmob_grob (smob);
-typedef map<int, Dot_position> Dot_configuration;
+ me->set_property ("positioning-done", SCM_BOOL_T);
-/*
- Value CFG according.
-*/
-int
-dot_config_badness (Dot_configuration const &cfg)
-{
- int t = 0;
- for (Dot_configuration::const_iterator i (cfg.begin ());
- i != cfg.end (); i++)
- {
- int p = i->first;
- int demerit = sqr (p - i->second.pos_) * 2;
-
- int dot_move_dir = sign (p - i->second.pos_);
- if (i->second.extremal_head_)
- {
- if (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;
+ vector<Grob*> dots
+ = extract_grob_array (me, "dots");
- t += demerit;
- }
+ vector<Grob*> main_heads;
+ Real ss = 0;
- return t;
-}
+ Grob *commonx = me;
+ { /*
+ Trigger note collision resolution first, since that may kill off
+ dots when merging.
+ */
+ for (vsize i = 0; i < dots.size (); i++)
+ {
+ Grob *n = dots[i]->get_parent (Y_AXIS);
+ commonx = n->common_refpoint (commonx, X_AXIS);
-void
-print_dot_configuration (Dot_configuration const &cfg)
-{
- printf ("dotconf { ");
- for (Dot_configuration::const_iterator i (cfg.begin ());
- i != cfg.end (); i++)
- printf ("%d, ", i->first);
- printf ("} \n");
-}
+ if (Grob *stem = unsmob_grob (n->get_object("stem")))
+ {
+ commonx = stem->common_refpoint (commonx, X_AXIS);
-/*
- Shift K and following (preceding) entries up (down) as necessary to
- prevent staffline collisions if D is up (down).
+ if (Stem::first_head (stem) == n)
+ main_heads.push_back (n);
+ }
+ }
+ }
- If K is in CFG, then do nothing.
-*/
+ vector<Box> boxes;
+ set<Grob*> stems;
-Dot_configuration
-shift_one (Dot_configuration const &cfg,
- int k, Direction d)
-{
- Dot_configuration new_cfg;
- int offset = 0;
+ extract_grob_set(me, "side-support-elements", support);
- if (d > 0)
+ Interval base_x;
+ for (vsize i = 0; i < main_heads.size (); i++)
+ base_x.unite (main_heads[i]->extent (commonx, X_AXIS));
+
+ for (vsize i = 0; i < support.size (); i++)
{
- for (Dot_configuration::const_iterator i (cfg.begin ());
- i != cfg.end (); i++)
- {
- int p = i->first;
- if (p == k)
- {
- if (Staff_symbol_referencer::on_line (i->second.dot_, p))
- p += d;
- else
- p += 2* d;
-
- offset = 2*d;
-
- new_cfg[p] = i->second;
- }
- else
- {
- if (new_cfg.find (p) == new_cfg.end ())
- offset = 0;
- new_cfg[p + offset] = i->second;
- }
- }
+ if (!ss)
+ ss = Staff_symbol_referencer::staff_space (support[i]);
+
+ Interval y (support[i]->extent (support[i], Y_AXIS));
+
+ y *= 2 / ss;
+ y += Staff_symbol_referencer::get_position (support[i]);
+
+ Box b (support[i]->extent (commonx, X_AXIS), y);
+ boxes.push_back (b);
+
+ if (Grob *s = unsmob_grob (support[i]->get_object ("stem")))
+ stems.insert (s);
}
- else
+
+ for (set<Grob*>::const_iterator i(stems.begin());
+ i != stems.end (); i++)
{
- Dot_configuration::const_iterator i (cfg.end ());
- do
+ Grob *stem = (*i);
+ Stencil flag = Stem::flag (stem);
+ if (!flag.is_empty ())
{
- i--;
-
- int p = i->first;
- if (p == k)
- {
- if (Staff_symbol_referencer::on_line (i->second.dot_, p))
- p += d;
- else
- p += 2* d;
-
- offset = 2*d;
-
- new_cfg[p] = i->second;
- }
- else
- {
- if (new_cfg.find (p) == new_cfg.end ())
- offset = 0;
-
- new_cfg[p + offset] = i->second;
- }
+ Interval y = flag.extent (Y_AXIS)
+ * (2 / ss)
+ + Stem::stem_end_position (stem);
+
+ Interval x = stem->relative_coordinate (commonx, X_AXIS)
+ + flag.extent (X_AXIS);
+
+ boxes.push_back (Box (x,y));
}
- 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)
-{
- bool collide = cfg.find (p) != cfg.end ();
-
- if (collide)
- {
- 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_down = dot_config_badness (cfg_down);
-
- cfg = (b_up < b_down) ? cfg_up : cfg_down;
- }
-}
-
-MAKE_SCHEME_CALLBACK(Dot_column, calc_positioning_done, 1);
-SCM
-Dot_column::calc_positioning_done (SCM smob)
-{
- 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, position_less);
for (vsize i = dots.size (); i--;)
if (!dots[i]->is_live ())
dots.erase (dots.begin () + i);
- Dot_configuration cfg;
- for (vsize i = 0;i < dots.size (); i++)
+ Dot_formatting_problem problem (boxes, base_x);
+
+ Dot_configuration cfg (problem);
+ for (vsize i = 0; i < dots.size (); i++)
{
Dot_position dp;
dp.dot_ = dots[i];
{
Grob *stem = unsmob_grob (note->get_object ("stem"));
if (stem)
- dp.extremal_head_ = Stem::first_head (stem) == note;
+ {
+ dp.extremal_head_ = Stem::first_head (stem) == note;
+
+
+ }
+
+ dp.x_extent_ = note->extent (commonx, X_AXIS);
}
int p = Staff_symbol_referencer::get_rounded_position (dp.dot_);
- dp.pos_ = p;
+ /* icky, since this should go via a Staff_symbol_referencer
+ offset callback but adding a dot overwrites Y-offset. */
+ p += (int) robust_scm2double (dp.dot_->get_property ("staff-position"), 0.0);
+ dp.pos_ = p;
if (dp.extremal_head_)
dp.dir_ = to_dir (dp.dot_->get_property ("direction"));
- remove_collision (cfg, p);
+ cfg.remove_collision (p);
cfg[p] = dp;
if (Staff_symbol_referencer::on_line (dp.dot_, p))
- remove_collision (cfg, p);
+ cfg.remove_collision (p);
}
+ problem.register_configuration (cfg);
+
for (Dot_configuration::const_iterator i (cfg.begin ());
i != cfg.end (); i++)
{
*/
Staff_symbol_referencer::set_position (i->second.dot_, i->first);
}
+
+
+ me->translate_axis (cfg.x_offset () - me->relative_coordinate (commonx, X_AXIS),
+ X_AXIS);
return SCM_BOOL_T;
}
Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d);
d->set_property ("Y-offset", Grob::x_parent_positioning_proc);
+ d->set_property ("X-offset", Grob::x_parent_positioning_proc);
Axis_group_interface::add_element (me, d);
}
}
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 ",
+ "clash with staff lines. ",
/* properties */
"dots "
projects / lilypond.git / blobdiff