diff options
| author | Keith OHara <k-ohara5a5a@oco.net> | 2013-03-21 00:34:52 -0700 |
|---|---|---|
| committer | Keith OHara <k-ohara5a5a@oco.net> | 2013-05-13 22:29:23 -0700 |
| commit | 76444caf979f97076ab78d5937fb5f6c78326f75 (patch) | |
| tree | 69fb88c8ce46b7c23be178163e5d8aedfe106296 | |
| parent | 492a7326057fec726684ef429763c745e9ec982b (diff) | |
Adjust padding for skylines; issue 3336
Enclose one regression test in a \book so it shows true system-spacing
on the test scripts.
| -rw-r--r-- | input/regression/multi-measure-rest-text.ly | 5 | ||||
| -rw-r--r-- | ly/property-init.ly | 5 | ||||
| -rw-r--r-- | scm/define-grobs.scm | 3 | ||||
| -rw-r--r-- | scm/script.scm | 3 |
4 files changed, 11 insertions, 5 deletions
diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index ad3d6ccf69..575b62d774 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -13,8 +13,7 @@ measures stretch to accommodate wide texts. } -\layout { ragged-right = ##t } -{ +\book { \score { { \time 3/4 \set Score.skipBars = ##t R2._\markup { \center-column { \musicglyph #"scripts.dfermata" \roman "Ad lib" } } @@ -28,3 +27,5 @@ measures stretch to accommodate wide texts. R2.^"very very very very very very long text" c'2. } + \layout { ragged-right = ##t } +}} diff --git a/ly/property-init.ly b/ly/property-init.ly index fc7c67179a..93906aa632 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -553,15 +553,14 @@ showSplitTiedTabNotes = { %% text length textLengthOn = { - \override TextScript.extra-spacing-width = #'(0 . 0) + % 0.4 staff-space between adjacent texts + \override TextScript.extra-spacing-width = #'(-0.0 . 0.4) \override TextScript.extra-spacing-height = #'(-inf.0 . +inf.0) - \override TextScript.outside-staff-horizontal-padding = #0 } textLengthOff = { \override TextScript.extra-spacing-width = #'(+inf.0 . -inf.0) \override TextScript.extra-spacing-height = #'(0 . 0) - \revert TextScript.outside-staff-horizontal-padding } markLengthOn = { diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index b89fc14757..846cfedf3f 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -804,6 +804,7 @@ (direction . ,DOWN) (minimum-space . 1.2) (outside-staff-priority . 250) + (outside-staff-padding . 0.6) (padding . 0.6) (side-axis . ,Y) (slur-padding . 0.3) @@ -885,6 +886,7 @@ (minimum-Y-extent . (-1 . 1)) (right-bound-info . ,ly:line-spanner::calc-right-bound-info) + (skyline-horizontal-padding . 0.2) (springs-and-rods . ,ly:spanner::set-spacing-rods) (stencil . ,ly:line-spanner::print) (style . dashed-line) @@ -1527,6 +1529,7 @@ (outside-staff-priority . 450) (padding . 0.2) (self-alignment-X . ,CENTER) + (skyline-horizontal-padding . 0.2) (staff-padding . 0.25) (stencil . ,ly:text-interface::print) (X-offset . ,(ly:make-simple-closure diff --git a/scm/script.scm b/scm/script.scm index 125a2fee5d..b5e14bae56 100644 --- a/scm/script.scm +++ b/scm/script.scm @@ -62,6 +62,7 @@ . ( (script-stencil . (feta . ("downbow" . "downbow"))) (padding . 0.20) + (skyline-horizontal-padding . 0.20) (avoid-slur . around) (direction . ,UP) (script-priority . 150))) @@ -268,6 +269,7 @@ (quantize-position . #t) (script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo"))) (padding . 0.20) + (skyline-horizontal-padding . 0.10) (side-relative-direction . ,DOWN))) ("staccato" . ( @@ -277,6 +279,7 @@ (avoid-slur . inside) (toward-stem-shift . 0.5) (padding . 0.20) + (skyline-horizontal-padding . 0.10) (script-priority . -100))) ("stopped" . ( |