* lily/rest.cc (polyphonic_offset_callback): new function. Do

[lilypond.git] / input / mutopia / J.S.Bach / wtk1-fugue2.ly

diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index fa88266238d568d7ab700d71c5f000fbe9cd0687..db7a991564305791cd0dea28bf27ea05620cb05d 100644 (file)
--- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -1,9 +1,9 @@
 \header {
-  title =       "Fuga a 3 voci"
-  opus =        "BWV 847-Fuga"
-  source =      "Henle's Urtext"
-  composer =    "Johann Sebastian Bach (1685-1750)"
-  enteredby =   "hwn, wl, jcn"
+  title = "Fuga a 3 voci"
+  opus = "BWV 847-Fuga"
+  source = "Henle's Urtext"
+  composer = "Johann Sebastian Bach (1685-1750)"
+  enteredby = "hwn, wl, jcn"
 
   % mutopia headers.
   mutopiatitle = "Das Wohltemperierte Clavier I, Fuga II (c-minor)"
@@ -33,16 +33,15 @@
  the few forced linebreaks were an earlier attempt to get the spacing
  to match up.
 
-%\include "paper19.ly" 
 %}
 
 
-\version "1.7.6"
+\version "2.1.22"
 
 
 
 
-dux =  \context Voice=two \notes \relative c''{
+dux = \context Voice=two \notes \relative c''{
   \voiceTwo
   \clef violin
 
@@ -60,7 +59,7 @@ dux =  \context Voice=two \notes \relative c''{
 %%10 
   as4 r8 a bes bes16 a bes8 f |
   g4 r8 g as as g
-  \translator Staff = bass \stemUp 
+  \change Staff = bass \stemUp 
   f |
   r8 
   as, bes c r8 as16 g as8 f8 |
@@ -68,7 +67,7 @@ dux =  \context Voice=two \notes \relative c''{
   f des' c bes c as g f |
 %%15
   g8
- \translator Staff = treble
+ \change Staff = treble
    \stemDown
 
   g'16 fis g8 c, 
@@ -82,10 +81,10 @@ dux =  \context Voice=two \notes \relative c''{
 %%20
   c16 f es d
    c
-  \translator Staff = bass
+  \change Staff = bass
   \stemUp
    bes! as g 
-  f8 \translator Staff = treble
+  f8 \change Staff = treble
   \stemDown
   as' g f |
   es d es f b, c d b |
@@ -99,14 +98,14 @@ dux =  \context Voice=two \notes \relative c''{
   b, c d b b c r c |
   f16 d es c ~ c8 b c4 r8 e |
 %%30
-  f4 r8 f f es16 d es8 <<f as>> |
-  <<b, d>> r <<b d>> r <<g c>>2 |
+  f4 r8 f f es16 d es8 <f as> |
+  <b, d> r <b d> r <g c>2 |
 }
 
 
-comes =  \context Voice=one \notes \relative c'' {
+comes = \context Voice=one \notes \relative c'' {
   \voiceOne
-  \property Voice.MultiMeasureRest \override #'staff-position = #6 
+  \override MultiMeasureRest  #'staff-position = #6 
   R1 |
   R1 |
   r8 g'16 fis g8 c, es g16 fis g8 a |
@@ -142,11 +141,11 @@ comes =  \context Voice=one \notes \relative c'' {
   g f16 es f8 d as' g r a |
   b c f,16 es d c c8 c'16 b c8 g |
 %%30
-  as c16 b c8 <<d b ! as !>> g,8 c16 b c8 d |
+  as c16 b c8 <d b ! as !> g,8 c16 b c8 d |
   f,16 g as4 g16 f e2 |
 }
 
-bassdux =  \context Voice=three \notes \relative c' {
+bassdux = \context Voice=three \notes \relative c' {
   \clef bass
   R1 |
   R |
@@ -185,26 +184,26 @@ bassdux =  \context Voice=three \notes \relative c' {
   f,16 g as4 g16 f es4 r8 es' |
   d c g' g, 
 %%30
-  < {  c2 ~ | c1 ~ | c1 } \\
+  << {  c2 ~ | c1 ~ | c1 } \\
     {   c,2 ~ | c1 ~ | c1 }
-  > 
+  >> 
 }
 
 \score {
  
-    \notes \context PianoStaff < 
-        \property Score.TimeSignature \override #'style = #'C
-       \context Staff = treble <
+    \notes \context PianoStaff << 
+        \override Score.TimeSignature  #'style = #'C
+       \context Staff = treble <<
            \key c \minor
            \dux
            { \comes \bar "|." }
              \time 4/4
-         >
-       \context Staff = bass <
+         >>
+       \context Staff = bass <<
            \key c \minor
            \bassdux
-       >
-    >
+       >>
+    >>
 
     \paper {
         linewidth = 18.0 \cm
@@ -222,4 +221,4 @@ bassdux =  \context Voice=three \notes \relative c' {
     }
 }
 
-%% new-chords-done %%
+