Add warning about \key and accidentals.

diff --git a/ChangeLog b/ChangeLog
index f391a9416fa4780e55c4dca19b654334b956da25..30c709837997d831e629fe44dc03f6b4e9f851c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-14  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/ tutorial.itely, refman.itely: add warning
+       about \key and accidentals.
+
 2003-09-14  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * Documentation/user/*.itely: manual tweaks

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index e269cc8a5f891df2ada33107a0c11cf6a4997e3c..cfbfede34e5df29c21c9c6bcfbf230cab0370780 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -828,6 +828,29 @@ The key signature indicates the scale in which a piece is played. It
 is denoted by a set of alterations (flats or sharps) at the start of
 the staff.
 
+WARNING!  The key signature only changes the output, not the music
+itself.  An F-sharp in the key of D major is still an F-sharp, not
+an F -- you must type @code{fis}, not @code{f}.  If you don't modify
+a pitch with @code{-is} or @code{-es}, LilyPond will assume that
+you want a natural note.  See this example:
+
+@quotation
+@example
+\key d \major
+fis4 f fes fis
+g2 fis
+@end example
+@end quotation
+
+@lilypond[noindent]
+\score{ \notes { \relative c'{
+\key d \major
+fis4 f fes fis
+g2 fis
+}}}
+@end lilypond
+
+
 @syntax
 
 Setting or changing the key signature is done with the @code{\key}

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 183aba4a124b799cfc8130805b860847c3050078..92d1a175c88a3d6d064744a352c735d0ee82ccdd 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1,4 +1,4 @@
-@c -*-texinfo-*-
+c -*-texinfo-*-
 
 @c TODO:
 @c   * more details about running lilypond; error messages,
@@ -373,7 +373,7 @@ cis1 ees fisis aeses
 @cindex key signature, setting
 
 The key signature is set with the command ``@code{\key}'', followed by
-a pitch and  @code{\major} or @code{\minor}:
+a pitch and @code{\major} or @code{\minor}:
 @quotation
 @example
 \key d \major
@@ -391,6 +391,36 @@ g'
 @end lilypond
 @end quotation
 
+WARNING!  The key signature only affects the way the output is printed,
+not the music itself.  If you type
+
+@example
+@code{
+\key d \major
+d e f g
+}
+@end example
+
+LilyPond will print an F-natural.  An F-sharp in the key of D major
+is still an F-sharp!  To print an F-sharp, you must use @code{fis},
+no matter what the key signature is.  See this example:
+
+@quotation
+@example
+\key d \major
+fis4 f fes fis |
+g2 fis
+@end example
+@end quotation
+
+@lilypond[noindent]
+\score{ \notes { \relative c'{
+\key d \major
+fis4 f fes fis
+g2 fis
+}}}
+@end lilypond
+@separate
 
 @cindex tie
 A tie is created by adding a tilde ``@code{~}'' to the first note