Changes order of the appendices; index should come last. This might

break something.
Also minor changes to refman.

diff --git a/ChangeLog b/ChangeLog
index ca13b974a3bc07bce0bfcb0b191f02fd7422a07b..f8212afd358a91c0ab3138f9cb644a1509d4a30c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-16  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/lilypond.tely: changed order of appendices;
+       unified index should be last.
+
+       * Documentation/user/notation.itely: add example of key signatures
+       and info about Staff.printKeyCancellation.
+
 2005-01-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/include/repeated-music.hh (class Repeated_music): change

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index e7456862bfcf8bd46dc6f404dc8426a9b7dc04a8..f9f656f4a51313c960554c42a4c52544e50cc16a 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -266,9 +266,9 @@ of this and other documentation.
 * Scheme tutorial::
 * Notation manual details::
 * Point and click::             
-* Unified index::
 * GNU Free Documentation License:: FDL.
 * Cheat sheet::     
+* Unified index::
 @end menu
 @end ifnottex
 
@@ -297,13 +297,13 @@ of this and other documentation.
 @include notation-appendices.itely
 @include point-and-click.itely
 
+@include fdl.itexi
+
+@include cheatsheet.itely
+
 @node Unified index
 @appendix Unified index
 
 @printindex cp
 
-@include fdl.itexi
-
-@include cheatsheet.itely
-
 @bye

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 0c9c0d4be232fab7c58e270a1b3082ce4a37fb2a..4ae9b06b0cb8f737ea168dcdb21e58e90af6141c 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -929,6 +929,24 @@ This command sets the context property
 @internalsref{Staff}.@code{keySignature}.  Non-standard key signatures
 can be specified by setting this property directly.
 
+A natural sign is printed to cancel any previous accidentals.  This
+can be suppressed by setting the @code{Staff.printKeyCancellation}
+property.
+
+@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+{
+  \key d \major
+  a b cis d
+  \key g \minor
+  a bes c d
+  \set Staff.printKeyCancellation = ##f
+  \key d \major
+  a b cis d
+  \key g \minor
+  a bes c d
+}
+@end lilypond
+
 Accidentals and key signatures often confuse new users, because
 unaltered notes get natural signs depending on the key signature.  For
 more information, see @ref{More about pitches}.
@@ -1012,6 +1030,9 @@ This command is equivalent to setting @code{clefGlyph},
 when any of these properties are changed.  The following example shows
 possibilities when setting properties manually.
 
+@ignore
+should to be fixed very quickly  -gp
+
 @lilypond[quote,raggedright,verbatim]
 {
   \set Staff.clefGlyph = #"clefs.F"
@@ -1028,9 +1049,12 @@ possibilities when setting properties manually.
   c'4
   \clef "bass"
   c'4
+  \set Staff.middleCPosition = #4
+  c'4
 }
 @end lilypond
 
+@end ignore
 
 @seealso