Imported Upstream version 2.16.0

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

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 51163474822011ea4a5d8e26b068d8414fcf770e..0b2271e71bd72e7843cdf2677e535862f76a30c5 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.16.0"

 
 
 @node Pitches
 
 
 @node Pitches


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

-

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


@@ -255,6 +254,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 +273,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
 


@@ -282,7 +283,6 @@ Internals Reference:
 @funindex \relative
 @funindex relative
 
 @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
 @c DEPRECATED
 If no @code{@var{startpitch}} is specified for @code{\relative},
 then@tie{}@code{c'} is assumed.  However, this is a deprecated


@@ -290,7 +290,6 @@ option and may disappear in future versions, so its use is
 discouraged.
 
 
 discouraged.
 
 

-

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


@@ -389,10 +388,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 +420,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
 


@@ -570,7 +566,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 +658,6 @@ checks fail, but the second one does not fail.
 }
 @end lilypond
 
 }
 @end lilypond
 

-

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


@@ -784,10 +778,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 +795,6 @@ Snippets:
 Internals Reference:
 @rinternals{TransposedMusic}.
 
 Internals Reference:
 @rinternals{TransposedMusic}.
 

-

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


@@ -811,7 +803,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 +820,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 +840,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},


@@ -1157,20 +1153,22 @@ c2 c
 
 Some special purpose clefs are described in @ref{Mensural clefs},
 @ref{Gregorian clefs}, @ref{Default tablatures}, and @ref{Custom
 
 Some special purpose clefs are described in @ref{Mensural clefs},
 @ref{Gregorian clefs}, @ref{Default tablatures}, and @ref{Custom

-tablatures}.
+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}.

 
 @snippets
 
 
 @snippets
 

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

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

-

 @seealso
 Notation Reference:
 @ref{Mensural clefs},
 @ref{Gregorian clefs},
 @ref{Default tablatures},
 @seealso
 Notation Reference:
 @ref{Mensural clefs},
 @ref{Gregorian clefs},
 @ref{Default tablatures},

-@ref{Custom tablatures}.
+@ref{Custom tablatures},
+@ref{Formatting cue notes}.

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


@@ -1255,13 +1253,12 @@ fis
 
 @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},


@@ -1315,10 +1312,9 @@ a2 b
 
 @snippets
 
 
 @snippets
 

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

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

-

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


@@ -1406,7 +1402,7 @@ clarinet.
 \transposition a
 c d e f
 \textLengthOn
 \transposition a
 c d e f
 \textLengthOn

-s1*0^\markup { Switch to B\flat clarinet }
+<>^\markup { Switch to B\flat clarinet }

 R1
 
 \key bes \major
 R1
 
 \key bes \major


@@ -1414,7 +1410,6 @@ R1
 c2 g
 @end lilypond
 
 c2 g
 @end lilypond
 

-

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


@@ -1438,7 +1433,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
 


@@ -1448,7 +1443,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


@@ -1461,7 +1456,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


@@ -1487,11 +1482,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 |


@@ -1504,11 +1499,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
     }
   >>


@@ -1524,7 +1519,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" @{


@@ -1570,11 +1565,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 |


@@ -1587,11 +1582,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
     }
   >>


@@ -1643,11 +1638,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 |


@@ -1660,11 +1655,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
     }
   >>


@@ -1709,11 +1704,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 |


@@ -1726,11 +1721,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
     }
   >>


@@ -1773,11 +1768,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 |


@@ -1790,11 +1785,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
     }
   >>


@@ -1840,11 +1835,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 |


@@ -1857,11 +1852,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
     }
   >>


@@ -1901,11 +1896,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 |


@@ -1918,11 +1913,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
     }
   >>


@@ -1966,11 +1961,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 |


@@ -1983,7 +1978,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" {


@@ -2026,11 +2021,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 |


@@ -2043,7 +2038,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" {


@@ -2085,11 +2080,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 |


@@ -2102,11 +2097,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
     }
   >>


@@ -2142,11 +2137,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 |


@@ -2159,11 +2154,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
     }
   >>


@@ -2202,11 +2197,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 |


@@ -2219,11 +2214,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
     }
   >>


@@ -2259,11 +2254,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 |


@@ -2276,11 +2271,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
     }
   >>


@@ -2319,11 +2314,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 |


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

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

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

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

       \musicB
     }
   >>
       \musicB
     }
   >>


@@ -2361,7 +2356,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' {


@@ -2380,11 +2375,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 |


@@ -2398,12 +2393,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
     }
   >>


@@ -2441,11 +2436,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 |


@@ -2458,11 +2453,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
     }
   >>


@@ -2500,11 +2495,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 |


@@ -2517,11 +2512,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
     }
   >>


@@ -2543,14 +2538,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{!}


@@ -2566,7 +2559,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


@@ -2583,12 +2576,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


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

+

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


@@ -2635,16 +2629,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}.


@@ -2662,9 +2655,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.
 


@@ -2819,10 +2810,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}.


@@ -2939,12 +2929,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}.


@@ -2990,13 +2979,11 @@ rhythm.  Such note heads can be created:
 }
 @end lilypond
 
 }
 @end lilypond
 

-

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

-

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