More (final) docs for music expressions.

diff --git a/ChangeLog b/ChangeLog
index 573b6e96ad297459fea2b279c97a4194b1d6022d..667f88bb36762e1b075cde4b0999492d06a56c97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-28  Graham Percival  <gpermus@gmail.com>
+
+       * Documentation/user/ advanced-notation, global: more (final)
+       docs for music expressions, removed special fermatas.
+
 2006-02-27  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/ basic-notation, global: minor changes

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index a262c9fae4f31223f5d9dbeef70b33f7659a6b0b..3768dce33cbbda1073e54ce30de607ffbd1a177e 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -1768,54 +1768,6 @@ Music expressions like @code{<< @{ g8 e8 @} a4 >>} are not printed
 accurately.  Use @code{<g a>8 <e a>8} instead.
 
 
-@ignore
-
-This is covered in articulation; does it really need its
-own doc section?  -gp
-@n ode Special fermatas
-@s ubsection Special fermatas
-
-@c index fermatas, special
-
-In contemporary music notation, special fermata symbols denote breaks
-of differing lengths.  The following fermatas are supported
-
-@li lypond[quote,ragged-right]
-<<
-  \oldaddlyrics {
-    b'2
-    ^\shortfermata
-    _\shortfermata
-    r
-
-    b'
-    ^\fermata
-    _\fermata
-    r
-
-    b'
-    ^\longfermata
-    _\longfermata
-    r
-
-    b'
-    ^\verylongfermata
-    _\verylongfermata
-    r
-  }
-  \new Lyrics \lyricmode {
-    \override LyricText #'font-family = #'typewriter
-    "shortfermata" "fermata" "longfermata" "verylongfermata"
-  }
->>
-@end li lypond
-
-See @ref{Articulations} for general instructions how to apply scripts
-such as fermatas to notes.
-
-@end ignore
-
-
 @node Special noteheads
 @subsection Special noteheads
 

diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index b7a51512213c3dff06cfe4242b6c1a462ef8657e..6bee5dcd1dc045dbbe65c42ebc86174207e29dd1 100644 (file)
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -13,7 +13,7 @@ specific notation.
 
 @menu
 * Input files::                 
-* Music expressions again::     
+* A single music expression::   
 * Titles and headers::          
 * Paper and pages::             
 * Music layout::                
@@ -105,8 +105,8 @@ This behavior can be changed by setting the variable
 @code{toplevel-score-handler} at toplevel.  The default handler is
 defined in the init file @file{scm/@/lily@/.scm}.
 
-The @code{\score} must begin with music, and may contain only
-one music block.
+The @code{\score} must begin with a music expression, and may
+contain only one music expression.
 
 @item
 A @code{\book} block logically combines multiple movements
@@ -294,11 +294,48 @@ To use a Unicode escape sequence, use
 
 
 
-@c  FIXME: --must-- delete/modify this before 2.8.0!!!  -gp
-@node Music expressions again
-@section Music expressions again
+@node A single music expression
+@section A single music expression
 
-Should we include anything about this here?
+A @code{\score} must contain a single music expression.  However,
+this music expression may be of any size.  Recall that music
+expressions may be included inside other expressions to form
+larger expressions.  All of these examples are single music
+expressions; note the curly braces @{ @} or angle brackets <<
+>> at the beginning and ending of the music.
+
+@example
+@{ c'4 c' c' c' @}
+@end example
+
+@lilypond[ragged-right,verbatim,quote]
+{
+  { c'4 c' c' c'}
+  { d'4 d' d' d'}
+}
+@end example
+
+@lilypond[ragged-right,verbatim,quote]
+<<
+  \new Staff { c'4 c' c' c' }
+  \new Staff { d'4 d' d' d' }
+>>
+@end example
+
+@example
+@{
+  \new GrandStaff <<
+    \new StaffGroup <<
+      \new Staff @{ \flute @}
+      \new Staff @{ \oboe @}
+    >>
+    \new StaffGroup <<
+      \new Staff @{ \violinI @}
+      \new Staff @{ \violinII @}
+    >>
+  >>
+@}
+@end example
 
 
 @node Titles and headers