From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 10 Mar 2005 19:59:50 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.15~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=87de27a68862bbb4d54e11385dc92aa5089c9ed7;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 356ca5a573..2194f94f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 
 2005-03-10  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* Documentation/user/global.itely (File structure): Add markup blocks
+	to toplevel expressions.
+	(Multiple movements, Creating titles): Add markup blocks.
+
 	* lily/stencil-scheme.cc: Use "libc-extention.hh" (WAS:
 	<libc-extention.hh>).
 
diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index 2f44fcc6df..488319b985 100644
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -312,7 +312,7 @@ value has to be multiplied in the example
 The default footer is empty, except for the first page, where the
 @code{copyright} field from @code{\header} is inserted, and the last
 page, where @code{tagline} from @code{\header} is added.  The default
-tagline is ``Engraved by LilyPond (@var{version})''.@footnote{Nicely
+tagline is ``Music engraving by LilyPond (@var{version})''.@footnote{Nicely
 printed parts are good PR for us, so please leave the tagline if you
 can.}
 
@@ -668,11 +668,11 @@ Page breaks are computed by the @code{page-breaking} function in the
 @cindex bibliographic information
 @cindex titles
 @cindex composer
-@cindex Engraved by LilyPond
+@cindex Music engraiving by LilyPond
 
-A document may contain multiple pieces of music.  Examples of these
-are an etude book, or an orchestral part with multiple movements.
-Each movement is entered with a @code{\score} block,
+A document may contain multiple pieces of music and texts.  Examples
+of these are an etude book, or an orchestral part with multiple
+movements.  Each movement is entered with a @code{\score} block,
 
 @example
 \score @{
@@ -680,13 +680,25 @@ Each movement is entered with a @code{\score} block,
 @}
 @end example
 
-The movements are combined together in a @code{\book} block, like
+and texts are entered with a @code{\markup} block,
+
+@example
+\markup @{
+  @var{..text..}
+@}
+@end example
+
+The movements and texts are combined together in a @code{\book} block,
+like
 
 @example
 \book @{
   \score @{
     @var{..}
   @}
+  \markup @{
+    @var{..}
+  @}
   \score @{
     @var{..}
   @}
@@ -713,6 +725,12 @@ the top of the file is inserted.
     @dots{}
     \header @{ piece = "Romanze" @}
   @}
+  \markup @{
+     ..text of second verse..
+  @}
+  \markup @{
+     ..text of third verse..
+  @}
   \score @{
     @dots{}
     \header @{ piece = "Menuetto" @}
@@ -797,6 +815,9 @@ Here is a demonstration of the fields available,
     }
     { c'1 }
   }
+  \markup {
+      and now...
+  }
   \score {
     \header {
       piece = "piece2"
@@ -940,6 +961,16 @@ This behavior can be changed by setting the variable
 @code{toplevel-music-handler} at toplevel.  The default handler is
 defined in the init file @file{scm/@/lily@/.scm}.
 
+@item A markup text, a verse for example
+@example
+\markup @{
+   2.  The first line verse two.
+@}
+@end example
+
+Markup texts are rendered above, between or below the scores or music
+expressions, wherever they appear.
+
 @item An indentifier, such as
 @example
 foo = @{ c4 d e d @}