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

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

diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index e02cd494c22cd7f162c2f84f97369863dce9343c..51f50b887e6439d05d1ac29e1674d527cfac6a77 100644 (file)
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -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


@@ -890,11 +893,13 @@ 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 +1119,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 +1128,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.