patch::: 1.2.13.jcn3

13.jcn3
	- mutopia/J.S.Bach/Petites-Preludes: bf's and mutopia preraration

13.jcn2

diff --git a/CHANGES b/CHANGES
index 143ff34fc6eff5aca40c31fe3d66fb3256f866a8..206cd44f248528bc5acfe8386a900c92b8adf3fb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
-13.jcn1
+13.jcn3
+       - mutopia/J.S.Bach/Petites-Preludes: bf's and mutopia preraration
+
+13.jcn2
        - separate documentation package
 
 13.jcn1

diff --git a/VERSION b/VERSION
index c76923f1fa1666722043eacb978016dd4541c561..511df13f8edcec27af176d105fc0185b281f9d09 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
 PATCH_LEVEL=13
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
index 79ee1ae87ac7ff3e8f5f969d99514ad6fbca8c79..0052ef33619200014e0e5dcca022cd60dcbc3ab8 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
@@ -1,9 +1,8 @@
 \header{
 filename =      "preludes-1.ly";
-% urg?
-%opus = "BWV 924";
-% piece = "1";
-% blz 1
+%
+% page 1
+%
 % Clavierb"uchlein f"ur W. Fr. Bach
 % Clav. W. Fr. Bach: 2-Praeambulum I
 % ca 1720

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
index 7a73c477d8c6912e79e27c2c7856c54b895ede1b..4982d35ef3e639e9cab0f71ad257945d3b720bae 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
@@ -1,8 +1,9 @@
 \header{
 filename =      "preludes-2.ly";
-% blz 10
+%
+% page 10
 % 
-% Six Petits Pr eludes
+% Six Petits Preludes
 % Collection Johann Peter Kellner
 % ca 1703- 1707
 composer =      "Johann Sebastian Bach (1685-1750)";

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
index 234732a3d5c9d95031a0dc4e372aada82bb02c1a..b2f91414091da53b9e2b78dc1c6f09230a437d3a 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
@@ -7,8 +7,11 @@ define(t, r16 [$1$4 $2 $3] [$2 $1 $2 $6$1] r $1$7 r $5$1 |)
 
 \header{
 filename =      "preludes-3.ly";
+%
+% page 16
+%
 % Pr"aludum in C Moll f"ur Laute
-% blz 16
+%
 % Six Petits Preludes`
 % Collection Johann Peter Kellner
 % ca 1703 - 1707
@@ -51,7 +54,7 @@ upper = \context Staff \notes \transpose c'' {
 %#     t(c,fis,a,-"poco a poco cresc.")
        s(c fis a)
        s(d g bes)
-       s(d fis c`)
+       s(d fis c')
 
        s(cis g bes)
 %#     s(c es a !-"dim.")
@@ -130,7 +133,7 @@ lower = \context Staff \notes{
 
        d`4 r [bes`8 g`] |
        d`4 r [es8 c] |
-       d`4 r [d8 a] |
+       d`4 r [d8 a`] |
 
        g`4 r [es8 c] |
        g`4 r [d8 b`] |

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
index 289131cdf3dc0cb76613894a6abe4df7a0be72af..d253a7b960ce40adbcbec8c6b09d1da2d3157432 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
@@ -1,6 +1,8 @@
 \header{
 filename =     "preludes-4.ly";
-% blz 8
+%
+% page 8
+%
 % Clavierb"uchlein f"ur W. Fr. Bach
 % Clav. W. Fr. Bach: 27-Praeludium ex d neutral
 % ca 1720
@@ -127,7 +129,7 @@ two = \context Staff \notes\relative c{
 three = \notes\relative c{
        \context Voice=iii
        \stemdown 
-       d4-3 c-4 b e-3 |
+       d4-3 cis-4 b e-3 |
        a16 a,-5\mf( cis-3 a-5  d-2 e-1 fis-2 d-4 
        g-1 fis-3 g a  g b a g |
        )fis4 fis e a-4 |

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
index e51569a8881b37888c3cf45d4f96eefc2606c0e0..e72617d5ac32163e7bd601b1b93861de6e06106f 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
@@ -1,6 +1,8 @@
 \header{
 filename =     "preludes-5.ly";
-% blz 2
+%
+% page 2
+%
 % Clavierb"uchlein f"ur W. Fr. Bach
 % Clav. W. Fr. Bach: 4-Praeludium 2
 % ca 1720
@@ -87,7 +89,7 @@ upper = \context Staff \notes\relative c{
        %40
        s4 s16 [d16-1-"m.d." f-2 a-4] \stemdown [d,-2-"m.g." f a] \stemup d-1 |
        \stemboth
-       f a-4 f d  f-4 d b d-5  gis-2 b a gis, |
+       f a-4 f d  f-4 d b d-5  gis,-2 b a gis |
        <g'!4.-5\f e a,> a8-5 
        <
                {

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
index ca330c2ec4ab41210178054236cd538b1530bf44..7fcb5e59721358a9facf3e470a149811319c2b34 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
@@ -1,6 +1,8 @@
 \header{
 filename =     "preludes-6.ly";
-% blz 11
+%
+% page 11
+%
 % Six Petits Preludes
 % Collection Johann Peter Kellner
 % ca 1703 - 1707
@@ -20,9 +22,9 @@ one = \context Staff \notes\relative c{
        )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 |
+       )cis4\> ~ cis16 a \!d8 ~ d4 a( |
        %5
-       b2-4 ~ b4 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 |
@@ -80,10 +82,12 @@ four = \context Staff \notes\relative c{
        \context Voice=iv
        \stemdown 
        d2-3 cis-4 |
-       \skip 1*3; |
-       %5
+       \skip 1*2; |
+       \skip 4*3;
        \translator Staff=upper \stemup \property Voice.horizontalNoteShift = 1 
-       a'4 gis-2 ~ gis16 gis-3 fis e 
+       c''4-5 |
+       %5
+       a gis-2 ~ gis16 gis-3 fis e 
        \skip 4*1;
        \translator Staff=lower \stemdown \property Voice.horizontalNoteShift = 0 
        \stemup

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-paper.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-paper.ly
index 7d037022bb64196975871b6cc6279be50b386430..a09cf5906f9c700307b9b3de3d0e9dfd02927af5 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-paper.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-paper.ly
@@ -1,6 +1,3 @@
-% nice, but some printers can't handle...
+% Nice, but some printers can't seem to handle...
 % linewidth= 193.\mm;
 linewidth= 180.\mm;
-gourlay_maxmeasures = 10.0;
-%arithmetic_basicspace = 3.;
-%arithmetic_multiplier = 6.\pt;

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly
new file mode 100644 (file)
index 0000000..5fea1f9
--- /dev/null
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly
@@ -0,0 +1,31 @@
+\header{
+filename =      "preludes-score.ly";
+
+% This is the main score file of the Petites Preludes
+
+title =         "Petites Pr\'eludes";
+% urg subtitle = "Clavierb\\"uchlein";
+subtitle = "Clavierbuechlein";
+composer =      "Johann Sebastian Bach (1685-1750)";
+enteredby =     "jcn";
+copyright =     "public domain";
+
+  % mutopia headers.
+  mutopiatitle = "Petites Pr\'eludes";
+  mutopiacomposer = "J. S. Bach (1685-1750)";
+  mutopiaopus = "BWV 924,939,999,925,926,940";
+  mutopiainstrument = "Piano";
+  style = "baroque";
+  copyright = "Public Domain";
+  tagline =    "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by Jan Nieuwenhuizen.\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!";
+  maintainer = "janneke@gnu.org";
+  lastupdated = "1999/Oct/14";
+  
+}
+
+\include "preludes-1.ly"
+\include "preludes-2.ly"
+\include "preludes-3.ly"
+\include "preludes-4.ly"
+\include "preludes-5.ly"
+\include "preludes-6.ly"

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes.ly
index d397df5f556c05a2959acaf701e28f14ec436b1e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes.ly
@@ -1,17 +0,0 @@
-\header{
-filename =      "preludes.ly";
-% mmm
-title =         "Petites Pr\'eludes";
-% urg subtitle = "Clavierb\\"uchlein";
-subtitle = "Clavierbuechlein";
-composer =      "Johann Sebastian Bach (1685-1750)";
-enteredby =     "jcn";
-copyright =     "public domain";
-}
-
-\include "preludes-1.ly"
-\include "preludes-2.ly"
-\include "preludes-3.ly"
-\include "preludes-4.ly"
-\include "preludes-5.ly"
-\include "preludes-6.ly"