Doc: General tidy up of Winds.itely

Standardized LilyPond examples in terms of spacing and some CG guidelines.

Line breaks for @code {} to avoid odd output for PDFs

Made some minor syntax and grammar changes that (I hope) read better.

Removed an unnecessary @knownissue (i.e. there were none listed)

diff --git a/Documentation/notation/wind.itely b/Documentation/notation/wind.itely
index 70431e83c74d1633473ed4407f4d6ab4f956c1fd..b2384f15bc1d602c4aa4e8d81dfba8c212373a8e 100644 (file)
--- a/Documentation/notation/wind.itely
+++ b/Documentation/notation/wind.itely
@@ -14,8 +14,8 @@
 
 @lilypondfile[quote]{wind-headword.ly}
 
 
 @lilypondfile[quote]{wind-headword.ly}
 

-This section includes some elements of music notation that arise when
-writing for winds.
+This section includes elements of music notation that arise when
+writing specifically for wind instruments.

 
 @menu
 * Common notation for wind instruments::
 
 @menu
 * Common notation for wind instruments::


@@ -26,7 +26,7 @@ writing for winds.
 @node Common notation for wind instruments
 @subsection Common notation for wind instruments
 
 @node Common notation for wind instruments
 @subsection Common notation for wind instruments
 

-This section discusses some issues common to most wind instruments.
+This section discusses notation common to most wind instruments.

 
 @menu
 * References for wind instruments::
 
 @menu
 * References for wind instruments::


@@ -46,14 +46,13 @@ tonguing:
 @item Legato playing is indicated by @ref{Slurs}.
 @item Different types of tonguings, ranging from legato to non-legato to
 staccato are usually shown by articulation marks, sometimes combined
 @item Legato playing is indicated by @ref{Slurs}.
 @item Different types of tonguings, ranging from legato to non-legato to
 staccato are usually shown by articulation marks, sometimes combined

-with slurs, see @ref{Articulations and ornamentations} and @ref{List of
-articulations}.
+with slurs, see @ref{Articulations and ornamentations} and
+@ref{List of articulations}.

 @item Flutter tonguing is usually indicated by placing a tremolo mark
 and a text markup on the note.  See @ref{Tremolo repeats}.
 @end itemize
 
 @item Flutter tonguing is usually indicated by placing a tremolo mark
 and a text markup on the note.  See @ref{Tremolo repeats}.
 @end itemize
 

-There are also other aspects of musical notation that can apply to wind
-instruments:
+Other aspects of musical notation that can apply to wind instruments:

 
 @itemize
 @item Many wind instruments are transposing instruments, see
 
 @itemize
 @item Many wind instruments are transposing instruments, see


@@ -63,16 +62,18 @@ 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
 @ref{Grace notes}.
 @item Harmonic series glissandi, which are possible on all brass
 instruments but common for French Horns, are usually written out as
 @ref{Grace notes}.

-@item Pitch inflections at the end of a note are discussed in @ref{Falls
-and doits}.
+@item Pitch inflections at the end of a note are discussed in
+@ref{Falls and doits}.

 @item Key slaps or valve slaps are often shown by the @code{cross} style
 of @ref{Special note heads}.
 @item Woodwinds can overblow low notes to sound harmonics.  These are
 @item Key slaps or valve slaps are often shown by the @code{cross} style
 of @ref{Special note heads}.
 @item Woodwinds can overblow low notes to sound harmonics.  These are

-shown by the @code{flageolet} articulation.  See @ref{List of articulations}.
+shown by the @code{flageolet} articulation.
+See @ref{List of articulations}.

 @item The use of brass mutes is usually indicated by a text markup, but
 where there are many rapid changes it is better to use the
 @item The use of brass mutes is usually indicated by a text markup, but
 where there are many rapid changes it is better to use the

-@code{stopped} and @code{open} articulations.  See @ref{Articulations and
-ornamentations} and @ref{List of articulations}.
+@code{stopped} and @code{open} articulations.
+See @ref{Articulations and ornamentations} and
+@ref{List of articulations}.

 @item Stopped horns are indicated by the @code{stopped} articulation.
 See @ref{Articulations and ornamentations}.
 @end itemize
 @item Stopped horns are indicated by the @code{stopped} articulation.
 See @ref{Articulations and ornamentations}.
 @end itemize


@@ -104,7 +105,7 @@ Snippets:
 @unnumberedsubsubsec Fingerings
 
 All wind instruments other than the trombone require the use of several
 @unnumberedsubsubsec Fingerings
 
 All wind instruments other than the trombone require the use of several

-fingers to produce each pitch.  Some fingering helps are shown in
+fingers to produce each pitch.  Some fingering examples are shown in

 the snippets below.
 
 Woodwind diagrams can be produced and are described in
 the snippets below.
 
 Woodwind diagrams can be produced and are described in


@@ -130,7 +131,7 @@ Snippets:
 @node Bagpipes
 @subsection Bagpipes
 
 @node Bagpipes
 @subsection Bagpipes
 

