X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Fmusic-functions.scm;h=aad42b51fe08b4a93ebfa9935c516bb7e47b08dc;hb=89f7b5a4f48b6d8812efbe9cd5dd9aaef4932a5f;hp=b1dc2f9c61391f32931e66b039561220af3e493c;hpb=ece789bf5f661cb8f16b50f87a248dedd6e1d8d5;p=lilypond.git

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index b1dc2f9c61..aad42b51fe 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -1842,6 +1842,31 @@ on the same staff line."
                               ,(make-accidental-rule 'same-octave 1))
                        GrandStaff)
 
+     ;; Accidentals on a choir staff for simultaneous reading of the
+     ;; own voice and the surrounding choir. Similar to piano, except
+     ;; that the first alteration within a voice is always printed.
+     (choral #f
+             (Voice ,(make-accidental-rule 'same-octave 0)
+                    Staff
+                    ,(make-accidental-rule 'same-octave 1)
+                    ,(make-accidental-rule 'any-octave 0)
+                    ,(make-accidental-rule 'same-octave 1)
+                    ChoirStaff
+                    ,(make-accidental-rule 'any-octave 0)
+                    ,(make-accidental-rule 'same-octave 1))
+             ()
+             ChoirStaff)
+     (choral-cautionary #f
+                        (Voice ,(make-accidental-rule 'same-octave 0)
+                               Staff
+                               ,(make-accidental-rule 'same-octave 0))
+                        (Staff ,(make-accidental-rule 'any-octave 0)
+                               ,(make-accidental-rule 'same-octave 1)
+                               ChoirStaff
+                               ,(make-accidental-rule 'any-octave 0)
+                               ,(make-accidental-rule 'same-octave 1))
+                        ChoirStaff)
+
      ;; same as modern, but cautionary accidentals are printed for all
      ;; non-natural tones specified by the key signature.
      (teaching #f