source file of the GNU LilyPond music typesetter
- (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "spanner.hh"
-#include "output-def.hh"
-#include "item.hh"
-#include "staff-symbol-referencer.hh"
-#include "font-interface.hh"
-#include "warn.hh"
#include "align-interface.hh"
+#include "axis-group-interface.hh"
+#include "font-interface.hh"
+#include "grob-interface.hh"
+#include "item.hh"
+#include "lily-proto.hh"
#include "line-interface.hh"
#include "moment.hh"
-
-#include "lily-proto.hh"
-#include "grob-interface.hh"
+#include "output-def.hh"
+#include "pointer-group-interface.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "system.hh"
#include "text-interface.hh"
+#include "warn.hh"
class Line_spanner
{
DECLARE_GROB_INTERFACE ();
};
-
-static Grob *
-line_spanner_common_parent (Grob *me)
+Spanner *parent_spanner (Grob *g)
{
- /* FIXME: what is the right thing to do here, now that PianoStaves don't
- have fixed spacing? */
- Grob *common = 0; //find_fixed_alignment_parent (me);
- if (!common)
- {
- common = Staff_symbol_referencer::get_staff_symbol (me);
- if (common)
- common = common->get_parent (Y_AXIS);
- else
- common = me->get_parent (Y_AXIS);
- }
-
- return common;
+ if (Spanner::has_interface (g))
+ return dynamic_cast<Spanner*> (g);
+ return parent_spanner (g->get_parent (Y_AXIS));
}
SCM
? ly_symbol2scm ("left-broken")
: ly_symbol2scm ("right-broken"), bound_details, SCM_EOL);
- for (SCM s = extra; scm_is_pair (s); s = scm_cdr (s))
+ for (SCM s = scm_reverse (extra); scm_is_pair (s); s = scm_cdr (s))
details = scm_cons (scm_car (s), details);
}
details, SCM_BOOL_F),
CENTER);
+ Item *bound_item = me->get_bound (dir);
+ Grob *bound_grob = bound_item;
+ if (to_boolean (ly_assoc_get (ly_symbol2scm ("end-on-note"), details, SCM_BOOL_F))
+ && bound_item->break_status_dir ())
+ {
+ extract_grob_set (me, "note-columns", columns);
+ if (columns.size ())
+ bound_grob = (dir == LEFT)
+ ? columns[0] : columns.back();
+ }
+
details = scm_acons (ly_symbol2scm ("X"),
- scm_from_double (me->get_bound (dir)->extent (commonx, X_AXIS)
+ scm_from_double (robust_relative_extent (bound_grob, commonx, X_AXIS)
.linear_combination (attach)),
details);
}
Real extra_dy = robust_scm2double (me->get_property ("extra-dy"),
0.0);
-
+
+ Grob *common_y = me->common_refpoint (me->get_bound (dir), Y_AXIS);
if (me->get_bound (dir)->break_status_dir ())
{
- /*
- This is hairy. For the normal case, we simply find common
- parents, and draw a line between the bounds. When two note
- heads are on different systems, there is no common parent
- anymore. We have to find the piano-staff object.
- */
-
Spanner *next_sp = me->broken_neighbor (dir);
Item *next_bound = next_sp->get_bound (dir);
return SCM_EOL;
}
- Grob *next_common_y = line_spanner_common_parent (next_bound);
- Interval next_ext = next_bound->extent (next_common_y, Y_AXIS);
+ Spanner *next_bound_parent = parent_spanner (next_bound);
+ Interval next_ext = next_bound->extent (next_bound_parent, Y_AXIS);
- y = next_ext.center ();
+ /* We want to know what would be the
+ y-position of the next bound (relative to my y-parent) if it belonged
+ to the same system as this bound. We rely on the fact that
+ the y-parent of the next bound is a spanner (probably the
+ VerticalAxisGroup of a staff) that extends over the break.
+ */
+ Spanner *next_bound_parent_on_this_line =
+ next_bound_parent->broken_neighbor (other_dir (dir));
+
+ if (next_bound_parent_on_this_line)
+ {
+ Grob *common = me->common_refpoint (next_bound_parent_on_this_line, Y_AXIS);
+ Real bound_offset = next_bound_parent_on_this_line->relative_coordinate (common, Y_AXIS);
+ y = next_ext.center () + bound_offset - me->relative_coordinate (common, Y_AXIS);
+ }
+ else
+ {
+ /* We fall back to assuming that the distance between staves doesn't
+ change over line breaks. */
+ programming_error ("next-bound's parent doesn't extend to this line");
+ Grob *next_system = next_bound->get_system ();
+ Grob *this_system = me->get_system ();
+ y = next_ext.center () + next_bound_parent->relative_coordinate (next_system, Y_AXIS)
+ - me->relative_coordinate (this_system, Y_AXIS);
+ }
}
else
{
- Grob *commony = me->common_refpoint (me->get_bound (dir), Y_AXIS);
- y = me->get_bound (dir)->extent (commony, Y_AXIS).center ();
- details = scm_acons (ly_symbol2scm ("common-Y"), commony->self_scm (), details);
+ y = me->get_bound (dir)->extent (common_y, Y_AXIS).center ();
+ details = scm_acons (ly_symbol2scm ("common-Y"), common_y->self_scm (), details);
}
y += dir * extra_dy / 2;
do
{
Offset z (robust_scm2double (ly_assoc_get (ly_symbol2scm ("X"),
- bounds[d], SCM_BOOL_F), 0.0)
- + commonx->relative_coordinate (commonx, X_AXIS),
+ bounds[d], SCM_BOOL_F), 0.0),
robust_scm2double (ly_assoc_get (ly_symbol2scm ("Y"),
bounds[d], SCM_BOOL_F), 0.0));
Drul_array<Real> gaps (0, 0);
Drul_array<bool> arrows (0, 0);
+ Drul_array<Real> anchor_align (0, 0);
Drul_array<Stencil*> stencils (0,0);
Drul_array<Grob*> common_y (0, 0);
do
bounds[d], SCM_BOOL_F), 0.0);
arrows[d] = to_boolean (ly_assoc_get (ly_symbol2scm ("arrow"),
bounds[d], SCM_BOOL_F));
+ anchor_align[d] = robust_scm2double (ly_assoc_get (ly_symbol2scm ("anchor-alignment"),
+ bounds[d], SCM_BOOL_F), LEFT);
stencils[d] = unsmob_stencil (ly_assoc_get (ly_symbol2scm ("stencil"),
bounds[d], SCM_BOOL_F));
common_y[d] = unsmob_grob (ly_assoc_get (ly_symbol2scm ("common-Y"),
Stencil line;
do
{
+ span_points[d] += -d * gaps[d] * dz.direction ();
+
if (stencils[d])
{
- Stencil s = stencils[d]->translated (span_points[d]);
- SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-y"),
- bounds[d], SCM_BOOL_F);
- SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"),
- bounds[d], SCM_BOOL_F);
+ Interval ext = stencils[d]->extent (X_AXIS);
+ Real anchor = ext.linear_combination (anchor_align[d]) - ext[LEFT];
+ span_points[d][X_AXIS] -= anchor;
- if (scm_is_number (align))
- s.align_to (Y_AXIS, scm_to_double (align));
+ Stencil s = stencils[d]->translated (span_points[d]);
+ SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-y"),
+ bounds[d], SCM_BOOL_F);
+ SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"),
+ bounds[d], SCM_BOOL_F);
- /*
- todo: should use font-size.
+ if (scm_is_number (align))
+ s.align_to (Y_AXIS, scm_to_double (align));
+
+ /*
+ todo: should use font-size.
*/
- if (is_number_pair (off))
- s.translate (ly_scm2offset (off));
+ if (is_number_pair (off))
+ s.translate (ly_scm2offset (off));
- line.add_stencil (s);
+ line.add_stencil (s);
}
}
while (flip (&d) != LEFT);
if (stencils[d])
span_points[d] += dz_dir *
(stencils[d]->extent (X_AXIS)[-d] / dz_dir[X_AXIS]);
-
- span_points[d] += -d * gaps[d] * dz.direction ();
}
while (flip (&d) != LEFT);
- line.add_stencil (Line_interface::line (me,
- span_points[LEFT],
- span_points[RIGHT]));
+ Offset adjust = dz.direction() * Staff_symbol_referencer::staff_space (me);
- line.add_stencil (Line_interface::arrows (me,
- span_points[LEFT],
- span_points[RIGHT],
- arrows[LEFT],
- arrows[RIGHT]));
+ Offset line_left = span_points[LEFT] + (arrows[LEFT] ? adjust*1.4 : Offset (0, 0));
+ Offset line_right = span_points[RIGHT] - (arrows[RIGHT] ? adjust*0.55 : Offset (0, 0));
+ if (line_right[X_AXIS] > line_left[X_AXIS])
+ {
+ line.add_stencil (Line_interface::line (me, line_left, line_right));
+
+ line.add_stencil (Line_interface::arrows (me,
+ span_points[LEFT],
+ span_points[RIGHT],
+ arrows[LEFT],
+ arrows[RIGHT]));
+ }
line.translate (Offset (-me->relative_coordinate (commonx, X_AXIS),
-me->relative_coordinate (my_common_y, Y_AXIS)));
-
+
return line.smobbed_copy ();
}
ADD_INTERFACE (Line_spanner,
- "Generic line drawn between two objects, e.g. for use with glissandi.\n"
- "The property @code{style} can be @code{line}, "
- "@code{dashed-line}, @code{trill}, \n"
- "@code{dotted-line} or @code{zigzag}.\n"
- "\n",
-
+ "Generic line drawn between two objects, e.g., for use with"
+ " glissandi.\n"
+ "\n"
+ "The property @code{style} can be @code{line},"
+ " @code{dashed-line}, @code{trill}, @code{dotted-line} or"
+ " @code{zigzag}.",
+
+ /* properties */
+ "bound-details "
"extra-dy "
"gap "
+ "left-bound-info "
+ "note-columns "
+ "right-bound-info "
"thickness "
- "bound-details "
- "left-bound-info "
- "right-bound-info "
+ "to-barline "
);
projects / lilypond.git / blobdiff