-/*
- stem-tremolo.cc -- implement Stem_tremolo
-
+/*
+ stem-tremolo.cc -- implement Stem_tremolo
+
source file of the GNU LilyPond music typesetter
-
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#include "stem-tremolo.hh"
+
+#include "spanner.hh"
#include "beam.hh"
#include "directional-element-interface.hh"
#include "item.hh"
#include "lookup.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "staff-symbol-referencer.hh"
-#include "stem-tremolo.hh"
#include "stem.hh"
#include "warn.hh"
/* TODO: lengthen stem if necessary */
-MAKE_SCHEME_CALLBACK (Stem_tremolo, dim_callback, 2);
+MAKE_SCHEME_CALLBACK (Stem_tremolo, dim_callback, 1);
/* todo: init with cons. */
SCM
-Stem_tremolo::dim_callback (SCM e, SCM)
+Stem_tremolo::dim_callback (SCM e)
{
Grob *se = unsmob_grob (e);
-
+
Real space = Staff_symbol_referencer::staff_space (se);
return ly_interval2scm (Interval (-space, space));
}
-/* ugh ? --from Slur */
-MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 2);
+MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 1);
SCM
-Stem_tremolo::height (SCM smob, SCM ax)
+Stem_tremolo::height (SCM smob)
{
- Axis a = (Axis)ly_scm2int (ax);
Grob *me = unsmob_grob (smob);
- assert (a == Y_AXIS);
-
- SCM mol = me->get_uncached_stencil ();
- if (Stencil *m = unsmob_stencil (mol))
- return ly_interval2scm (m->extent (a));
- else
- return ly_interval2scm (Interval ());
+ /* TODO: fixme. uncached? */
+ return ly_interval2scm (me->get_stencil ()
+ ? me->get_stencil ()->extent (Y_AXIS)
+ : Interval());
}
Stencil
Stem_tremolo::raw_stencil (Grob *me)
{
- Grob *stem = unsmob_grob (me->get_property ("stem"));
- Grob *beam = Stem::get_beam (stem);
-
- Real dydx;
- if (beam)
+ Grob *stem = unsmob_grob (me->get_object ("stem"));
+ Spanner *beam = Stem::get_beam (stem);
+
+ SCM slope = me->get_property ("slope");
+ Real dydx = 0.25;
+ if (scm_is_number (slope))
{
- Real dy = 0;
- SCM s = beam->get_property ("positions");
- if (is_number_pair (s))
- dy = -ly_scm2double (ly_car (s)) +ly_scm2double (ly_cdr (s));
-
- Real dx = Beam::last_visible_stem (beam)->relative_coordinate (0, X_AXIS)
- - Beam::first_visible_stem (beam)->relative_coordinate (0, X_AXIS);
- dydx = dx ? dy/dx : 0;
+ dydx = robust_scm2double (slope, 0.0);
}
else
- // urg
- dydx = 0.25;
-
+ {
+ if (beam)
+ {
+ Real dy = 0;
+ SCM s = beam->get_property ("positions");
+ if (is_number_pair (s))
+ dy = - scm_to_double (scm_car (s)) + scm_to_double (scm_cdr (s));
+
+ Real dx = Beam::last_visible_stem (beam)->relative_coordinate (0, X_AXIS)
+ - Beam::first_visible_stem (beam)->relative_coordinate (0, X_AXIS);
+ dydx = dx ? dy / dx : 0;
+ }
+ }
Real ss = Staff_symbol_referencer::staff_space (me);
- Real thick = robust_scm2double (me->get_property ("beam-thickness"),1);
- Real width = robust_scm2double (me->get_property ("beam-width"),1);
- Real blot = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+ Real thick = robust_scm2double (me->get_property ("beam-thickness"), 1);
+ Real width = robust_scm2double (me->get_property ("beam-width"), 1);
+ Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
width *= ss;
thick *= ss;
-
+
Stencil a (Lookup::beam (dydx, width, thick, blot));
a.translate (Offset (-width * 0.5, width * 0.5 * dydx));
-
+
int tremolo_flags = 0;
SCM s = me->get_property ("flag-count");
- if (ly_c_number_p (s))
- tremolo_flags = ly_scm2int (s);
+ if (scm_is_number (s))
+ tremolo_flags = scm_to_int (s);
if (!tremolo_flags)
{
- programming_error ("No tremolo flags?");
+ programming_error ("no tremolo flags");
me->suicide ();
return Stencil ();
/* Who the fuck is 0.81 ? --hwn. */
Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81;
- Stencil mol;
+ Stencil mol;
for (int i = 0; i < tremolo_flags; i++)
{
Stencil b (a);
return mol;
}
-MAKE_SCHEME_CALLBACK (Stem_tremolo,print,1);
+MAKE_SCHEME_CALLBACK (Stem_tremolo, print, 1);
SCM
-Stem_tremolo::print (SCM grob)
+Stem_tremolo::print (SCM grob)
{
Grob *me = unsmob_grob (grob);
- Grob *stem = unsmob_grob (me->get_property ("stem"));
+ Grob *stem = unsmob_grob (me->get_object ("stem"));
if (!stem)
{
- programming_error ("No stem for stem-tremolo");
+ programming_error ("no stem for stem-tremolo");
return SCM_EOL;
}
-
- Grob *beam = Stem::get_beam (stem);
- Direction stemdir = Stem::get_direction (stem);
+
+ Spanner *beam = Stem::get_beam (stem);
+ Direction stemdir = get_grob_direction (stem);
if (stemdir == 0)
stemdir = UP;
Real beam_translation
- = (beam && beam->live ())
+ = (beam && beam->is_live ())
? Beam::get_beam_translation (beam)
: 0.81;
int beam_count = beam ? (Stem::beam_multiplicity (stem).length () + 1) : 0;
Real beamthickness = 0.0;
- SCM sbt = (beam) ? beam->get_property ("thickness") : SCM_EOL ;
- if (ly_c_number_p (sbt))
- beamthickness = ly_scm2double (sbt) * ss;
+ SCM sbt = (beam) ? beam->get_property ("thickness") : SCM_EOL;
+ if (scm_is_number (sbt))
+ beamthickness = scm_to_double (sbt) * ss;
Real end_y
= Stem::stem_end_position (stem) * ss / 2
- stemdir * (beam_count * beamthickness
- + ((beam_count -1) >? 0) * beam_translation);
+ + (max (beam_count -1, 0) * beam_translation));
/* FIXME: the 0.33 ss is to compensate for the size of the note head. */
Real chord_start_y = Stem::chord_start_y (stem) + 0.33 * ss * stemdir;
return mol.smobbed_copy ();
}
-
-
-ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface",
- "A beam slashing a stem to indicate a tremolo.",
- "stem beam-width beam-thickness flag-count");
+ADD_INTERFACE (Stem_tremolo, "stem-tremolo-interface",
+ "A beam slashing a stem to indicate a tremolo.",
+ "stem "
+ "slope "
+ "beam-width "
+ "beam-thickness "
+ "flag-count");
projects / lilypond.git / blobdiff