source file of the GNU LilyPond music typesetter
- (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
*/
+#include "line-spanner.hh"
+
#include <math.h>
-#include "molecule.hh"
-#include "item.hh"
#include "spanner.hh"
-#include "line-spanner.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "paper-column.hh"
#include "staff-symbol-referencer.hh"
#include "font-interface.hh"
#include "lookup.hh"
#include "line-interface.hh"
-/*
- TODO: convert all Molecule functions to taking arguments of the form
-
- Offset FROM, Offset TO.
-
-
- TODO:
-
- Introduce line-interface that allows dots/dashes/etc. to be set as
- grob-properties. Make arbitrary paths.
-
- */
-
-
-Molecule
-zigzag_molecule (Grob *me, Real thick,
+Stencil
+zigzag_stencil (Grob *me,
Offset from,
Offset to)
{
Offset dz = to -from;
Real dx = dz[X_AXIS];
Real dy = dz[Y_AXIS];
+
+ Real thick = Staff_symbol_referencer::line_thickness (me);
+ thick *= robust_scm2double (me->get_property ("thickness"), 1.0); // todo: staff sym referencer?
Real staff_space = Staff_symbol_referencer::staff_space (me);
- SCM ws = me->get_grob_property ("zigzag-width");
- SCM ls = me->get_grob_property ("zigzag-length");
- double w = (gh_number_p(ws) ? gh_scm2double(ws) : 1)*staff_space;
- double l = (gh_number_p(ls) ? gh_scm2double(ls) : 1)*w;
- double h = l>w/2 ? sqrt(l*l-w*w/4) : 0;
+
+ double w = robust_scm2double (me->get_property ("zigzag-width"), 1)*staff_space;
+ double l = robust_scm2double ( me->get_property ("zigzag-length"), 1)* w;
+ double h = l>w/2 ? sqrt (l*l-w*w/4) : 0;
SCM list = scm_list_n (ly_symbol2scm ("zigzag-line"),
- gh_bool2scm (true),
- gh_double2scm (w),
- gh_double2scm (h),
- gh_double2scm (thick),
- gh_double2scm (dx),
- gh_double2scm (dy),
+ ly_bool2scm (true),
+ scm_make_real (w),
+ scm_make_real (h),
+ scm_make_real (thick),
+ scm_make_real (dx),
+ scm_make_real (dy),
SCM_UNDEFINED);
Box b;
b.add_point (Offset (0,0));
b[X_AXIS].widen (thick/2);
b[Y_AXIS].widen (thick/2);
- return Molecule (b, list);
+ return Stencil (b, list);
}
-MAKE_SCHEME_CALLBACK(Line_spanner, after_line_breaking, 1);
+MAKE_SCHEME_CALLBACK (Line_spanner, after_line_breaking, 1);
SCM
Line_spanner::after_line_breaking (SCM g)
{
--hwn.
*/
- if (sp->get_bound (LEFT)->break_status_dir()
- && !sp->get_bound (RIGHT)->break_status_dir())
+ if (sp->get_bound (LEFT)->break_status_dir ()
+ && !sp->get_bound (RIGHT)->break_status_dir ())
{
/*
Can't do suicide, since this mucks up finding the trend.
*/
- me->set_grob_property ("molecule-callback", SCM_EOL);
+ me->set_property ("print-function", SCM_EOL);
}
return SCM_EOL;
}
-Molecule
-Line_spanner::line_molecule (Grob *me, Real thick,
+Stencil
+Line_spanner::line_stencil (Grob *me,
Offset from,
Offset to)
{
Offset dz = to -from ;
- SCM type = me->get_grob_property ("style");
- if (gh_symbol_p (type)
+ SCM type = me->get_property ("style");
+ if (scm_is_symbol (type)
&& (type == ly_symbol2scm ("line")
|| type == ly_symbol2scm ("dashed-line")
|| type == ly_symbol2scm ("dotted-line")
|| (type == ly_symbol2scm ("trill") && dz[Y_AXIS] != 0)))
{
return (type == ly_symbol2scm ("zigzag"))
- ? zigzag_molecule (me, thick, from, to)
- : Line_interface::dashed_line (me, thick, from, to);
+ ? zigzag_stencil (me, from, to)
+ : Line_interface::line (me, from, to);
}
- else if (gh_symbol_p (type)
+ else if (scm_is_symbol (type)
&& type == ly_symbol2scm ("trill"))
{
- SCM alist_chain = Font_interface::font_alist_chain (me);
- SCM style_alist = scm_list_n (gh_cons (ly_symbol2scm ("font-family"),
- ly_symbol2scm ("music")),
+ SCM alist_chain = Font_interface::text_font_alist_chain (me);
+ SCM style_alist = scm_list_n (scm_cons (ly_symbol2scm ("font-encoding"),
+ ly_symbol2scm ("fetaMusic")),
SCM_UNDEFINED);
- Font_metric *fm = select_font (me->get_paper (),
- gh_cons (style_alist,
- alist_chain));
- Molecule m = fm->find_by_name ("scripts-trill-element");
- Molecule mol;
+ Font_metric *fm = select_font (me->get_layout (),
+ scm_cons (style_alist,
+ alist_chain));
+ Stencil m = fm->find_by_name ("scripts.trill_element");
+ Stencil mol;
do
mol.add_at_edge (X_AXIS, RIGHT, m, 0,0);
mol.translate (from);
return mol;
}
- return Molecule();
+ return Stencil ();
}
/*
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 staves aren't
+ routine, via stencil_extent. At this point, the staves aren't
separated yet, so it doesn't work cross-staff.
+ (huh? crossable staves have fixed distance? --hwn)
+
*/
-MAKE_SCHEME_CALLBACK (Line_spanner, brew_molecule, 1);
+
+MAKE_SCHEME_CALLBACK (Line_spanner, print, 1);
SCM
-Line_spanner::brew_molecule (SCM smob)
+Line_spanner::print (SCM smob)
{
Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (smob));
me->get_bound (RIGHT));
- Real gap = gh_scm2double (me->get_grob_property ("gap"));
+ Real gap = robust_scm2double (me->get_property ("gap"), 0.0);
Offset ofxy (gap, 0); /*offset from start point to start of line*/
Offset dxy ;
Offset my_off;
Offset his_off;
- Real thick = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
-
- SCM s = me->get_grob_property ("thickness");
- if (gh_number_p (s))
- thick *= gh_scm2double (s);
- if (bound[RIGHT]->break_status_dir())
+ if (bound[RIGHT]->break_status_dir ())
{
if (bound[LEFT]->break_status_dir ())
{
programming_error ("line-spanner with two broken ends. Farewell sweet world.");
- me->suicide();
+ me->suicide ();
return SCM_EOL;
}
/*
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 lines, there is no common parent
+ heads are on different systems, there is no common parent
anymore. We have to find the piano-staff object.
*/
{
programming_error ("no note heads for the line spanner on next line?"
" Confused.");
- me->suicide();
+ me->suicide ();
return SCM_EOL;
}
dz = (dz.length () - 2*gap) *dir;
- Molecule l (line_molecule (me, thick, Offset(0, 0), dz));
+ Stencil l (line_stencil (me, Offset (0, 0), dz));
l.translate (dir * gap + p1
- Offset (me->relative_coordinate (commonx, X_AXIS),
+ bound[RIGHT]->extent (common[X_AXIS], ax).center ()
- bound[LEFT]->extent (common[X_AXIS], ax).center ();
- my_off[ax] =me->relative_coordinate (common[a], ax);
+ my_off[ax] = me->relative_coordinate (common[a], ax);
his_off[ax] = bound[LEFT]->relative_coordinate (common[a], ax);
}
ofxy = dxy * (off/dxy.length ());
dxy -= 2*ofxy;
- Molecule line = line_molecule (me, thick, Offset (0,0),dxy);
+ Stencil line = line_stencil (me, Offset (0,0),dxy);
line.translate_axis (bound[LEFT]->extent (bound[LEFT], X_AXIS).length ()/2, X_AXIS);
line.translate (ofxy - my_off + his_off);
ADD_INTERFACE (Line_spanner, "line-spanner-interface",
- "Generic line drawn between two objects, eg. for use with glissandi.\n"
-"gap is measured in staff-spaces.\n"
-"The property 'type is one of: line, dashed-line, trill, dotted-line or zigzag.\n"
-"\n",
- "gap zigzag-width zigzag-length thickness");
+ "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"
+ ,
+ "gap zigzag-width zigzag-length thickness");
projects / lilypond.git / blobdiff