-This section includes extra information for writing for bagpipes.
+This section discusses notation common bagpipes.

 
 @menu
 * Bagpipe definitions::
 
 @menu
 * Bagpipe definitions::


@@ -150,15 +151,15 @@ This section includes extra information for writing for bagpipes.
 @funindex \showKeySignature
 @funindex showKeySignature
 
 @funindex \showKeySignature
 @funindex showKeySignature
 

-LilyPond contains special definitions for music for the Scottish
-highland bagpipe; to use them, add
+LilyPond contains special definitions for Scottish, Highland Bagpipe
+music; to use them, add

 
 @example
 \include "bagpipe.ly"
 @end example
 
 @noindent
 
 @example
 \include "bagpipe.ly"
 @end example
 
 @noindent

-at the top of your input file.  This lets you add the special grace notes
+to the top of your input file.  This lets you add the special grace notes

 common to bagpipe music with short commands.  For example, you could
 write @code{\taor} instead of
 
 common to bagpipe music with short commands.  For example, you could
 write @code{\taor} instead of
 


@@ -245,7 +246,7 @@ notation.
 @node Woodwinds
 @subsection Woodwinds
 
 @node Woodwinds
 @subsection Woodwinds
 

-This section describes notation specifically for woodwinds.
+This section discusses notation specifically for woodwind instruments.

 
 @menu
 * Woodwind diagrams::
 
 @menu
 * Woodwind diagrams::


@@ -255,10 +256,7 @@ This section describes notation specifically for woodwinds.
 @subsubsection Woodwind diagrams
 
 Woodwind diagrams can be used to indicate the fingering to be used
 @subsubsection Woodwind diagrams
 
 Woodwind diagrams can be used to indicate the fingering to be used

-to play specific notes.  Woodwind diagrams are available for most woodwind
-instruments.
-
-Woodwind diagrams are available for the following instruments:
+for specific notes and are available for the following instruments:

 
 @itemize
 @item piccolo
 
 @itemize
 @item piccolo


@@ -272,95 +270,125 @@ Woodwind diagrams are available for the following instruments:
 @end itemize
 
 @noindent
 @end itemize
 
 @noindent

-The diagrams and the scheme instrument names are shown in the snippet below.
-

 Woodwind diagrams are created as markups:
 
 
 Woodwind diagrams are created as markups:
 
 

-@lilypond[verbatim, quote, relative=2]
-c1^ \markup \woodwind-diagram #'piccolo #'((lh . (gis))
-                                           (cc . (one three))
-                                           (rh . (ees)))
+@lilypond[verbatim,quote,relative=2]
+c1^\markup {
+  \woodwind-diagram #'piccolo #'((lh . (gis))
+                                 (cc . (one three))
+                                 (rh . (ees)))
+}

 @end lilypond
 
 Keys can be open, partially-covered, ring-depressed, or fully covered:
 
 @end lilypond
 
 Keys can be open, partially-covered, ring-depressed, or fully covered:
 

-@lilypond [verbatim, quote, relative=2]
+@lilypond[verbatim,quote,relative=2]

 \textLengthOn
 \textLengthOn

-c1^ \markup \center-column {
-  "one quarter"
-  \woodwind-diagram #'flute #'((cc . (one1q))
-                                  (lh . ())
-                                  (rh . ()))
+c1^\markup {
+  \center-column {
+    "one quarter"
+    \woodwind-diagram #'flute #'((cc . (one1q))
+                                 (lh . ())
+                                 (rh . ()))
+  }

 }
 }

-c1^ \markup \center-column {
-  "one half"
-  \woodwind-diagram #'flute #'((cc . (one1h))
-                                  (lh . ())
-                                  (rh . ()))
+
+c1^\markup {
+  \center-column {
+    "one half"
+    \woodwind-diagram #'flute #'((cc . (one1h))
+                                 (lh . ())
+                                 (rh . ()))
+  }

 }
 }

-c1^ \markup \center-column {
-  "three quarter"
-  \woodwind-diagram #'flute #'((cc . (one3q))
-                                  (lh . ())
-                                  (rh . ()))
+
+c1^\markup {
+  \center-column {
+    "three quarter"
+    \woodwind-diagram #'flute #'((cc . (one3q))
+                                 (lh . ())
+                                 (rh . ()))
+  }

 }
 }

-c1^ \markup \center-column {
-  "ring"
-  \woodwind-diagram #'flute #'((cc . (oneR))
-                                  (lh . ())
-                                  (rh . ()))
+
+c1^\markup {
+  \center-column {
+    "ring"
+    \woodwind-diagram #'flute #'((cc . (oneR))
+                                 (lh . ())
+                                 (rh . ()))
+  }

 }
 }

