/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "self-alignment-interface.hh"
-#include "directional-element-interface.hh"
#include "grob.hh"
-#include "grob-array.hh"
-#include "interval-minefield.hh"
#include "note-column.hh"
#include "paper-column.hh"
#include "pointer-group-interface.hh"
SCM
Self_alignment_interface::y_aligned_on_self (SCM element)
{
- return aligned_on_self (unsmob_grob (element), Y_AXIS, false, 0, 0);
+ return aligned_on_self (Grob::unsmob (element), Y_AXIS, false, 0, 0);
}
MAKE_SCHEME_CALLBACK (Self_alignment_interface, x_aligned_on_self, 1);
SCM
Self_alignment_interface::x_aligned_on_self (SCM element)
{
- return aligned_on_self (unsmob_grob (element), X_AXIS, false, 0, 0);
+ return aligned_on_self (Grob::unsmob (element), X_AXIS, false, 0, 0);
}
MAKE_SCHEME_CALLBACK (Self_alignment_interface, pure_y_aligned_on_self, 3);
SCM
Self_alignment_interface::pure_y_aligned_on_self (SCM smob, SCM start, SCM end)
{
- return aligned_on_self (unsmob_grob (smob), Y_AXIS, true, robust_scm2int (start, 0), robust_scm2int (end, INT_MAX));
+ return aligned_on_self (Grob::unsmob (smob), Y_AXIS, true, robust_scm2int (start, 0), robust_scm2int (end, INT_MAX));
}
SCM
if (scm_is_number (align))
{
Interval ext (me->maybe_pure_extent (me, a, pure, start, end));
+ // Empty extent doesn't mean an error - we simply don't align such grobs.
+ // However, empty extent and non-empty stencil would be suspicious.
if (!ext.is_empty ())
return scm_from_double (- ext.linear_combination (scm_to_double (align)));
+ else if (me->get_stencil ())
+ warning (me->name () + " has empty extent and non-empty stencil.");
}
return scm_from_double (0.0);
}
SCM
Self_alignment_interface::centered_on_x_parent (SCM smob)
{
- return centered_on_object (unsmob_grob (smob)->get_parent (X_AXIS), X_AXIS);
-}
-
-MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_note_columns, 1);
-SCM
-Self_alignment_interface::centered_on_note_columns (SCM smob)
-{
- Item *it = unsmob_item (smob)->get_column ();
- if (!it)
- return scm_from_double (0.0);
-
- extract_grob_set (it, "elements", elts);
- vector<Grob *> ncs;
- Interval centers;
- for (vsize i = 0; i < elts.size (); i++)
- if (Note_column::has_interface (elts[i]))
- centers.add_point (scm_to_double (centered_on_object (elts[i], X_AXIS)));
-
- if (centers.is_empty ())
- return scm_from_double (0.0);
-
- return scm_from_double (centers.center ());
+ return centered_on_object (Grob::unsmob (smob)->get_parent (X_AXIS), X_AXIS);
}
MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_y_parent, 1);
SCM
Self_alignment_interface::centered_on_y_parent (SCM smob)
{
- return centered_on_object (unsmob_grob (smob)->get_parent (Y_AXIS), Y_AXIS);
-}
-
-MAKE_SCHEME_CALLBACK (Self_alignment_interface, x_centered_on_y_parent, 1);
-SCM
-Self_alignment_interface::x_centered_on_y_parent (SCM smob)
-{
- return centered_on_object (unsmob_grob (smob)->get_parent (Y_AXIS), X_AXIS);
+ return centered_on_object (Grob::unsmob (smob)->get_parent (Y_AXIS), Y_AXIS);
}
MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_x_parent, 1);
SCM
Self_alignment_interface::aligned_on_x_parent (SCM smob)
{
- return aligned_on_parent (unsmob_grob (smob), X_AXIS);
+ return aligned_on_parent (Grob::unsmob (smob), X_AXIS);
}
MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_y_parent, 1);
SCM
Self_alignment_interface::aligned_on_y_parent (SCM smob)
{
- return aligned_on_parent (unsmob_grob (smob), Y_AXIS);
+ return aligned_on_parent (Grob::unsmob (smob), Y_AXIS);
}
SCM
Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
{
Grob *him = me->get_parent (a);
+ Interval he;
if (Paper_column::has_interface (him))
- return scm_from_double (0.0);
-
- Interval he = him->extent (him, a);
+ /*
+ PaperColumn extents aren't reliable (they depend on size and alignment
+ of PaperColumn's children), so we align on NoteColumn instead.
+ This happens e.g. for lyrics without associatedVoice.
+ */
+ he = Paper_column::get_interface_extent
+ (him, ly_symbol2scm ("note-column-interface"), a);
+ else
+ {
+ if (ly_scm2bool(me->internal_get_property (ly_symbol2scm ("X-align-on-main-noteheads")))
+ && Note_column::has_interface (him))
+ he = Note_column::calc_main_heads_extent(him);
+ else
+ he = him->extent (him, a);
+ }
SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
: ly_symbol2scm ("self-alignment-Y");
Real align = scm_to_double (align_prop);
Interval ext (me->extent (me, a));
- if (ext.is_empty ())
- programming_error ("cannot align on self: empty element");
- else
+
+ // Empty extent doesn't mean an error - we simply don't align such grobs.
+ // However, empty extent and non-empty stencil would be suspicious.
+ if (!ext.is_empty ())
x -= ext.linear_combination (align);
+ else if (me->get_stencil ())
+ warning (me->name () + " has empty extent and non-empty stencil.");
+ // See comment above.
if (!he.is_empty ())
x += he.linear_combination (align);
+ else if (him->get_stencil ())
+ warning (him->name () + " has empty extent and non-empty stencil.");
return scm_from_double (x);
}
void
-Self_alignment_interface::set_center_parent (Grob *me, Axis a)
-{
- add_offset_callback (me,
- (a == X_AXIS) ? centered_on_x_parent_proc : centered_on_y_parent_proc,
- a);
-}
-
-void
-Self_alignment_interface::set_align_self (Grob *me, Axis a)
+Self_alignment_interface::set_aligned_on_parent (Grob *me, Axis a)
{
add_offset_callback (me,
- (a == X_AXIS) ? x_aligned_on_self_proc : y_aligned_on_self_proc,
+ (a == X_AXIS) ? aligned_on_x_parent_proc : aligned_on_y_parent_proc,
a);
}
"@end table\n",
/* properties */
- "collision-bias "
- "collision-padding "
- "potential-X-colliding-grobs "
"self-alignment-X "
"self-alignment-Y "
- "X-colliding-grobs "
- "Y-colliding-grobs "
+ "X-align-on-main-noteheads "
);
projects / lilypond.git / blobdiff