*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 01e0010eaa22383739b62aff94a1e6864f1f6ece..a8e8633f8f9e83ba71ce5a3bf745d333085594d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-12  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * Documentation/user/instrument-notation.itely (Setting simple
+       songs): Added \book{...} around the full example, so the separate
+       markups are included in the printed example. 
+
 2006-03-12  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scripts/lilypond-book.py (get_latex_textwidth): explicitly close tmphandle.

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 8c5f2950a46345194afeb019e455f1c5d39b6df4..d1f9ba33eabe6305c3ccf34a6dbcfd0aa069bfdb 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -756,25 +756,27 @@ text = \lyricmode {
 it's fleece was white as snow.
 }
 
-\score{ <<
-  \new Voice = "one" { \melody }
-  \new Lyrics \lyricsto "one" \text
+\book{
+  \score{ <<
+    \new Voice = "one" { \melody }
+    \new Lyrics \lyricsto "one" \text
        >>
-  \layout { }
-}
-\markup { \column{
-  \line{ Verse 2. }
-  \line{ All the children laughed and played }
-  \line{ To see a lamb at school. }
+    \layout { }
   }
-}
-\markup{
-  \wordwrap-string #"
-  Verse 3.
+  \markup { \column{
+    \line{ Verse 2. }
+    \line{ All the children laughed and played }
+    \line{ To see a lamb at school. }
+    }
+  }
+  \markup{
+    \wordwrap-string #"
+    Verse 3.
 
-  Mary took it home again,
+    Mary took it home again,
 
-  It was against the rule."
+    It was against the rule."
+  }
 }
 @end lilypond