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

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

diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely
index 7d34d76f29a39253d4a443670a7547fbd3a34210..355a3387461f6e0daa370bf2b4688eef3992c973 100644 (file)
--- a/Documentation/user/fundamental.itely
+++ b/Documentation/user/fundamental.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 

-@c \version "2.11.61"
+@c \version "2.12.0"

 
 @node Fundamental concepts
 @chapter Fundamental concepts
 
 @node Fundamental concepts
 @chapter Fundamental concepts


@@ -242,12 +242,11 @@ limitations on variable names are detailed in
 @ruser{File structure}.
 
 
 @ruser{File structure}.
 
 

-

 @seealso
 @seealso

-

 For a complete definition of the input format, see
 @ruser{File structure}.
 
 For a complete definition of the input format, see
 @ruser{File structure}.
 

+

 @node Score is a (single) compound musical expression
 @subsection Score is a (single) compound musical expression
 
 @node Score is a (single) compound musical expression
 @subsection Score is a (single) compound musical expression
 


@@ -395,10 +394,11 @@ each smaller level.  It also really helps to be strict with
 indentation -- make sure that each item on the same level starts
 on the same horizontal position in your text editor.
 
 indentation -- make sure that each item on the same level starts
 on the same horizontal position in your text editor.
 

-@seealso

 
 

+@seealso

 Notation Reference: @ruser{Structure of a score}.
 
 Notation Reference: @ruser{Structure of a score}.
 

+

 @node Nesting music expressions
 @subsection Nesting music expressions
 
 @node Nesting music expressions
 @subsection Nesting music expressions
 


