Merge branch 'release/unstable' into HEAD

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

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 312b1a6eebe986c793c28700500e88546d49b809..491e76f03c870d18f9f7ad664678242880779b88 100644 (file)
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.20"
 
 
 @node Pitches
@@ -255,6 +255,9 @@ that each interval contains.
 }
 @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:
@@ -389,10 +392,10 @@ cis
 
 @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}
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {preventing-extra-naturals-from-being-automatically-added.ly}
 
 @seealso
@@ -784,7 +787,7 @@ see @ref{Instrument transpositions}.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {transposing-pitches-with-minimum-accidentals-smart-transpose.ly}
 
 
@@ -1163,7 +1166,7 @@ in @ref{Formatting cue notes}.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {tweaking-clef-properties.ly}
 
 @seealso
@@ -1257,10 +1260,10 @@ fis
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {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}
 
 
@@ -1317,7 +1320,7 @@ a2 b
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {ottava-text.ly}
 
 
@@ -1440,7 +1443,7 @@ Snippets:
 @cindex automatic accidentals
 @cindex default accidental style
 
-@funindex set-accidental-style
+@funindex \accidentalStyle
 @funindex voice
 @funindex default
 
@@ -1450,7 +1453,7 @@ accidental style to use.  This function is called as follows:
 
 @example
 \new Staff <<
-  #(set-accidental-style 'voice)
+  \accidentalStyle "voice"
   @{ @dots{} @}
 >>
 @end example
@@ -1463,7 +1466,7 @@ scope the style should be changed.  For example, to use the same
 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
@@ -1506,11 +1509,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1526,7 +1529,7 @@ both staves.
   <<
     \context Staff = "up" @{
       %%% change the next line as desired:
-      #(set-accidental-style 'default 'Score)
+      \accidentalStyle #'Score "default"
       \musicA
     @}
     \context Staff = "down" @{
@@ -1589,11 +1592,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1662,11 +1665,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicB
     }
   >>
@@ -1728,11 +1731,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicB
     }
   >>
@@ -1792,11 +1795,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicB
     }
   >>
@@ -1859,11 +1862,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicB
     }
   >>
@@ -1920,11 +1923,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicB
     }
   >>
@@ -1985,7 +1988,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano)
+      \accidentalStyle "piano"
       \musicA
     }
     \context Staff = "down" {
@@ -2045,7 +2048,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano-cautionary)
+      \accidentalStyle "piano-cautionary"
       \musicA
     }
     \context Staff = "down" {
@@ -2104,11 +2107,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicB
     }
   >>
@@ -2161,11 +2164,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicB
     }
   >>
@@ -2221,11 +2224,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicB
     }
   >>
@@ -2278,11 +2281,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicB
     }
   >>
@@ -2338,11 +2341,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicB
     }
   >>
@@ -2400,12 +2403,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicB
     }
   >>
@@ -2460,11 +2463,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicB
     }
   >>
@@ -2519,11 +2522,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicB
     }
   >>
@@ -2568,7 +2571,7 @@ not need a natural sign:
 
 @lilypond[quote]
 {
-  #(set-accidental-style 'modern)
+  \accidentalStyle "modern"
   \time 2/4
   \repeat volta 2 {
     c'2
@@ -2585,12 +2588,12 @@ the accidental style to @code{forget}:
 
 @lilypond[verbatim,quote]
 forget = #(define-music-function (parser location music) (ly:music?) #{
-  #(set-accidental-style 'forget)
+  \accidentalStyle "forget"
   $music
-  #(set-accidental-style 'modern)
+  \accidentalStyle "modern"
 #})
 {
-  #(set-accidental-style 'modern)
+  \accidentalStyle "modern"
   \time 2/4
   \repeat volta 2 {
     c'2
@@ -2637,13 +2640,13 @@ printed if they are not part of the key signature.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {adding-ambitus-per-voice.ly}
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {ambitus-with-multiple-voices.ly}
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {changing-the-ambitus-gap.ly}
 
 
@@ -2821,7 +2824,7 @@ font, see @ref{Setting the staff size}.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {numbers-as-easy-note-heads.ly}
 
 
@@ -2941,7 +2944,7 @@ a2 b c d \break
 
 @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}.