diff options
| author | Keith OHara <k-ohara5a5a@oco.net> | 2011-08-20 22:15:52 -0700 |
|---|---|---|
| committer | Keith OHara <k-ohara5a5a@oco.net> | 2011-08-21 12:00:00 -0700 |
| commit | cc88cd368096843ec42d001fe96eca038d1bd3be (patch) | |
| tree | 65927884ef757113a9fc8baa39be700a07a60d32 | |
| parent | 6e39f536c11c8a65d3e99a43cc9dd9593c61fa4f (diff) | |
Fixed spacing in space-alist; issue 1785
The 'fixed' distance was intended to limit compressibility.
| -rw-r--r-- | input/regression/tablature-full-notation.ly | 3 | ||||
| -rw-r--r-- | lily/staff-spacing.cc | 1 | ||||
| -rw-r--r-- | scm/define-grobs.scm | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/input/regression/tablature-full-notation.ly b/input/regression/tablature-full-notation.ly index 8e31540b88..0b7e0646fd 100644 --- a/input/regression/tablature-full-notation.ly +++ b/input/regression/tablature-full-notation.ly @@ -13,9 +13,8 @@ tabstuff = { f4\f g a^\fermata | R2.*3 | c8\<\( c16 c ~ c2\! | - c'2.\) | \mark \default - R2. | + c'2.\) | \ottava #1 r4 d'4 r8 e | \ottava #0 diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index 00c9abd6dc..7c4ece4643 100644 --- a/lily/staff-spacing.cc +++ b/lily/staff-spacing.cc @@ -214,6 +214,7 @@ Staff_spacing::get_spacing (Grob *me, Grob *right_col, Real situational_space) Spring ret (ideal, min_dist); ret.set_inverse_stretch_strength (max (0.0, stretchability)); + ret.set_inverse_compress_strength (max (0.0, ideal - fixed)); return ret; } diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 680f1598af..2dbaa4c2e7 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1072,7 +1072,7 @@ (key-signature . (extra-space . 0.5)) (cue-clef . (extra-space . 0.5)) (right-edge . (extra-space . 0.5)) - (first-note . (fixed-space . 2.5)))) + (first-note . (semi-fixed-space . 2.5)))) (stencil . ,ly:key-signature-interface::print) (extra-spacing-width . (0.0 . 0.5)) (Y-offset . ,ly:staff-symbol-referencer::callback) @@ -1096,7 +1096,7 @@ (staff-bar . (extra-space . 1.1)) (cue-clef . (extra-space . 0.5)) (right-edge . (extra-space . 0.5)) - (first-note . (fixed-space . 2.5)))) + (first-note . (semi-fixed-space . 2.5)))) (stencil . ,ly:key-signature-interface::print) (extra-spacing-width . (0.0 . 0.5)) (Y-offset . ,ly:staff-symbol-referencer::callback) @@ -2242,7 +2242,7 @@ (non-musical . #t) (space-alist . ( (cue-clef . (extra-space . 1.5)) - (first-note . (fixed-space . 2.0)) + (first-note . (semi-fixed-space . 2.0)) (right-edge . (extra-space . 0.5)) (staff-bar . (minimum-space . 2.0)))) (stencil . ,ly:time-signature::print) |