Renaming chapter, rearranging.

diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index 241e55450af70f5de3f75548ff2bf2be4e824c56..5b3124af08b51c1cbeff7ef64f671ffbb118be71 100644 (file)
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -5,22 +5,22 @@
 @c     M-x texinfo-all-menus-update
 @c to automatically fill in these menus before saving changes
 
-@node Global issues
-@chapter Global issues
+@node Output formats
+@chapter Output formats
 
 This is a placeholder until I can write a nice intro for this chapter.
 
 @menu
-* Global layout::               
+* Paper output::                
+* Sound output::                
 * LilyPond files::              
-* Sound::                       
 @end menu
 
 
-@node Global layout
-@section Global layout
+@node Paper output
+@section Paper output
 
-The global layout is determined by three factors: the page layout, the
+The global paper layout is determined by three factors: the page layout, the
 line breaks, and the spacing.  These all influence each other.  The
 choice of spacing determines how densely each system of music is set.
 This influences where line breaks are chosen, and thus ultimately, how
@@ -894,6 +894,137 @@ composer flush right on a single line.
 
 
 
+@node Sound output
+@section Sound output
+
+@cindex Sound
+@cindex MIDI
+
+MIDI (Musical Instrument Digital Interface) is a standard for
+connecting and controlling digital instruments.  A MIDI file is a
+series of notes in a number of tracks.  It is not an actual
+sound file; you need special software to translate between the
+series of notes and actual sounds.
+
+Pieces of music can be converted to MIDI files, so you can listen to
+what was entered.  This is convenient for checking the music; octaves
+that are off or accidentals that were mistyped stand out very much
+when listening to the MIDI output.
+
+@refbugs
+
+Many musically interesting effects, such as swing, articulation,
+slurring, etc., are not translated to midi.
+
+The midi output allocates a channel for each staff, and one for global
+settings.  Therefore the midi file should not have more than 15 staves
+(or 14 if you do not use drums).  Other staves will remain silent.
+
+Not all midi players correctly handle tempo changes in the midi
+output.  Players that are known to work include
+@uref{http://@/timidity@/.sourceforge@/.net/,timidity}.
+
+@menu
+* Creating MIDI files::         
+* MIDI block::                  
+* MIDI instrument names::       
+@end menu
+
+@node Creating MIDI files
+@subsection Creating MIDI files 
+
+To create a MIDI from a music piece of music, add a @code{\midi} block
+to a score, for example,
+
+@example 
+\score @{
+  @var{...music...}
+  \midi @{ \tempo 4=72 @}
+@}
+@end example 
+
+The tempo is specified using the @code{\tempo} command.  In this
+example the tempo of quarter notes is set to 72 beats per minute.
+
+
+If there is a @code{\midi} command in a @code{\score}, only MIDI will
+be produced.  When notation is needed too, a @code{\layout} block must
+be added
+
+@example 
+\score @{
+  @var{...music...}
+  \midi @{ \tempo 4=72 @}
+  \layout @{ @}
+@}
+@end example 
+@cindex layout block
+
+
+
+Ties, dynamics, and tempo changes are interpreted.  Dynamic marks,
+crescendi and decrescendi translate into MIDI volume levels.  Dynamic
+marks translate to a fixed fraction of the available MIDI volume
+range, crescendi and decrescendi make the volume vary linearly between
+their two extremes.  The fractions can be adjusted by
+@code{dynamicAbsoluteVolumeFunction} in @internalsref{Voice} context.
+For each type of MIDI instrument, a volume range can be defined.  This
+gives a basic equalizer control, which can enhance the quality of
+the MIDI output remarkably.  The equalizer can be controlled by
+setting @code{instrumentEqualizer}.
+
+
+@node MIDI block
+@subsection MIDI block
+@cindex MIDI block
+
+
+The MIDI block is analogous to the layout block, but it is somewhat
+simpler.  The @code{\midi} block can contain
+@cindex MIDI block
+
+@itemize @bullet
+  @item a @code{\tempo} definition, and
+  @item context definitions.
+@end itemize
+
+A number followed by a period is interpreted as a real number, so
+for setting the tempo for dotted notes, an extra space should be
+inserted, for example
+
+@example
+\midi @{ \tempo 4 . = 120 @} 
+@end example
+
+
+@cindex context definition
+
+Context definitions follow precisely the same syntax as within the
+\layout block.  Translation modules for sound are called performers.
+The contexts for MIDI output are defined in @file{ly/@/performer@/-init@/.ly}.
+
+
+@node MIDI instrument names
+@subsection MIDI instrument names
+
+@cindex instrument names
+@cindex @code{Staff.midiInstrument}
+
+The MIDI instrument name is set by the @code{Staff.midiInstrument}
+property.  The instrument name should be chosen from the list in
+@ref{MIDI instruments}.
+
+@example
+\set Staff.midiInstrument = "glockenspiel"
+@var{...notes...}
+@end example
+
+If the selected instrument does not exactly match an instrument from
+the list of MIDI instruments, the Grand Piano (@code{"acoustic grand"})
+instrument is used.
+
+
+
 @node LilyPond files
 @section LilyPond files
 
@@ -1037,134 +1168,3 @@ For example, you may write separate files for each instrument part and
 create a ``full score'' file which brings together the individual
 instrument files.
 
-
-@node Sound
-@section Sound
-@cindex Sound
-
-@cindex MIDI
-
-MIDI (Musical Instrument Digital Interface) is a standard for
-connecting and controlling digital instruments.  A MIDI file is a
-series of notes in a number of tracks.  It is not an actual
-sound file; you need special software to translate between the
-series of notes and actual sounds.
-
-Pieces of music can be converted to MIDI files, so you can listen to
-what was entered.  This is convenient for checking the music; octaves
-that are off or accidentals that were mistyped stand out very much
-when listening to the MIDI output.
-
-@refbugs
-
-Many musically interesting effects, such as swing, articulation,
-slurring, etc., are not translated to midi.
-
-The midi output allocates a channel for each staff, and one for global
-settings.  Therefore the midi file should not have more than 15 staves
-(or 14 if you do not use drums).  Other staves will remain silent.
-
-Not all midi players correctly handle tempo changes in the midi
-output.  Players that are known to work include
-@uref{http://@/timidity@/.sourceforge@/.net/,timidity}.
-
-@menu
-* Creating MIDI files::         
-* MIDI block::                  
-* MIDI instrument names::       
-@end menu
-
-@node Creating MIDI files
-@subsection Creating MIDI files 
-
-To create a MIDI from a music piece of music, add a @code{\midi} block
-to a score, for example,
-
-@example 
-\score @{
-  @var{...music...}
-  \midi @{ \tempo 4=72 @}
-@}
-@end example 
-
-The tempo is specified using the @code{\tempo} command.  In this
-example the tempo of quarter notes is set to 72 beats per minute.
-
-
-If there is a @code{\midi} command in a @code{\score}, only MIDI will
-be produced.  When notation is needed too, a @code{\layout} block must
-be added
-
-@example 
-\score @{
-  @var{...music...}
-  \midi @{ \tempo 4=72 @}
-  \layout @{ @}
-@}
-@end example 
-@cindex layout block
-
-
-
-Ties, dynamics, and tempo changes are interpreted.  Dynamic marks,
-crescendi and decrescendi translate into MIDI volume levels.  Dynamic
-marks translate to a fixed fraction of the available MIDI volume
-range, crescendi and decrescendi make the volume vary linearly between
-their two extremes.  The fractions can be adjusted by
-@code{dynamicAbsoluteVolumeFunction} in @internalsref{Voice} context.
-For each type of MIDI instrument, a volume range can be defined.  This
-gives a basic equalizer control, which can enhance the quality of
-the MIDI output remarkably.  The equalizer can be controlled by
-setting @code{instrumentEqualizer}.
-
-
-@node MIDI block
-@subsection MIDI block
-@cindex MIDI block
-
-
-The MIDI block is analogous to the layout block, but it is somewhat
-simpler.  The @code{\midi} block can contain
-@cindex MIDI block
-
-@itemize @bullet
-  @item a @code{\tempo} definition, and
-  @item context definitions.
-@end itemize
-
-A number followed by a period is interpreted as a real number, so
-for setting the tempo for dotted notes, an extra space should be
-inserted, for example
-
-@example
-\midi @{ \tempo 4 . = 120 @} 
-@end example
-
-
-@cindex context definition
-
-Context definitions follow precisely the same syntax as within the
-\layout block.  Translation modules for sound are called performers.
-The contexts for MIDI output are defined in @file{ly/@/performer@/-init@/.ly}.
-
-
-@node MIDI instrument names
-@subsection MIDI instrument names
-
-@cindex instrument names
-@cindex @code{Staff.midiInstrument}
-
-The MIDI instrument name is set by the @code{Staff.midiInstrument}
-property.  The instrument name should be chosen from the list in
-@ref{MIDI instruments}.
-
-@example
-\set Staff.midiInstrument = "glockenspiel"
-@var{...notes...}
-@end example
-
-If the selected instrument does not exactly match an instrument from
-the list of MIDI instruments, the Grand Piano (@code{"acoustic grand"})
-instrument is used.
-
-

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index c226d05e636a27ea981bfebae6cb4911c7363f50..32fe5161275d4a9f39d23cbfdde590058af9952b 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -672,14 +672,15 @@ instrument (or vocal) groups.
 discusses topics grouped by notation construct.  This section gives
 details about complicated or unusual notation.
 
-@item
-@emph{@ref{Global issues}}
-discusses issues which affect the whole lilypond file.
-
 @item
 @emph{@ref{Changing defaults}}
 explains how to fine tune layout.
 
+@item
+@emph{@ref{Output formats}}
+discusses issues which affect the global output, such as selecting
+paper size or which MIDI instruments to use.
+
 @item
 @emph{@ref{LilyPond-book}} explains the details behind creating
 documents with in-line music examples, like this manual.

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 7f15e8d3171eac815d2d78bafb0acb51df8f9a1e..4eac0037e5b61ab3f1d7a5aa2bbac9a24681363b 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -261,7 +261,7 @@ of this and other documentation.
                                    instruments.
 * Advanced notation::              Less frequently used notation.
 * Changing defaults::              Tuning output.
-* Global issues::                  Non-notation commands.
+* Output formats::                 What LilyPond produces.
 
 * Interfaces for programmers::
 * LilyPond-book::                  Integrating text and music.