X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fottava.ly;h=1c133a195a0ca699ed753e2775ec47b7f2a6a52b;hb=27a4d9354effb09c696925881ec4df007da8a0db;hp=06423dbf6e4d66de151713dc8ed274d05e1ece99;hpb=d77933148612eca5821af90e30803793d2e3daed;p=lilypond.git

diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index 06423dbf6e..1c133a195a 100644
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -1,40 +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 for 8va bassa, and the string can be tuned
-with @code{Staff.ottavation}.
+The spanner should go below a staff for 8va bassa, and the ottavation
+markup can be tuned with @code{Staff.ottavation}.
 
 "
 
 }
-\version "2.1.7"
 
+\version "2.12.0"
 
-\paper { raggedright = ##t} 
-\score {
-  \notes\relative c''' \notes {
+%% . 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 { ragged-right = ##t} 
+
+\relative c'''  {
   a b c a
-  #(set-octavation 1)
+  \ottava #1
   a b c a
-  #(set-octavation 0)
-  #(set-octavation 2)
+  \ottava #0
+  \ottava #2
   a b c a
-  #(set-octavation 0)
-  #(set-octavation -1)
+  \ottava #0
+  \ottava #-1
   a b c a
-  #(set-octavation 0)
-  a,
-  #(set-octavation 1)
-  \property Staff.ottavation = #"8"
+  \ottava #0
+  \break
+  a, 
+  \ottava #1
+  \set Staff.ottavation = #"8"
   b
-  #(set-octavation 0)
+  \ottava #0
   c a 
-  #(set-octavation -1) b a g 
-  #(set-octavation 0)
-  c
-}
+  \ottava #-1
+  \set Staff.ottavation = \markup { \concat { 8 \tiny \raise #0.8 vb }}
+  b a g
+  \ottava #0
+  c 
+  \ottava #-1
+  \set Staff.ottavation = #"8"
+  c,,16
+  \ottava #0
+  c'16
+  \ottava #-1
+  \set Staff.ottavation = #"8"
+  g,,16
 }
 
+