From 8d8a54f9903e27263581f684b0a22dc2aca5d24c Mon Sep 17 00:00:00 2001 From: Alexander Kobel Date: Sun, 18 Dec 2016 23:09:41 +0100 Subject: [PATCH] update documentation for choral accidental styles --- Documentation/changes.tely | 6 ++++++ Documentation/notation/pitches.itely | 6 +++--- scm/music-functions.scm | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Documentation/changes.tely b/Documentation/changes.tely index 958ecb109e..158e4cf4ae 100644 --- 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 4e443522c5..d58ca67128 100644 --- 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 c152189d3c..aad42b51fe 100644 --- 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 -- 2.39.5