commas aren't allowed in section headings.

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

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index a27989416d10c745e94b20372b4f8f44654e8660..bf0dcb70b70d2351d8854bbd06ee3740e77185b0 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c -*- coding: utf-8; mode: texinfo; -*-

-@c This file is part of lilypond.tely
+@c This file is part of lilypond-learning.tely

 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 


@@ -243,7 +243,7 @@ programming language; the program's functionality was set in stone by
 the developers.  That proved to be unsatisfactory for a number of
 reasons:
 
 the developers.  That proved to be unsatisfactory for a number of
 reasons:
 

-@itemize @bullet
+@itemize

 @item When LilyPond makes mistakes,
 users need to override formatting decisions.  Therefore, the user must
 have access to the formatting engine.  Hence, rules and settings cannot
 @item When LilyPond makes mistakes,
 users need to override formatting decisions.  Therefore, the user must
 have access to the formatting engine.  Hence, rules and settings cannot


@@ -540,7 +540,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 +569,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 +655,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


@@ -690,22 +697,20 @@ to mix music and text in documents.
 @node About this manual
 @section About this manual
 
 @node About this manual
 @section About this manual
 

-There are two manuals about LilyPond: the @emph{user manual} (this
-document), and @emph{program usage}.
-
+FIXME: needs almost-complete rewrite.  -gp

 
 

-@subheading User manual
+There are four manuals about LilyPond: the @emph{Learning Manual},
+the @emph{Notation Reference}, the @emph{Application Usage}, and the
+@emph{Internals Reference}.

 
 

-The manual is divided into three books.

 
 

-@subsubheading Learning manual
+@subheading Learning Manual (LM)

 
 This book explains how to begin learning LilyPond, as well as explaining
 some key concepts in easy terms.  It is recommended to read these
 chapters in a linear fashion.
 
 
 This book explains how to begin learning LilyPond, as well as explaining
 some key concepts in easy terms.  It is recommended to read these
 chapters in a linear fashion.
 

-
-@itemize @bullet
+@itemize

 
 @item
 @ifhtml
 
 @item
 @ifhtml


@@ -716,7 +721,7 @@ gives a gentle introduction to typesetting music.  First time
 users should start here.
 
 @item
 users should start here.
 
 @item

-@emph{@ref{Putting it all together}},
+@emph{@ref{Fundamental concepts}},

 explains some general concepts about the lilypond file format.  If
 you are not certain where to place a command, read this chapter!
 
 explains some general concepts about the lilypond file format.  If
 you are not certain where to place a command, read this chapter!
 


@@ -733,7 +738,7 @@ produces.
 @end itemize
 
 
 @end itemize
 
 

-@subsubheading Notation reference
+@subheading Notation Reference (NR)

 
 This book explains all the LilyPond commands which produce notation.  It
 assumes that readers are familiar with the concepts in the Learning
 
 This book explains all the LilyPond commands which produce notation.  It
 assumes that readers are familiar with the concepts in the Learning


@@ -743,7 +748,7 @@ All of this needs to be rewritten after GDP, anyway.
 
 @ignore
 
 
 @ignore
 

-@itemize @bullet
+@itemize

 
 @item
 @emph{@r ef{Basic notation}},
 
 @item
 @emph{@r ef{Basic notation}},


@@ -787,7 +792,7 @@ explains how to create music functions.
 
 This book contains useful reference charts.
 
 
 This book contains useful reference charts.
 

-@itemize @bullet
+@itemize

 @item
 @ifhtml
 The
 @item
 @ifhtml
 The


@@ -836,7 +841,7 @@ is a complete index.
 This book explains how to execute the program and how to integrate
 LilyPond notation with other programs.
 
 This book explains how to execute the program and how to integrate
 LilyPond notation with other programs.
 

-@itemize @bullet
+@itemize

 
 @item
 @emph{@rprogram{Install}},
 
 @item
 @emph{@rprogram{Install}},


@@ -872,7 +877,7 @@ formats to the @code{.ly} format.
 
 There are a number of other places which may be very valuable.
 
 
 There are a number of other places which may be very valuable.
 

-@itemize @bullet
+@itemize

 @cindex idiom
 @cindex jargon
 @cindex terminology
 @cindex idiom
 @cindex jargon
 @cindex terminology


@@ -898,7 +903,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


@@ -912,10 +917,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