Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / notation / pitches.itely

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 312b1a6eebe986c793c28700500e88546d49b809..e11a4fb1f308b0e36f658aa73eefce03dab5b51a 100644 (file)
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
     Guide, node Updating translation committishes..
 @end ignore
 

-@c \version "2.14.0"
+@c \version "2.19.2"

 
 
 @node Pitches
 
 
 @node Pitches


@@ -87,6 +87,17 @@ octave.
 }
 @end lilypond
 
 }
 @end lilypond
 

+@funindex absolute
+@funindex \absolute
+Music can be marked explicitly as being in absolute octave
+notation by preceding it with @code{\absolute}:
+
+@example
+\absolute @var{musicexpr}
+@end example
+
+will be interpreted in absolute octave entry mode regardless of
+the context it appears in.

 
 @seealso
 Music Glossary:
 
 @seealso
 Music Glossary:


@@ -108,13 +119,13 @@ Snippets:
 @funindex relative
 @funindex \relative
 
 @funindex relative
 @funindex \relative
 

-When octaves are specified in absolute mode it is easy to
-accidentally put a pitch in the wrong octave.  Relative octave
-mode reduces these errors since most of the time it is not
-necessary to indicate any octaves at all.  Furthermore, in
-absolute mode a single mistake may be difficult to spot, while in
-relative mode a single error puts the rest of the piece off by one
-octave.
+Absolute octave entry requires specifying the octave for every
+single note.  Relative octave entry, in contrast, specifies each
+octave in relation to the last note: changing one note's octave
+will affect all of the following notes.
+
+Relative note mode has to be entered explicitly using the
+@code{\relative} command:

 
 @example
 \relative @var{startpitch} @var{musicexpr}
 
 @example
 \relative @var{startpitch} @var{musicexpr}


@@ -144,8 +155,27 @@ octaves.
 @item
 The pitch of the first note is relative to
 @code{@var{startpitch}}.  @code{@var{startpitch}} is specified in
 @item
 The pitch of the first note is relative to
 @code{@var{startpitch}}.  @code{@var{startpitch}} is specified in

-absolute octave mode, and it is recommended that it be a octave of
-@code{c}.
+absolute octave mode.  Which choices are meaningful?
+
+@table @asis
+@item an octave of @code{c}
+Identifying middle C with @code{c'} is quite basic, so finding
+octaves of @code{c} tends to be straightforward.  If your music
+starts with @code{gis} above @code{c'''}, you'd write something
+like @code{\relative c''' @{ gis' @dots{} @}}
+
+@item an octave of the first note inside
+Writing @code{\relative gis''' @{ gis @dots{} @}} makes it easy to
+determine the absolute pitch of the first note inside.
+
+@item no explicit starting pitch
+This (namely writing @code{\relative @{ gis''' @dots{} @}}) can be
+viewed as a compact version of the previous option: the first note
+inside is written in absolute pitch itself.  This happens to be
+equivalent to choosing @code{f} as the reference pitch.
+@end table
+
+The documentation will usually employ the first option.

 @end itemize
 
 Here is the relative mode shown in action:
 @end itemize
 
 Here is the relative mode shown in action:


@@ -255,6 +285,9 @@ that each interval contains.
 }
 @end lilypond
 
 }
 @end lilypond
 

+One consequence of these rules is that the first note inside
+@code{@w{\relative f}} music is interpreted just the same as
+if it was written in absolute pitch mode.

 
 @seealso
 Music Glossary:
 
 @seealso
 Music Glossary:


@@ -271,7 +304,6 @@ Snippets:
 Internals Reference:
 @rinternals{RelativeOctaveMusic}.
 
 Internals Reference:
 @rinternals{RelativeOctaveMusic}.
 

-

 @cindex relative octave entry and transposition
 @cindex transposition and relative octave entry
 
 @cindex relative octave entry and transposition
 @cindex transposition and relative octave entry
 


@@ -283,14 +315,6 @@ Internals Reference:
 @funindex relative
 
 
 @funindex relative
 
 

-@c DEPRECATED
-If no @code{@var{startpitch}} is specified for @code{\relative},
-then@tie{}@code{c'} is assumed.  However, this is a deprecated
-option and may disappear in future versions, so its use is
-discouraged.
-
-
-

 @node Accidentals
 @unnumberedsubsubsec Accidentals
 
 @node Accidentals
 @unnumberedsubsubsec Accidentals
 


@@ -380,8 +404,8 @@ cis cis cis! cis? c c c! c?
 Accidentals on tied notes are only printed at the beginning of a
 new system:
 
 Accidentals on tied notes are only printed at the beginning of a
 new system:
 

-@lilypond[verbatim,quote,relative=2]
-cis1~ cis~
+@lilypond[verbatim,quote,relative=2,ragged-right]
+cis1~ 1~

 \break
 cis
 @end lilypond
 \break
 cis
 @end lilypond


@@ -389,10 +413,10 @@ cis
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle,ragged-right]
+@lilypondfile[verbatim,quote,texidoc,doctitle,ragged-right]

 {hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly}
 
 {hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly}
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {preventing-extra-naturals-from-being-automatically-added.ly}
 
 @seealso
 {preventing-extra-naturals-from-being-automatically-added.ly}
 
 @seealso


@@ -421,18 +445,15 @@ Internals Reference:
 @rinternals{AccidentalCautionary},
 @rinternals{accidental-interface}.
 
 @rinternals{AccidentalCautionary},
 @rinternals{accidental-interface}.
 

-

 @cindex accidental, quarter-tone
 @cindex quarter-tone accidental
 
 @knownissues
 @cindex accidental, quarter-tone
 @cindex quarter-tone accidental
 
 @knownissues

-

 There are no generally accepted standards for denoting
 quarter-tone accidentals, so LilyPond's symbol does not conform to
 any standard.
 
 
 There are no generally accepted standards for denoting
 quarter-tone accidentals, so LilyPond's symbol does not conform to
 any standard.
 
 

-

 @node Note names in other languages
 @unnumberedsubsubsec Note names in other languages
 
 @node Note names in other languages
 @unnumberedsubsubsec Note names in other languages
 


@@ -468,9 +489,9 @@ The available languages and the note names they define are:
   @tab c d e f g a b h
 @item @code{english}
   @tab c d e f g a bf b
   @tab c d e f g a b h
 @item @code{english}
   @tab c d e f g a bf b

-@item @code{espanol}
+@item @code{espanol} or @code{español}

   @tab do re mi fa sol la sib si
   @tab do re mi fa sol la sib si

-@item @code{italiano}
+@item @code{italiano} or @code{français}

   @tab do re mi fa sol la sib si
 @item @code{norsk}
   @tab c d e f g a b h
   @tab do re mi fa sol la sib si
 @item @code{norsk}
   @tab c d e f g a b h


@@ -501,9 +522,9 @@ also vary depending on the language:
 @item @code{english}
   @tab -s/-sharp @tab -f/-flat @tab -ss/-x/-sharpsharp
     @tab -ff/-flatflat
 @item @code{english}
   @tab -s/-sharp @tab -f/-flat @tab -ss/-x/-sharpsharp
     @tab -ff/-flatflat

-@item @code{espanol}
+@item @code{espanol} or @code{español}

   @tab -s @tab -b @tab -ss/-x @tab -bb
   @tab -s @tab -b @tab -ss/-x @tab -bb

-@item @code{italiano}
+@item @code{italiano} or @code{français}

   @tab -d @tab -b @tab -dd @tab -bb
 @item @code{norsk}
   @tab -iss/-is @tab -ess/-es @tab -ississ/-isis
   @tab -d @tab -b @tab -dd @tab -bb
 @item @code{norsk}
   @tab -iss/-is @tab -ess/-es @tab -ississ/-isis


@@ -555,9 +576,9 @@ appear in this table do not provide special note names yet.
   @tab -ih @tab -eh @tab -isih @tab -eseh
 @item @code{english}
   @tab -qs @tab -qf @tab -tqs @tab -tqf
   @tab -ih @tab -eh @tab -isih @tab -eseh
 @item @code{english}
   @tab -qs @tab -qf @tab -tqs @tab -tqf

-@item @code{espanol}
+@item @code{espanol} or @code{español}

   @tab -cs @tab -cb @tab -tcs @tab -tcb
   @tab -cs @tab -cb @tab -tcs @tab -tcb

-@item @code{italiano}
+@item @code{italiano} or @code{français}

   @tab -sd @tab -sb @tab -dsd @tab -bsb
 @item @code{portugues}
   @tab -sqt @tab -bqt @tab -stqt @tab -btqt
   @tab -sd @tab -sb @tab -dsd @tab -bsb
 @item @code{portugues}
   @tab -sqt @tab -bqt @tab -stqt @tab -btqt


@@ -570,7 +591,6 @@ Western classical music, also referred to as
 pitches and tuning systems are also supported: see
 @ref{Common notation for non-Western music}.
 
 pitches and tuning systems are also supported: see
 @ref{Common notation for non-Western music}.
 

-

 @seealso
 Music Glossary:
 @rglos{Pitch names},
 @seealso
 Music Glossary:
 @rglos{Pitch names},


@@ -663,7 +683,6 @@ checks fail, but the second one does not fail.
 }
 @end lilypond
 
 }
 @end lilypond
 

