source file of the GNU LilyPond music typesetter
- (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
TODO: This is way too hairy
{
int staff_center = 0;
Interval hp = head_positions (me);
- if (hp.empty_b())
+ if (hp.is_empty ())
{
return CENTER;
}
|| (get_direction (me) != get_default_dir (me)))
{
- Real shorten = 0.0;
SCM sshorten = me->get_grob_property ("stem-shorten");
SCM scm_shorten = gh_pair_p (sshorten) ?
robust_list_ref ((duration_log (me) - 2) >? 0, sshorten): SCM_EOL;
- if (gh_number_p (scm_shorten))
- {
- shorten = 2* gh_scm2double (scm_shorten);
- }
+ Real shorten = 2* robust_scm2double (scm_shorten,0);
+
/* On boundary: shorten only half */
if (abs (head_positions (me)[get_direction (me)]) <= 1)
if (durlog >= 3)
{
Interval flag_ext = flag (me).extent (Y_AXIS) ;
- if (!flag_ext.empty_b())
+ if (!flag_ext.is_empty ())
minlen += 2 * flag_ext.length () / ss ;
/*
heads.reverse ();
- Real thick = gh_scm2double (me->get_grob_property ("thickness"))
- * me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+ Real thick = thickness (me);
Grob *hed = support_head (me);
Real w = Note_head::head_extent (hed,X_AXIS)[dir];
}
bool parity= true;
- int lastpos = int (Staff_symbol_referencer::get_position (heads[0]));
+ Real lastpos = Real (Staff_symbol_referencer::get_position (heads[0]));
for (int i=1; i < heads.size (); i ++)
{
Real p = Staff_symbol_referencer::get_position (heads[i]);
- int dy =abs (lastpos- (int)p);
+ Real dy =fabs (lastpos- p);
- if (dy <= 1)
+ /*
+ dy should always be 0.5, 0.0, 1.0, but provide safety margin
+ for rounding errors.
+ */
+ if (dy < 1.1)
{
if (parity)
{
Real l = Note_head::head_extent (heads[i], X_AXIS).length ();
Direction d = get_direction (me);
- /* reversed head should be shifted l-thickness, but this looks
- too crowded, so we only shift l-0.5*thickness.
- Notice that this leads to assymetry: Normal heads overlap
- the stem 100% whereas reversed heads only overlaps the stem
- 50% */
- #define magic 0.5
- heads[i]->translate_axis ((l-thick*magic) * d, X_AXIS);
+ /*
+ Reversed head should be shifted l-thickness, but this
+ looks too crowded, so we only shift l-0.5*thickness.
+
+ This leads to assymetry: Normal heads overlap the
+ stem 100% whereas reversed heads only overlaps the
+ stem 50%
+
+ */
+
+ Real reverse_overlap =0.5;
+ heads[i]->translate_axis ((l-thick*reverse_overlap) * d, X_AXIS);
if (invisible_b(me))
- heads[i]->translate_axis (-thick*(2-magic) * d , X_AXIS);
+ heads[i]->translate_axis (-thick*(2 - reverse_overlap) * d , X_AXIS);
/* TODO:
flag_style + to_string (dir) + staffline_offs + to_string (duration_log (me));
Font_metric *fm = Font_interface::get_default_font (me);
Molecule flag = fm->find_by_name ("flags-" + font_char);
- if (flag.empty_b ())
+ if (flag.is_empty ())
{
me->warning (_f ("flag `%s' not found", font_char));
}
if (gh_string_p (stroke_style_scm))
{
String stroke_style = ly_scm2string (stroke_style_scm);
- if (!stroke_style.empty_b ())
+ if (!stroke_style.is_empty ())
{
String font_char = to_string (dir) + stroke_style;
Molecule stroke = fm->find_by_name ("flags-" + font_char);
- if (stroke.empty_b ())
+ if (stroke.is_empty ())
{
me->warning (_f ("flag stroke `%s' not found", font_char));
}
{
Axis a = (Axis) gh_scm2int (ax);
assert (a == X_AXIS);
- Grob *se = unsmob_grob (e);
+ Grob *me = unsmob_grob (e);
Interval r (0, 0);
- if (unsmob_grob (se->get_grob_property ("beam")) || abs (duration_log (se)) <= 2)
+ if (unsmob_grob (me->get_grob_property ("beam")) || abs (duration_log (me)) <= 2)
; // TODO!
else
{
- r = flag (se).extent (X_AXIS);
+ r = flag (me).extent (X_AXIS)
+ + thickness (me)/2;
}
return ly_interval2scm (r);
}
-
+Real
+Stem::thickness (Grob* me)
+{
+ return gh_scm2double (me->get_grob_property ("thickness"))
+ * Staff_symbol_referencer::line_thickness (me);
+}
MAKE_SCHEME_CALLBACK (Stem,brew_molecule,1);
Grob*me = unsmob_grob (smob);
Molecule mol;
Direction d = get_direction (me);
-
-
/*
- TODO: make the stem start a direction ?
+ TODO: make the stem start a direction ?
This is required to avoid stems passing in tablature chords...
*/
if (!lh)
return SCM_EOL;
+
+ if (invisible_b (me))
+ return SCM_EOL;
Real y1 = Staff_symbol_referencer::get_position (lh);
Real y2 = stem_end_position (me);
Interval stem_y (y1 <? y2,y2 >? y1);
-
+
// dy?
Real dy = Staff_symbol_referencer::staff_space (me) * 0.5;
must not take ledgers into account.
*/
Interval head_height = Note_head::head_extent (hed,Y_AXIS);
- Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS);
+ Real y_attach = Note_head::stem_attachment_coordinate (hed, Y_AXIS);
y_attach = head_height.linear_combination (y_attach);
stem_y[Direction (-d)] += d * y_attach/dy;
}
+
- if (!invisible_b (me))
- {
- Real stem_width = gh_scm2double (me->get_grob_property ("thickness"))
- // URG
- * me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
- Real blot =
+ // URG
+ Real stem_width = thickness (me);
+ Real blot =
me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
- Box b = Box (Interval (-stem_width/2, stem_width/2),
- Interval (stem_y[DOWN]*dy, stem_y[UP]*dy));
+
+ Box b = Box (Interval (-stem_width/2, stem_width/2),
+ Interval (stem_y[DOWN]*dy, stem_y[UP]*dy));
- Molecule ss = Lookup::round_filled_box (b, blot);
- mol.add_molecule (ss);
- }
+ Molecule ss = Lookup::round_filled_box (b, blot);
+ mol.add_molecule (ss);
if (!get_beam (me) && abs (duration_log (me)) > 2)
{
Molecule fl = flag (me);
- fl.translate_axis (stem_y[d]*dy, Y_AXIS);
+ fl.translate_axis (stem_y[d]*dy - d * blot/2, Y_AXIS);
+ fl.translate_axis (stem_width/2, X_AXIS);
mol.add_molecule (fl);
}
if (Grob * f = first_head (me))
{
Interval head_wid = Note_head::head_extent(f, X_AXIS);
-
Real attach =0.0;
if (attach)
{
Real rule_thick
- = gh_scm2double (me->get_grob_property ("thickness"))
- * me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
-
+ = thickness (me);
r += - d * rule_thick * 0.5;
}
return gh_double2scm (r);
}
+
Grob*
Stem::get_beam (Grob*me)
{
Real staff_space = Staff_symbol_referencer::staff_space (me);
Grob *beam = get_beam (me);
Real beam_translation = Beam::get_beam_translation (beam);
- Real beam_thickness = gh_scm2double (beam->get_grob_property ("thickness"));
+ Real beam_thickness = Beam::get_thickness (beam);
int beam_count = Beam::get_direction_beam_count (beam, my_dir);
Real note_start =
/* staff positions */
head_positions (me)[my_dir] * 0.5
- * my_dir;
+ * my_dir * staff_space;
Real ideal_y = note_start + ideal_length;
}
- SCM shorten = beam->get_grob_property ("shorten");
- if (gh_number_p (shorten))
- ideal_y -= gh_scm2double (shorten);
+ ideal_y -= robust_scm2double (beam->get_grob_property ("shorten"), 0);
Real minimum_free =
gh_scm2double (robust_list_ref
/* stem only extends to center of beam */
- 0.5 * beam_thickness;
- Real minimum_y = note_start + minimum_length;
+ Real minimum_y = note_start + minimum_length;
ideal_y *= my_dir;
"no-stem-extend stroke-style");
+
+/****************************************************************/
+
+Stem_info::Stem_info()
+{
+ ideal_y_ = shortest_y_ =0;
+ dir_ = CENTER;
+}
+
+void
+Stem_info::scale (Real x)
+{
+ ideal_y_ *= x;
+ shortest_y_ *= x;
+}
projects / lilypond.git / blobdiff