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

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

diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index 922d7a79b20fc59243fa3147dd977936c500d8b7..3950eef54212950f8f6c2f766375f39cd7a5c713 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 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"
-
-% . 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'.
-
-
-\paper { raggedright = ##t} 
-\score {
-  \notes\relative c''' \notes {
+\version "2.11.47"
+
+%% . 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)
   a b c a
@@ -45,15 +45,26 @@ with @code{Staff.ottavation}.
   #(set-octavation -1)
   a b c a
   #(set-octavation 0)
-  a,
+  \break
+  a, 
   #(set-octavation 1)
-  \property Staff.ottavation = #"8"
+  \set Staff.ottavation = #"8"
   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
-}
+  c 
+  #(set-octavation -1)
+  \set Staff.ottavation = #"8"
+  c,,16
+  #(set-octavation 0)
+  c'16
+  #(set-octavation -1)
+  \set Staff.ottavation = #"8"
+  g,,16
 }
 
+