X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fottava.ly;h=54501c50c94edb1136fa11a5a51fdcd0c13292dd;hb=26a079ca2393d053315ef8dbef626c897dc9645a;hp=4b39a202ea94fa313ced9ae30008bca0404ace4d;hpb=641486a1a5522a9e66b470d8c762a1f789219573;p=lilypond.git

diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index 4b39a202ea..54501c50c9 100644
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -1,68 +1,71 @@
 
 \header
 {
-texidoc = "Ottava brackets are supported, through the
-use of the scheme function @code{set-octavation}.
+  texidoc = "Ottava brackets are supported, through the
+use of the music function @code{\\ottava}.
 
 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.4.0"
 
-% . 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'.
+\version "2.16.0"
 
+%% . 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'.
 
-\layout { raggedright = ##t} 
-\score {
-  \relative c'''  {
+
+\layout { ragged-right = ##t} 
+
+\relative c'''  {
+  a b c a
+  \ottava #1
   a b c a
-  #(set-octavation 1)
+  \ottava #0
+  \ottava #2
   a b c a
-  #(set-octavation 0)
-  #(set-octavation 2)
+  \ottava #0
+  \ottava #-1
   a b c a
-  #(set-octavation 0)
-  #(set-octavation -1)
-  a b c a 
-  #(set-octavation 0)
+  \ottava #0
   \break
   a, 
-  #(set-octavation 1)
+  \ottava #1
   \set Staff.ottavation = #"8"
   b
-  #(set-octavation 0)
+  \ottava #0
   c a 
-  #(set-octavation -1) b a g 
-  #(set-octavation 0)
+  \ottava #-1
+  \set Staff.ottavation = \markup { \concat { 8 \tiny \raise #0.8 vb }}
+  b a g
+  \ottava #0
   c 
-  #(set-octavation -1)
+  \ottava #-1
   \set Staff.ottavation = #"8"
   c,,16
-  #(set-octavation 0)
+  \ottava #0
   c'16
-  #(set-octavation -1)
+  \ottava #-1
   \set Staff.ottavation = #"8"
   g,,16
 }
-}
+