2005-08-15 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * input/regression/tuplet-slope.ly: add a test case.
+
+ * lily/tuplet-bracket.cc (calc_position_and_height): revert
+ erroneous fix. Add spanner bounds to offset array with relative X
+ positions.
+
* ly/engraver-init.ly: add Rest_engraver only once.
* scm/define-music-display-methods.scm (KeyChangeEvent): only do
}
+\layout {
+ raggedright = ##t
+}
\version "2.6.0"
-\score {
- \relative c' {
- \times 4/5 { a'4 as g fis f }
- \times 4/5 { fis4 e es d des }
- \times 4/5 { fis,4 e es d des }
- \times 4/5 { bes'''4 bes,, b c cis }
- \times 4/5 { a''4 b b c cis }
- }
- \layout {
- raggedright = ##t
- }
+\new Voice {
+ \relative c'' {
+ \times 2/3 { c4 d e}
+ \times 2/3 { c4 d e}
+ }
+
+ \relative c' {
+ \times 4/5 { a'4 as g fis f }
+ \times 4/5 { fis4 e es d des }
+ \times 4/5 { fis,4 e es d des }
+ \times 4/5 { bes'''4 bes,, b c cis }
+ \times 4/5 { a''4 b b c cis }
+ }
}
Real x0 = robust_relative_extent (lgr, commonx, X_AXIS)[LEFT];
Real x1 = robust_relative_extent (rgr, commonx, X_AXIS)[RIGHT];
- /*
- offset
- */
- Real factor = columns.size () > 1 ? 1 / (x1 - x0) : 1.0;
-
Array<Offset> points;
- points.push (Offset (x0, staff[dir]));
- points.push (Offset (x1, staff[dir]));
+ points.push (Offset (x0 - x0, staff[dir]));
+ points.push (Offset (x1 - x0, staff[dir]));
for (int i = 0; i < columns.size (); i++)
{
while (flip (&d) != LEFT);
}
+ Real factor = (columns.size () > 1) ? 1 / (x1 - x0) : 1.0;
for (int i = 0; i < points.size (); i++)
{
Real x = points[i][X_AXIS];
- Real tuplety = *dy * x * factor;
+ Real tuplety = (*dy) * x * factor;
if (points[i][Y_AXIS] * dir > (*offset + tuplety) * dir)
- *offset = points[i][Y_AXIS] - tuplety * sign (*dy) * dir;
+ *offset = points[i][Y_AXIS] - tuplety;
}
*offset += scm_to_double (me->get_property ("padding")) * dir;