Minor additions and editing.

diff --git a/ChangeLog b/ChangeLog
index 0e784c0b65314a9fb6c14be810d439ae2553b421..b87e3619e03d3f966a7dbae0cfb5b3c881867683 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-08  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/notation.itely: add info about
+       Staff.extraNatural = ##f in Pitches section.  Also
+       fixed some minor issues in the Vocal music section.
+
 2005-01-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/output-ps.scm (white-text): comment out Helvetica font,
@@ -57,6 +63,7 @@
 
        * lily/score-engraver.cc (MUSIC_FONT): Use emmentaler20.
 
+>>>>>>> 1.3039
 2005-01-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/general-scheme.cc (LY_DEFINE): Use snprintf (WAS: sprintf).

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index c0f670baced5f38937edcd0d374ba6504d225a00..9ca44ceeff2d2f760e2d2ef86f1da71afd131ef0 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -107,6 +107,17 @@ cis
 cisis
 @end lilypond
 
+In accordance with standard typsetting rules, a natural sign is printed
+before a sharp or flat if a previous accidental needs to be
+cancelled.  To change this behaviour, use
+@code{\set Staff.extraNatural = ##f}
+
+@lilypond[fragment,quote,raggedright,verbatim,relative=2]
+ceses4 ces cis c
+\set Staff.extraNatural = ##f
+ceses4 ces cis c
+@end lilypond
+
 There are predefined sets of note names for various other languages.
 To use them, include the language specific init file.  For
 example: @code{\include "english.ly"}.  The available language files
@@ -3761,7 +3772,7 @@ More stanzas can be added by adding more
 
 The @code{\addlyrics} command is actually just a convienient way
 to write a more complicated LilyPond structure that sets up the
-lyrics.  You should use @code{\addlyrics} unless you need to
+lyrics.  You should use @code{\addlyrics} unless you need to do
 fancy things, in which case you should investigate
 @code{\lyricsto} or @code{\lyricmode}.
 
@@ -3805,7 +3816,7 @@ is that a word can end with @code{@}}.  The following example is
 usually a mistake in the input file.  The syllable includes a @code{@}}, so the
 opening brace is not balanced
 @example
-\lyricmode @{ twinkle @}
+\lyricmode @{ twinkle@}
 @end example
 
 @cindex @code{\property}, in @code{\lyricmode}
@@ -4327,9 +4338,12 @@ ambitus per staff rather than per each voice, add the
 rather than to the @internalsref{Voice} context.  Here is an example,
 
 @lilypond[verbatim,raggedright,quote]
-\new Staff <<
+\new Staff \with {
+  \consists "Ambitus_engraver"
+}
+<<
   \new Voice \with {
-    \consists "Ambitus_engraver"
+    \remove "Ambitus_engraver"
   } \relative c'' {
     \override Ambitus #'X-offset-callbacks
       = #(list (lambda (grob axis) -1.0))
@@ -4337,7 +4351,7 @@ rather than to the @internalsref{Voice} context.  Here is an example,
     c4 a d e f2
   }
   \new Voice \with {
-    \consists "Ambitus_engraver"
+    \remove "Ambitus_engraver"
   } \relative c' {
     \voiceTwo
     es4 f g as b2