-

 @seealso
 Snippets:
 @rlsr{Pitches}.
 @seealso
 Snippets:
 @rlsr{Pitches}.


@@ -784,10 +803,9 @@ see @ref{Instrument transpositions}.
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {transposing-pitches-with-minimum-accidentals-smart-transpose.ly}
 
 {transposing-pitches-with-minimum-accidentals-smart-transpose.ly}
 

-

 @seealso
 Notation Reference:
 @ref{Instrument transpositions},
 @seealso
 Notation Reference:
 @ref{Instrument transpositions},


@@ -802,7 +820,6 @@ Snippets:
 Internals Reference:
 @rinternals{TransposedMusic}.
 
 Internals Reference:
 @rinternals{TransposedMusic}.
 

-

 @funindex \transpose
 @funindex transpose
 @funindex \chordmode
 @funindex \transpose
 @funindex transpose
 @funindex \chordmode


@@ -811,7 +828,6 @@ Internals Reference:
 @funindex relative
 
 @knownissues
 @funindex relative
 
 @knownissues

-

 The relative conversion will not affect @code{\transpose},
 @code{\chordmode} or @code{\relative} sections in its argument.  To use
 relative mode within transposed music, an additional @code{\relative}
 The relative conversion will not affect @code{\transpose},
 @code{\chordmode} or @code{\relative} sections in its argument.  To use
 relative mode within transposed music, an additional @code{\relative}


@@ -829,15 +845,16 @@ rather than e-triple-flat).
 @cindex operation, inversion
 @funindex \inversion
 
 @cindex operation, inversion
 @funindex \inversion
 

-A music expression can be inverted with:
+A music expression can be inverted and transposed in a single
+operation with:

 
 @example
 
 @example

-\inversion @var{from-pitch} @var{to-pitch} @var{musicexpr}
+\inversion @var{around-pitch} @var{to-pitch} @var{musicexpr}

 @end example
 
 @end example
 

-The @code{@var{musicexpr}} is inverted interval-by-interval,
-and then transposed so that @code{@var{from-pitch}} is mapped
-to @code{@var{to-pitch}}.
+The @code{@var{musicexpr}} is inverted interval-by-interval around
+@code{@var{around-pitch}}, and then transposed so that
+@code{@var{around-pitch}} is mapped to @code{@var{to-pitch}}.

 
 @lilypond[verbatim,quote]
 music = \relative c' { c d e f }
 
 @lilypond[verbatim,quote]
 music = \relative c' { c d e f }


@@ -848,6 +865,10 @@ music = \relative c' { c d e f }
 }
 @end lilypond
 
 }
 @end lilypond
 

+@warning{Motifs to be inverted should be expressed in absolute form
+or be first converted to absolute form by enclosing them in a
+@code{\relative} block.}
+

 @seealso
 Notation Reference:
 @ref{Modal transformations},
 @seealso
 Notation Reference:
 @ref{Modal transformations},


@@ -904,7 +925,7 @@ It may also be reversed to produce its @notation{retrograde}, see
 @warning{Any note that does not lie within the given scale will be
 left untransformed.}
 
 @warning{Any note that does not lie within the given scale will be
 left untransformed.}
 

-@subsubheading Modal transposition
+@subsubsubheading Modal transposition

 
 @cindex modal transposition
 @cindex transposition, modal
 
 @cindex modal transposition
 @cindex transposition, modal


@@ -961,7 +982,7 @@ motif = \relative c' { c8 d e f g a b c }
 }
 @end lilypond
 
 }
 @end lilypond
 

-@subsubheading Modal inversion
+@subsubsubheading Modal inversion

 
 @cindex modal inversion
 @cindex inversion, modal
 
 @cindex modal inversion
 @cindex inversion, modal


@@ -1083,8 +1104,16 @@ This section discusses how to alter the output of pitches.
 @funindex \clef
 @funindex clef
 
 @funindex \clef
 @funindex clef
 

-The clef may be altered.  Middle C is shown in every example.  The
-following clef names can (but do not need to) be enclosed in quotes.
+Without any explicit command, the default clef for LilyPond is the
+treble (or @emph{G}) clef.
+
+@lilypond[verbatim,quote,relative=1,ragged-right]
+c2 c
+@end lilypond
+
+However, the clef can be changed by using the @code{\clef} command and
+an appropriate clef name.  @emph{Middle C} is shown in each of the
+following examples.

 
 @lilypond[verbatim,quote,relative=1]
 \clef treble
 
 @lilypond[verbatim,quote,relative=1]
 \clef treble


@@ -1097,40 +1126,23 @@ c2 c
 c2 c
 @end lilypond
 
 c2 c
 @end lilypond
 