@@ -447,7 +447,7 @@ as follows:
     <<
       { f c c }
       \new Staff \with {
     <<
       { f c c }
       \new Staff \with {

-        alignAboveContext = "main" }
+        alignAboveContext = #"main" }

       { f8 f c }
     >>
     r4 |
       { f8 f c }
     >>
     r4 |


@@ -461,8 +461,8 @@ of a single Staff.  Here it says that the new staff should be
 placed above the staff called @qq{main} instead of the default
 position which is below.
 
 placed above the staff called @qq{main} instead of the default
 position which is below.
 

-@seealso

 
 

+@seealso

 Ossia are often written without clef and without
 time signature and are usually in a smaller font.
 These require further commands which
 Ossia are often written without clef and without
 time signature and are usually in a smaller font.
 These require further commands which


@@ -924,8 +924,8 @@ to see how to correct this, so we shall leave this problem until a
 later section --- see the @code{force-hshift} property in @ref{Fixing
 overlapping notation}.
 
 later section --- see the @code{force-hshift} property in @ref{Fixing
 overlapping notation}.
 

-@seealso

 
 

+@seealso

 Notation Reference: @ruser{Multiple voices}.
 
 
 Notation Reference: @ruser{Multiple voices}.
 
 


@@ -1168,8 +1168,8 @@ same direction are placed at the same position and both voices
 have no shift or the same shift specified, the error message
 @qq{Too many clashing note columns} will be produced.
 
 have no shift or the same shift specified, the error message
 @qq{Too many clashing note columns} will be produced.
 

-@seealso

 
 

+@seealso

 Notation Reference: @ruser{Multiple voices}.
 
 
 Notation Reference: @ruser{Multiple voices}.
 
 


@@ -1356,7 +1356,7 @@ versewords = \lyricmode {
   One two three four five six
 }
 \score {
   One two three four five six
 }
 \score {

-  \new Choirstaff {
+  \new ChoirStaff {

     \new Staff <<
       \new Voice = "verse" {
         \versenotes \break
     \new Staff <<
       \new Voice = "verse" {
         \versenotes \break


@@ -1517,8 +1517,8 @@ refrainwordsB = \lyricmode {
 }
 @end lilypond
 
 }
 @end lilypond
 

-@seealso

 
 

+@seealso

 Notation Reference: @ruser{Vocal music}.
 
 
 Notation Reference: @ruser{Vocal music}.
 
 


@@ -1609,8 +1609,8 @@ words, each word being capitalized and joined immediately to the
 preceding word with no hyphen or underscore, e.g.,
 @code{GregorianTranscriptionStaff}.
 
 preceding word with no hyphen or underscore, e.g.,
 @code{GregorianTranscriptionStaff}.
 

-@seealso

 
 

+@seealso

 Notation Reference: @ruser{Contexts explained}.
 
 
 Notation Reference: @ruser{Contexts explained}.
 
 


@@ -1720,8 +1720,8 @@ The identifying name is used to
 refer back to that particular instance of a context.  We saw this in
 use in the section on lyrics, see @ref{Voices and vocals}.
 
 refer back to that particular instance of a context.  We saw this in
 use in the section on lyrics, see @ref{Voices and vocals}.
 

-@seealso

 
 

+@seealso

 Notation Reference: @ruser{Creating contexts}.
 
 
 Notation Reference: @ruser{Creating contexts}.
 
 


@@ -1805,8 +1805,8 @@ from the name, or vice versa.
 We shall see later how the output of LilyPond can be changed
 by modifying the action of Engravers.
 
 We shall see later how the output of LilyPond can be changed
 by modifying the action of Engravers.
 

-@seealso

 
 

+@seealso

 Internals reference: @rinternals{Engravers and Performers}.
 
 
 Internals reference: @rinternals{Engravers and Performers}.
 
 


@@ -2092,8 +2092,8 @@ Context properties set in this way may be overridden for particular
 instances of contexts by statements in a @code{\with} block, and by
 @code{\set} commands embedded in music statements.
 
 instances of contexts by statements in a @code{\with} block, and by
 @code{\set} commands embedded in music statements.
 

-@seealso

 
 

+@seealso

 Notation Reference:
 @ruser{Changing context default settings}.
 @c FIXME
 Notation Reference:
 @ruser{Changing context default settings}.
 @c FIXME


@@ -2250,8 +2250,8 @@ for all contexts of a particular type by including the
 @code{\set} command in a @code{\context} block in the
 same way.
 
 @code{\set} command in a @code{\context} block in the
 same way.
 

-@seealso

 
 

+@seealso

 Notation Reference: @ruser{Modifying context plug-ins},
 @ruser{Changing context default settings}.
 
 Notation Reference: @ruser{Modifying context plug-ins},
 @ruser{Changing context default settings}.
 


@@ -2451,8 +2451,8 @@ celloMusic = \relative c {
 }
 @end lilypond
 
 }
 @end lilypond
 

-@seealso

 
 

+@seealso

 The starting templates can be found in the @q{Templates} appendix,
 see @ref{Single staff}.
 
 The starting templates can be found in the @q{Templates} appendix,
 see @ref{Single staff}.
 


@@ -2514,29 +2514,29 @@ lower = \relative c, {
   <<  % combine ChoirStaff and PianoStaff in parallel
     \new ChoirStaff <<
       \new Staff = "sopranos" <<
   <<  % combine ChoirStaff and PianoStaff in parallel
     \new ChoirStaff <<
       \new Staff = "sopranos" <<

-        \set Staff.instrumentName = "Soprano"
+        \set Staff.instrumentName = #"Soprano"

         \new Voice = "sopranos" { \global \sopranoMusic }
       >>
       \new Lyrics \lyricsto "sopranos" { \sopranoWords }
       \new Staff = "altos" <<
         \new Voice = "sopranos" { \global \sopranoMusic }
       >>
       \new Lyrics \lyricsto "sopranos" { \sopranoWords }
       \new Staff = "altos" <<

-        \set Staff.instrumentName = "Alto"
+        \set Staff.instrumentName = #"Alto"

         \new Voice = "altos" { \global \altoMusic }
       >>
       \new Lyrics \lyricsto "altos" { \altoWords }
       \new Staff = "tenors" <<
         \new Voice = "altos" { \global \altoMusic }
       >>
       \new Lyrics \lyricsto "altos" { \altoWords }
       \new Staff = "tenors" <<

-        \set Staff.instrumentName = "Tenor"
+        \set Staff.instrumentName = #"Tenor"

         \new Voice = "tenors" { \global \tenorMusic }
       >>
       \new Lyrics \lyricsto "tenors" { \tenorWords }
       \new Staff = "basses" <<
         \new Voice = "tenors" { \global \tenorMusic }
       >>
       \new Lyrics \lyricsto "tenors" { \tenorWords }
       \new Staff = "basses" <<

-        \set Staff.instrumentName = "Bass"
+        \set Staff.instrumentName = #"Bass"

         \new Voice = "basses" { \global \bassMusic }
       >>
       \new Lyrics \lyricsto "basses" { \bassWords }
     >>  % end ChoirStaff
 
     \new PianoStaff <<
         \new Voice = "basses" { \global \bassMusic }
       >>
       \new Lyrics \lyricsto "basses" { \bassWords }
     >>  % end ChoirStaff
 
     \new PianoStaff <<

-      \set PianoStaff.instrumentName = "Piano"
+      \set PianoStaff.instrumentName = #"Piano"

       \new Staff = "upper" \upper
       \new Staff = "lower" \lower
     >>
       \new Staff = "upper" \upper
       \new Staff = "lower" \lower
     >>


@@ -2567,22 +2567,22 @@ Doing this gives for our ChoirStaff:
 @example
     \new ChoirStaff <<
       \new Staff = "sopranos" <<
 @example
     \new ChoirStaff <<
       \new Staff = "sopranos" <<

-        \set Staff.instrumentName = "Soprano"
+        \set Staff.instrumentName = #"Soprano"

         \new Voice = "sopranos" @{ \global \sopranoMusic @}
       >>
       \new Lyrics \lyricsto "sopranos" @{ \sopranoWords @}
       \new Staff = "altos" <<
         \new Voice = "sopranos" @{ \global \sopranoMusic @}
       >>
       \new Lyrics \lyricsto "sopranos" @{ \sopranoWords @}
       \new Staff = "altos" <<

-        \set Staff.instrumentName = "Alto"
+        \set Staff.instrumentName = #"Alto"

         \new Voice = "altos" @{ \global \altoMusic @}
       >>
       \new Lyrics \lyricsto "altos" @{ \altoWords @}
       \new Staff = "tenors" <<
         \new Voice = "altos" @{ \global \altoMusic @}
       >>
       \new Lyrics \lyricsto "altos" @{ \altoWords @}
       \new Staff = "tenors" <<

-        \set Staff.instrumentName = "Tenor"
+        \set Staff.instrumentName = #"Tenor"

         \new Voice = "tenors" @{ \global \tenorMusic @}
       >>
       \new Lyrics \lyricsto "tenors" @{ \tenorWords @}
       \new Staff = "basses" <<
         \new Voice = "tenors" @{ \global \tenorMusic @}
       >>
       \new Lyrics \lyricsto "tenors" @{ \tenorWords @}
       \new Staff = "basses" <<

-        \set Staff.instrumentName = "Bass"
+        \set Staff.instrumentName = #"Bass"

         \new Voice = "basses" @{ \global \bassMusic @}
       >>
       \new Lyrics \lyricsto "basses" @{ \bassWords @}
         \new Voice = "basses" @{ \global \bassMusic @}
       >>
       \new Lyrics \lyricsto "basses" @{ \bassWords @}


@@ -2595,7 +2595,7 @@ easy - we just pull out the piano part from the
 
 @example
 \new PianoStaff <<
 
 @example
 \new PianoStaff <<

-  \set PianoStaff.instrumentName = "Piano  "
+  \set PianoStaff.instrumentName = #"Piano  "

   \new Staff = "upper" \upper
   \new Staff = "lower" \lower
 >>
   \new Staff = "upper" \upper
   \new Staff = "lower" \lower
 >>


@@ -2632,7 +2632,7 @@ stacked one above the other:
   >>  % end ChoirStaff
 
   \new PianoStaff <<
   >>  % end ChoirStaff
 
   \new PianoStaff <<

-    \set PianoStaff.instrumentName = "Piano"
+    \set PianoStaff.instrumentName = #"Piano"

     \new Staff = "upper" \upper
     \new Staff = "lower" \lower
   >>
     \new Staff = "upper" \upper
     \new Staff = "lower" \lower
   >>


@@ -2685,29 +2685,29 @@ lower = \relative c, {
   <<  % combine ChoirStaff and PianoStaff in parallel
     \new ChoirStaff <<
       \new Staff = "sopranos" <<
   <<  % combine ChoirStaff and PianoStaff in parallel
     \new ChoirStaff <<
       \new Staff = "sopranos" <<

-        \set Staff.instrumentName = "Soprano"
+        \set Staff.instrumentName = #"Soprano"

         \new Voice = "sopranos" { \global \sopranoMusic }
       >>
       \new Lyrics \lyricsto "sopranos" { \sopranoWords }
       \new Staff = "altos" <<
         \new Voice = "sopranos" { \global \sopranoMusic }
       >>
       \new Lyrics \lyricsto "sopranos" { \sopranoWords }
       \new Staff = "altos" <<

-        \set Staff.instrumentName = "Alto"
+        \set Staff.instrumentName = #"Alto"

         \new Voice = "altos" { \global \altoMusic }
       >>
       \new Lyrics \lyricsto "altos" { \altoWords }
       \new Staff = "tenors" <<
         \new Voice = "altos" { \global \altoMusic }
       >>
       \new Lyrics \lyricsto "altos" { \altoWords }
       \new Staff = "tenors" <<

-        \set Staff.instrumentName = "Tenor"
+        \set Staff.instrumentName = #"Tenor"

         \new Voice = "tenors" { \global \tenorMusic }
       >>
       \new Lyrics \lyricsto "tenors" { \tenorWords }
       \new Staff = "basses" <<
         \new Voice = "tenors" { \global \tenorMusic }
       >>
       \new Lyrics \lyricsto "tenors" { \tenorWords }
       \new Staff = "basses" <<

-        \set Staff.instrumentName = "Bass"
+        \set Staff.instrumentName = #"Bass"

         \new Voice = "basses" { \global \bassMusic }
       >>
       \new Lyrics \lyricsto "basses" { \bassWords }
     >>  % end ChoirStaff
 
     \new PianoStaff <<
         \new Voice = "basses" { \global \bassMusic }
       >>
       \new Lyrics \lyricsto "basses" { \bassWords }
     >>  % end ChoirStaff
 
     \new PianoStaff <<

-      \set PianoStaff.instrumentName = "Piano  "
+      \set PianoStaff.instrumentName = #"Piano  "

       \new Staff = "upper" \upper
       \new Staff = "lower" \lower
     >>
       \new Staff = "upper" \upper
       \new Staff = "lower" \lower
     >>