Merge branch 'master' into nested-bookparts

[lilypond.git] / Documentation / user / input.itely

diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index 03fdba03fe87aae47fddb400cf547897842a0caf..7c199fef71247d4aa649605d8153b8f529547f61 100644 (file)
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.57"
 
 @node General input and output
 @chapter General input and output
@@ -428,13 +428,13 @@ may use any @ref{Formatting text}, commands in the header.
 \book {
   \header {
     dedication = "dedicated to me"
-    title = \markup \center-align { "Title first line" "Title second line,
+    title = \markup \center-column { "Title first line" "Title second line,
 longer" }
     subtitle = "the subtitle,"
     subsubtitle = #(string-append "subsubtitle LilyPond version "
 (lilypond-version))
     poet = "Poet"
-    composer =  \markup \center-align { "composer" \small "(1847-1973)" }
+    composer =  \markup \center-column { "composer" \small "(1847-1973)" }
     texttranslator = "Text Translator"
     meter = \markup { \teeny "m" \tiny "e" \normalsize "t" \large "e" \huge
 "r" }
@@ -1870,37 +1870,31 @@ copied out and compiled to test microtones in your MIDI player.
 @node Percussion in MIDI
 @subsection Percussion in MIDI
 
-@c FIXME: sorry Trevor, I know this is a complete mess.  :(
-
-But You should be aware,  that some percussion sounds cannot be
-reached via the  @code{DrumStaff} context. Pitched percussion
-sounds,  like
-Xylophone, Marimaphone, Vibraphone, Timpani, etc. are treated like
-"normal" instruments and You should input music for these
-instruments in a @code{Staff} context, not in a @code{DrumStaff}
-context.
-Too make it more complicated:
-some  non pitched percussion sounds  of the general midi standard,
-like "melodic-tom", "taiko-drum" "synth drum", etc. cannot
-be reached via midi-channel 10, so You should also  use for them a
-@code{ Staff} context, with "normal" pitches. And, last but not
-least,
-it should be mentioned, that there are lots of percussion
-instruments, which are note part of the general midi standard.
-If You want to  write for e.g. castanets, You have to find a
-substitution for this sound (or have a good sampler).
-But let us forget for this moment the limitations of midi and let
-us go on with some more examples, that show You how to write
-for percussion instruments with Lilypond:
-
-@c (no, seriously, there was no example here.  I didn't just forget
-@c to copy it.  -gp)
+Percussion instruments are generally notated in a @code{DrumStaff}
+context and when notated in this way they are outputted correctly
+to MIDI channel@tie{}10, but some pitched percussion instruments,
+like the xylophone, marimba, vibraphone, timpani, etc., are
+treated like @qq{normal} instruments and music for these instruments
+should be entered in a normal @code{Staff} context, not a
+@code{DrumStaff} context, to obtain the correct MIDI output.
 
+Some non-pitched percussion sounds included in the general MIDI
+standard, like melodic tom, taiko drum, synth drum, etc., cannot
+be reached via MIDI channel@tie{}10, so the notation for such
+instruments should also be entered in a normal @code{Staff}
+context, using suitable normal pitches.
 
+Many percussion instruments are not included in the general MIDI
+standard, e.g. castanets.  The easiest, although unsatisfactory,
+method of producing some MIDI output when writing for such
+instruments is to substitute the nearest sound from the standard
+set.
+
+@c TODO Expand with examples, and any other issues
 
 @knownissues
 
-Because general MIDI does not contain rim shots, the sidestick is
-used for this purpose instead.
+Because the general MIDI standard does not contain rim shots, the
+sidestick is used for this purpose instead.