-Other clefs include:
-
-@lilypond[verbatim,quote,relative=1]
-\clef french
-c2 c
-\clef soprano
-c2 c
-\clef mezzosoprano
-c2 c
-\clef baritone
-c2 c
+For the full range of possible clef names see @ref{Clef styles}.

 
 

-\break
+Specialized clefs, such as those used in @emph{Ancient} music, are
+described in @ref{Mensural clefs} and @ref{Gregorian clefs}.  Music that
+requires tablature clefs is discussed in @ref{Default tablatures} and
+@ref{Custom tablatures}.

 
 

-\clef varbaritone
-c2 c
-\clef subbass
-c2 c
-\clef percussion
-c2 c
-
-\break
-
-\clef G   % synonym for treble
-c2 c
-\clef F   % synonym for bass
-c2 c
-\clef C   % synonym for alto
-c2 c
-@end lilypond
+@cindex Cue clefs
+@cindex Clefs with cue notes
+For mixing clefs when using cue notes, see the @code{\cueClef} and
+@code{\cueDuringWithClef} commands in @ref{Formatting cue notes}.

 
 @cindex transposing clef
 @cindex clef, transposing
 @cindex octave transposition
 
 @cindex transposing clef
 @cindex clef, transposing
 @cindex octave transposition

+@cindex optional octave transposition
+@cindex octave transposition, optional

 @cindex choral tenor clef
 @cindex tenor clef, choral
 
 @cindex choral tenor clef
 @cindex tenor clef, choral
 


@@ -1155,15 +1167,27 @@ c2 c
 c2 c
 @end lilypond
 
 c2 c
 @end lilypond
 

-Some special purpose clefs are described in @ref{Mensural clefs},
-@ref{Gregorian clefs}, @ref{Default tablatures}, and @ref{Custom
-tablatures}.  For mixing different clefs when using cue notes within a
-score, see the @code{\cueClef} and @code{\cueDuringWithClef} functions
-in @ref{Formatting cue notes}.
+Optional octavation can be obtained by enclosing the numeric
+argument in parentheses or brackets:
+
+@lilypond[verbatim,quote,relative=1]
+\clef "treble_(8)"
+c2 c
+\clef "bass^[15]"
+c2 c
+@end lilypond
+
+The pitches are displayed as if the numeric argument were
+given without parentheses/brackets.

 
 @snippets
 
 @snippets

+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{forcing-a-clef-symbol-to-be-displayed.ly}
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{keep-change-clefs-full-sized.ly}

 
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {tweaking-clef-properties.ly}
 
 @seealso
 {tweaking-clef-properties.ly}
 
 @seealso


@@ -1174,15 +1198,33 @@ Notation Reference:
 @ref{Custom tablatures},
 @ref{Formatting cue notes}.
 
 @ref{Custom tablatures},
 @ref{Formatting cue notes}.
 

+Installed Files:
+@file{../scm/parser-clef.scm}.
+

 Snippets:
 @rlsr{Pitches}.
 
 Internals Reference:
 @rinternals{Clef_engraver},
 @rinternals{Clef},
 Snippets:
 @rlsr{Pitches}.
 
 Internals Reference:
 @rinternals{Clef_engraver},
 @rinternals{Clef},

-@rinternals{OctavateEight},
+@rinternals{ClefModifier},

 @rinternals{clef-interface}.
 
 @rinternals{clef-interface}.
 

+@knownissues
+Ottavation numbers attached to clefs are treated as separate grobs.  So
+any @code{\override} done to the @var{Clef} will also need to be
+applied, as a separate @code{\override}, to the @var{ClefModifier}
+grob.
+
+@lilypond[fragment,quote,verbatim,relative=1]
+\new Staff \with {
+  \override Clef.color = #blue
+  \override ClefModifier.color = #red
+}
+
+\clef "treble_8" c4
+@end lilypond
+

 
 @node Key signature
 @unnumberedsubsubsec Key signature
 
 @node Key signature
 @unnumberedsubsubsec Key signature


@@ -1254,16 +1296,46 @@ f
 fis
 @end lilypond
 
 fis
 @end lilypond
 

