Merge branch 'master' of ssh://jeancharlesm@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index 35948d78e8c2b7153233ee7d3afff42ce34dafa6..fde1bd564f29843d1d57ba25c7ac83eb2d1e465a 100644 (file)
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -9,10 +9,10 @@
 
 @c \version "2.11.51"
 
-@node Input syntax
-@chapter Input syntax
+@node General input and output
+@chapter General input and output
 
-This section deals with general LilyPond input syntax issues,
+This section deals with general LilyPond input and output issues,
 rather than specific notation.
 
 @menu
@@ -1130,7 +1130,7 @@ Unicode-aware editor and saving the file with UTF-8 encoding.  Most
 popular modern editors have UTF-8 support, for example, vim, Emacs,
 jEdit, and GEdit do.  All MS Windows systems later than NT use
 Unicode as their native character encoding, so even Notepad can
-edit and save a file in UTF-8 format.  A more functional 
+edit and save a file in UTF-8 format.  A more functional
 alternative for Windows is BabelPad.
 
 If a LilyPond input file containing a non-ASCII character is not
@@ -1145,7 +1145,8 @@ will be generated.
 Here is an example showing Cyrillic, Hebrew and Portuguese
 text:
 
-@lilypond[verbatim,quote]
+@lilypond[quote]
+%c No verbatim here as the code does not display correctly in PDF
 % Cyrillic
 bulgarian = \lyricmode {
   Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
@@ -1334,10 +1335,8 @@ settings.  Therefore the midi file should not have more than 15 staves
 * Creating MIDI files::
 * MIDI block::
 * What goes into the MIDI output?::
-* MIDI instrument names::
 * Repeats in MIDI::
 * Controlling MIDI dynamics::
-* Microtones in MIDI::
 @end menu
 
 @node Creating MIDI files
@@ -1392,16 +1391,16 @@ The MIDI instrument to be used is specified by setting the
 The name should be chosen from the list in @ref{MIDI instruments}.
 
 @example
-\new Staff {
+\new Staff @{
   \set Staff.midiInstrument = "glockenspiel"
   @var{...notes...}
-}
+@}
 @end example
 
 @example
-\new Staff \with {midiInstrument = "cello"} {
+\new Staff \with @{midiInstrument = "cello"@} @{
   @var{...notes...}
-}
+@}
 @end example
 
 If the selected instrument does not exactly match an instrument from
@@ -1629,7 +1628,7 @@ required fraction, and setting
 @code{Score.dynamicAbsoluteVolumeFunction} to this function.
 
 For example, if a @notation{rinforzando} dynamic marking,
-@code{\rfz), is required, this will not by default
+@code{\rfz}, is required, this will not by default
 have any effect on the MIDI volume, as this dynamic marking is not
 included in the default set.  Similarly, if a new dynamic marking
 has been defined with @code{make-dynamic-script} that too will not
@@ -1864,7 +1863,7 @@ copied out and compiled to test microtones in your MIDI player.
   \midi {}
 }
 @end lilypond
-@end ingore
+@end ignore