Merge master into nested-bookparts

[lilypond.git] / input / les-nereides.ly

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index b96a5ce49e8f64245e2418cccba6a4c5f0824ea8..7a420afbd3327a0424f2416ad6a3cbef1166bcf2 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,4 +1,4 @@
-\version "2.11.51"
+\version "2.11.61"
 
 \header {
     composer = "ARTHUR GRAY"
@@ -46,7 +46,7 @@ treble = \new Voice \relative c''{
     \slurUp
     \set PianoStaff.connectArpeggios = ##t
 
-    #(set-octavation 1)
+    \ottava #1
 
     \tieUp
     cis''''4^\markup { \small \italic "m.g." }\arpeggio~
@@ -55,7 +55,7 @@ treble = \new Voice \relative c''{
        \revert Stem #'direction
        
        a16[-5_( fis dis]
-       #(set-octavation 0)
+       \ottava #0
        
        cis32[ a-1 fis-4 dis]   cis[ a  fis)-2]
                                % the small grace in lower staff comes after us