From d6e504152e6f3c75ce681403b1b28e95d70f081a Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Thu, 21 Aug 2003 23:24:39 +0000
Subject: [PATCH] (to_relative_octave): undo relative meaning for now.

---
 ChangeLog                                     |   9 +
 .../J.S.Bach/Petites-Preludes/header.ly       |   2 +-
 .../J.S.Bach/Petites-Preludes/preludes-3.ly   |   5 +-
 .../J.S.Bach/Petites-Preludes/preludes-4.ly   |   2 +-
 .../J.S.Bach/Petites-Preludes/preludes-5.ly   |   9 +-
 .../J.S.Bach/baerenreiter-sarabande.ly        |  16 +-
 input/mutopia/J.S.Bach/wtk1-fugue1.ly         | 278 +++++++++---------
 input/mutopia/J.S.Bach/wtk1-prelude1.ly       | 177 -----------
 lily/simultaneous-music.cc                    |   4 +
 9 files changed, 176 insertions(+), 326 deletions(-)
 delete mode 100644 input/mutopia/J.S.Bach/wtk1-prelude1.ly

diff --git a/ChangeLog b/ChangeLog
index 2f5a8e9003..05c602917b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
+2003-08-22  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* lily/simultaneous-music.cc (to_relative_octave): undo relative
+	meaning for now.
+
 2003-08-21  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* input/mutopia/J.S.Bach/wtk1-fugue1.ly: updates
+
+	* input/mutopia/J.S.Bach/wtk1-prelude1.ly: remove file
+
 	* input/mutopia/F.Schubert/standchen.ly (trebleThrough): fixes
 
 	* lily/simultaneous-music.cc (to_relative_octave): add Event_chord.
diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/header.ly b/input/mutopia/J.S.Bach/Petites-Preludes/header.ly
index 666dffd113..08709160a1 100644
--- a/input/mutopia/J.S.Bach/Petites-Preludes/header.ly
+++ b/input/mutopia/J.S.Bach/Petites-Preludes/header.ly
@@ -22,7 +22,7 @@ instrument = "Piano"
   mutopiatitle = "Petites Pr&eacuteluedes"
   mutopiacomposer = "J.S.Bach (1685-1750)"
   mutopiaopus = "BWV924,939,999,925,926,940"
-  mutopiainstrument = \intrument
+  mutopiainstrument = \instrument
   date = "1700s"
   source = "Ed. Henry Lemoine Urtext"
   style = "Baroque"
diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly
index c5f2d7924b..7196554644 100644
--- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly
+++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly
@@ -148,7 +148,10 @@ global  = \notes{
 		>
 	>
 	\paper{
-		\translator {\OrchestralScoreContext }
+		\translator {\PianoStaffContext
+			     VerticalAlignment \set #'forced-distance = #10
+			 }
+		
 	}
 	\midi{ \tempo 4 = 100 }
 	\header{
diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
index db4b1f5729..20ab6fe71e 100644
--- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
+++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
@@ -107,7 +107,7 @@ two = \context Staff \notes\relative c
 	>
 	\translator Staff=lower
 	\stemUp\tieUp
-	g fis g a  g b a g ~ |
+	g16 fis g a  g b a g ~ |
 	g g fis e fis4 ~ fis2
 	\bar "|."
 }
diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
index a9caa3b00a..2be246fa2c 100644
--- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
+++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
@@ -26,8 +26,8 @@ upper =  \context Staff \notes\relative c
 		{
 			
 			\property Voice.TextScript \set #'font-style = #'roman
-			c4-\mordent^\markup { \musicglyph  "accidentals-1" } r r |
-			c4-\mordent^\markup { \musicglyph  "accidentals-1" } r r
+			c4-\mordent^\markup { \musicglyph #"accidentals-1" } r r |
+			c4-\mordent^\markup { \musicglyph #"accidentals-1" } r r
 			\property Voice.TextScript \set #'font-style = #'italic
 		} \\
 		{ a4 r r | a4 r r }
@@ -119,7 +119,7 @@ lower =  \context Staff \notes\relative c{
 	fis,4 r r 
 	d  fis d |
 	\property Voice.TextScript \set #'font-style = #'roman
-	g4-\mordent^\markup { \musicglyph  "accidentals-1" } r r8 f!8 |
+	g4-\mordent^\markup { \musicglyph #"accidentals-1" } r r8 f!8 |
 	\property Voice.TextScript \set #'font-style = #'italic
 	e4-\prall r r |
 	f4-\mordent r r8 e |
@@ -193,6 +193,9 @@ global =  \notes{
 	>
 	\paper{
 		linewidth = 18.0 \cm  
+		\translator {\PianoStaffContext
+			     VerticalAlignment \set #'forced-distance = #10
+			 }
 
 	}
 	\midi{ \tempo 4 = 90 }
diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index e0294e58ee..848d7d78da 100644
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -51,6 +51,8 @@ half way in measure 13 has been forgotten.
 
 sarabandeA =  \context Voice \notes \relative c {
   \property Staff.NoteCollision \set #'merge-differently-dotted = ##t
+
+  
   < { d8. e16 e4.-\trill d16 e } \\
     { d4 a2 } >
   <<d, a' f'>>4.  e'8-[ d c] |
@@ -60,19 +62,19 @@ sarabandeA =  \context Voice \notes \relative c {
   %% check spacing without accs: 
   %%	c4.-\trill bes8-[ a g] |
   
-  < { d'8. e16 e4.-\trill d16 e |
+  \relative c < { d'8. e16 e4.-\trill d16 e |
       f4. d8-[ e f] }
     \\
     { <<a, f>>4 a2 <<a d,>>4.  } > |
 
   %%7
   g8 bes16(a-) c(bes-) a(g-) d'8 f, |
-  <  e4.-\trill
-  \\ <<c, g'>>4 >
+  \relative c <  e4.-\trill
+    \\ <<c, g'>>4 >
   d8-[ c bes]
 
   %%9
-  < { f'8 g16(a-) a4. g16(f-)  |
+  \relative c < { f8 g16(a-) a4. g16(f-)  |
       g8 a16(bes-) bes4. c16(d-) }
     \\
     { a,4 <<bes d >>4. r8 bes4 <<g f'>>2  }
@@ -80,7 +82,7 @@ sarabandeA =  \context Voice \notes \relative c {
   \forcedBreak
 
   %% 11
-  e,8-[ f] c,-[ g'] f'-[ e] |
+  e'8-[ f] c,-[ g'] f'-[ e] |
   f4 f,2 |
   < {  a'4 a4.-\trill bes8 
        c bes16 a } \\
@@ -113,13 +115,13 @@ sarabandeA =  \context Voice \notes \relative c {
   \stemBoth
   \forcedLastBreak
   %%25
-  < { a16(b c b-) c4. b16(a-) |
+  \relative c' < { a16(b c b-) c4. b16(a-) |
       b cis d cis d4. e16(f-) | }
     \\
     { f,4 fis4. s8 |
       <<d g,>>4 gis4.   } >
   \voiceOne
-  d16(cis  d-) f,
+  d'16(cis  d-) f,
   a,8-[ e']
   \oneVoice
   d'-[ cis] |
diff --git a/input/mutopia/J.S.Bach/wtk1-fugue1.ly b/input/mutopia/J.S.Bach/wtk1-fugue1.ly
index 98aecc5c51..1a0fd209e1 100644
--- a/input/mutopia/J.S.Bach/wtk1-fugue1.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue1.ly
@@ -1,3 +1,4 @@
+\version "1.8.1"
 \header{
 title = 	 	 "Fuga a 4"
 opus =            "BWV 846"
@@ -12,164 +13,152 @@ enteredby = 	 "Shay Rojansky"
   style = "baroque"
   copyright =    "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by Han-Wen Nienhuys.\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"
   maintainer = "hanwen@cs.uu.nl"
-  lastupdated = "2001/April/6"
+  lastupdated = "2003/Aug/21"
   footer = "Mutopia-2001/4/6-4"
 }
 
 %{
 TODO: use autobeaming.	
 %}
-\version "1.7.18"
+\version "1.8.1"
 
 % #(ly:set-point-and-click 'line-column)
 
-tenor = 
-	\context Voice  = tenor  \notes \relative c' {
-	\clef "violin"
-
-	\voiceTwo
-	r8 [c8 d e] [f8. g32 f] [e8 a] |
-	[d, g] ~ [g16 a g f] [e f e d] [c d c b ] |
-	[a 8 fis'] g4 ~ [g8 fis16 e] [f8 d] |
-	[g f! e d] c r r g' ~ |
-%% 5
-	[g f16 e] f4 ~ [f16 f e8] d4 |
-	[c8 f] r16 [g f e] [f8 d] g4 ~ |
+alt = \notes \relative c' {
+	r8   c8-[ d e]   f8.-[ g32 f]   e8-[ a] |
+ 	 d,-[ g] ~   g16-[ a g f]   e-[ f e d]   c-[ d c b ] |
+ 	 a8-[ fis'] g4 ~   g8-[ fis16 e]   f8-[ d] | 
+ 	 g-[ f! e d] c r r g' ~ |
+%%5
+ 	 g-[ f16 e] f4 ~   f16-[ f e8] d4 |
+ 	 c8-[ f] r16   g-[ f e]   f8-[ d] g4 ~ |
 	g4 r4 r2 |
 	r1 |
-	r8 [g8 a b] [c8.   d 32 c ] [b8 e ]
-%% 10
-	[a, d ] ~ [d 16 e  d  c ] b8 r8 r d, |
-	[e fis] [g8.   a32 g] [fis8 b e, a] ~ |
-	[a16 b a gis] [fis8 f!] [e d] ~ [d16 e fis gis] |
-	[a gis a b] [gis fis gis a] b8 r8 r4 |
-	r8 [c,8 d e]  [f8.  g32 f] [e8 a] |
-%% 15
-	[d, g] ~ [g16 a g f] e8 [e fis g] ~ |
-	[g8 fis] [gis8 a] ~ [a g! a b] |
-	[c8.    d32 c ] [b8 e ] [a, d ] ~ [d 16 e  d  c ] |
-	[b8 g'  cis,  d ] [e  cis  d  e  ] |
-	 a,8 r8 r e [fis g] [a8.  b32 a] |
-%% 20
-	[g8 c  fis, b] ~ [b16 c  b a]  [g fis e d]  |
-	e4 d ~ [d16 a' g f!] [e g f! a] |
-	g4 ~ [g16 a bes8] c 4 [d 8 g,] |
-	 g4. f8 ~ [f e] d4 |
-	 e8 a4 g8 ~ [g8 f g a] |
-%% 25
-	[bes8.  c32 b] [a8 d ] [g, c ] ~ [c 16 d  c  bes] |
-	[a bes a g] [f g f e] d4 ~ [d8. g16] |
-	a4 r16 [f' 16 d 8] e 2 |
+	r8   g8-[ a b]   c8.-[   d32 c ]   b8-[ e ]
+%%10
+ 	 a,-[ d ] ~   d16-[ e  d  c ] b8 r8 r d, |
+ 	 e-[ fis]   g8.-[   a32 g]   fis8-[ b e, a] ~ |
+ 	 a16-[ b a gis]   fis8-[ f!]   e-[ d] ~   d16-[ e fis gis] |
+ 	 a-[ gis a b]   gis-[ fis gis a] b8 r8 r4 |
+	r8   c,8-[ d e]    f8.-[  g32 f]   e8-[ a] |
+%%15
+ 	 d,-[ g] ~   g16-[ a g f] e8   e-[ fis g] ~ |
+ 	 g8-[ fis]   gis8-[ a] ~   a-[ g! a b] |
+ 	 c8.-[    d32 c ]   b8-[ e ]   a,-[ d ] ~   d16-[ e  d  c ] |
+ 	 b8-[ g'  cis,  d ]   e-[  cis  d  e  ] |
+	 a,8 r8 r e   fis-[ g]   a8.-[  b32 a] |
+%%20
+ 	 g8-[ c  fis, b] ~   b16-[ c  b a]    g-[ fis e d]  |
+	e4 d ~   d16-[ a' g f!]   e-[ g f! a] |
+	g4 ~   g16-[ a bes8] c4   d8-[ g,] |
+	 g4. f8 ~   f-[ e] d4 |
+	 e8 a4 g8 ~   g8-[ f g a] |
+%%25
+ 	 bes8.-[  c32 b]   a8-[ d ]   g,-[ c ] ~   c16-[ d  c  bes] |
+ 	 a-[ bes a g]   f-[ g f e] d4 ~   d8.-[ g16] |
+	a4 r16   f'16-[ d8] e2 |
 	}
 
 
 soprane = 
-	\context Voice = sop \notes \relative c' {
-
-	\voiceOne
+ \notes \relative c' {
 	r1 |
-	r2 r8 [g'8 a b] |
-	[c8.  d32 c ] [b8 e ] [a, d ] ~ [d 16 e  d  c ] |
-	[b g a b] [c  b c  d ] [e  d  e  fis ] [g 8 b,] |
-%% 5
-	[c  a] [d 16 c  b a] [g8. g16] [f e f g] |
-	[a g a b] c 2 b4 |
-	r8 [c8 d e] [f8.  g32 f] [e8 a] |
-	[d, g] ~ [g16 a g f] [e8 a] ~ [a16 b a g] |
-	f2 [e8. fis16] g4 ~
-%% 10
-	g4 fis [g16 f! e d] [c d c b ] |
-	[a 16 c b  a ] g 8 r8 r16 [c16 b  a ] [gis 8 e'] |
-	[d c16 b 16] [a  gis  a  b ] [c fis,  a  gis ] [b 8 a 16 b ]
-	[c8 f e d] ~ [d c16 b ] [b 8. a 16] |
-	a 4 r4 r2 |
-%% 15
-	r2 r8 [g 8 a  b ] |
-	[c8.  d32 c] [b 8 c] [d e] [f!8.  g32 f!] |
-	[e8 a d, g] ~ [g16 a g f] [e8 a] |
-	[d,8 bes'] [a g16 f] [g f g e] [f g g  f32 g] |
-	[a16 cis, d g] [e8. d16] d8 r8 r4 |
-%% 20
+	r2 r8   g'8-[ a b] |
+ 	 c8.-[  d32 c ]   b8-[ e ]   a,-[ d ] ~   d16-[ e  d  c ] |
+ 	 b-[ g a b]   c-[  b c  d ]   e-[  d  e  fis ]   g8-[ b,] |
+%%5
+ 	 c-[  a]   d16-[ c  b a]   g8.-[ g16]   f-[ e f g] |
+ 	 a-[ g a b] c2 b4 |
+	r8   c8-[ d e]   f8.-[  g32 f]   e8-[ a] |
+ 	 d,-[ g] ~   g16-[ a g f]   e8-[ a] ~   a16-[ b a g] |
+	f2   e8.-[ fis16] g4 ~
+%%10
+	g4 fis   g16-[ f! e d]   c-[ d c b ] |
+ 	 a16-[ c b  a ] g8 r8 r16   c16-[ b  a ]   gis8-[ e'] |
+ 	 d-[ c16 b16]   a-[  gis  a  b ]   c-[ fis,  a  gis ]   b8-[ a16 b ]
+ 	 c8-[ f e d] ~   d-[ c16 b ]   b8.-[ a16] |
+	a4 r4 r2 |
+%%15
+	r2 r8   g8-[ a  b ] |
+ 	 c8.-[  d32 c]   b8-[ c]   d-[ e]   f!8.-[  g32 f!] |
+ 	 e8-[ a d, g] ~   g16-[ a g f]   e8-[ a] |
+ 	 d,8-[ bes']   a-[ g16 f]   g-[ f g e]   f-[ g g  f32 g] |
+ 	 a16-[ cis, d g]   e8.-[ d16] d8 r8 r4 |
+%%20
 	r2 r4 r8 g,  |
-	[a  b ] [c8.  d32 c] [b 8 e a,  d( ]  |
-	[) e16 e d c] [b  c d e] [f g a g] [f e d c] |
-	b 4 [c,8 d] g  c4 b 8 |
-	c4 [b 8 bes 8] a  d4 c8 |
-%% 25
-	[d8 e] f4 ~ [f16 a g f] [e f e d] |
-	c2 r16 [g32 a  b !16 c] [d e f8] ~ |
-	[f32 c d e f16 g] [a8. b16] <<g c >>2 |
+ 	 a-[  b ]   c8.-[  d32 c]   b8-[ e a,  d( ]  |
+	[ e16-) e d c]   b-[  c d e]   f-[ g a g]   f-[ e d c] |
+	b4   c,8-[ d] g  c4 b8 |
+	c4   b8-[ bes8] a  d4 c8 |
+%%25
+ 	 d8-[ e] f4 ~   f16-[ a g f]   e-[ f e d] |
+	c2 r16   g32-[ a  b!16 c]   d-[ e f8] ~ |
+ 	 f32-[ c d e f16 g]   a8.-[ b16] <<g c>>2 |
 	}
 
-alt = 
-\context Voice = alt	\notes \relative   c {
-	\clef "bass"
+tenor = 
+	\notes \relative   c {
 
-	
-	\voiceOne
 	R1*3 |
-	r8 [g'8 a b] [c8.  d32 c ] [b8 e ] |
-%% 5
-	[a, d ] ~ [d 16 e  d  c ] [b8 c  ~ c  bes8] |
-	[a d  g, c ] r16 [a16 b c ] d 4 |
-	g,4 r8 g8 [a b] [c8.  d32 c ] |
-	[b8 e  a, d ] ~ [d 16 e  d  c !] [b!8 e ] ~ |
-	e 4 d 4 [c 16 b c  a] [e'  d  c  b] |
-%% 10
-	[c 16 a b c ] [d  c  b a] g4 r4 |
+	r8   g'8-[ a b]   c8.-[  d32 c ]   b8-[ e ] |
+%%5
+ 	 a,-[ d ] ~   d16-[ e  d  c ]   b8-[ c  ~ c  bes8] |
+ 	 a-[ d  g, c ] r16   a16-[ b c ] d4 |
+	g,4 r8 g8   a-[ b]   c8.-[  d32 c ] |
+ 	 b8-[ e  a, d ] ~   d16-[ e  d  c!]   b!8-[ e ] ~ |
+	e4 d4   c16-[ b c  a]   e'-[  d  c  b] |
+%%10
+ 	 c16-[ a b c ]   d-[  c  b a] g4 r4 |
 	r1 |
-	r8 [e8 fis gis] [a8.  b32 a] [gis8 c ] |
-	[fis, b] ~ [b16 c  b a] gis8 a4 gis8 |
-	a4 r8 g8 [a b] c8. [d32 c ] |
-%% 15
-	[b8 e  a, d ] ~ [ d  g,] d'4 |
-	[c 8 a] e' 4 d 8 r8 r4 |
-	r8 [a8 b cis ] [d8.  e32 d ] [c !8 f ] |
-	[b,8 e ] ~ [e 16 f  e  d ] cis 8 r8 r4 |
-	r8 [a8 b cis ] [d8.  e32 d ] [c !8 fis ] |
-%% 20
-	[b, e ] ~ [e 16 fis  e  d ] c 2 ~ |
-	[c 16 d  c  b] [a g a fis] [g8 b c  d ] |
-	[e8.  f32 e ] [d 8 g ] [c,  f ] ~ [f 16 g  f  e ] |
-	d 4 [e 8 d ] ~ [d  g,] g4 ~
-	[g8 c, d e] [f8.  g32 f] [e8 a] |
-%% 25
-	[d, g] ~ [g16 a g f] [e d e f] [g a bes g] |
-	[a e f g] [a b c  a] b2 |
-	c 1 |
+	r8   e8-[ fis gis]   a8.-[  b32 a]   gis8-[ c ] |
+ 	 fis,-[ b] ~   b16-[ c  b a] gis8 a4 gis8 |
+	a4 r8 g8   a-[ b] c8.   d32-[ c ] |
+%%15
+ 	 b8-[ e  a, d ] ~   d-[  g,] d'4 |
+ 	 c8-[ a] e'4 d8 r8 r4 |
+	r8   a8-[ b cis ]   d8.-[  e32 d ]   c!8-[ f ] |
+ 	 b,8-[ e ] ~   e16-[ f  e  d ] cis8 r8 r4 |
+	r8   a8-[ b cis ]   d8.-[  e32 d ]   c!8-[ fis ] |
+%%20
+ 	 b,-[ e ] ~   e16-[ fis  e  d ] c2 ~ |
+ 	 c16-[ d  c  b]   a-[ g a fis]   g8-[ b c  d ] |
+ 	 e8.-[  f32 e ]   d8-[ g ]   c,-[  f ] ~   f16-[ g  f  e ] |
+	d4   e8-[ d ] ~   d-[  g,] g4 ~
+ 	 g8-[ c, d e]   f8.-[  g32 f]   e8-[ a] |
+%%25
+ 	 d,-[ g] ~   g16-[ a g f]   e-[ d e f]   g-[ a bes g] |
+ 	 a-[ e f g]   a-[ b c  a] b2 |
+	c1 |
 	}
 
-bass = \context Voice = bassvoice
-	\notes \relative c {
-	\clef "bass"
+bass = 	\notes \relative c {
 
-	\voiceTwo
 	R1*4 |
-%% 5
-	r2 r8 [c8 d e] |
-	[f8.  g32 f] [e8 a] [d, g] ~ [g16 a g f] |
-	[e f e d] [c d c b ] [a' 8 d a fis] |
-	[g16 a bes g] [cis,8 d] a'4 e4 |
-	[a16 b c  d ] [c  b a g] c 8 r8 r4 |
-%% 10
-	r2 r8 [g, 8 a  b ] |
-	[c8.  d32 c] [b 8 e] [a,  d] ~ [d16 e d c] |
-	b 8 e4 d8 c f!4 e8 ~ |
-	e d4 e8 [f! e16 d] e4 |
-	a, 4 r4 r2 |
-%% 15
-	r8 [g 8 a  b ] [c8.  d32 c] [b 8 e] |
-	[a, 8 d] ~ [d16 e d c] [b 8 bes  a  g ] |
-	[a 8 fis' g e] d4 [e8 f!] |
-	[g8.  a32 g] [f8 bes] [e, a] ~ [a16 bes a g] |
-	[f e f d] [g8 a] d,2 ~ |
-%% 20
-	[d16 e d c] [b  a  g  fis ] [e' 8 e fis g] ~ |
-	[g a16 g16] [fis8 d] g2 ~ |
-	g2 a4 [b8 c ] |
-	[f,16 a g f] [e d c b ] [c d e f] [g8 g, ] |
+%%5
+	r2 r8   c8-[ d e] |
+ 	 f8.-[  g32 f]   e8-[ a]   d,-[ g] ~   g16-[ a g f] |
+ 	 e-[ f e d]   c-[ d c b ]   a'8-[ d a fis] |
+ 	 g16-[ a bes g]   cis,8-[ d] a'4 e4 |
+ 	 a16-[ b c  d ]   c-[  b a g] c8 r8 r4 |
+%%10
+	r2 r8   g,8-[ a  b ] |
+ 	 c8.-[  d32 c]   b8-[ e]   a,-[  d] ~   d16-[ e d c] |
+	b8 e4 d8 c f!4 e8 ~ |
+	e d4 e8   f!-[ e16 d] e4 |
+	a,4 r4 r2 |
+%%15
+	r8   g8-[ a  b ]   c8.-[  d32 c]   b8-[ e] |
+ 	 a,8-[ d] ~   d16-[ e d c]   b8-[ bes  a  g ] |
+ 	 a8-[ fis' g e] d4   e8-[ f!] |
+ 	 g8.-[  a32 g]   f8-[ bes]   e,-[ a] ~   a16-[ bes a g] |
+ 	 f-[ e f d]   g8-[ a] d,2 ~ |
+%%20
+ 	 d16-[ e d c]   b-[  a  g  fis ]   e'8-[ e fis g] ~ |
+ 	 g-[ a16 g16]   fis8-[ d] g2 ~ |
+	g2 a4   b8-[ c ] |
+ 	 f,16-[ a g f]   e-[ d c b ]   c-[ d e f]   g8-[ g, ] |
 	c1 ~ |
-%% 25
+%%25
 	c1 ~ |
 	c1 ~ |
 	c1 |
@@ -180,18 +169,35 @@ bass = \context Voice = bassvoice
 	\notes \context PianoStaff < 
 		\context Staff = one {
 		\time 4/4
+		\clef treble
 		<
-			\soprane
-			\tenor
-		> \bar "|." }
-		\context Staff = two <
+			\soprane \\
 			\alt
+		> \bar "|." }
+		\context Staff = two {
+		    \clef bass
+		    <
+			\tenor \\
 			\bass
-		>
+		> }
 	> 
 
 	\paper{
 	   linewidth = 18.0 \cm
+	   \translator {
+	       \ScoreContext
+
+%{
+
+ This is effective in squeezing it in  more pages, but 1/32nd looks 
+ better. Unfortunately, with that configuration, it doesn't
+ fit to 2 pages anymore.
+
+%}
+
+       	       SpacingSpanner \set #'common-shortest-duration =  #(ly:make-moment 1 16)
+	       
+	   }
 	}
 
 	\midi { \tempo 4 = 84 }
diff --git a/input/mutopia/J.S.Bach/wtk1-prelude1.ly b/input/mutopia/J.S.Bach/wtk1-prelude1.ly
deleted file mode 100644
index f05304bfb8..0000000000
--- a/input/mutopia/J.S.Bach/wtk1-prelude1.ly
+++ /dev/null
@@ -1,177 +0,0 @@
-\header{
-title = 	 "Preludium"
-opus = 	 "BWV 846"
-composer = 	 "Johann Sebastian Bach (1685-1750)"
-enteredby = 	 "Shay Rojansky"
-
-
-  % mutopia headers.
-  mutopiatitle = "Das Wohltemperierte Clavier I, Prelude 1 (c-major)"
-  mutopiacomposer = "J.S. Bach"
-  mutopiaopus = "BWV846"
-  style = "baroque"
-  copyright =    "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by Han-Wen Nienhuys.\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"
-  maintainer = "hanwen@cs.uu.nl"
-  lastupdated = "1999/Oct/14"
-}
-
-\version "1.7.18"
-
-% should do programmable input.
-soprane = 
-    \notes \transpose c c' {
-	\context Staff <
-	% Real soprane
-	\context Voice = uVoice {
-	\time 4/4
-        \clef "violin"
-
-	\stemUp
-	r8 [g16 c'] [e' g c' e'] r8 [g16 c'] [e' g c' e'] |
-	r8 [a16 d'] [f' a d' f'] r8 [a16 d'] [f' a d' f'] |
-	r8 [g16 d'] [f' g d' f'] r8 [g16 d'] [f' g d' f'] |
-	r8 [g16 c'] [e' g c' e'] r8 [g16 c'] [e' g c' e'] |
-	r8 [a16 e'] [a' a e' a'] r8 [a16 e'] [a' a e' a'] |
-	r8 [fis16 a] [d' fis a d'] r8 [fis16 a] [d' fis a d'] |
-	r8 [g16 d'] [g' g d' g'] r8 [g16 d'] [g' g d' g'] |
-	r8 [e16 g] [c' e g c'] r8 [e16 g] [c' e g c'] |
-	r8 [e16 g] [c' e g c'] r8 [e16 g] [c' e g c'] }
-	% Tenor
-	\context Voice = dVoice {\stemDown
-	r16 e8. ~ e4 r16 e8. ~ e4 |
-	r16 d8. ~ d4 r16 d8. ~ d4 |
-	r16 d8. ~ d4 r16 d8. ~ d4 |
-	r16 e8. ~ e4 r16 e8. ~ e4 |
-	r16 e8. ~ e4 r16 e8. ~ e4 |
-	r16 d8. ~ d4 r16 d8. ~ d4 |
-	r16 d8. ~ d4 r16 d8. ~ d4 |
-	r16 c8. ~ c4 r16 c8. ~ c4 |
-	r16 c8. ~ c4 r16 c8. ~ c4 |}>
-%% 10	
-	r8 [d16 fis] [c' d fis c'] r8 [d16 fis] [c' d fis c'] |
-	r8 [d16 g] [b d g b] r8 [d16 g] [b d g b] |
-	r8 [e16 g] [cis' e g cis'] r8 [e16 g] [cis' e g cis'] |
-	r8 [d16 a] [d' d a d'] r8 [d16 a] [d' d a d'] |
-	r8 [d16 f] [b d f b] r8 [d16 f] [b d f b] |
-	r8 [c16 g] [c' c g c'] r8 [c16 g] [c' c g c'] |
-	r8 [a,16 c] [f a, c f] r8 [a,16 c] [f a, c f] |
-	r8 [a,16 c] [f a, c f] r8 [a,16 c] [f a, c f] |
-	r8 [g,16 b,] [f g, b, f] r8 [g,16 b,] [f g, b, f] |
-	r8 [g,16 c] [e g, c e] r8 [g,16 c] [e g, c e] |
-%% 20
-	r8 [bes,16 c] [e bes, c e] r8 [bes,16 c] [e bes, c e] |
-	r8 [a,16 c] [e a, c e] r8 [a,16 c] [e a, c e] |
-	r8 [a,16 c] [ees a, c ees] r8 [a,16 c] [ees a, c ees] |
-	r8 [b,16 c] [d b, c d] r8 [b,16 c] [d b, c d] |
-	r8 [g,16 b,] [d g, b, d] r8 [g,16 b,] [d g, b, d] |
-	r8 [g,16 c] [e g, c e] r8 [g,16 c] [e g, c e] |
-	r8 [g,16 c] [f g, c f] r8 [g,16 c] [f g, c f] |
-	r8 [g,16 b,] [f g, b, f] r8 [g,16 b,] [f g, b, f] |
-	r8 [a,16 c] [fis a, c fis] r8 [a,16 c] [fis a, c fis] |
-	r8 [g,16 c] [g g, c g] r8 [g,16 c] [g g, c g] |
-%% 30
-	r8 [g,16 c] [f g, c f] r8 [g,16 c] [f g, c f] |
-	r8 [g,16 b,] [f g, b, f] r8 [g,16 b,] [f g, b, f] |
-	r8 [g,16 bes,] [e g, bes, e] r8 [g,16 bes,] [e g, bes, e] |
-
-	r8 [f,16 a,] [c f c a,] [c a, f, a,] [f, d, f, d,] |
-	r8 [g16 b] [d' f' d' b] [d' b g b] [d f e d] |
-	<<e g c'>>1 \bar "|."
-    }
-
-bass = 
-    \notes {
-        \clef "bass"
-
-
-	\stemDown
-	c'2 c' |
-	c' c' |
-	b b |
-	c' c' |
-	c' c' |
-	c' c' |
-	b b |
-	b b |
-	a a |	
-%% 10
-	\context Staff <
-	\context Voice =  Alt
-	{\stemUp
-	r16 a8. ~ a4 r16 a8. ~ a4 |
-	r16 b8. ~ b4 r16 b8. ~ b4 |
-	r16 bes8. ~ bes4 r16 bes8. ~ bes4 |
-	r16 a8. ~ a4 r16 a8. ~ a4 |
-	r16 aes8. ~ aes4 r16 aes8. ~ aes4 |
-	r16 g8. ~ g4 r16 g8. ~ g4 |
-	r16 f8. ~ f4 r16 f8. ~ f4 |
-	r16 f8. ~ f4 r16 f8. ~ f4 |
-	r16 d8. ~ d4 r16 d8. ~ d4 |
-	r16 e8. ~ e4 r16 e8. ~ e4 |
-%% 20
-	r16 g8. ~ g4 r16 g8. ~ g4 |
-	r16 f8. ~ f4 r16 f8. ~ f4 |
-	r16 c8. ~ c4 r16 c8. ~ c4 |
-	r16 f8. ~ f4 r16 f8. ~ f4 |
-	r16 f8. ~ f4 r16 f8. ~ f4 |
-	r16 e8. ~ e4 r16 e8. ~ e4 |
-	r16 d8. ~ d4 r16 d8. ~ d4 |
-	r16 d8. ~ d4 r16 d8. ~ d4 |
-	r16 ees8. ~ ees4 r16 ees8. ~ ees4 |
-	r16 e!8. ~ e4 r16 e8. ~ e4 |
-%% 30
-	r16 d8. ~ d4 r16 d8. ~ d4 |
-	r16 d8. ~ d4 r16 d8. ~ d4 |
-	r16 c8. ~ c4 r16 c8. ~ c4 |
-
-	r16 c8. ~ c4 ~ c2 |
-	r16 b,8. ~ b,4 ~ b,2 |
-	c1 ||}
-
-	\context Voice = Bass
-	{\stemDown
-	d2 d |
-	g g |
-	g g |
-	f f |
-	f f |
-	e e |
-	e e |
-	d d |
-	g, g, |
-	c c |
-%% 20
-	c c |
-	f, f, |
-	fis, fis, |
-	aes, aes, |
-	g, g, |
-	g, g, |
-	g, g, |
-	g, g, |
-	g, g, |
-	g, g, |
-%% 30
-	g, g, |
-	g, g, |
-	c, c, |
-	
-	c, c, |
-	c, c, |
-	c,1 \bar "|." }>
-    }
-
-        
-\score {
-    \notes \context PianoStaff < 
-    	\soprane
-        \bass
-    >
-    \midi {
-        \tempo 4 = 80
-    }
-}
-
-% EOF
-	
-
diff --git a/lily/simultaneous-music.cc b/lily/simultaneous-music.cc
index 77c3d89d06..7e070968c3 100644
--- a/lily/simultaneous-music.cc
+++ b/lily/simultaneous-music.cc
@@ -41,6 +41,7 @@ Simultaneous_music::to_relative_octave (Pitch p)
 	}
     }
 
+#if 0
   if (count && first != last)
     {
       String str = _("Changing relative definition may cause octave change.");
@@ -51,6 +52,9 @@ Simultaneous_music::to_relative_octave (Pitch p)
     }
 
   return last;
+#else
+  return first;
+#endif
 }
 
 ADD_MUSIC (Simultaneous_music);
-- 
2.39.2