From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 19 Aug 2002 00:48:15 +0000 (+0000)
Subject: 	* input/mutopia/J.S.Bach/wtk1-fugue2.ly: staff switch fixes.
X-Git-Tag: release/1.6.0~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dbf1d3139edbf3ece2c056b28316a542a7d47786;p=lilypond.git

	* input/mutopia/J.S.Bach/wtk1-fugue2.ly: staff switch fixes.

	* Documentation/user/lilypond-book.itely: small cleanups
---

diff --git a/ChangeLog b/ChangeLog
index 43d277995f..195a737566 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 	
 2002-08-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* input/mutopia/J.S.Bach/wtk1-fugue2.ly: staff switch fixes.
+
 	* Documentation/user/lilypond-book.itely: small cleanups
 
 	* Documentation/user/*.itely: fix overfull hboxes. 
diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index e42fb4d523..0c22d5f2d4 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -8,7 +8,7 @@ LilyPond is a program to print sheet music. If you have used notation
 programs before, then the way to use this program might be surprising
 at first sight. To print music with lilypond, you have to enter
 musical codes in a file. Then you run LilyPond on the file, and the
-music is produced without any user intervention. For example,
+music is produced without any further intervention. For example,
 something like this:
 
 @lilypond[fragment,verbatim, relative 1, intertext="produces this"]
diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index a0ea6b389c..cf01cd5725 100644
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -34,6 +34,14 @@ they match the layout of your document.
 It can work on La@TeX{}, @code{html} or texinfo documents.  A tutorial
 on using lilypond-book is in @ref{integrating text and music}.
 
+@menu
+* Integrating Texinfo and music::  
+* Integrating La@TeX{} and music::  
+* Integrating HTML and music::  
+* Music fragment options::      
+* Invoking lilypond-book::      
+@end menu
+
 
 @cindex texinfo
 @cindex latex
diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index 2b09f5d420..f9c6f2a63f 100644
--- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -59,18 +59,20 @@ dux =  \context Voice=two \notes \relative c''{
   g4 r8 b c c16 b c8 g |
 %%10 
   as4 r8 a bes bes16 a bes8 f |
-  g4 r8 g as as g f |
-  r8 
+  g4 r8 g as as g
   \translator Staff = bass \stemUp 
+  f |
+  r8 
   as, bes c r8 as16 g as8 f8 |
   bes8 c bes as bes g f es |
   f des' c bes c as g f |
 %%15
   g8
+ \translator Staff = treble
+   \stemDown
+
   g'16 fis g8 c, 
-  es \translator Staff = treble
-  \stemBoth
-  \stemDown
+  es
   g16 fis! g8 a |
   d, g16 fis g8 a! c,16 d es4 d16 c |  % forced accident!
   bes8 r8 r16 d e fis g a bes8 ~ bes16 e, f g |
@@ -79,8 +81,9 @@ dux =  \context Voice=two \notes \relative c''{
   as f'16 es f8 a,8 bes g'16 f g8 b, |
 %%20
   c16 f es d
+   c
   \translator Staff = bass
-   c bes! as g 
+   bes! as g 
   f8 \translator Staff = treble
   as' g f |
   es d es f b, c d b |