Doc-es: various updates.

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

diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index d8011816eb0ca3d424a02798a9ea94f90ce8ac44..0cb98e915de60f12ceb3b4a6bbc8815921937359 100644 (file)
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -1,63 +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"
-
-% . 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.19.21"
+
+%% . 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  {
+  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)
-  \property Staff.ottavation = #"8"
+  \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)
-  \property Staff.ottavation = #"8"
+  \ottava #-1
+  \set Staff.ottavation = #"8"
   c,,16
+  \ottava #0
+  c'16
+  \ottava #-1
+  \set Staff.ottavation = #"8"
+  g,,16
 }
-}
+