* scm/part-combiner.scm: Add proper header.

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

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 46240d2c8e0a1c43b336a809d32d5de4c509dfdd..ae051f57209c0fbe994290f085eb353572e07211 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -24,7 +24,7 @@ we love to see and love to play from.
 @end menu
 
 
-@node Notation in LilyPond 
+@node Notation in LilyPond
 @section Notation in LilyPond
 
 
@@ -39,7 +39,7 @@ placing symbols such that the result looks pleasing.
 
 Common music notation is a system of recording music that has evolved
 over the past 1000 years. The form that is now in common use, dates
-from the early renaissance. Although, the basic form (note heads on a
+from the early renaissance. Although, the basic form (i.e. note heads on a
 5-line staff) has not changed, the details still change to express the
 innovations of contemporary notation.  Hence, it encompasses some 500
 years of music. Its applications range from monophonic melodies to
@@ -58,13 +58,13 @@ Each plug-in are completely modular and independent, so each can be
 developed and improved separately.  When put together, the plug-ins
 can solve the music notation program in cooperation.  People that put
 graphics to musical ideas are called copyists or engravers, so by
-analogy, each plug-in is also @code{engraver}.
+analogy, each plug-in is also called @code{engraver}.
 
 In the following example, we see how we start out with a note head
 engraver.
 
-@lilypond[notexidoc]
-\include "engraver-example.ly"
+@lilypond[]
+\include "engraver-example.lyinc"
 
 \score { \topVoice
 \paper {
@@ -93,8 +93,8 @@ engraver.
 
 Then a @code{Staff_symbol_engraver} adds the staff:
 
-@lilypond[notexidoc]
-\include "engraver-example.ly"
+@lilypond[]
+\include "engraver-example.lyinc"
 
 \score { \topVoice
 \paper {
@@ -122,8 +122,8 @@ Then a @code{Staff_symbol_engraver} adds the staff:
 
  The @code{Clef_engraver} defines a reference point for the staff:
 
-@lilypond[notexidoc]
-\include "engraver-example.ly"
+@lilypond[]
+\include "engraver-example.lyinc"
 
 \score { \topVoice
 \paper {
@@ -148,8 +148,8 @@ Then a @code{Staff_symbol_engraver} adds the staff:
 
 And the @code{Stem_engraver} adds stems:
 
-@lilypond[notexidoc]
-\include "engraver-example.ly"
+@lilypond[]
+\include "engraver-example.lyinc"
 
 \score { \topVoice
 \paper {
@@ -171,15 +171,15 @@ And the @code{Stem_engraver} adds stems:
 @end lilypond
 
 The @code{Stem_engraver} is notified of any note head coming along.
-Every time one (or more, for a chord) note heads is seen, a stem
+Every time one (or more, for a chord) note head(s) is seen, a stem
 object is created, and attached to the note head.
 
 By adding engravers for beams, slurs, accents, accidentals, bar lines,
 time signature, and key signature, we get a complete piece of
 notation.
 
-@lilypond[notexidoc]
-\include "engraver-example.ly"
+@lilypond[]
+\include "engraver-example.lyinc"
 
 \score { \topVoice }
 @end lilypond
@@ -189,8 +189,8 @@ notation.
 This system works well for monophonic music, but what about
 polyphony? In polyphonic notation, many voices can share a staff.
 
-@lilypond[notexidoc]
-\include "engraver-example.ly"
+@lilypond[]
+\include "engraver-example.lyinc"
 \score { \context Staff << \topVoice \\ \botVoice >> }
 @end lilypond
 
@@ -203,8 +203,8 @@ case of polyphony, a single Staff context contains more than one Voice
 context.  In polyphonic notation, many voices can share a staff:
 Similarly, more Staff contexts can be put into a single Score context.
 
-@lilypond[notexidoc]
-\include "engraver-example.ly"
+@lilypond[]
+\include "engraver-example.lyinc"
 \score {
 << \new Staff << \topVoice \\ \botVoice >>
 \new Staff << \pah \\ \hoom >>
@@ -214,7 +214,7 @@ Similarly, more Staff contexts can be put into a single Score context.
 
 
 
-@node  Engraving in LilyPond
+@node Engraving in LilyPond
 @section Engraving in LilyPond
 
 
@@ -423,12 +423,12 @@ require them to be twice the thickness of the staff lines. The same
 mechanism can be used to adjust a setting globally. By issuing the
 following command, the entire piece is now formatted with thicker stems:
 @example
-    \property Score.Stem \override #'thickness = #2.0 
+    \property Score.Stem \override #'thickness = #3.0 
 @end example
 
 @lilypond
 \score { \notes \relative c'' {
-    \property Score.Stem \override #'thickness = #2.0 
+    \property Score.Stem \override #'thickness = #3.0 
     \once\property Voice. DynamicLineSpanner  \override #'padding = #4.0 
 \stemUp
     a4_\f f,8
@@ -450,7 +450,7 @@ example above is calculated by the function
 this function by a more advanced one, we could issue
 @example
     \property Voice.DynamicLineSpanner \override #'Y-offset-callbacks
-       = #`(,gee-whiz-gadget)
+       = #(list gee-whiz-gadget)
 @end example
 
 @noindent
@@ -543,7 +543,7 @@ By adding chord names and lyrics we obtain a lead sheet:
 \score { <<
   \context ChordNames \chords  { c2 c f2 c }
   \notes \relative c' { \time 2/4 c4 c g'4 g a4 a g2 }
-  \context Lyrics \lyrics  { twin4 kle twin kle lit tle star2 } >> }
+  \context LyricsVoice \lyrics  { twin4 kle twin kle lit tle star2 } >> }
 @end lilypond
 
 Polyphonic notation and piano music can also be printed. The following
@@ -630,8 +630,8 @@ how to upgrade input files from previous versions of LilyPond.
 
 Once you are an experienced user, you can use the manual as reference:
 there is an extensive index@footnote{If you are looking for something,
-and you cannot find it by using the index, that is considered a bug.
-In that case, please file a bug report.}, but the document is also
+and you cannot find it in the manual, that is considered a bug.  In
+that case, please file a bug report.}, but the document is also
 available in
 @ifnothtml
 a big HTML page,