/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2000--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
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 "axis-group-interface.hh"
#include "font-interface.hh"
#include "grob-interface.hh"
-#include "international.hh"
#include "item.hh"
#include "lily-proto.hh"
#include "line-interface.hh"
SCM
Line_spanner::calc_bound_info (SCM smob, Direction dir)
{
- Spanner *me = unsmob_spanner (smob);
+ Spanner *me = Spanner::unsmob (smob);
Grob *commonx = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
commonx = me->common_refpoint (commonx, X_AXIS);
SCM bound_details = me->get_property ("bound-details");
SCM details = SCM_BOOL_F;
- if (details == SCM_BOOL_F)
+ if (scm_is_false (details))
details = ly_assoc_get ((dir == LEFT)
? ly_symbol2scm ("left")
: ly_symbol2scm ("right"), bound_details, SCM_BOOL_F);
details = scm_append (scm_list_2 (extra, details));
}
- if (details == SCM_BOOL_F)
+ if (scm_is_false (details))
details = ly_assoc_get (ly_symbol2scm ("default"), bound_details, SCM_EOL);
SCM text = ly_assoc_get (ly_symbol2scm ("text"), details, SCM_BOOL_F);
? Axis_group_interface::generic_bound_extent (bound_grob, commonx, X_AXIS)
: robust_relative_extent (bound_grob, commonx, X_AXIS)).linear_combination (attach);
- Grob *acc = Note_column::accidentals (bound_grob->get_parent (X_AXIS));
+ Grob *acc = Grob::unsmob (bound_grob->get_object ("accidental-grob"));
if (acc && to_boolean (ly_assoc_get (ly_symbol2scm ("end-on-accidental"), details, SCM_BOOL_F)))
x_coord = robust_relative_extent (acc, commonx, X_AXIS).linear_combination (attach);
+ Grob *dot = Grob::unsmob (bound_grob->get_object ("dot"));
+ if (dot && to_boolean (ly_assoc_get (ly_symbol2scm ("start-at-dot"), details, SCM_BOOL_F)))
+ x_coord = robust_relative_extent (dot, commonx, X_AXIS).linear_combination (attach);
+
details = scm_acons (ly_symbol2scm ("X"),
scm_from_double (x_coord),
details);
}
else
{
- y = me->get_bound (dir)->extent (common_y, Y_AXIS).center ();
+ Interval ii = me->get_bound (dir)->extent (common_y, Y_AXIS);
+ if (!ii.is_empty())
+ y = ii.center ();
details = scm_acons (ly_symbol2scm ("common-Y"), common_y->self_scm (), details);
}
SCM
Line_spanner::calc_cross_staff (SCM smob)
{
- Spanner *me = unsmob_spanner (smob);
+ Spanner *me = Spanner::unsmob (smob);
if (!me)
return SCM_BOOL_F;
Line_spanner::calc_left_bound_info_and_text (SCM smob)
{
SCM alist = Line_spanner::calc_bound_info (smob, LEFT);
- Spanner *me = unsmob_spanner (smob);
+ Spanner *me = Spanner::unsmob (smob);
SCM text = me->get_property ("text");
if (Text_interface::is_markup (text)
&& me->get_bound (LEFT)->break_status_dir () == CENTER
- && ly_assoc_get (ly_symbol2scm ("stencil"), alist, SCM_BOOL_F) == SCM_BOOL_F)
+ && scm_is_false (ly_assoc_get (ly_symbol2scm ("stencil"), alist, SCM_BOOL_F)))
{
Output_def *layout = me->layout ();
SCM properties = Font_interface::text_font_alist_chain (me);
SCM
Line_spanner::print (SCM smob)
{
- Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+ Spanner *me = dynamic_cast<Spanner *> (Grob::unsmob (smob));
// Triggers simple-Y calculations
bool simple_y = to_boolean (me->get_property ("simple-Y")) && !to_boolean (me->get_property ("cross-staff"));
bounds[d], SCM_BOOL_F), 0.0);
arrows[d] = to_boolean (ly_assoc_get (ly_symbol2scm ("arrow"),
bounds[d], SCM_BOOL_F));
- stencils[d] = unsmob_stencil (ly_assoc_get (ly_symbol2scm ("stencil"),
+ stencils[d] = Stencil::unsmob (ly_assoc_get (ly_symbol2scm ("stencil"),
bounds[d], SCM_BOOL_F));
- common_y[d] = unsmob_grob (ly_assoc_get (ly_symbol2scm ("common-Y"),
+ common_y[d] = Grob::unsmob (ly_assoc_get (ly_symbol2scm ("common-Y"),
bounds[d], SCM_BOOL_F));
if (!common_y[d])
common_y[d] = me;
arrows[LEFT],
arrows[RIGHT]));
}
- else
- me->warning (_ ("Line spanner's left point is to the right of its right point."));
line.translate (Offset (-me->relative_coordinate (commonx, X_AXIS),
simple_y ? 0.0 : -me->relative_coordinate (my_common_y, Y_AXIS)));