Merge branch 'master' into nested-bookparts

[lilypond.git] / input / regression / accidental-contemporary.ly

diff --git a/input/regression/accidental-contemporary.ly b/input/regression/accidental-contemporary.ly
index 1c021d57fed3ef7a706615e1389e8d2d4e608db0..926c9ffc62328acf348ebaed52a5fdf4b1803b1a 100644 (file)
--- a/input/regression/accidental-contemporary.ly
+++ b/input/regression/accidental-contemporary.ly
@@ -1,4 +1,4 @@
-\version "2.11.61"
+\version "2.11.57"
 \header {
 
 texidoc = "Several automatic accidental rules
@@ -6,19 +6,15 @@ aim to reproduce contemporary music notation
 practices:
 @itemize
 @item
-@code{'dodecaphonic} style prints accidentals on every
+'dodecaphonic style prints accidentals on every
 note (including naturals)
 @item
-@code{'neo-modern style} prints accidentals on every note
+'neo-modern style prints accidentals on every note
 (not including naturals), except when a note is
 immediately repeated
 @item
-@code{'neo-modern-cautionary} style acts like neo-modern,
+'neo-modern-cautionary style acts like neo-modern,
 adding cautionary parentheses around accidentals.
-@item
-@code{'teaching} prints accidentals normally, but adds
-cautionary accidentals when an accidental is
-already included in the key signature.
 @end itemize
 
 Both scores should show the same accidentals.
@@ -36,9 +32,6 @@ Both scores should show the same accidentals.
     gis8 a gis gis g' gis gis,, a'
     #(set-accidental-style 'neo-modern-cautionary)
     eis fis eis eis g2
-    #(set-accidental-style 'teaching)
-    \key e \major
-    e8 eis fis fis gis2
   }
 }
 
@@ -49,7 +42,5 @@ Both scores should show the same accidentals.
     gis!4 a! g! gisis!
     gis!8 a gis! gis g'! gis! gis,,! a'
     eis! fis! eis? eis g?2
-    \key e \major
-    e8 eis! fis? fis gis?2
   }
 }