+Additional modes can be defined, by listing the alterations
+for each scale step when the mode starts on C.
+
+@lilypond[verbatim,quote]
+freygish = #`((0 . ,NATURAL) (1 . ,FLAT) (2 . ,NATURAL)
+    (3 . ,NATURAL) (4 . ,NATURAL) (5 . ,FLAT) (6 . ,FLAT))
+
+\relative c' {
+  \key c \freygish c4 des e f
+  \bar "||" \key d \freygish d es fis g
+}
+@end lilypond
+
+Accidentals in the key signature may be printed in octaves other
+than their traditional positions, or in multiple octaves, by
+using the @code{flat-positions} and @code{sharp-positions}
+properties of @code{KeySignature}.  Entries in these properties
+specify the range of staff-positions where accidentals will be
+printed.  If a single position is specified in an entry, the
+accidentals are placed within the octave ending at that staff
+position.
+
+@lilypond[verbatim, quote,relative=0]
+\override Staff.KeySignature.flat-positions = #'((-5 . 5))
+\override Staff.KeyCancellation.flat-positions = #'((-5 . 5))
+\clef bass \key es \major es g bes d
+\clef treble \bar "||" \key es \major es g bes d
+
+\override Staff.KeySignature.sharp-positions = #'(2)
+\bar "||" \key b \major b fis b2
+@end lilypond

 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly}
 
 {preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly}
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {non-traditional-key-signatures.ly}
 
 {non-traditional-key-signatures.ly}
 

-

 @seealso
 Music Glossary:
 @rglos{church mode},
 @seealso
 Music Glossary:
 @rglos{church mode},


@@ -1281,7 +1353,6 @@ Internals Reference:
 @rinternals{Key_performer},
 @rinternals{KeyCancellation},
 @rinternals{KeySignature},
 @rinternals{Key_performer},
 @rinternals{KeyCancellation},
 @rinternals{KeySignature},

-@rinternals{key-cancellation-interface},

 @rinternals{key-signature-interface}.
 
 
 @rinternals{key-signature-interface}.
 
 


@@ -1317,9 +1388,11 @@ a2 b
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {ottava-text.ly}
 
 {ottava-text.ly}
 

+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{adding-an-ottava-marking-to-a-single-voice.ly}

 
 @seealso
 Music Glossary:
 
 @seealso
 Music Glossary:


@@ -1399,24 +1472,36 @@ playing in unison.
 @end lilypond
 
 The @code{\transposition} may be changed during a piece.  For
 @end lilypond
 
 The @code{\transposition} may be changed during a piece.  For

-example, a clarinetist may switch from an A clarinet to a B-flat
-clarinet.
-
-@lilypond[verbatim,quote,relative=2]
-\set Staff.instrumentName = #"Cl (A)"
-\key a \major
-\transposition a
-c d e f
-\textLengthOn
-s1*0^\markup { Switch to B\flat clarinet }
-R1
+example, a clarinetist may be required to switch from an A clarinet
+to a B-flat clarinet.

 
 

