source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include "dots.hh"
#include "dot-column.hh"
-#include "rhythmic-head.hh"
-#include "group-interface.hh"
-#include "staff-symbol-referencer.hh"
+
+#include <cstdio>
+#include <cmath>
+#include <map>
+#include <set>
+
+using namespace std;
+
+#include "axis-group-interface.hh"
#include "directional-element-interface.hh"
+#include "dot-column.hh"
+#include "dot-configuration.hh"
+#include "dot-formatting-problem.hh"
+#include "dots.hh"
+#include "grob.hh"
+#include "note-head.hh"
+#include "pointer-group-interface.hh"
+#include "rest.hh"
+#include "rhythmic-head.hh"
#include "side-position-interface.hh"
-#include "axis-group-interface.hh"
+#include "staff-symbol-referencer.hh"
#include "stem.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, calc_positioning_done, 1);
SCM
-Dot_column::force_shift_callback (SCM element_smob, SCM axis)
+Dot_column::calc_positioning_done (SCM smob)
{
- Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
- assert (a == Y_AXIS);
- me = me->get_parent (X_AXIS);
- SCM l = me->get_grob_property ("dots");
- do_shifts (l);
- return gh_double2scm (0.0);
-}
+ Grob *me = unsmob_grob (smob);
-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)
- )
- {
- /*
- trigger stem end & direction calculation.
+ /*
+ Trigger note collision resolution first, since that may kill off
+ dots when merging.
+ */
+ if (Grob *collision = unsmob_grob (me->get_object ("note-collision")))
+ (void) collision->get_property ("positioning-done");
- 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);
-}
+ me->set_property ("positioning-done", SCM_BOOL_T);
+ vector<Grob*> dots
+ = extract_grob_array (me, "dots");
-/*
- Will fuck up in this case.
+ vector<Grob*> main_heads;
+ Real ss = 0;
- X. .
- X.X .
- |X .
- |
- |
- |X .
- |
- |
+ Grob *commonx = me;
+ for (vsize i = 0; i < dots.size (); i++)
+ {
+ Grob *n = dots[i]->get_parent (Y_AXIS);
+ commonx = n->common_refpoint (commonx, X_AXIS);
+
+ if (Grob *stem = unsmob_grob (n->get_object("stem")))
+ {
+ commonx = stem->common_refpoint (commonx, X_AXIS);
+
+ if (Stem::first_head (stem) == n)
+ main_heads.push_back (n);
+ }
+ }
+ vector<Box> boxes;
+ set<Grob*> stems;
- Should be smarter.
- */
-SCM
-Dot_column::do_shifts (SCM l)
-{
- Link_array<Grob> dots;
- while (gh_pair_p (l))
+ extract_grob_set(me, "side-support-elements", support);
+
+ 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++)
{
- dots.push (unsmob_grob (ly_car (l)));
- l = ly_cdr (l);
+ Grob *s = support[i];
+ if (!ss)
+ ss = Staff_symbol_referencer::staff_space (s);
+
+ /* can't inspect Y extent of rest.
+
+ Rest collisions should wait after line breaking.
+ */
+ Interval y;
+ if (Rest::has_interface (s))
+ {
+ base_x.unite (s->extent (commonx, X_AXIS));
+ continue;
+ }
+ else if (Stem::has_interface (s))
+ {
+ Real y1 = Stem::head_positions (s)[-get_grob_direction (s)];
+ Real y2 = y1 + get_grob_direction (s) * 7;
+
+ y.add_point (y1);
+ y.add_point (y2);
+ }
+ else
+ y = s->extent (s, Y_AXIS);
+
+ y *= 2 / ss;
+ y += Staff_symbol_referencer::get_position (s);
+
+ Box b (s->extent (commonx, X_AXIS), y);
+ boxes.push_back (b);
+
+ if (Grob *stem = unsmob_grob (s->get_object ("stem")))
+ stems.insert (stem);
}
-
- dots.sort (compare_position);
-
- if (dots.size () < 2)
- return SCM_UNSPECIFIED;
- Slice s;
- s.set_empty ();
-
- Array<int> taken_posns;
- int conflicts = 0;
- for (int i=0; i < dots.size (); i++)
+
+ for (set<Grob*>::const_iterator i(stems.begin());
+ i != stems.end (); i++)
{
- Real p = Staff_symbol_referencer::get_position (dots[i]);
- for (int j=0; j < taken_posns.size (); j++)
+ Grob *stem = (*i);
+ Stencil flag = Stem::flag (stem);
+ if (!flag.is_empty ())
{
- if (taken_posns[j] == (int) p)
- conflicts++;
+ 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));
}
- taken_posns.push ((int)p);
- s.unite (Slice ((int)p,
- (int)p));
}
+
+ vector_sort (dots, position_less);
+ for (vsize i = dots.size (); i--;)
+ if (!dots[i]->is_live ())
+ dots.erase (dots.begin () + i);
- if (!conflicts)
- return SCM_UNSPECIFIED;
-
- int middle = s.center ();
- /*
- +1 -> off by one
- */
- int pos = middle - dots.size () + 1;
- if (! (pos % 2))
- pos ++; // center () rounds down.
+ Dot_formatting_problem problem (boxes, base_x);
- for (int i=0; i < dots.size (); pos += 2, i++)
+ Dot_configuration cfg (problem);
+ for (vsize i = 0; i < dots.size (); i++)
{
- Grob * d = dots[i];
- Staff_symbol_referencer::set_position (d,pos);
- }
+ Dot_position dp;
+ dp.dot_ = dots[i];
- return SCM_UNSPECIFIED;
-}
+ Grob *note = dots[i]->get_parent (Y_AXIS);
+ if (note)
+ {
+ Grob *stem = unsmob_grob (note->get_object ("stem"));
+ if (stem)
+ 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_);
+ /* 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"));
+
+ cfg.remove_collision (p);
+ cfg[p] = dp;
+ if (Staff_symbol_referencer::on_line (dp.dot_, p))
+ cfg.remove_collision (p);
+ }
+
+ problem.register_configuration (cfg);
+
+ for (Dot_configuration::const_iterator i (cfg.begin ());
+ i != cfg.end (); i++)
+ {
+ /*
+ Junkme?
+ */
+ 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;
+}
void
-Dot_column::add_head (Grob * me, Grob *rh)
+Dot_column::add_head (Grob *me, Grob *head)
{
- Grob * d = unsmob_grob (rh->get_grob_property ("dot"));
+ Grob *d = unsmob_grob (head->get_object ("dot"));
if (d)
{
- Side_position_interface::add_support (me,rh);
+ Side_position_interface::add_support (me, head);
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);
+ // Dot formatting requests the Y-offset, -which- for rests may
+ // trigger post-linebreak callbacks.
+ if (!Rest::has_interface (head))
+ d->set_property ("X-offset", Grob::x_parent_positioning_proc);
Axis_group_interface::add_element (me, d);
}
}
+ADD_INTERFACE (Dot_column,
+ "Group dot objects so they form a column, and position"
+ " dots so they do not clash with staff lines.",
-
-
-ADD_INTERFACE (Dot_column, "dot-column-interface",
- "Interface that groups dots so they form a column",
- "direction stem");
+ /* properties */
+ "dots "
+ "positioning-done "
+ "direction "
+ );
projects / lilypond.git / blobdiff