source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "molecule.hh"
#include "paper-def.hh"
#include "paper-column.hh"
#include "staff-symbol-referencer.hh"
+#include "font-interface.hh"
-SCM
-Line_spanner::line_atom (Grob* me, Real dx, Real dy)
+#include <math.h>
+
+
+/*
+ slightishly clumsy interface?
+
+ Make a Scheme expression for a line going from (0,0) to (dx,dy).
+ */
+
+static SCM
+line_atom (Grob* me, Real thick, Real dx, Real dy)
{
- SCM list = SCM_EOL;
SCM type = me->get_grob_property ("type");
- if (gh_symbol_p (type)
- && (type == ly_symbol2scm ("line")
- || type == ly_symbol2scm ("dashed-line")
- || type == ly_symbol2scm ("dotted-line")))
- {
- Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real thick = me->paper_l ()->get_var ("stafflinethickness");
-
- SCM s = me->get_grob_property ("line-thickness");
- if (gh_number_p (s))
- thick *= gh_scm2double (s);
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
// maybe these should be in line-thickness?
- Real length = staff_space;
- s = me->get_grob_property ("dash-length");
- if (gh_number_p (s))
- length = gh_scm2double (s) * staff_space;
-
- Real period = 2 * length + thick;
- s = me->get_grob_property ("dash-period");
- if (gh_number_p (s))
- period = gh_scm2double (s) * staff_space;
+ Real length = staff_space;
+ SCM s = me->get_grob_property ("dash-length");
+ if (gh_number_p (s))
+ length = gh_scm2double (s) * staff_space;
+
+ Real period = 2 * length + thick;
+ s = me->get_grob_property ("dash-period");
+ if (gh_number_p (s))
+ period = gh_scm2double (s) * staff_space;
- if (type == ly_symbol2scm ("dotted-line"))
- length = thick;
+ if (type == ly_symbol2scm ("dotted-line"))
+ length = thick;
- if (type == ly_symbol2scm ("line"))
- length = period + thick;
+ if (type == ly_symbol2scm ("line"))
+ length = period + thick;
- Real on = length - thick;
- Real off = period - on;
+ Real on = length - thick;
+ Real off = period - on;
- list = gh_list (ly_symbol2scm ("dashed-line"),
+ SCM list = scm_list_n (ly_symbol2scm ("dashed-line"),
gh_double2scm (thick),
gh_double2scm (on),
gh_double2scm (off),
gh_double2scm (dx),
gh_double2scm (dy),
SCM_UNDEFINED);
- }
+
return list;
}
+Molecule
+Line_spanner::line_molecule (Grob* me, Real thick, Real dx, Real dy)
+{
+ Molecule mol;
+ SCM type = me->get_grob_property ("type");
+ if (gh_symbol_p (type)
+ && (type == ly_symbol2scm ("line")
+ || type == ly_symbol2scm ("dashed-line")
+ || type == ly_symbol2scm ("dotted-line")
+ || (type == ly_symbol2scm ("trill") && dy != 0)))
+ {
+ Box b (Interval (-0.5* thick + (0 <? dx) ,0.5* thick+ (0 >? dx)),
+ Interval (- 0.5* thick + (0<? dy), 0.5*thick + (0 >? dy)));
+ mol = Molecule (b, line_atom (me, thick, dx, dy));
+ }
+ else if (gh_symbol_p (type)
+ && type == ly_symbol2scm ("trill"))
+ {
+ SCM alist_chain = Font_interface::font_alist_chain (me);
+ SCM style_chain = scm_list_n (gh_cons (ly_symbol2scm ("font-family"),
+ ly_symbol2scm ("music")),
+ SCM_UNDEFINED);
+
+ Font_metric *fm = Font_interface::get_font (me,
+ scm_list_n (style_chain,
+ alist_chain,
+ SCM_UNDEFINED));
+ Molecule m = fm->find_by_name ("scripts-trill-element");
+ do
+ mol.add_at_edge (X_AXIS, RIGHT, m, 0);
+ while (m.extent (X_AXIS).length ()
+ && mol.extent (X_AXIS).length ()
+ + m.extent (X_AXIS).length () < dx);
+
+ /*
+ FIXME: should center element on x/y
+ */
+ mol.translate_axis (m.extent (X_AXIS).length () / 2, X_AXIS);
+ mol.translate_axis (-(mol.extent (Y_AXIS)[DOWN]
+ + mol.extent (Y_AXIS).length ())/2, Y_AXIS);
+ }
+ return mol;
+}
+
Offset
Line_spanner::get_broken_offset (Grob *me, Direction dir)
{
if (!bound->break_status_dir ())
{
Grob *common[] = {
- bound->common_refpoint (Staff_symbol_referencer::staff_symbol_l (me),
+ bound->common_refpoint (Staff_symbol_referencer::get_staff_symbol (me),
X_AXIS),
- bound->common_refpoint (Staff_symbol_referencer::staff_symbol_l (me),
+ bound->common_refpoint (Staff_symbol_referencer::get_staff_symbol (me),
Y_AXIS)
};
- return Offset ( abs (bound->extent (common[X_AXIS], X_AXIS)[-dir]),
+ return Offset (abs (bound->extent (common[X_AXIS], X_AXIS)[-dir]),
bound->extent (common[Y_AXIS], Y_AXIS).center ());
}
return Offset ();
the unbroken line-spanner would have had.
From slur */
Offset o;
- if (Spanner *mother = dynamic_cast<Spanner*> (me->original_l_))
+ if (Spanner *mother = dynamic_cast<Spanner*> (me->original_))
{
- for (int i = dir == LEFT ? 0 : mother->broken_into_l_arr_.size () - 1;
- dir == LEFT ? i < mother->broken_into_l_arr_.size () : i > 0;
+ for (int i = dir == LEFT ? 0 : mother->broken_intos_.size () - 1;
+ dir == LEFT ? i < mother->broken_intos_.size () : i > 0;
dir == LEFT ? i++ : i--)
{
- if (mother->broken_into_l_arr_[i - dir] == me)
+ if (mother->broken_intos_[i - dir] == me)
{
- Grob *neighbour = mother->broken_into_l_arr_[i];
+ Grob *neighbour = mother->broken_intos_[i];
Offset neighbour_o = get_broken_offset (neighbour, dir);
Offset me_o = get_broken_offset (me, -dir);
// Hmm, why not return me_o[X], but recalc in brew_mol?
o = Offset (0,
- (neighbour_o[Y_AXIS]*me_o[X_AXIS]
+ (neighbour_o[Y_AXIS]*me_o[X_AXIS]
- me_o[Y_AXIS]*neighbour_o[X_AXIS]) * dir /
- (me_o[X_AXIS] + neighbour_o[X_AXIS]));
+ (me_o[X_AXIS] + neighbour_o[X_AXIS]));
break;
}
}
/*
Warning: this thing is a cross-staff object, so it should have empty Y-dimensions.
- (If not, you risk that this is called from the staff-alignment
- routine, via molecule_extent. At this point, the staffs aren't
+ (If not, you risk that this is called from the staff-alignment
+ routine, via molecule_extent. At this point, the staves aren't
separated yet, so it doesn't work cross-staff.
*/
}
Real gap = gh_scm2double (me->get_grob_property ("gap"));
-
+ Real dist; /*distance between points */
+
+ Offset ofxy (gap, 0); /*offset from start point to start of line*/
Offset dxy ;
Offset my_off;
Offset his_off;
+
if (bound[LEFT]->break_status_dir () || bound[RIGHT]->break_status_dir ())
/* across line break */
}
else
{
- dxy[X_AXIS] = bound[RIGHT]->extent (common[X_AXIS], X_AXIS)[LEFT]
- - bound[LEFT]->extent (common[X_AXIS], X_AXIS)[RIGHT];
+ Real off = gap + ((bound[LEFT]->extent (bound[LEFT], X_AXIS).length ()*3)/4); // distance from center to start of line
+ dxy[X_AXIS] = bound[RIGHT]->extent (common[X_AXIS], X_AXIS).center ()
+ - bound[LEFT]->extent (common[X_AXIS], X_AXIS).center ();
dxy[Y_AXIS] = bound[RIGHT]->extent (common[Y_AXIS], Y_AXIS).center ()
- bound[LEFT]->extent (common[Y_AXIS], Y_AXIS).center ();
- dxy[X_AXIS] -= 2 * gap;
+
+ dist = sqrt (dxy[X_AXIS]*dxy[X_AXIS]+dxy[Y_AXIS]*dxy[Y_AXIS]);
+ ofxy = dxy* (off/dist);
+ dxy -= 2*ofxy;
my_off = Offset (me->relative_coordinate (common[X_AXIS], X_AXIS),
me->relative_coordinate (common[Y_AXIS], Y_AXIS));
Y_AXIS));
}
- Molecule line;
- SCM list = Line_spanner::line_atom (me, dxy[X_AXIS], dxy[Y_AXIS]);
-
- if (list == SCM_EOL)
- return SCM_EOL;
-
- Box b (Interval (0, dxy[X_AXIS]), Interval (0, dxy[Y_AXIS]));
-
- line = Molecule (b, list);
- line.translate_axis (bound[LEFT]->extent (bound[LEFT], X_AXIS).length (), X_AXIS);
- Offset g (gap, 0);
- line.translate (g - my_off + his_off);
-
+ Real thick = me->get_paper ()->get_var ("linethickness");
+
+ SCM s = me->get_grob_property ("thickness");
+ if (gh_number_p (s))
+ thick *= gh_scm2double (s);
+
+
+ Molecule line = line_molecule (me, thick, dxy[X_AXIS], dxy[Y_AXIS]);
+ line.translate_axis (bound[LEFT]->extent (bound[LEFT],
+ X_AXIS).length ()/2, X_AXIS);
+ line.translate (ofxy - my_off + his_off);
return line.smobbed_copy ();
}
+
+ADD_INTERFACE (Line_spanner, "line-spanner-interface",
+ "Generic line drawn between two objects, eg. for use with glissandi.
+gap is measured in staff-spaces. ",
+ "gap dash-period dash-length thickness type");
+
+
projects / lilypond.git / blobdiff