Merge remote branch 'origin' into release/unstable

diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi
index c952506ccc0b76011c2b0f7af252345d8a4ec2c9..54d8ba7d7e7d94affcf3fb73c395d2129f385cdc 100644 (file)
--- a/Documentation/contributor/source-code.itexi
+++ b/Documentation/contributor/source-code.itexi
@@ -1029,6 +1029,9 @@ issue webpage and using @qq{Publish + Mail Comments} to add a
 (mostly bogus) comment to your issue.  The text of your comment
 will be sent to our developer mailing list.
 
+@warning{There is no automatic notification of a new patch; you
+must add a comment yourself.}
+
 @subsubheading Revisions
 
 As revisions are made in response to comments, successive patch sets

diff --git a/Documentation/css/text-to-speech.css b/Documentation/css/text-to-speech.css
deleted file mode 100644 (file)
index 96c1f20..0000000
--- a/Documentation/css/text-to-speech.css
+++ /dev/null
@@ -1,24 +0,0 @@
-@media aural {
-   h1, h2, h3,
-   h4, h5, h6    { voice-family: paul, male; stress: 20; richness: 90 }
-   h1            { pitch: x-low; pitch-range: 90 }
-   h2            { pitch: x-low; pitch-range: 80 }
-   h3            { pitch: low; pitch-range: 70 }
-   h4            { pitch: medium; pitch-range: 60 }
-   h5            { pitch: medium; pitch-range: 50 }
-   h6            { pitch: medium; pitch-range: 40 }
-   li, dt, dd    { pitch: medium; richness: 60 }
-   dt            { stress: 80 }
-   pre, code, tt { pitch: medium; pitch-range: 0; stress: 0; richness: 80 }
-   em            { pitch: medium; pitch-range: 60; stress: 60; richness: 50 }
-   strong        { pitch: medium; pitch-range: 60; stress: 90; richness: 90 }
-   dfn           { pitch: high; pitch-range: 60; stress: 60 }
-   s, strike     { richness: 0 }
-   i             { pitch: medium; pitch-range: 60; stress: 60; richness: 50 }
-   b             { pitch: medium; pitch-range: 60; stress: 90; richness: 90 }
-   u             { richness: 0 }
-   a:link        { voice-family: harry, male }
-   a:visited     { voice-family: betty, female }
-   a:active      { voice-family: betty, female; pitch-range: 80; pitch: x-high}
-}
-

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index ab7dafe48ee3a77b5437236494419f88cb63824b..99d057cedaf5327919ef62affe37b246323fb759 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -312,6 +312,7 @@ contained staves are connected vertically."
   \consists "Span_bar_engraver"
   \consists "Span_arpeggio_engraver"
   \consists "System_start_delimiter_engraver"
+  \consists "Vertical_align_engraver"
   systemStartDelimiter = #'SystemStartBrace
   topLevelAlignment = ##f
   %% explicitly set instrument, so it is not inherited from the parent