Merge branch 'master' into translation

[lilypond.git] / Documentation / learning / common-notation.itely

diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely
index e5b3a652a34487e14ddc15a0afc78f35ef5b9f8c..b9b62cf3b321452ec117290c7f9b68cf4246e39b 100644 (file)
--- a/Documentation/learning/common-notation.itely
+++ b/Documentation/learning/common-notation.itely
@@ -178,11 +178,8 @@ like German and Dutch.  To use other names for
 @cindex layout vs. content
 
 @funindex \key
-@funindex key
 @funindex \major
-@funindex major
 @funindex \minor
-@funindex minor
 
 Music Glossary: @rglos{key signature}, @rglos{major},
 @rglos{minor}.
@@ -334,9 +331,8 @@ starting note and ending note are marked with @code{(} and
 Music Glossary: @rglos{slur}, @rglos{phrasing}.
 
 Slurs to indicate longer @notation{phrasing} can be entered with
-@code{\(} and @code{\)}.  You can have both @notation{slurs}
-and phrasing slurs at the same time, but you cannot have
-simultaneous slurs or simultaneous phrasing slurs.
+@code{\(} and @code{\)}.  You can have both @notation{slurs} and
+phrasing slurs at the same time.
 
 @lilypond[verbatim,quote]
 \relative { g'4\( g8( a) b( c) b4\) }
@@ -442,11 +438,8 @@ to let LilyPond determine the articulation directions.
 @funindex \mf
 @funindex \pp
 @funindex \<
-@funindex <
 @funindex \>
-@funindex >
 @funindex \!
-@funindex !
 
 Music Glossary: @rglos{dynamics}, @rglos{crescendo},
 @rglos{decrescendo}.
@@ -484,7 +477,6 @@ Notation Reference:
 @cindex markup
 
 @funindex \markup
-@funindex markup
 
 Text may be added to your scores:
 
@@ -521,9 +513,7 @@ Notation Reference:
 @funindex [
 @funindex ]
 @funindex \autoBeamOff
-@funindex autoBeamOff
 @funindex \autoBeamOn
-@funindex autoBeamOn
 
 Music Glossary: @rglos{beam}.
 
@@ -580,7 +570,6 @@ Notation Reference:
 @cindex partial measure
 
 @funindex \partial
-@funindex partial
 
 Music Glossary: @rglos{anacrusis}.
 
@@ -603,7 +592,6 @@ is a quarter note pickup and @code{\partial 8} an eighth note.
 @cindex triplets
 
 @funindex \tuplet
-@funindex tuplet
 
 Music Glossary: @rglos{note value}, @rglos{triplet}.
 
@@ -632,9 +620,7 @@ For triplets, there are three notes instead of two, so
 @cindex appoggiatura
 
 @funindex \grace
-@funindex grace
 @funindex \acciaccatura
-@funindex acciaccatura
 @funindex \appoggiatura
 @funindex acciaccatura
 
@@ -822,10 +808,8 @@ out on a single staff.
 @cindex notation context
 
 @funindex \new Staff
-@funindex new Staff
 @funindex Staff
 @funindex \new
-@funindex new
 @funindex Score
 @funindex Voice
 @funindex Lyrics
@@ -1021,7 +1005,6 @@ This section introduces vocal music and simple song sheets.
 @cindex songs
 
 @funindex \addlyrics
-@funindex addlyrics
 
 Music Glossary: @rglos{lyrics}.
 
@@ -1341,8 +1324,7 @@ cello = \new Staff {
 @end lilypond
 
 @noindent
-The name of a variable must have alphabetic characters only, no
-numbers, underscores, or dashes.
+By convention, variable names consist of alphabetic characters only.
 
 Variables must be defined @emph{before} the main music
 expression, but may be used as many times as required anywhere after
@@ -1361,9 +1343,9 @@ Variables may be used for many other types of objects in
 the input.  For example,
 
 @example
-width = 4.5\cm
-name = "Wendy"
-aFivePaper = \paper @{ paperheight = 21.0 \cm @}
+myWidth = 60      % a number to pass to a \paper variable (the unit is millimeter)
+myName = "Wendy"  % a string to pass to a markup
+aFivePaper = \paper @{ #(set-paper-size "a5") @}
 @end example
 
 Depending on its contents, the variable can be used in different
@@ -1372,11 +1354,11 @@ places.  The following example uses the above variables:
 @example
 \paper @{
   \aFivePaper
-  line-width = \width
+  line-width = \myWidth
 @}
 
 @{
-  c4^\name
+  c4^\myName
 @}
 @end example
 
@@ -1389,7 +1371,6 @@ places.  The following example uses the above variables:
 @cindex header block
 
 @funindex \header
-@funindex header
 
 The title, composer, opus number, and similar information are
 entered in the @code{\header} block.  This exists outside of the