X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fregression%2Faccidental-contemporary.ly;h=9da5027861251108ae49c5bff01c8bb3eb84c20d;hb=1dbeded5626ac18a0e3ca98c0ed9aaeef4e5c4d0;hp=926c9ffc62328acf348ebaed52a5fdf4b1803b1a;hpb=d44d9333d8318a9a1dee7a68ea8e9149877b7d4b;p=lilypond.git diff --git a/input/regression/accidental-contemporary.ly b/input/regression/accidental-contemporary.ly index 926c9ffc62..9da5027861 100644 --- a/input/regression/accidental-contemporary.ly +++ b/input/regression/accidental-contemporary.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \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. @@ -32,6 +36,9 @@ 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 } } @@ -42,5 +49,7 @@ 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 } }