Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / ottava.ly

diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index d06bf46982ceb2c58a8102937c0d2cfdb0fa6fc5..f14dd831a15822d2ab5a939a0e7c5667e2174abe 100644 (file)
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -5,12 +5,12 @@
 use of the scheme function @code{set-octavation}.
 
 The spanner should go below a staff for 8va bassa, and the ottavation
-string can be tuned with @code{Staff.ottavation}.
+markup can be tuned with @code{Staff.ottavation}.
 
 "
 
 }
-\version "2.7.39"
+\version "2.11.51"
 
 %% . There must be a minimum distance between the octavation line and the
 %%   topmost staff line, taking into account the height of the closing
@@ -19,7 +19,7 @@ string can be tuned with @code{Staff.ottavation}.
 %% . Octavation lines broken across staves must always start with `8va'
 %%   (or something similar).
                                %
-%% . The `8va' should be slightl offset to the left.
+%% . The `8va' should be slightly offset to the left.
                                %
 %% . The final vertical dashed line of the octavation line should be offset
 %%   to the right.
@@ -43,7 +43,7 @@ string can be tuned with @code{Staff.ottavation}.
   a b c a
   #(set-octavation 0)
   #(set-octavation -1)
-  a b c a 
+  a b c a
   #(set-octavation 0)
   \break
   a, 
@@ -52,7 +52,9 @@ string can be tuned with @code{Staff.ottavation}.
   b
   #(set-octavation 0)
   c a 
-  #(set-octavation -1) b a g 
+  #(set-octavation -1)
+  \set Staff.ottavation = \markup { \concat { 8 \tiny \raise #0.8 vb }}
+  b a g
   #(set-octavation 0)
   c 
   #(set-octavation -1)