From: Joe Neeman Date: Tue, 23 Jan 2007 08:11:41 +0000 (+0200) Subject: Remove old piano spacing documentation. X-Git-Tag: release/2.11.15-1~9^2~9 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a1141dd5b7c0f2b86e89661acf1b8ab59ec1ef27;p=lilypond.git Remove old piano spacing documentation. Prevent ties from looking up end_position on cross-staff stems. --- diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely index a15df59045..377a74ea13 100644 --- a/Documentation/user/spacing.itely +++ b/Documentation/user/spacing.itely @@ -484,7 +484,6 @@ staves inside a system. @menu * Vertical spacing inside a system:: -* Vertical spacing of piano staves:: * Vertical spacing between systems:: * Controlling spacing of individual systems:: * Two-pass vertical spacing:: @@ -538,53 +537,6 @@ Example files: @inputfileref{input/regression/,page-spacing.ly}, @inputfileref{input/regression/,alignment-vertical-spacing.ly}. -@node Vertical spacing of piano staves -@subsection Vertical spacing of piano staves - -The distance between staves of a @internalsref{PianoStaff} cannot be -computed during formatting. Rather, to make cross-staff beaming work -correctly, that distance has to be fixed beforehand. - -The distance of staves in a @code{PianoStaff} is set with the -@code{forced-distance} property of the -@internalsref{VerticalAlignment} object, created in -@internalsref{PianoStaff}. - -It can be adjusted as follows -@example -\new PianoStaff \with @{ - \override VerticalAlignment #'forced-distance = #7 -@} @{ - ... -@} -@end example - -@noindent -This would bring the staves together at a distance of 7 staff spaces, -measured from the center line of each staff. - -The difference is demonstrated in the following example, -@lilypond[quote,verbatim] -\relative c'' << - \new PianoStaff \with { - \override VerticalAlignment #'forced-distance = #7 - } << - \new Staff { c1 } - \new Staff { c } - >> - \new PianoStaff << - \new Staff { c } - \new Staff { c } - >> ->> -@end lilypond - - -@seealso - -Example files: @inputfileref{input/regression/,alignment-vertical-spacing.ly}. - - @node Vertical spacing between systems @subsection Vertical spacing between systems diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely index fca2900d65..e68480cf61 100644 --- a/Documentation/user/templates.itely +++ b/Documentation/user/templates.itely @@ -366,7 +366,6 @@ pedal = { \context { \PianoStaff \accepts Dynamics - \override VerticalAlignment #'forced-distance = #7 } } } diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index 6c7e2a024f..38510ae5f0 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -128,7 +128,12 @@ Tie_formatting_problem::set_column_chord_outline (vector bounds, x.add_point (stem->relative_coordinate (x_refpoint_, X_AXIS)); x.widen (staff_space / 20); // ugh. Interval y; - y.add_point (Stem::stem_end_position (stem) * staff_space * .5); + Real stem_end_position = + Stem::is_cross_staff (stem) + ? get_grob_direction (stem) * infinity_f + : Stem::stem_end_position (stem) * staff_space * .5; + + y.add_point (stem_end_position); Direction stemdir = get_grob_direction (stem); y.add_point (Stem::head_positions (stem)[-stemdir] diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 9ac5a25294..ea16ead164 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -57,7 +57,6 @@ \consists "Figured_bass_position_engraver" \consists "Script_row_engraver" - \override VerticalAxisGroup #'minimum-Y-extent = #'(-3.5 . 3.5) localKeySignature = #'() createSpacing = ##t ignoreFiguredBassRest = ##t @@ -308,6 +307,7 @@ contained staves are not connected vertically." "Just like @code{GrandStaff} but with a forced distance between the staves, so cross staff beaming and slurring can be used." + \override VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 4) \consists "Instrument_name_engraver" instrumentName = #'()