X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Faccidental-contemporary.ly;h=536cce96f5d961c64c1f92faac07740b80dac329;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=926c9ffc62328acf348ebaed52a5fdf4b1803b1a;hpb=d44d9333d8318a9a1dee7a68ea8e9149877b7d4b;p=lilypond.git

diff --git a/input/regression/accidental-contemporary.ly b/input/regression/accidental-contemporary.ly
index 926c9ffc62..536cce96f5 100644
--- a/input/regression/accidental-contemporary.ly
+++ b/input/regression/accidental-contemporary.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.19.21"
 \header {
 
 texidoc = "Several automatic accidental rules
@@ -6,15 +6,19 @@ aim to reproduce contemporary music notation
 practices:
 @itemize
 @item
-'dodecaphonic style prints accidentals on every
+@code{'dodecaphonic} style prints accidentals on every
 note (including naturals)
 @item
-'neo-modern style prints accidentals on every note
+@code{'neo-modern style} prints accidentals on every note
 (not including naturals), except when a note is
 immediately repeated
 @item
-'neo-modern-cautionary style acts like neo-modern,
+@code{'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.
@@ -25,22 +29,27 @@ Both scores should show the same accidentals.
 \layout { ragged-right = ##t }
 
 \score {
-  \relative c'' {
-    #(set-accidental-style 'dodecaphonic)
-    gis4 a g gisis
-    #(set-accidental-style 'neo-modern)
+  \relative {
+    \accidentalStyle dodecaphonic
+    gis'4 a g gisis
+    \accidentalStyle neo-modern
     gis8 a gis gis g' gis gis,, a'
-    #(set-accidental-style 'neo-modern-cautionary)
+    \accidentalStyle neo-modern-cautionary
     eis fis eis eis g2
+    \accidentalStyle teaching
+    \key e \major
+    e8 eis fis fis gis2
   }
 }
 
 \score {
-  \relative c'' {
+  \relative {
     \set Staff.autoAccidentals = #'()
     \set Staff.autoCautionaries = #'()
-    gis!4 a! g! gisis!
+    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
   }
 }