fix "make web"

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 726f66c7106965b0b8b54fef954b46dd22e23dd1..5a7a93f77dbfe17188c56ac6c483ca4a31e07fa5 100644 (file)
--- 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 96ade6e37ccd12b23c0ed6d45e537bad3039d9c1..40b089878f186c945e10f375a8f6acbef1135e43 100644 (file)
--- 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 27a48002a172ad8b649c0fe1e30c6ef659834561..71af01adac5e438ea1640eb0e16b96967c624096 100644 (file)
--- 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 899fee3c61cbb566bc4de0796d979f4e83c32801..b3e74500d0c5ae102d14457ff3259c6a5335841c 100644 (file)
--- 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<Engraver *> (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 ceee8a37cba397e79f099f9aaf41c5b1238d7809..14d5c8903d24c953f655de51910265af353c65a1 100644 (file)
--- 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);