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 3b1a765f8e2381e32b8bc0b687728880a0db823d..f14dd831a15822d2ab5a939a0e7c5667e2174abe 100644 (file)
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -1,40 +1,40 @@
 
 \header
 {
-texidoc = "Ottava brackets are supported, through the
+  texidoc = "Ottava brackets are supported, through the
 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.3.4"
+\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
-%   vertical dashed line.
-%
-% . Octavation lines broken across staves must always start with `8va'
-%   (or something similar).
-%
-% . The `8va' should be slightl offset to the left.
-%
-% . The final vertical dashed line of the octavation line should be offset
-%   to the right.
-%
-% . Octavation lines for `8va bassa' must be below the staff, not above.
-%
-% . The `8va bassa' string is far too long for short octavation lines.
-%   LilyPond should select between `8va bassa', `8ba', and `8', depending
-%   on the available horizontal space (and the octavation style selected
-%   by the user).  The same holds for `8va' and `15ma'.
+%% . There must be a minimum distance between the octavation line and the
+%%   topmost staff line, taking into account the height of the closing
+%%   vertical dashed line.
+                               %
+%% . Octavation lines broken across staves must always start with `8va'
+%%   (or something similar).
+                               %
+%% . The `8va' should be slightly offset to the left.
+                               %
+%% . The final vertical dashed line of the octavation line should be offset
+%%   to the right.
+                               %
+%% . Octavation lines for `8va bassa' must be below the staff, not above.
+                               %
+%% . The `8va bassa' string is far too long for short octavation lines.
+%%   LilyPond should select between `8va bassa', `8ba', and `8', depending
+%%   on the available horizontal space (and the octavation style selected
+%%   by the user).  The same holds for `8va' and `15ma'.
 
 
-\paper { raggedright = ##t} 
-\score {
-  \relative c'''  {
+\layout { ragged-right = ##t} 
+
+\relative c'''  {
   a b c a
   #(set-octavation 1)
   a b c a
@@ -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)
@@ -64,5 +66,5 @@ string can be tuned with @code{Staff.ottavation}.
   \set Staff.ottavation = #"8"
   g,,16
 }
-}
+