Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

diff --combined Documentation/topdocs/NEWS.tely
index 1e6e5b7da8afbf3cf33294b688bfe33cfeab23a5,89e8a40ce06f42b9daa3da9d48a5510f81d2a4ad..46a24d2db5688012fa13d745768c01746fa2b63c
--- 1/Documentation/topdocs/NEWS.tely
--- 2/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@@ -90,13 -90,14 +90,14 @@@ All line spanners are more flexible no
  end points.  This includes glissando, voice followers, text crescendos
  and other text spanners.
  
- @lilypond[ragged-right]
+ @c  with ragged-right we can't see the gliss.
+ @lilypond[]
  \relative c'' {
    \override Glissando #'bound-details #'right #'text = \markup { \hcenter \bold down }
    \override Glissando #'bound-details #'right #'Y = #-4
    \override Glissando #'bound-details #'right #'padding = #0.0
    \override Glissando #'bound-details #'left #'arrow = ##t
 -  \override Glissando #'bound-details #'left #'padding = #5.0
 +  \override Glissando #'bound-details #'left #'padding = #3.0
    \override Glissando #'style = #'trill
    
    c1 \glissando c'

diff --combined Documentation/user/running.itely
index 5709230bdde7c7e7c906ec2d6874147ccd1ad872,a081721d113a2307b5e4fa63883a868db3000a4a..981e71867a5d2fcd8e5c7a418361215b82bf3a57
--- 1/Documentation/user/running.itely
--- 2/Documentation/user/running.itely
+++ b/Documentation/user/running.itely
@@@ -252,7 -252,7 +252,7 @@@ Generate PostScript
  
  @item --dvi
  Generate DVI files.  In this case, the @TeX{} backend should be
 -specified, i.e., @code{-b tex}.
 +specified, i.e., @code{-dbackend=tex}.
  
  @item --png
  Generate pictures of each page, in PNG format.  This implies
@@@ -451,6 -451,12 +451,12 @@@ To upgrade LilyPond fragments in texinf
  convert-ly --from=... --to=... --no-version *.itely
  @end example
  
+ To see the changes in the LilyPond syntax between two versions, use
+ 
+ @example
+ convert-ly --from=... --to=... -s
+ @end example
+ 
  To upgrade many files at once, combine @code{convert-ly} with
  standard unix commands.  This example will upgrade all @code{.ly}
  files in the current directory

diff --combined scm/define-grobs.scm
index 63df32b9a9f067f54ceeb99571c546ab359c96e8,98d09dc9bfbc5c0790c0ad26e589657b45c17d49..49b9a32bac4494f9ca6adfbb59b7cacdd91717d0
--- 1/scm/define-grobs.scm
--- 2/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@@ -1256,7 -1256,7 +1256,7 @@@
        (minimum-length . 1.5)
        (height-limit . 2.0)
        (ratio . 0.333)
-       (cross-staff . ,ly:slur::cross-staff)
+       (cross-staff . ,ly:slur::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
  
@@@ -1455,7 -1455,7 +1455,7 @@@
        (height-limit . 2.0)
        (ratio . 0.25)
        (avoid-slur . inside)
-       (cross-staff . ,ly:slur::cross-staff)
+       (cross-staff . ,ly:slur::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
  
@@@ -1576,7 -1576,7 +1576,7 @@@
        (Y-extent . ,ly:stem::height)
        (length . ,ly:stem::calc-length)
        (thickness . 1.3)
-       (cross-staff . ,ly:stem::cross-staff)
+       (cross-staff . ,ly:stem::calc-cross-staff)
        (details
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
@@@ -1990,6 -1990,7 +1990,7 @@@
        (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
        (control-points . ,ly:tuplet-bracket::calc-control-points)
        (stencil . ,ly:tuplet-bracket::print)
+       (cross-staff . ,ly:tuplet-bracket::calc-cross-staff)
        
        (meta . ((class . Spanner)
                 (interfaces . (line-interface
@@@ -2002,6 -2003,7 +2003,7 @@@
        (font-shape . italic)
        (font-size . -2)
        (avoid-slur . inside)
+       (cross-staff . ,ly:tuplet-number::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (text-interface tuplet-number-interface
                                font-interface))))))
@@@ -2081,7 -2083,6 +2083,7 @@@
        (direction . ,UP)
        (padding . 1)
        (font-encoding . fetaNumber)
 +      (minimum-Y-extent . (0 . 2))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
        (thickness . 1.6)  ;;  line-thickness