-c1^ \markup \center-column {
-  "full"
-  \woodwind-diagram #'flute #'((cc . (oneF two))
-                                  (lh . ())
-                                  (rh . ()))
+
+c1^\markup {
+  \center-column {
+    "full"
+    \woodwind-diagram #'flute #'((cc . (oneF two))
+                                 (lh . ())
+                                 (rh . ()))
+  }

 }
 @end lilypond
 
 }
 @end lilypond
 

-Trills are indicated in the woodwind diagrams as shaded keys:
+Trills are indicated as shaded keys:

 
 

-@lilypond [verbatim, quote, relative=2]
-c1^ \markup \woodwind-diagram #'bass-clarinet
-                              #'((cc . (threeT four))
-                                 (lh . ())
-                                 (rh . (b fis)))
+@lilypond[verbatim,quote,relative=2]
+c1^\markup {
+  \woodwind-diagram #'bass-clarinet
+                    #'((cc . (threeT four))
+                       (lh . ())
+                       (rh . (b fis)))
+}

 @end lilypond
 
 A variety of trills can be displayed:
 
 @end lilypond
 
 A variety of trills can be displayed:
 

-@lilypond [verbatim, quote, relative=2]
+@lilypond[verbatim,quote,relative=2]

 \textLengthOn
 \textLengthOn

-c1^ \markup \center-column {
-  "one quarter to ring"
-  \woodwind-diagram #'flute #'((cc . (one1qTR))
-                                  (lh . ())
-                                  (rh . ()))
+c1^\markup {
+  \center-column {
+    "one quarter to ring"
+    \woodwind-diagram #'flute #'((cc . (one1qTR))
+                                 (lh . ())
+                                 (rh . ()))
+  }

 }
 }

-c1^ \markup \center-column {
-  "ring to shut"
-  \woodwind-diagram #'flute #'((cc . (oneTR))
-                                  (lh . ())
-                                  (rh . ()))
+
+c1^\markup {
+  \center-column {
+    "ring to shut"
+    \woodwind-diagram #'flute #'((cc . (oneTR))
+                                 (lh . ())
+                                 (rh . ()))
+  }

 }
 }

-c1^ \markup \center-column {
-  "ring to open"
-  \woodwind-diagram #'flute #'((cc . (oneRT))
-                                  (lh . ())
-                                  (rh . ()))
+
+c1^\markup {
+  \center-column {
+    "ring to open"
+    \woodwind-diagram #'flute #'((cc . (oneRT))
+                                 (lh . ())
+                                 (rh . ()))
+  }

 }
 }

-c1^ \markup \center-column {
-  "open to shut"
-  \woodwind-diagram #'flute #'((cc . (oneT))
-                                  (lh . ())
-                                  (rh . ()))
+
+c1^\markup {
+  \center-column {
+    "open to shut"
+    \woodwind-diagram #'flute #'((cc . (oneT))
+                                 (lh . ())
+                                 (rh . ()))
+  }

 }
 }

-c1^ \markup \center-column {
-  "one quarter to three quarters"
-  \woodwind-diagram #'flute #'((cc . (one1qT3q))
-                                  (lh . ())
-                                  (rh . ()))
+
+c1^\markup {
+  \center-column {
+    "one quarter to three quarters"
+    \woodwind-diagram #'flute #'((cc . (one1qT3q))
+                                 (lh . ())
+                                 (rh . ()))
+  }

 }
 @end lilypond
 
 }
 @end lilypond
 


@@ -368,7 +396,7 @@ The list of all possible keys and settings for a given instrument
 can be displayed on the console or in the log file, although they
 will not show up in the music output:
 
 can be displayed on the console or in the log file, although they
 will not show up in the music output:
 

-@lilypond[verbatim, quote]
+@lilypond[verbatim,quote]

 
 #(print-keys-verbose 'flute)
 
 
 #(print-keys-verbose 'flute)
 


@@ -386,13 +414,13 @@ require Scheme ability and may not be accessible to all users.
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {woodwind-diagrams-listing.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {woodwind-diagrams-listing.ly}
 

-@lilypondfile[verbatim, lilyquote, texidoc, doctitle]
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]

 {graphical-and-text-woodwind-diagrams.ly}
 
 {graphical-and-text-woodwind-diagrams.ly}
 

-@lilypondfile[verbatim, lilyquote, texidoc, doctitle]
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]

 {changing-the-size-of-woodwind-diagrams.ly}
 
 {changing-the-size-of-woodwind-diagrams.ly}
 

-@lilypondfile[verbatim, lilyquote, texidoc, doctitle]
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]

 {woodwind-diagrams-key-lists.ly}
 
 @seealso
 {woodwind-diagrams-key-lists.ly}
 
 @seealso


@@ -406,5 +434,3 @@ Snippets: @rlsr{Winds}.
 Internals Reference:
 @rinternals{TextScript},
 @rinternals{instrument-specific-markup-interface}.
 Internals Reference:
 @rinternals{TextScript},
 @rinternals{instrument-specific-markup-interface}.

-
-@knownissues