/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2001--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2001--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
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 "paper-column.hh"
#include "separation-item.hh"
#include "warn.hh"
-#include "bar-line.hh"
#include "staff-symbol-referencer.hh"
#include "note-column.hh"
#include "stem.hh"
Real
Staff_spacing::optical_correction (Grob *me, Grob *g, Interval bar_height)
{
- if (!g || !Note_column::has_interface (g))
+ if (!g || !has_interface<Note_column> (g))
return 0;
Grob *stem = Note_column::get_stem (g);
Direction d = get_grob_direction (stem);
if (Stem::is_normal_stem (stem) && d == DOWN)
{
-
- /*
- can't look at stem-end-position, since that triggers
- beam slope computations.
- */
- Real stem_start = Stem::head_positions (stem) [d];
- Real stem_end = stem_start
- + d * robust_scm2double (stem->get_property ("length"), 7);
-
- Interval stem_posns (min (stem_start, stem_end),
- max (stem_end, stem_start));
+ Interval stem_posns = stem->pure_y_extent (stem, 0, INT_MAX);
stem_posns.intersect (bar_height);
{
Interval bar_size;
bar_size.set_empty ();
- if (Bar_line::has_interface (bar_grob))
+
+ if (bar_grob->internal_has_interface (ly_symbol2scm ("bar-line-interface")))
{
SCM glyph = bar_grob->get_property ("glyph-name");
Grob *staff_sym = Staff_symbol_referencer::get_staff_symbol (bar_grob);
We arrange things so that the fixed distance will be attained when the
line is compressed with a force of 1.0 */
Spring
-Staff_spacing::get_spacing (Grob *me, Grob *right_col)
+Staff_spacing::get_spacing (Grob *me, Grob *right_col, Real situational_space)
{
Item *me_item = dynamic_cast<Item *> (me);
Grob *left_col = me_item->get_column ();
/*
TODO:
- Should insert a adjustable space here? For excercises, you might want to
+ Should insert an adjustable space here? For exercises, you might want to
use a staff without a clef in the beginning.
*/
}
SCM alist = last_grob->get_property ("space-alist");
- if (!scm_list_p (alist))
+ if (!ly_is_list (alist))
return Spring ();
SCM space_def = scm_sloppy_assq (ly_symbol2scm ("first-note"), alist);
Real fixed = last_ext[RIGHT];
Real ideal = fixed + 1.0;
- if (type == ly_symbol2scm ("fixed-space"))
+ if (scm_is_eq (type, ly_symbol2scm ("fixed-space")))
{
fixed += distance;
ideal = fixed;
}
- else if (type == ly_symbol2scm ("extra-space"))
+ else if (scm_is_eq (type, ly_symbol2scm ("extra-space")))
ideal = fixed + distance;
- else if (type == ly_symbol2scm ("semi-fixed-space"))
+ else if (scm_is_eq (type, ly_symbol2scm ("semi-fixed-space")))
{
fixed += distance / 2;
ideal = fixed + distance / 2;
}
- else if (type == ly_symbol2scm ("minimum-space"))
+ else if (scm_is_eq (type, ly_symbol2scm ("minimum-space")))
ideal = last_ext[LEFT] + max (last_ext.length (), distance);
- else if (type == ly_symbol2scm ("minimum-fixed-space"))
+ else if (scm_is_eq (type, ly_symbol2scm ("minimum-fixed-space")))
{
fixed = last_ext[LEFT] + max (last_ext.length (), distance);
ideal = fixed;
}
+ Real stretchability = ideal - fixed;
+
+ /* 'situational_space' passed by the caller
+ could include full-measure-extra-space */
+ ideal += situational_space;
+
Real optical_correction = next_notes_correction (me, last_grob);
+ fixed += optical_correction;
+ ideal += optical_correction;
+
Real min_dist = Paper_column::minimum_distance (left_col, right_col);
/* ensure that the "fixed" distance will leave a gap of at least 0.3 ss. */
Real min_dist_correction = max (0.0, 0.3 + min_dist - fixed);
- Real correction = max (optical_correction, min_dist_correction);
-
- fixed += correction;
- ideal += correction;
+ fixed += min_dist_correction;
+ ideal = max (ideal, fixed);
Spring ret (ideal, min_dist);
- ret.set_inverse_stretch_strength (max (0.0, ideal - fixed));
+ ret.set_inverse_stretch_strength (max (0.0, stretchability));
+ ret.set_inverse_compress_strength (max (0.0, ideal - fixed));
return ret;
}