The grand \paper -> \layout, \bookpaper -> \paper renaming.

[lilypond.git] / input / mutopia / J.S.Bach / bwv940.ly

diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly
index a03c519e015eb765a5e9707e3a95ac467d8ba7cf..65265083b55a03fc580bd9b2de5841fcef957241 100644 (file)
--- a/input/mutopia/J.S.Bach/bwv940.ly
+++ b/input/mutopia/J.S.Bach/bwv940.ly
@@ -1,4 +1,5 @@
-\version "1.8.0"
+#(ly:set-option 'old-relative)
+\version "2.3.22"
 
 %{
  Header for Petites Preludes.
@@ -40,13 +41,13 @@
  footer = "Mutopia-2003/08/22-nr"
 }
 
-one =   \notes\relative c{
+one = \relative c{
        \skip 1 |
        \stemUp
        r4 d''2 cis4 |
-       \stemBoth
+       \stemNeutral
        d16 a' g f  e f cis d 
-       e8.-\mordent f16  d8.-\prall cis16 |
+       e8.\mordent f16  d8.\prall cis16 |
        \stemUp\tieUp
        cis4 ~ cis16 a d8 ~ d4 a |
        %5
@@ -61,18 +62,18 @@ one =   \notes\relative c{
        \bar "|."
 }
 
-two =   \notes\relative c{
+two = \relative c{
        r16 d'' c bes  a bes f g 
-       a8.-\mordent bes16  g8.-\prall f16 |
+       a8.\mordent bes16  g8.\prall f16 |
        \stemDown
        f2 e2 |
-       \translator Staff=lower \stemUp
+       \change Staff=lower \stemUp
        r4 a, bes b |
-       \translator Staff=upper \stemDown\tieDown
+       \change Staff=upper \stemDown\tieDown
        r16 b' a g  f8. f16 e2 ~ |
        %5
        e2 ~ e4 ~ e16 e f! d |
-       s4 e4_\mordent-~ e4 d4 ~ |
+       s4 e4_\mordent~ e4 d4 ~ |
        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 |
@@ -80,21 +81,21 @@ two =   \notes\relative c{
        fis1
 }
 
-three = \notes\relative c{
+three = \relative c{
        \stemUp
        f2 e |
-       \stemBoth
+       \stemNeutral
        d16 d' c bes  a bes f g 
-       a8.-\mordent bes16 
-       g8.-\prall f16 |
+       a8.\mordent bes16 
+       g8.\prall f16 |
        f2 g4 gis |
        a2 ~ a16 a g f  e f c d |
        %5
-       e8.-\mordent f16  d8.-\prall c16 \stemBoth c4. d8 |
+       e8.\mordent f16  d8.\prall c16 \stemNeutral c4. d8 |
        \stemDown       \tieDown
 
        e4 ~ e16 f e d  cis a b cis  d e f d |
-       \property Voice.TextScript \set #'font-style = #'finger
+       \override TextScript  #'font-style = #'finger
        bes2 a ~ |
        a a |
        d, cis' |
@@ -103,56 +104,56 @@ three = \notes\relative c{
        \bar "|."
 }
 
-four =   \notes\relative c{
+four = \relative c{
        \stemDown 
        d2 cis |
        \skip 1*2 |
        \skip 4*3
-       \translator Staff=upper \stemUp
-       \property Voice.NoteColumn \override #'horizontal-shift = #1
+       \change Staff=upper \stemUp
+       \override NoteColumn #'horizontal-shift = #1
        c''4 |
        %5
        a gis ~ gis16 gis fis e 
        \skip 4*1
-       \translator Staff=lower \stemDown
-       \property Voice.NoteColumn \override #'horizontal-shift = #0
+       \change Staff=lower \stemDown
+       \override NoteColumn   #'horizontal-shift = #0
        \stemUp\tieUp
        b2 a |
        g a4. gis16 a |
-       gis2 << g cis,>>8 <<f d>> e4 |
+       gis2 < g cis,>8 <f d> e4 |
        d4. fis16 g r16 bes8. ~ bes4 |
        %10
        \stemDown
-       < d,1  { \fatText s4^\markup { \hspace #20 }
+       << d,1  { \fatText s4^\markup { \hspace #20 }
                 s4^\markup { \hspace #1 }  s4 }
-            >
+            >>
 }
 
-global =  \notes{
+global = {
        \time 4/4
        \key f \major
 }
 
 \score{
        % Allegretto
-       \context PianoStaff <
-               \context Staff = upper <
+       \context PianoStaff <<
+               \context Staff = upper <<
                        \global
                        \context Voice = i\one
                        \context Voice = ii \two
-               >
-               \context Staff = lower <
+               >>
+               \context Staff = lower <<
                        \global
                        \clef "bass"
                        \context Voice= iii \three
                        \context Voice = iv \four
-               >
-       >
-       \paper{
+               >>
+       >>
+       \layout{
                linewidth = 17.0 \cm  
-               \translator {
-                   \ScoreContext
-                   SpacingSpanner \set #'spacing-increment = #2.0
+               \context {
+                   \Score
+                   \override SpacingSpanner #'spacing-increment = #2.0
                }
        }
        \midi{ \tempo 4 = 40 }