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

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

diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index e02cd494c22cd7f162c2f84f97369863dce9343c..f290a3370ea920edaf490c524d935f1a0e6ec64c 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
 
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 

-@c \version "2.11.61"
+@c \version "2.12.0"

 
 @node General input and output
 @chapter General input and output
 
 @node General input and output
 @chapter General input and output


@@ -99,10 +99,9 @@ input file.  They may be placed inside or outside a @code{\score}
 block, and inside or outside the single music expression within a
 @code{\score} block.
 
 block, and inside or outside the single music expression within a
 @code{\score} block.
 

-@seealso

 
 

+@seealso

 Learning Manual:
 Learning Manual:

-

 @rlearning{Working on input files},
 @rlearning{Music expressions explained},
 @rlearning{Score is a (single) compound musical expression}.
 @rlearning{Working on input files},
 @rlearning{Music expressions explained},
 @rlearning{Score is a (single) compound musical expression}.


@@ -355,11 +354,12 @@ A multi-line comment delimited by @code{%@{ .. %@}}.
 
 @end itemize
 
 
 @end itemize
 

-@seealso

 
 

+@seealso

 Learning Manual:
 @rlearning{How LilyPond input files work}.
 
 Learning Manual:
 @rlearning{How LilyPond input files work}.
 

+

 @node Titles and headers
 @section Titles and headers
 
 @node Titles and headers
 @section Titles and headers
 


@@ -666,12 +666,14 @@ the markup have to be known before, so a gauge is used to decide these
 dimensions.  If the book has between 10 and 99 pages, it may be "00",
 ie. a two digit number.
 
 dimensions.  If the book has between 10 and 99 pages, it may be "00",
 ie. a two digit number.
 

-@predefined

 
 

+@predefined

 @funindex \label
 @funindex \label

-@code{\label}
+@code{\label},

 @funindex \page-ref
 @funindex \page-ref

-@code{\page-ref}
+@code{\page-ref}.
+@endpredefined
+

 
 @node Table of contents
 @subsection Table of contents
 
 @node Table of contents
 @subsection Table of contents


@@ -775,16 +777,17 @@ tocAct =
 }
 @end lilypond
 
 }
 @end lilypond
 

-@seealso

 
 

+@seealso

 Init files: @file{../ly/@/toc@/-init@/.ly}.
 
 Init files: @file{../ly/@/toc@/-init@/.ly}.
 

-@predefined

 
 

+@predefined

 @funindex \table-of-contents
 @funindex \table-of-contents

-@code{\table-of-contents}
+@code{\table-of-contents},

 @funindex \tocItem
 @funindex \tocItem

-@code{\tocItem}
+@code{\tocItem}.
+@endpredefined

 
 
 @node Working with input files
 
 
 @node Working with input files


@@ -846,11 +849,19 @@ subdirectory called @file{parts} within the current directory, use
 @end example
 
 Files which are to be included can also contain @code{\include}
 @end example
 
 Files which are to be included can also contain @code{\include}

-statements of their own.  These second-level
+statements of their own.  By default, these second-level

 @code{\include} statements are not interpreted until they have
 been brought into the main file, so the file names they specify
 must all be relative to the directory containing the main file,
 @code{\include} statements are not interpreted until they have
 been brought into the main file, so the file names they specify
 must all be relative to the directory containing the main file,

