X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fpitches.itely;h=764a993abeb134641c2e6279e097e371f8468508;hb=54ddf4a92964f132013eb4bc0e6350846b5e1003;hp=7ab2d9289225c9f621efda6387a2e8005e4dcd01;hpb=388aa60acc492bc088855aaf6da2fbc73dc1ec3e;p=lilypond.git diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely index 7ab2d92892..764a993abe 100644 --- a/Documentation/user/pitches.itely +++ b/Documentation/user/pitches.itely @@ -244,6 +244,7 @@ see @rlearning{Accidentals and key signatures}.} @cindex sharp, double @cindex double flat @cindex flat, double +@cindex natural sign A @notation{sharp} pitch is made by adding @code{is} to the note name, and a @notation{flat} pitch by adding @code{es}. As you might expect, @@ -316,8 +317,7 @@ cis @seealso Music Glossary: @rglos{sharp}, @rglos{flat}, @rglos{double sharp}, -@rglos{double flat}, @rglos{Pitch names}. -@c FIXME: add @rglos{quarter-tone} +@rglos{double flat}, @rglos{Pitch names}, @rglos{quarter-tone}. Learning Manual: @rlearning{Accidentals and key signatures}. @@ -869,8 +869,7 @@ The @code{set-octavation} function also takes -1 (for 8va bassa), @seealso -Music Glossary: @rglos{ottava}. -@c FIXME? @rglos{15ma}, @rglos{8va}, @rglos{8ve}, @rgloss{octavation} +Music Glossary: @rglos{octavation}. Snippets: @lsrdir{Pitches,Pitches}. @@ -1315,6 +1314,8 @@ musicB = { @cindex accidentals, modern @cindex modern accidentals @cindex multivoice accidentals +@cindex accidental style, modern +@cindex modern accidental style @funindex modern-voice This rule is used for multivoice accidentals to be read both by @@ -1373,6 +1374,9 @@ musicB = { } @end lilypond +@cindex accidental style, modern voice cautionary +@cindex accidental style, cautionary, modern voice +@cindex accidental style, voice, modern cautionary @funindex modern-voice-cautionary @item modern-voice-cautionary @@ -1430,6 +1434,10 @@ musicB = { @item piano @funindex piano accidentals +@cindex piano accidentals +@cindex accidentals, piano +@cindex piano accidental style +@cindex accidental style, piano This rule reflects twentieth-century practice for piano notation. Its behavior is very similar to @code{modern} style, but here @@ -1487,6 +1495,12 @@ musicB = { @item piano-cautionary @funindex #(set-accidental-style 'piano-cautionary) +@cindex accidentals, piano cautionary +@cindex cautionary accidentals, piano +@cindex piano cautionary accidentals +@cindex accidental style, piano cautionary +@cindex cautionary accidental style, piano +@cindex piano cautionary accidental style Same as @code{#(set-accidental-style 'piano)} but with the extra accidentals typeset as cautionaries. @@ -1538,6 +1552,8 @@ musicB = { @item no-reset @funindex no-reset accidental style +@cindex accidental style, no reset +@cindex no reset accidental style This is the same as @code{default} but with accidentals lasting @q{forever} and not only within the same measure: @@ -1590,6 +1606,8 @@ musicB = { @item forget @funindex forget accidental style +@cindex forget accidental style +@cindex accidental style, forget This is the opposite of @code{no-reset}: Accidentals are not remembered at all -- and hence all accidentals are typeset