Moving bagpipe info from templates into instrument-notation.

diff --git a/ChangeLog b/ChangeLog
index f753ed56c2baa4a23bc7974a6ac2f8c71072cb49..3a4aa41590591ac60d3eea65a120e243d7dba26b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-27  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/examples.itely: remove bagpipe template.
+
+       * Documentation/user/instrument-notation.itely: add bagpipe
+       section.
+
 2005-07-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/accidental-engraver.cc: formatting fixes.

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index df4ed86b4e13b647ea6560ace5949d9e7e38f333..bb1a37749d2a7b942206615548cdd1b39d484270 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -1317,78 +1317,6 @@ chant = \relative c' {
 }
 @end lilypond
 
-@subsection Bagpipe music
-
-Here is an example of bagpipe music.  It demonstrates a big strength of
-LilyPond, compared to graphical score editors: in LilyPond, you can
-very easily reuse small segments of music without writing them out
-completely.  This template defines a large number of small segments
-(@code{taor}, @code{grip}, @code{thrd}, etc), which can be reused easily.
-
-@c TODO - replace Bagpipe template with Andrew McNabb's work?
-@c  http://www.mcnabbs.org/andrew/linux/lilypond-ghb/
-
-@lilypond[quote,verbatim]
-taor = { \grace { g32[ d' g e'] } }
-grip = { \grace { g32[ b g ]    } }
-thrd = { \grace { g32[ d' c']   } }
-birl = { \grace { g32[ a g]     } }
-gstd = { \grace { g'32[ d' g]   } }
-fgg  = { \grace { f32[ g'32]    } }
-dblb = { \grace { g'32[ b d']   } }
-dblc = { \grace { g'32[ c' d']  } }
-dble = { \grace { g'32[ e' f']  } }
-dblf = { \grace { g'32[ f' g']  } }
-dblg = { \grace { g'32[ f']     } }
-dbla = { \grace { a'32[ g']     } }
-lgg  = { \grace { g32  } }
-lag  = { \grace { a32  } }
-cg   = { \grace { c'32 } }
-eg   = { \grace { e'32 } }
-gg   = { \grace { g'32 } }
-dg   = { \grace { d'32 } }
-hag  = { \grace { a'32 } }
-gefg = { \grace { g'32[ e' f']  } }
-efg  = { \grace { e'32[ f']     } }
-gdcg = { \grace { g'32[ d' c']  } }
-gcdg = { \grace { g'32[ c' d']  } }
-
-\transpose a a' {
-  #(add-grace-property 'Voice 'Stem 'length 6)
-  \time 6/8 \partial 4
-  \tieUp
-  \slurUp
-
-  f'4 |
-  \gg f'4 e'8 \thrd d'4. |
-  \eg a4.(a4) d'8 |
-  \gg d'4 f'8 \dble e'4. ( | \noBreak
-  e'8) d'4 \gg d'4 e'8 |
-
-  \break
-  \time 9/8
-  \dblf f'2.( f'4) d'8 |
-  \time 6/8
-  \dblg g'4 a'8 \gg a'4. |
-  \thrd d'4.( d'4) \eg a8 |
-  \time 9/8
-  \dble e'4 \lag e'8 \gg e'16[ d'8. e'8] \gg f'4 g'8 |
-
-  \break
-  \time 6/8
-  \gg f'4 e'8 \thrd d'4. |
-  \eg a4.( a4) d'8 |
-  \dblg g'4 a'8 \gg a'4. |
-  \thrd d'4.( d'4) f'8 |
-
-  \break
-  \dblg g'4 e'8( e'8) \dblf f'8.[ e'16] |
-  \thrd d'4.( d'4) \cg d'8 |
-  \gg c'4 e'8 \thrd d'4.( |
-  d'4.) \gdcg d'4.
-}
-@end lilypond
-
 
 @node Lilypond-book templates
 @section Lilypond-book templates

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 3c8db87ffb9b103bba5c1236ad9fa2c883a62aab..715357d990b13d3dd196405227b12d234b0f5412 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -16,6 +16,7 @@ This chapter explains how to use notation for specific instruments.
 * Vocal music::                 
 * Rhythmic music::              
 * Guitar::                      
+* Bagpipe::                     
 * Ancient notation::            
 * Other instrument specific notation::  
 @end menu
@@ -1879,6 +1880,53 @@ pitch.  It is notated with cross noteheads; this is
 demonstrated in @ref{Special noteheads}.
 
 
+@node Bagpipe
+@section Bagpipe
+
+@cindex Bagpipe
+
+@menu
+* Bagpipe definitions::         
+* Bagpipe example::             
+@end menu
+
+
+@node Bagpipe definitions
+@subsection Bagpipe definitions
+
+LilyPond contains special definitions for bagpipe music; 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
+common to bagpipe music with short commands.  For example, you could
+write @code{\taor} instead of
+
+@example
+\grace @{ \small G32[ d G e] @}
+@end example
+
+@code{bagpipe.ly} also contains pitch definitions for the bagpipe
+notes in the appropiate octaves, so you do not need to worry about
+@code{\relative} or @code{\transpose}.
+
+@ignore
+@lilypond[raggedright,verbatim,quote]
+\include "bagpipe.ly"
+{ G4 a b c d e f g A B C }
+@end lilypond
+@end ignore
+
+
+@node Bagpipe example
+@subsection Bagpipe example
+
+To be inserted soon.
+
+
 @node Ancient notation
 @section Ancient notation