X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Fwind.itely;h=73d8c36b388506b27d0bedbb55ff77284113c5be;hb=fb2041257a9f00d4dbfab1766beefc0ef1425ea4;hp=72bb5255f6589f4a71802d95a963547e4ecf8eec;hpb=9a73c67a79a21b889d67f8d28f2c106de830d936;p=lilypond.git

diff --git a/Documentation/notation/wind.itely b/Documentation/notation/wind.itely
index 72bb5255f6..73d8c36b38 100644
--- a/Documentation/notation/wind.itely
+++ b/Documentation/notation/wind.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.19.16"
 
 @node Wind instruments
 @section Wind instruments
@@ -57,7 +57,7 @@ Other aspects of musical notation that can apply to wind instruments:
 @itemize
 @item Many wind instruments are transposing instruments, see
 @ref{Instrument transpositions}.
-@item The slide glissando are characteristic of the trombone, but other
+@item Slide glissandi are characteristic of the trombone, but other
 winds may perform keyed or valved glissandi.  See @ref{Glissando}.
 @item Harmonic series glissandi, which are possible on all brass
 instruments but common for French Horns, are usually written out as
@@ -143,11 +143,8 @@ This section discusses notation common bagpipes.
 @cindex Scottish highland bagpipe
 @cindex grace notes
 @funindex \taor
-@funindex taor
 @funindex \hideKeySignature
-@funindex hideKeySignature
 @funindex \showKeySignature
-@funindex showKeySignature
 
 LilyPond contains special definitions for Scottish, Highland Bagpipe
 music; to use them, add
@@ -182,8 +179,8 @@ 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
+This can be indicated by @code{c-flat} or @code{f-flat}.  Similarly, the
+piobaireachd high g can be written @code{g-flat} when it occurs in light
 music.
 
 @seealso
@@ -272,8 +269,8 @@ for specific notes and are available for the following instruments:
 Woodwind diagrams are created as markups:
 
 
-@lilypond[verbatim,quote,relative=2]
-c1^\markup {
+@lilypond[verbatim,quote,fragment]
+c''1^\markup {
   \woodwind-diagram #'piccolo #'((lh . (gis))
                                  (cc . (one three))
                                  (rh . (ees)))
@@ -282,9 +279,9 @@ c1^\markup {
 
 Keys can be open, partially-covered, ring-depressed, or fully covered:
 
-@lilypond[verbatim,quote,relative=2]
+@lilypond[verbatim,quote,fragment]
 \textLengthOn
-c1^\markup {
+c''1^\markup {
   \center-column {
     "one quarter"
     \woodwind-diagram #'flute #'((cc . (one1q))
@@ -293,7 +290,7 @@ c1^\markup {
   }
 }
 
-c1^\markup {
+c''1^\markup {
   \center-column {
     "one half"
     \woodwind-diagram #'flute #'((cc . (one1h))
@@ -302,7 +299,7 @@ c1^\markup {
   }
 }
 
-c1^\markup {
+c''1^\markup {
   \center-column {
     "three quarter"
     \woodwind-diagram #'flute #'((cc . (one3q))
@@ -311,7 +308,7 @@ c1^\markup {
   }
 }
 
-c1^\markup {
+c''1^\markup {
   \center-column {
     "ring"
     \woodwind-diagram #'flute #'((cc . (oneR))
@@ -320,7 +317,7 @@ c1^\markup {
   }
 }
 
-c1^\markup {
+c''1^\markup {
   \center-column {
     "full"
     \woodwind-diagram #'flute #'((cc . (oneF two))
@@ -332,8 +329,8 @@ c1^\markup {
 
 Trills are indicated as shaded keys:
 
-@lilypond[verbatim,quote,relative=2]
-c1^\markup {
+@lilypond[verbatim,quote,fragment]
+c''1^\markup {
   \woodwind-diagram #'bass-clarinet
                     #'((cc . (threeT four))
                        (lh . ())
@@ -343,9 +340,9 @@ c1^\markup {
 
 A variety of trills can be displayed:
 
-@lilypond[verbatim,quote,relative=2]
+@lilypond[verbatim,quote,fragment]
 \textLengthOn
-c1^\markup {
+c''1^\markup {
   \center-column {
     "one quarter to ring"
     \woodwind-diagram #'flute #'((cc . (one1qTR))
@@ -354,7 +351,7 @@ c1^\markup {
   }
 }
 
-c1^\markup {
+c''1^\markup {
   \center-column {
     "ring to shut"
     \woodwind-diagram #'flute #'((cc . (oneTR))
@@ -363,7 +360,7 @@ c1^\markup {
   }
 }
 
-c1^\markup {
+c''1^\markup {
   \center-column {
     "ring to open"
     \woodwind-diagram #'flute #'((cc . (oneRT))
@@ -372,7 +369,7 @@ c1^\markup {
   }
 }
 
-c1^\markup {
+c''1^\markup {
   \center-column {
     "open to shut"
     \woodwind-diagram #'flute #'((cc . (oneT))
@@ -381,7 +378,7 @@ c1^\markup {
   }
 }
 
-c1^\markup {
+c''1^\markup {
   \center-column {
     "one quarter to three quarters"
     \woodwind-diagram #'flute #'((cc . (one1qT3q))
@@ -397,10 +394,11 @@ can be displayed on the console using
 @code{#(print-keys-verbose 'flute (current-error-port))}, although
 they will not show up in the music output.
 
-New diagrams can be created by following the patterns in
+Creating new diagrams is possible, although this will require
+Scheme ability and may not be accessible to all users.  The
+patterns for the diagrams are in
 @file{scm/define-woodwind-diagrams.scm} and
-@file{scm/display-woodwind-diagrams.scm}.  However, this will
-require Scheme ability and may not be accessible to all users.
+@file{scm/display-woodwind-diagrams.scm}.
 
 @predefined
 @endpredefined
@@ -420,7 +418,7 @@ require Scheme ability and may not be accessible to all users.
 
 @seealso
 Installed Files:
-@file{scm/define-woodwind-diagrams.scm},
+@file{scm/define-woodwind-diagrams.scm}, @*
 @file{scm/display-woodwind-diagrams.scm}.
 
 Snippets: