-\version "1.9.8"
-\header{
-texidoc="
-Noteheads can have dots, and rests can too. Augmentation dots should
-never be printed on a staff line, but rather be shifted vertically. They
-should go up, but in case of multiple parts, the down stems have down
-shifted dots. (Wanske p. 186) In case of chords, all dots should be in
-a column. The dots go along as rests are shifted to avoid collisions.
+\version "1.9.8" \header{
+
+
+ texidoc=" Noteheads can have dots, and rests
+can too. Augmentation dots should never be printed on a staff line,
+but rather be shifted vertically. They should go up, but in case of
+multiple parts, the down stems have down shifted dots. In case of
+chords, all dots should be in a column. The dots go along as rests
+are shifted to avoid collisions.
+
+The priorities, are (ranked in importance):
+
+@itemize @bullet
+@item keeping dots off staff lines
+@item keeping dots close to their note heads
+@item moving dots in the direction specified by the voice
+@item moving dots up
+@end itemize
+
"
}
d4. g,,
\stemDown
<b'' c d e>4. <f g a b>
- <g b d> <c, g' d' a'>
+ <f a c> <e a c> <b f' c' g'>
<<
*/
#include <set>
+#include <map>
#include "dots.hh"
#include "dot-column.hh"
if (!to_boolean (me->get_grob_property ("collision-done")))
{
- SCM l = me->get_grob_property ("dots");
me->set_grob_property ("collision-done", SCM_BOOL_T);
- do_shifts (me, l);
+ do_shifts (me);
}
return gh_double2scm (0.0);
}
}
-/*
- Put the dots in the spaces, close to the heads.
-
- This is somewhat gruesome; the problem really is
- minimize (sum_j dist (head_j, dot_j))
+struct Dot_position
+{
+ int pos_;
+ Direction dir_;
+ Grob *dot_;
+ bool extremal_head_;
- over all configurations. This sounds like a messy optimization
- problem to solve.
+ Dot_position ()
+ {
+ dot_ = 0;
+ pos_ =0;
+ dir_ = CENTER;
+ }
+};
+
+
+typedef std::map<int, Dot_position> Dot_configuration;
+
+/*
+ Value CFG according.
+
*/
-SCM
-Dot_column::do_shifts (Grob*me, SCM l)
+int
+dot_config_badness (Dot_configuration const &cfg)
{
- Link_array<Grob> dots;
- while (gh_pair_p (l))
+ int t = 0;
+ for (Dot_configuration::const_iterator i (cfg.begin ());
+ i != cfg.end (); i++)
{
- dots.push (unsmob_grob (ly_car (l)));
- l = ly_cdr (l);
+ 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;
+
+ t += demerit;
}
-
- dots.sort (compare_position);
-
- set<int> taken_posns;
- for (int i=0; i < dots.size (); i++)
- {
- Grob * d = dots[i];
- int p = int (Staff_symbol_referencer::get_position (d));
+ return t;
+}
+
+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");
+}
+
+/*
+ Shift K and following (preceding) entries up (down) as necessary to
+ prevent staffline collisions if D is up (down).
- if (Staff_symbol_referencer::on_staffline (d, p)
- || taken_posns.find (p) != taken_posns.end ())
+ If K is in CFG, then do nothing.
+*/
+
+Dot_configuration
+shift_one (Dot_configuration const &cfg,
+ int k, Direction d)
+{
+ Dot_configuration new_cfg;
+ int offset = 0;
+
+ if (d > 0)
+ {
+ for (Dot_configuration::const_iterator i (cfg.begin ());
+ i != cfg.end (); i++)
{
- int pd = p;
- int pu = p;
- if (Staff_symbol_referencer::on_staffline (d, p))
+ int p = i->first;
+ if (p == k)
{
- pu ++;
- pd --;
+ if (Staff_symbol_referencer::on_staffline (i->second.dot_, p))
+ p += d ;
+ else
+ p += 2* d;
+
+ offset = 2*d;
+
+ new_cfg[p] = i->second;
}
-
- Direction dir = to_dir (d->get_grob_property ("direction"));
- if (dir != DOWN)
-
- while (1)
+ else
{
- if (dir != DOWN)
+ if (new_cfg.find (p) == new_cfg.end ())
{
- if (taken_posns.find (pu) == taken_posns.end ())
- {
- p = pu;
- break;
- }
- pu += 2;
+ offset =0;
}
- if (dir != UP)
+ new_cfg[p + offset] = i->second;
+ }
+ }
+ }
+ else
+ {
+ Dot_configuration::const_iterator i (cfg.end ());
+ do
+ {
+ i --;
+
+ int p = i->first;
+ if (p == k)
+ {
+ if (Staff_symbol_referencer::on_staffline (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 ())
{
- if (taken_posns.find (pd) == taken_posns.end ())
- {
- p = pd;
- break;
- }
- pd -= 2;
+ offset =0;
}
+
+ new_cfg[p + offset] = i->second;
}
- Staff_symbol_referencer::set_position (d, p);
}
-
- taken_posns.insert (p);
+ while (i != cfg.begin ());
}
- return SCM_UNSPECIFIED;
+ 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;
+ }
+}
+
+SCM
+Dot_column::do_shifts (Grob*me)
+{
+
+ Link_array<Grob> dots =
+ Pointer_group_interface__extract_grobs (me, (Grob*)0, "dots");
+
+ dots.sort (compare_position);
+
+ Dot_configuration cfg;
+ for (int i =0;i < dots.size (); i++)
+ {
+ Dot_position dp;
+ dp.dot_ = dots[i];
+
+ Grob * note = dots[i]->get_parent (Y_AXIS);
+ if (note)
+ {
+ Grob *stem = unsmob_grob (note->get_grob_property ("stem"));
+ if (stem)
+ dp.extremal_head_ = Stem::first_head (stem) == note;
+ }
+
+ int p = int (Staff_symbol_referencer::get_position (dp.dot_));
+ dp.pos_= p;
+
+ if (dp.extremal_head_)
+ dp.dir_ = to_dir (dp.dot_->get_grob_property ("direction"));
+
+ remove_collision (cfg, p);
+ cfg[p] = dp;
+ if (Staff_symbol_referencer::on_staffline (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);
+ }
+
+ return SCM_UNSPECIFIED;
+}
void
Dot_column::add_head (Grob * me, Grob *rh)
projects / lilypond.git / commitdiff