release commit

[lilypond.git] / Documentation / user / instrument-notation.itely

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 715357d990b13d3dd196405227b12d234b0f5412..be0513cdb99be780c1e63d615d50ff9ea5d358f0 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -41,8 +41,7 @@ handle this cross-staffing behavior.  In this section we discuss the
 * Cross staff stems::           
 @end menu
 
-@
-refbugs
+@refbugs
 
 Dynamics are not centered, but workarounds do exist.  See the
 ``piano centered dynamics'' template in @ref{Piano templates}.
@@ -322,6 +321,13 @@ This example also shows that the chord printing routines do not try to
 be intelligent.  The last chord (@code{f bes d}) is not interpreted as
 an inversion.
 
+Note that the duration of chords must be specified outside the
+@code{<>}.
+
+@example
+<c e g>2
+@end example
+
 
 @node Chords mode
 @subsection Chords mode
@@ -779,21 +785,17 @@ property commands
 
 Any @code{_} character that appears in an unquoted word is converted
 to a space.  This provides a mechanism for introducing spaces into words
-without using quotes.  Quoted words can also be used in Lyrics mode to
-specify words that cannot be written with the above rules.  The
-following example incorporates double quotes
+without using quotes.
 
-@example
-\lyricmode @{ He said: "\"Let" my peo ple "go\"" @}
-@end example
+To enter lyrics with characters from non-English languages, or with
+non-ascii characters (such as the heart symbol or slanted quotes),
+simply insert the characters directly into the input file and save
+it with utf-8 encoding.  See @ref{Text encoding} for more info.
 
-This example is slightly academic, since it gives better looking
-results using single quotes, @code{``} and @code{''}
 @example
-\lyricmode @{ He said: ``Let my peo ple go'' @}
+\lyricmode @{ He said: âÂ\80Â\9cLet my peo ple goâÂ\80Â\9d. @}
 @end example
 
-
 The full definition of a word start in Lyrics mode is somewhat more
 complex.
 
@@ -1894,14 +1896,15 @@ demonstrated in @ref{Special noteheads}.
 @node Bagpipe definitions
 @subsection Bagpipe definitions
 
-LilyPond contains special definitions for bagpipe music; to use them, add
+LilyPond contains special definitions for music for the Scottish
+highland bagpipe; to use them, add
 
 @example
 \include "bagpipe.ly"
 @end example
 
 @noindent
-at the top of your input file.  This lets you add the special flourishes
+at the top of your input file.  This lets you add the special gracenotes
 common to bagpipe music with short commands.  For example, you could
 write @code{\taor} instead of
 
@@ -1913,18 +1916,66 @@ write @code{\taor} instead of
 notes in the appropiate octaves, so you do not need to worry about
 @code{\relative} or @code{\transpose}.
 
-@ignore
-@lilypond[raggedright,verbatim,quote]
+@lilypond[raggedright,verbatim,quote,notime]
 \include "bagpipe.ly"
-{ G4 a b c d e f g A B C }
+{ \grg G4 \grg a \grg b \grg c \grg d \grg e \grg f \grA g A }
 @end lilypond
-@end ignore
+
+Bagpipe music nominally uses the key of D Major (even though that 
+isn't really true). However, since that is the only key that can be used, 
+the key signature is normally not written out. To set this up correctly, 
+always start your music with @code{\hideKeySignature}. If you for some 
+reason want to show the key signature, you can use @code{\showKeySignature}
+instead.
+
+Some modern music use cross fingering on c and f to flatten those notes.
+This can be indicated by @code{cflat} or @code{fflat}. Similarly, the
+piobaireachd high g can be written @code{gflat} when it occurs in light 
+music.
 
 
 @node Bagpipe example
 @subsection Bagpipe example
 
-To be inserted soon.
+This is what the well known tune Amazing Grace looks like in bagpipe
+notation.
+
+@lilypond[verbatim,quote]
+\include "bagpipe.ly"
+\layout {
+  indent = 0.0\cm
+  \context { \Score \remove "Bar_number_engraver" }
+}
+
+\header {
+  title = "Amazing Grace"
+  meter = "Hymn"
+  arranger = "Trad. arr."
+}
+
+{
+  \hideKeySignature
+  \time 3/4
+  \grg \partial 4 a8. d16 
+  \slurd d2 \grg f8[ e32 d16.]
+  \grg f2 \grg f8 e
+  \thrwd d2 \grg b4
+  \grG a2 \grg a8. d16
+  \slurd d2 \grg f8[ e32 d16.]
+  \grg f2 \grg e8. f16
+  \dblA A2 \grg A4
+  \grg A2 f8. A16
+  \grg A2 \hdblf f8[ e32 d16.]
+  \grg f2 \grg f8 e
+  \thrwd d2 \grg b4
+  \grG a2 \grg a8. d16
+  \slurd d2 \grg f8[ e32 d16.]
+  \grg f2 e4
+  \thrwd d2.
+  \slurd d2
+  \bar "|."
+}
+@end lilypond
 
 
 @node Ancient notation