From 0a0e509b60b5bf6d50dbd652a990f9a56285451a Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Mon, 9 Jul 2007 09:30:21 +1000 Subject: [PATCH] fix "make web" --- Documentation/user/advanced-notation.itely | 3 ++- Documentation/user/basic-notation.itely | 5 +++-- Documentation/user/instrument-notation.itely | 1 - lily/break-align-engraver.cc | 2 ++ lily/side-position-interface.cc | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely index 726f66c710..5a7a93f77d 100644 --- a/Documentation/user/advanced-notation.itely +++ b/Documentation/user/advanced-notation.itely @@ -395,10 +395,11 @@ object, but this can be changed by overriding the % the RehearsalMark will be aligned with the right edge of the KeySignature % and then shifted right by an additional 2 units. - \once \override Staff.KeySignature #'break-align = #2 + \once \override Staff.KeySignature #'break-align-anchor = #2 \mark \default ces1 } +@end lilypond Although text marks are normally only printed above the topmost staff, you may alter this to print them on every staff, diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely index 96ade6e37c..40b089878f 100644 --- a/Documentation/user/basic-notation.itely +++ b/Documentation/user/basic-notation.itely @@ -3246,8 +3246,9 @@ see @ref{Bar lines} for more information. Examples: Brackets for the repeat are normally only printed over the topmost -staff. This can be adjusted by setting the @code{voltaOnThisStaff} -property; see +staff. This can be adjusted by moving @code{Volta_engraver} to the +Staff context where you want the brackets to appear; +see @ref{Modifying context plug-ins} and @lsr{repeats,volta@/-multi@/-staff@/.ly}. diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely index 27a48002a1..71af01adac 100644 --- a/Documentation/user/instrument-notation.itely +++ b/Documentation/user/instrument-notation.itely @@ -512,7 +512,6 @@ for showing repeats. @lilypond[ragged-right,verbatim] \new ChordNames \with { \override BarLine #'bar-size = #4 - voltaOnThisStaff = ##t \consists Bar_engraver \consists "Volta_engraver" } diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 899fee3c61..b3e74500d0 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -79,6 +79,8 @@ Break_align_engraver::acknowledge_break_aligned (Grob_info inf) Translator_group *tg = origin->implementation (); Engraver *random_source = dynamic_cast (unsmob_translator (scm_car (tg->get_simple_trans_list ()))); + if (!random_source) + random_source = this; /* Make left edge appear to come from same context as clef/bar-line etc. diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index ceee8a37cb..14d5c8903d 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -236,7 +236,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i o += dir * 0.5 * ss; } } - else if (scm_is_number (me->get_property ("staff-padding"))) + else if (scm_is_number (me->get_property ("staff-padding")) && dir) { Interval iv = me->maybe_pure_extent (me, a, pure, start, end); -- 2.39.5