X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mutopia%2FJ.S.Bach%2FPetites-Preludes%2Fpreludes-6.ly;h=0dc4d06a64ec3c4a01657dc3759b10dd144dec46;hb=eb6cf5c0c4db23f26a3ac0fb229e8aff4448a7e4;hp=2aec8613d02fd89086fa4a09a8a5fc94d3316016;hpb=4fabc68182cab7149d2a4b52502e180f57199831;p=lilypond.git

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
index 2aec8613d0..0dc4d06a64 100644
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
@@ -1,109 +1,109 @@
-\header{
-filename =	"preludes-6.ly";
-% blz 11
-% Six Petits Preludes
-% Collection Johann Peter Kellner
-% ca 1703 - 1707
-composer =	"Johann Sebastian Bach (1685-1750)";
-enteredby =	"jcn";
-copyright =	"public domain";
-}
-\version "1.0.20";
+#(set! point-and-click line-column-location)
+
+opus = "BWV 940"
+piece = "6"
+
+\version "1.3.146"
 
 
-one = \context Staff \notes\relative c{
+
+one =  \context Staff \notes\relative c{
 	\context Voice=i
-	\skip 1; |
-	\stemup
-	r4 d''2-5( cis4-4 |
-	\stemboth
-	)d16-5\mf a'-4( g f  e f-4 cis-2 d-1 
-	e8.-\mordent f16  d8.-\prall-1 cis16-3 |
-	\stemup
-	)cis4\> ~ cis16 a \!d8 ~ d4 c-5 |
+	\skip 1 |
+	\stemUp
+	r4 d''2 cis4 |
+	\stemBoth
+	d16 a' g f  e f cis d 
+	e8.-\mordent f16  d8.-\prall cis16 |
+	\stemUp\tieUp
+	cis4 ~ cis16 a d8 ~ d4 a |
 	%5
-	b2-4 ~ b4 a-5 ~ |
-	a16 a-5 \stemup g! f g4-4\< ~ g f-3 ~ |
-	\!f16 a g f  e16 g8.-5 ~  g16 g-5 f-4 e-3  d-1 f8.-4 ~ |
-	f16 f-3 e d b'4 a-5 g-5 |
-%	fis4-4 g r8\<-"rall." g16-1( bes-2 \!e4-5 |
-	fis4-4 g r8\< g16-1( bes-2 \!e4-5 |
+	b2 ~ b4 a ~ |
+	a16 a \stemUp g! f g4 ~ g f ~ |
+	f16 a g f  e16 g8. ~  g16 g f e  d f8. ~ |
+	f16 f e d b'4 a g |
+
+	fis4 g r8 g16 bes e4 |
 	%10
-	)d1-5
-	\bar "|.";
+	d1
+	\bar "|."
 }
 
-two = \context Staff \notes\relative c{
+two =  \context Staff \notes\relative c{
 	\context Voice=ii
-	r16\p d''-5( c-4 bes-3  a-2 bes-3 f-1 g-2 
-	a8.-\mordent bes16-1  g8.-\prall f16-1 |
-	\stemdown
-	)f2 e2 |
-	\translator Staff=lower \stemup
-	r4 a,-1 bes-2 b-1 |
-	\translator Staff=upper \stemdown
-	r16 b'-3 a-1 g-2  f8. f16-2 e2 ~ |
+	r16 d'' c bes  a bes f g 
+	a8.-\mordent bes16  g8.-\prall f16 |
+	\stemDown
+	f2 e2 |
+	\translator Staff=lower \stemUp
+	r4 a, bes b |
+	\translator Staff=upper \stemDown\tieDown
+	r16 b' a g  f8. f16 e2 ~ |
 	%5
-	e2 ~ e4 ~ e16 e-2 f! d-1 |
+	e2 ~ e4 ~ e16 e f! d |
 	s4 e32 d e8.~ e4 d4 ~ |
-	d4. cis16-2 d-1 cis4 d-1 ~ |
-	d8 r r16 e-2 f d r16 e-2 f d r d-1 e-3 cis |
-	r16 e-3 d-1 c!-2  bes! d8. s4 r16\> bes'-2 a-2 \!g-1 |
+	d4. cis16 d cis4 d ~ |
+	d8 r r16 e f d r16 e f d r d e cis |
+	r16 e d c!  bes! d8. s4 r16 bes' a g |
 	%10
-	fis1-2
+	fis1
 }
 
-three = \context Staff \notes\relative c{
+three =  \context Staff \notes\relative c{
 	\context Voice=iii
-	\stemup
-	f2-1( e-2 |
-	\stemboth
-	)d16 d'( c bes  a-4 bes-2 f-5 g-4 
-	a8.-\mordent bes16-2 
-	g8.-\prall-4 f16-5 |
-	)f2-5 g4-4 gis |
-	a2-2 ~ a16 a-1( g f  e-4 f-2 c-5 d |
+	\stemUp
+	f2 e |
+	\stemBoth
+	d16 d' c bes  a bes f g 
+	a8.-\mordent bes16 
+	g8.-\prall f16 |
+	f2 g4 gis |
+	a2 ~ a16 a g f  e f c d |
 	%5
-	e8.-\mordent f16  d8.-\prall-4 c16-5 \stemboth )c4.-5 d8-4 |
-	\stemdown
-	e4 ~ e16 f-2( e-3 d-4  cis a b cis-3  d-4 e-3 f-2 d-4 |
-	\property Voice . textstyle = "finger"
-	)bes!2-"5\\_4" a ~ |
+	e8.-\mordent f16  d8.-\prall c16 \stemBoth c4. d8 |
+	\stemDown
+	e4 ~ e16 f e d  cis a b cis  d e f d |
+	\property Voice.TextScript \set #'font-style = #'finger
+	bes!2 a ~ |
 	a a |
-	d, cis'-5 |
+	d, cis' |
 	%10
-	a'1-2
-	\bar "|.";
+	a'1
+	\bar "|."
 }
 
-four = \context Staff \notes\relative c{
+four =  \context Staff \notes\relative c{
 	\context Voice=iv
-	\stemdown 
-	d2-3 cis-4 |
-	\skip 1*3; |
+	\stemDown 
+	d2 cis |
+	\skip 1*2 |
+	\skip 4*3
+	\translator Staff=upper \stemUp
+	\property Voice.NoteColumn \override #'horizontal-shift = #1
+	c''4 |
 	%5
-	\translator Staff=upper \stemup \property Voice.hshift = 1 
-	a'4 gis-2 ~ gis16 gis-3 fis e 
-	\skip 4*1;
-	\translator Staff=lower \stemdown \property Voice.hshift = 0 
-	\stemup
-	b2-1 a-1 |
+	a gis ~ gis16 gis fis e 
+	\skip 4*1
+	\translator Staff=lower \stemDown
+	\property Voice.NoteColumn \override #'horizontal-shift = #0
+	\stemUp\tieUp
+	b2 a |
 	g a4. gis16 a |
-	gis2 < g8 cis,> <f-3 d-1> e4-2 |
-	d4. fis16-3 g-2 r16 bes8.-1 ~ bes4 |
+	gis2 < g8 cis,> <f d> e4 |
+	d4. fis16 g r16 bes8. ~ bes4 |
 	%10
-	\stemdown
-	d,1-5
+	\stemDown
+	d,1
 }
 
-global = \notes{
-	\time 4/4;
-	\key F;
+global =  \notes{
+	\time 4/4
+	\key f \major
 }
 
 \score{
 	% Allegretto
-	\context GrandStaff <
+	\context PianoStaff <
 		\context Staff = upper <
 			\global
 			\one
@@ -111,24 +111,19 @@ global = \notes{
 		>
 		\context Staff = lower <
 			\global
-			\clef "bass";
+			\clef "bass"
 			\three
 			\four
 		>
 	>
 	\paper{
-		\include "preludes-paper.ly";
-		gourlay_maxmeasures = 3.0;
-		\translator{ 
-			\GrandStaffContext
-			minVerticalAlign = 3.0*\staffheight;
-			maxVerticalAlign = 3.0*\staffheight;
-		}
+		linewidth = 18.0 \cm  
+
 	}
-	\midi{ \tempo 4 = 40; }
+	\midi{ \tempo 4 = 40 }
 	\header{
-		piece = "6";
-		opus = "BWV 940";
+		piece = \piece
+		opus = \opus
 	}
 }