Docs: insert language @warning for non-default languages

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

diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index 9224f8e1bb04995e34361f2209c7dd1e9dc070b0..1b7c2c8e1d7499ab4e08170e1322b927d366ad60 100644 (file)
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.61"
+@c \version "2.12.0"
 
 
 @node Pitches
@@ -406,8 +406,13 @@ any standard.
 
 There are predefined sets of note and accidental names for various
 other languages.  To use them, include the language-specific init
-file listed below.  For example, to use English notes names, add
-@code{@w{\include "english.ly"}} to the top of the input file.
+file listed below.  For example, to use English note names, add
+@code{@w{\include "english.ly"}} to the input file.
+
+@warning{Because some other include files (such as @code{@w{predefined-fretboards.ly}})
+use default (Nederlands) note names, the @code{@bs{}include}
+command for the language file should be placed after all other
+LilyPond distribution files.}
 
 The available language files and the note names they define are:
 
@@ -1077,8 +1082,8 @@ playing in unison.
 \new GrandStaff <<
   \new Staff = "violin" {
     \relative c'' {
-      \set Staff.instrumentName = "Vln"
-      \set Staff.midiInstrument = "violin"
+      \set Staff.instrumentName = #"Vln"
+      \set Staff.midiInstrument = #"violin"
       % not strictly necessary, but a good reminder
       \transposition c'
 
@@ -1089,7 +1094,7 @@ playing in unison.
   \new Staff = "clarinet" {
     \relative c'' {
       \set Staff.instrumentName = \markup { Cl (B\flat) }
-      \set Staff.midiInstrument = "clarinet"
+      \set Staff.midiInstrument = #"clarinet"
       \transposition bes
 
       \key d \major
@@ -1104,7 +1109,7 @@ example, a clarinetist may switch from an A clarinet to a B-flat
 clarinet.
 
 @lilypond[verbatim,quote,relative=2]
-\set Staff.instrumentName = "Cl (A)"
+\set Staff.instrumentName = #"Cl (A)"
 \key a \major
 \transposition a
 c d e f