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

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

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 71fe0f3b0106b557798be75036b9b82b17578656..c6761089033ce9623a1d49e7c83cd751a981aa55 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -87,9 +87,8 @@ computer edition.
 @end ifnottex
 @end ifnotinfo
 @ifinfo
 @end ifnottex
 @end ifnotinfo
 @ifinfo

-@c workaround for makeinfo-4.6: line breaks and multi-column cookies
-@image{henle-flat-bw,,,png} @image{baer-flat-bw,,,png}
-@image{lily-flat-bw,,,png}
+@image{lilypond/henle-flat-bw,,,png} @image{lilypond/baer-flat-bw,,,png}
+@image{lilypond/lily-flat-bw,,,png}

 @end ifinfo
 
 @item @tab
 @end ifinfo
 
 @item @tab


@@ -540,7 +539,7 @@ context.  The Score context is the top level notation context.
 
 @seealso
 
 
 @seealso
 

-Program reference: @internalsref{Contexts}.
+Internals Reference: @internalsref{Contexts}.

 
 @lilypond[quote,ragged-right]
 \include "engraver-example.ily"
 
 @lilypond[quote,ragged-right]
 \include "engraver-example.ily"


@@ -569,14 +568,18 @@ The syntax is also the user-interface for LilyPond, hence it is easy
 to type
 
 @example
 to type
 
 @example

-c'4 d'8
+@{
+  c'4 d'8
+@}

 @end example
 
 @noindent
 a quarter note C1 (middle C) and an eighth note D1 (D above middle C)
 
 @end example
 
 @noindent
 a quarter note C1 (middle C) and an eighth note D1 (D above middle C)
 

-@lilypond[quote,fragment]
-c'4 d'8
+@lilypond[quote]
+{
+  c'4 d'8
+}

 @end lilypond
 
 On a microscopic scale, such syntax is easy to use.  On a larger
 @end lilypond
 
 On a microscopic scale, such syntax is easy to use.  On a larger


@@ -651,8 +654,11 @@ of music engraving into a computer program.  Thanks to all that hard
 work, the program can now be used to perform useful tasks.  The
 simplest application is printing notes.
 
 work, the program can now be used to perform useful tasks.  The
 simplest application is printing notes.
 

-@lilypond[quote,relative=1,fragment]
-\time 2/4 c4 c g'4 g a4 a g2
+@lilypond[quote,relative=1]
+{
+  \time 2/4
+  c4 c g'4 g a4 a g2
+}

 @end lilypond
 
 @noindent
 @end lilypond
 
 @noindent


@@ -693,8 +699,8 @@ to mix music and text in documents.
 FIXME: needs almost-complete rewrite.  -gp
 
 There are four manuals about LilyPond: the @emph{Learning Manual},
 FIXME: needs almost-complete rewrite.  -gp
 
 There are four manuals about LilyPond: the @emph{Learning Manual},

-the @emph{Notation Reference}, the @emph{Program Usage}, and the
-@emph{Program Reference}.
+the @emph{Notation Reference}, the @emph{Application Usage}, and the
+@emph{Internals Reference}.

 
 
 @subheading Learning Manual (LM)
 
 
 @subheading Learning Manual (LM)


@@ -896,7 +902,7 @@ advisable to consult the glossary.
 @item
 The
 @ifhtml
 @item
 The
 @ifhtml

-@uref{source/input/lsr/collated-files.html,Snippets}
+@uref{source/input/lsr/snippets/index.html,Snippets}

 @end ifhtml
 @ifnothtml
 Snippets
 @end ifhtml
 @ifnothtml
 Snippets


@@ -910,10 +916,10 @@ Repository}.  This website also has a searchable LilyPond manual.
 @item
 The
 @iftex
 @item
 The
 @iftex

-Program reference
+Internals Reference

 @end iftex
 @ifnottex
 @end iftex
 @ifnottex

-@ref{Top,Program reference,,lilypond-internals}
+@ref{Top,Internals Reference,,lilypond-internals}

 @end ifnottex
 is a set of heavily cross linked HTML pages, which document the
 nitty-gritty details of each and every LilyPond class, object, and
 @end ifnottex
 is a set of heavily cross linked HTML pages, which document the
 nitty-gritty details of each and every LilyPond class, object, and