update documentation for choral accidental styles

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 958ecb109e095c7fa9605da34647ca2ac0fbfb6c..158e4cf4ae7924455e24363a89764e70530974cb 100644 (file)
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -61,6 +61,12 @@ which scares away people.
 
 @end ignore
 
+@item
+Accidental rules can now be defined across @code{ChoirStaff} contexts.
+Two new rules @code{choral} and @code{choral-cautionary} are available
+that combine the characteristics of @code{modern-voice} and @code{piano}
+or their equivalents with cautionary accidentals.
+
 @item
 The music function @code{\\unfoldRepeats} can now take an
 optional argument-list specifying which type(s) of repeated music

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 4e443522c501bf37589ce30093d02685ecfe7472..d58ca67128fbd0e57e12db6112aaca8238ba5ff1 100644 (file)
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -2207,9 +2207,9 @@ musicB = {
 @funindex choral
 
 This rule is a combination of the @code{modern-voice} and the @code{piano}
-style. It is intended for editions that are used both by singers that only
-follow their own voice, as well as others that read an entire
-@code{ChoirStaff} simultaneously.
+style. It shows all accidentals required for singers that only follow their
+own voice, as well as additional accidentals for readers that follow all
+voices of an entire @code{ChoirStaff} simultaneously.
 
 This accidental style applies to the current @code{ChoirStaff} by default.
 

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index c152189d3c6523aedc6573c37c2402cf54d6a6a6..aad42b51fe08b4a93ebfa9935c516bb7e47b08dc 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -1844,8 +1844,7 @@ on the same staff line."
 
      ;; 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 (as opposed to on the
-     ;; same staff) is always printed.
+     ;; that the first alteration within a voice is always printed.
      (choral #f
              (Voice ,(make-accidental-rule 'same-octave 0)
                     Staff