-not the directory containing the included file.
+not the directory containing the included file. However,
+this behavior can be changed by passing the option
+@code{-drelative-includes} option at the command line
+(or by adding @code{#(ly:set-option 'relative-includes #t)}
+at the top of the main input file). With @code{relative-includes}
+set, the path for each @code{\include} command will be taken
+relative to the file containing that command. This behavior is
+recommended and it will become the default behavior in a future
+version of lilypond.

 
 Files can also be included from a directory in a search path
 specified as an option when invoking LilyPond from the command
 
 Files can also be included from a directory in a search path
 specified as an option when invoking LilyPond from the command


@@ -873,28 +884,32 @@ and in main.ly write
 
 Files which are to be included in many scores may be placed in
 the LilyPond directory @file{../ly}.  (The location of this
 
 Files which are to be included in many scores may be placed in
 the LilyPond directory @file{../ly}.  (The location of this

-directory is installation-dependent - see @rlearning{Other sources
-of information}).  These files can then be included simply by
-naming them on an @code{\include} statement.  This is how the
-language-dependent files like @file{english.ly} are included.
+directory is installation-dependent - see
+@rlearning{Other sources of information}).  These files can then
+be included simply by naming them on an @code{\include} statement.
+This is how the language-dependent files like @file{english.ly} are
+included.

 
 LilyPond includes a number of files by default when you start
 the program.  These includes are not apparent to the user, but the
 files may be identified by running @code{lilypond --verbose} from
 the command line.  This will display a list of paths and files that
 LilyPond uses, along with much other information.  Alternatively,
 
 LilyPond includes a number of files by default when you start
 the program.  These includes are not apparent to the user, but the
 files may be identified by running @code{lilypond --verbose} from
 the command line.  This will display a list of paths and files that
 LilyPond uses, along with much other information.  Alternatively,

-the more important of these files are discussed in @rlearning{Other
-sources of information}.  These files may be edited, but changes to
-them will be lost on installing a new version of LilyPond.
+the more important of these files are discussed in
+@rlearning{Other sources of information}.  These files may be
+edited, but changes to them will be lost on installing a new
+version of LilyPond.

 
 Some simple examples of using @code{\include} are shown in
 @rlearning{Scores and parts}.
 
 
 Some simple examples of using @code{\include} are shown in
 @rlearning{Scores and parts}.
 

+

 @seealso
 Learning Manual:
 @rlearning{Other sources of information},
 @rlearning{Scores and parts}.
 
 @seealso
 Learning Manual:
 @rlearning{Other sources of information},
 @rlearning{Scores and parts}.
 

+

 @knownissues
 
 If an included file is given a name which is the same as one in
 @knownissues
 
 If an included file is given a name which is the same as one in


@@ -1114,8 +1129,8 @@ expression will cause @emph{all} tagged sections to be removed, as
 the first filter will remove all tagged sections except the one
 named, and the second filter will remove even that tagged section.
 
 the first filter will remove all tagged sections except the one
 named, and the second filter will remove even that tagged section.
 

-@seealso

 
 

+@seealso

 Learning Manual:
 @rlearning{Organizing pieces with variables}.
 
 Learning Manual:
 @rlearning{Organizing pieces with variables}.
 


@@ -1123,6 +1138,7 @@ Notation Reference:
 @ref{Automatic part combining},
 @ref{Including LilyPond files}.
 
 @ref{Automatic part combining},
 @ref{Including LilyPond files}.
 

+

 @ignore
 @c This warning is more general than this placement implies.
 @c Rests are not merged whether or not they come from tagged sections.
 @ignore
 @c This warning is more general than this placement implies.
 @c Rests are not merged whether or not they come from tagged sections.


@@ -1224,7 +1240,7 @@ and as stand-alone text below the score:
   }
   \addlyrics { O \markup { \concat{ Ph \char ##x0153 be! } } }
 }
   }
   \addlyrics { O \markup { \concat{ Ph \char ##x0153 be! } } }
 }

-\markup { "Copyright 2008" \char ##x00A9 }
+\markup { "Copyright 2008--2009" \char ##x00A9 }

 @end lilypond
 
 To enter the copyright sign in the copyright notice use:
 @end lilypond
 
 To enter the copyright sign in the copyright notice use:


@@ -1443,13 +1459,13 @@ The name should be chosen from the list in @ref{MIDI instruments}.
 
 @example
 \new Staff @{
 
 @example
 \new Staff @{

-  \set Staff.midiInstrument = "glockenspiel"
+  \set Staff.midiInstrument = #"glockenspiel"

   @var{...notes...}
 @}
 @end example
 
 @example
   @var{...notes...}
 @}
 @end example
 
 @example

-\new Staff \with @{midiInstrument = "cello"@} @{
+\new Staff \with @{midiInstrument = #"cello"@} @{

   @var{...notes...}
 @}
 @end example
   @var{...notes...}
 @}
 @end example


@@ -1588,7 +1604,7 @@ The following items of notation are reflected in the MIDI output:
 
 @itemize
 @item Pitches
 
 @itemize
 @item Pitches

-@item Quarter tones (See @ref{Accidentals}. Rendering needs a
+@item Microtones (See @ref{Accidentals}. Rendering needs a

 player that supports pitch bend.)
 @item Chords entered as chord names
 @item Rhythms entered as note durations, including tuplets
 player that supports pitch bend.)
 @item Chords entered as chord names
 @item Rhythms entered as note durations, including tuplets


@@ -1614,6 +1630,7 @@ The following items of notation have no effect on the MIDI output:
 @item Crescendi, decrescendi over a single note
 @item Tremolos entered with @q{@code{:}[@var{number}]}
 @item Figured bass
 @item Crescendi, decrescendi over a single note
 @item Tremolos entered with @q{@code{:}[@var{number}]}
 @item Figured bass

+@item Microtonal chords

 @end itemize
 
 
 @end itemize
 
 


@@ -1695,7 +1712,7 @@ found, or calls the default function otherwise.
 
 \score {
   \new Staff {
 
 \score {
   \new Staff {

-    \set Staff.midiInstrument = "cello"
+    \set Staff.midiInstrument = #"cello"

     \set Score.dynamicAbsoluteVolumeFunction = #myDynamics
     \new Voice {
        \relative c'' {
     \set Score.dynamicAbsoluteVolumeFunction = #myDynamics
     \new Voice {
        \relative c'' {