-\key bes \major
-\transposition bes
-c2 g
+@lilypond[verbatim,quote]
+flute = \relative c'' {
+  \key f \major
+  \cueDuring #"clarinet" #DOWN {
+    R1 _\markup\tiny "clarinet"
+    c4 f e d
+    R1 _\markup\tiny "clarinet"
+  }
+}
+clarinet = \relative c'' {
+  \key aes \major
+  \transposition a
+  aes4 bes c des
+  R1^\markup { muta in B\flat }
+  \key g \major
+  \transposition bes
+  d2 g,
+}
+\addQuote "clarinet" \clarinet
+<<
+  \new Staff \with { instrumentName = #"Flute" }
+    \flute
+  \new Staff \with { instrumentName = #"Cl (A)" }
+    \clarinet
+>>

 @end lilypond
 
 @end lilypond
 

-

 @seealso
 Music Glossary:
 @rglos{concert pitch},
 @seealso
 Music Glossary:
 @rglos{concert pitch},


@@ -1440,7 +1525,7 @@ Snippets:
 @cindex automatic accidentals
 @cindex default accidental style
 
 @cindex automatic accidentals
 @cindex default accidental style
 

-@funindex set-accidental-style
+@funindex \accidentalStyle

 @funindex voice
 @funindex default
 
 @funindex voice
 @funindex default
 


@@ -1450,7 +1535,7 @@ accidental style to use.  This function is called as follows:
 
 @example
 \new Staff <<
 
 @example
 \new Staff <<

-  #(set-accidental-style 'voice)
+  \accidentalStyle voice

   @{ @dots{} @}
 >>
 @end example
   @{ @dots{} @}
 >>
 @end example


@@ -1463,7 +1548,7 @@ scope the style should be changed.  For example, to use the same
 style in all staves of the current @code{StaffGroup}, use:
 
 @example
 style in all staves of the current @code{StaffGroup}, use:
 
 @example

-#(set-accidental-style 'voice 'StaffGroup)
+\accidentalStyle StaffGroup.voice

 @end example
 
 The following accidental styles are supported.  To demonstrate
 @end example
 
 The following accidental styles are supported.  To demonstrate


@@ -1489,11 +1574,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -1506,11 +1591,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'default)
+      \accidentalStyle default

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'default)
+      \accidentalStyle default

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -1526,7 +1611,7 @@ both staves.
   <<
     \context Staff = "up" @{
       %%% change the next line as desired:
   <<
     \context Staff = "up" @{
       %%% change the next line as desired:

-      #(set-accidental-style 'default 'Score)
+      \accidentalStyle Score.default

       \musicA
     @}
     \context Staff = "down" @{
       \musicA
     @}
     \context Staff = "down" @{


@@ -1572,11 +1657,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -1589,11 +1674,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'default)
+      \accidentalStyle default

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'default)
+      \accidentalStyle default

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -1645,11 +1730,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -1662,11 +1747,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'voice)
+      \accidentalStyle voice

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'voice)
+      \accidentalStyle voice

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -1711,11 +1796,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -1728,11 +1813,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'modern)
+      \accidentalStyle modern

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'modern)
+      \accidentalStyle modern

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -1775,11 +1860,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -1792,11 +1877,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'modern-cautionary)
+      \accidentalStyle modern-cautionary

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'modern-cautionary)
+      \accidentalStyle modern-cautionary

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -1842,11 +1927,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -1859,11 +1944,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'modern-voice)
+      \accidentalStyle modern-voice

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'modern-voice)
+      \accidentalStyle modern-voice

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -1903,11 +1988,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -1920,11 +2005,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle modern-voice-cautionary

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle modern-voice-cautionary

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -1968,11 +2053,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -1985,7 +2070,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'piano)
+      \accidentalStyle piano

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {


@@ -2028,11 +2113,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -2045,7 +2130,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'piano-cautionary)
+      \accidentalStyle piano-cautionary

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {


@@ -2087,11 +2172,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -2104,11 +2189,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'neo-modern)
+      \accidentalStyle neo-modern

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'neo-modern)
+      \accidentalStyle neo-modern

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -2144,11 +2229,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -2161,11 +2246,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle neo-modern-cautionary

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle neo-modern-cautionary

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -2204,11 +2289,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -2221,11 +2306,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle neo-modern-voice

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle neo-modern-voice

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -2261,11 +2346,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -2278,11 +2363,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle neo-modern-voice-cautionary

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle neo-modern-voice-cautionary

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -2321,11 +2406,69 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>
+      \change Staff = up
+      cis' cis
+      \change Staff = down
+      <fis, a> <fis a>]
+      \showStaffSwitch
+      \change Staff = up
+      dis'4 |
+      \change Staff = down
+      <fis, a cis>4 gis <f a d>2 |
+    }
+  }
+}
+
+\new PianoStaff {
+  <<
+    \context Staff = "up" {
+      \accidentalStyle dodecaphonic
+      \musicA
+    }
+    \context Staff = "down" {
+      \accidentalStyle dodecaphonic
+      \musicB
+    }
+  >>
+}
+@end lilypond
+
+@item dodecaphonic-no-repeat
+
+@cindex dodecaphonic accidental style
+@cindex dodecaphonic style, neo-modern
+
+@funindex dodecaphonic-no-repeat
+
+Like with the dodecaphonic accidental style @emph{every} note
+gets an accidental sign by default, but accidentals are
+suppressed for pitches immediately repeated within the same staff.
+
+@lilypond[quote]
+musicA = {
+  <<
+    \relative c' {
+      cis'8 fis, bes4 <a cis>8 f bis4 |
+      cis2. <c, g'>4 |
+    }
+    \\
+    \relative c' {
+      ais'2 cis, |
+      fis8 b a4 cis2 |
+    }
+  >>
+}
+
+musicB = {
+  \clef bass
+  \new Voice {
+    \voiceTwo \relative c' {
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -2338,11 +2481,71 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'dodecaphonic)
+      \accidentalStyle dodecaphonic-no-repeat

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'dodecaphonic)
+      \accidentalStyle dodecaphonic-no-repeat
+      \musicB
+    }
+  >>
+}
+@end lilypond
+
+
+@item dodecaphonic-first
+
+@cindex dodecaphonic accidental style
+@cindex dodecaphonic style, neo-modern
+
+@funindex dodecaphonic-first
+
+Similar to the dodecaphonic accidental style @emph{every} pitch
+gets an accidental sign, but only the first time it is encountered
+in a measure.  Accidentals are only remembered for the actual octave
+but throughout voices.
+
+@lilypond[quote]
+musicA = {
+  <<
+    \relative c' {
+      cis'8 fis, bes4 <a cis>8 f bis4 |
+      cis2. <c, g'>4 |
+    }
+    \\
+    \relative c' {
+      ais'2 cis, |
+      fis8 b a4 cis2 |
+    }
+  >>
+}
+
+musicB = {
+  \clef bass
+  \new Voice {
+    \voiceTwo \relative c' {
+      <fis, a cis>8[ <fis a cis>
+      \change Staff = up
+      cis' cis
+      \change Staff = down
+      <fis, a> <fis a>]
+      \showStaffSwitch
+      \change Staff = up
+      dis'4 |
+      \change Staff = down
+      <fis, a cis>4 gis <f a d>2 |
+    }
+  }
+}
+
+\new PianoStaff {
+  <<
+    \context Staff = "up" {
+      \accidentalStyle dodecaphonic-first
+      \musicA
+    }
+    \context Staff = "down" {
+      \accidentalStyle dodecaphonic-first

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -2363,7 +2566,7 @@ Accidentals are printed like with @code{modern}, but cautionary
 accidentals are added for all sharp or flat tones specified by the
 key signature, except if the note is immediately repeated.
 
 accidentals are added for all sharp or flat tones specified by the
 key signature, except if the note is immediately repeated.
 

-@lilypond[quote]
+@lilypond[quote,staffsize=18]

 musicA = {
   <<
     \relative c' {
 musicA = {
   <<
     \relative c' {


@@ -2382,11 +2585,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -2400,12 +2603,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
   <<
     \context Staff = "up" {
       \key fis \minor

-      #(set-accidental-style 'teaching)
+      \accidentalStyle teaching

       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor

-      #(set-accidental-style 'teaching)
+      \accidentalStyle teaching

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -2443,11 +2646,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -2460,11 +2663,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'no-reset)
+      \accidentalStyle no-reset

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'no-reset)
+      \accidentalStyle no-reset

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -2502,11 +2705,11 @@ musicB = {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {
   \clef bass
   \new Voice {
     \voiceTwo \relative c' {

-      <fis, a cis>8 <fis a cis>
+      <fis, a cis>8[ <fis a cis>

       \change Staff = up
       cis' cis
       \change Staff = down
       \change Staff = up
       cis' cis
       \change Staff = down

-      <fis, a> <fis a>
+      <fis, a> <fis a>]

       \showStaffSwitch
       \change Staff = up
       dis'4 |
       \showStaffSwitch
       \change Staff = up
       dis'4 |


@@ -2519,11 +2722,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
 \new PianoStaff {
   <<
     \context Staff = "up" {

-      #(set-accidental-style 'forget)
+      \accidentalStyle forget

       \musicA
     }
     \context Staff = "down" {
       \musicA
     }
     \context Staff = "down" {

-      #(set-accidental-style 'forget)
+      \accidentalStyle forget

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -2545,14 +2748,12 @@ Internals Reference:
 @rinternals{AccidentalPlacement},
 @rinternals{accidental-suggestion-interface}.
 
 @rinternals{AccidentalPlacement},
 @rinternals{accidental-suggestion-interface}.
 

-

 @cindex accidentals and simultaneous notes
 @cindex simultaneous notes and accidentals
 @cindex accidentals in chords
 @cindex chords, accidentals in
 
 @knownissues
 @cindex accidentals and simultaneous notes
 @cindex simultaneous notes and accidentals
 @cindex accidentals in chords
 @cindex chords, accidentals in
 
 @knownissues

-

 Simultaneous notes are not considered in the automatic
 determination of accidentals; only previous notes and the key
 signature are considered.  Forcing accidentals with@tie{}@code{!}
 Simultaneous notes are not considered in the automatic
 determination of accidentals; only previous notes and the key
 signature are considered.  Forcing accidentals with@tie{}@code{!}


@@ -2568,7 +2769,7 @@ not need a natural sign:
 
 @lilypond[quote]
 {
 
 @lilypond[quote]
 {

-  #(set-accidental-style 'modern)
+  \accidentalStyle modern

   \time 2/4
   \repeat volta 2 {
     c'2
   \time 2/4
   \repeat volta 2 {
     c'2


@@ -2585,12 +2786,12 @@ the accidental style to @code{forget}:
 
 @lilypond[verbatim,quote]
 forget = #(define-music-function (parser location music) (ly:music?) #{
 
 @lilypond[verbatim,quote]
 forget = #(define-music-function (parser location music) (ly:music?) #{

-  #(set-accidental-style 'forget)
-  $music
-  #(set-accidental-style 'modern)
+  \accidentalStyle forget
+  #music
+  \accidentalStyle modern

 #})
 {
 #})
 {

-  #(set-accidental-style 'modern)
+  \accidentalStyle modern

   \time 2/4
   \repeat volta 2 {
     c'2
   \time 2/4
   \repeat volta 2 {
     c'2


@@ -2602,6 +2803,7 @@ forget = #(define-music-function (parser location music) (ly:music?) #{
 }
 @end lilypond
 
 }
 @end lilypond
 

+

 @node Ambitus
 @unnumberedsubsubsec Ambitus
 
 @node Ambitus
 @unnumberedsubsubsec Ambitus
 


@@ -2637,16 +2839,15 @@ printed if they are not part of the key signature.
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {adding-ambitus-per-voice.ly}
 
 {adding-ambitus-per-voice.ly}
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {ambitus-with-multiple-voices.ly}
 
 {ambitus-with-multiple-voices.ly}
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {changing-the-ambitus-gap.ly}
 
 {changing-the-ambitus-gap.ly}
 

-

 @seealso
 Music Glossary:
 @rglos{ambitus}.
 @seealso
 Music Glossary:
 @rglos{ambitus}.


@@ -2664,9 +2865,7 @@ Internals Reference:
 @rinternals{AmbitusNoteHead},
 @rinternals{ambitus-interface}.
 
 @rinternals{AmbitusNoteHead},
 @rinternals{ambitus-interface}.
 

-

 @knownissues
 @knownissues

-

 There is no collision handling in the case of multiple per-voice
 ambitus.
 
 There is no collision handling in the case of multiple per-voice
 ambitus.
 


@@ -2707,13 +2906,13 @@ The appearance of note heads may be altered:
 
 @lilypond[verbatim,quote,relative=2]
 c4 b
 
 @lilypond[verbatim,quote,relative=2]
 c4 b

-\override NoteHead #'style = #'cross
+\override NoteHead.style = #'cross

 c4 b
 c4 b

-\revert NoteHead #'style
+\revert NoteHead.style

 a b
 a b

-\override NoteHead #'style = #'harmonic
+\override NoteHead.style = #'harmonic

 a b
 a b

-\revert NoteHead #'style
+\revert NoteHead.style

 c4 d e f
 @end lilypond
 
 c4 d e f
 @end lilypond
 


@@ -2746,11 +2945,10 @@ As synonyms for @code{\xNote}, @code{\xNotesOn} and @code{\xNotesOff},
 @code{\deadNote}, @code{\deadNotesOn} and @code{\deadNotesOff} can
 be used.  The term @notation{dead note} is commonly used by guitarists.
 
 @code{\deadNote}, @code{\deadNotesOn} and @code{\deadNotesOff} can
 be used.  The term @notation{dead note} is commonly used by guitarists.
 

-There is also a shorthand for diamond shapes which can be used
-only inside chords:
+There is also a similar shorthand for diamond shapes:

 
 @lilypond[verbatim,quote,relative=2]
 
 @lilypond[verbatim,quote,relative=2]

-<c f\harmonic>2 <d a'\harmonic>4 <c g'\harmonic>
+<c f\harmonic>2 <d a'\harmonic>4 <c g'\harmonic> f\harmonic

 @end lilypond
 
 @predefined
 @end lilypond
 
 @predefined


@@ -2821,10 +3019,9 @@ font, see @ref{Setting the staff size}.
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {numbers-as-easy-note-heads.ly}
 
 {numbers-as-easy-note-heads.ly}
 

-

 @seealso
 Notation Reference:
 @ref{Setting the staff size}.
 @seealso
 Notation Reference:
 @ref{Setting the staff size}.


@@ -2941,12 +3138,11 @@ a2 b c d \break
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {applying-note-head-styles-depending-on-the-step-of-the-scale.ly}
 
 To see all note head styles, see @ref{Note head styles}.
 
 {applying-note-head-styles-depending-on-the-step-of-the-scale.ly}
 
 To see all note head styles, see @ref{Note head styles}.
 

-

 @seealso
 Snippets:
 @rlsr{Pitches}.
 @seealso
 Snippets:
 @rlsr{Pitches}.


@@ -2985,20 +3181,18 @@ rhythm.  Such note heads can be created:
   e8 e g a a16( bes) a8 g
   \improvisationOn
   e8 ~
   e8 e g a a16( bes) a8 g
   \improvisationOn
   e8 ~

-  e2 ~ e8 f4 f8 ~
-  f2
+  2 ~ 8 f4 f8 ~
+  2

   \improvisationOff
   a16( bes) a8 g e
 }
 @end lilypond
 
   \improvisationOff
   a16( bes) a8 g e
 }
 @end lilypond
 

-

 @predefined
 @code{\improvisationOn},
 @code{\improvisationOff}.
 @endpredefined
 
 @predefined
 @code{\improvisationOn},
 @code{\improvisationOff}.
 @endpredefined
 

-

 @seealso
 Snippets:
 @rlsr{Pitches}.
 @seealso
 Snippets:
 @rlsr{Pitches}.