* ly/property-init.ly (hideStaffSwitch): remove turnOff.

[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 0bf13d689476f20b0fb63fc62e79eab5d6726130..2a540d20dd8fb7bec4f8d0d6bcdd05d4b1b215a7 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)"
@@ -13,15 +13,23 @@
   style = "baroque"
   copyright = "Public Domain"
   maintainer = "hanwen@cs.uu.nl"
-  mutopiapublicdomain = "\\parbox{\\hsize}{\\thefooter\\quad\\small
-    \\\\This music is part of the Mutopia project,
-    \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset
-    and placed in the public domain by " + \maintainer +
-    ".\\\\Unrestricted modification and redistribution is permitted
-    and encouraged---copy this music and share it.}"
-  tagline = \mutopiapublicdomain
-  lastupdated = "2002/August/19"
+ %% TODO: handle \footer, \head[er] properly
   footer = "Mutopia-2002/08/19-6"
+
+  tagline = \markup { \smaller
+      \column <
+          \fill-line < \footer "" >
+          \fill-line < { "This music is part of the Mutopia project, "
+                         \typewriter { "http://sca.uwaterloo.ca/Mutopia/" }
+                         "." } >
+          \fill-line < { "It has been typeset and placed in the public "
+                         "domain by "  \maintainer  "." } >
+          \fill-line < { "Unrestricted modification and redistribution "
+                         "is permitted and encouraged---copy this music "
+                         "and share it!" } >
+          >
+       }
+  lastupdated = "2002/August/19"
 }
 
 
@@ -33,16 +41,15 @@
  the few forced linebreaks were an earlier attempt to get the spacing
  to match up.
 
-%\include "paper19.ly" 
 %}
 
 
-\version "1.6.0"
+\version "2.3.17"
 
 
 
 
-dux =  \context Voice=two \notes \relative c''{
+dux = \context Voice=two  \relative c''{
   \voiceTwo
   \clef violin
 
@@ -60,7 +67,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 +75,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 +89,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 |
@@ -100,13 +107,13 @@ dux =  \context Voice=two \notes \relative 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 <g2 c> |
+  <b, d> r <b d> r <g c>2 |
 }
 
 
-comes =  \context Voice=one \notes \relative c'' {
+comes = \context Voice=one  \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 |
@@ -121,7 +128,7 @@ comes =  \context Voice=one \notes \relative c'' {
   f f16 e f8 c8 d4 r8 d |
   es8 es16 d es8 bes c es16 d es8 f |
   bes, es16 d es8 f as,16 bes c4 bes16 as |
-  \stemBoth g16 es f g as bes c d es d c d es f g a |
+  \stemNeutral g16 es f g as bes c d es d c d es f g a |
   bes f, g as bes c d e f es d es f g a b |
 %%15
   \stemUp c8 b16 a g f! es d c8 es d c |
@@ -146,7 +153,7 @@ comes =  \context Voice=one \notes \relative c'' {
   f,16 g as4 g16 f e2 |
 }
 
-bassdux =  \context Voice=three \notes \relative c' {
+bassdux = \context Voice=three  \relative c' {
   \clef bass
   R1 |
   R |
@@ -173,7 +180,7 @@ bassdux =  \context Voice=three \notes \relative c' {
   c16 d es8~ es16 a, bes c d es f8~ f16 b, c d |
 %%20 
 % es8 r r e f f, es! d |     % -> \classic_accidentals
-  es8 r r e \stemBoth \stemDown f f, es! d \stemBoth |
+  es8 r r e \stemNeutral \stemDown f f, es! d \stemNeutral |
   r as' g f g f16 es f8 g |
   c16 d es d c bes as g f bes' as g f es d c |
   bes c d c bes as g f es as' g f es d c bes |
@@ -185,32 +192,33 @@ 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 }
-  > 
+  >> 
 }
 
+
+\book {
 \score {
- 
-    \notes \context PianoStaff < 
-        \property Score.TimeSignature \override #'style = #'C
-       \context Staff = treble <
+     \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
-       \translator { \ScoreContext
-       SpacingSpanner \override #'spacing-increment = #1.0
-       SpacingSpanner \override #'shortest-duration-space = #1.9       
+       \context { \Score
+       \override SpacingSpanner #'spacing-increment = #1.0
+       \override SpacingSpanner #'shortest-duration-space = #1.9       
        }
     }
     \header{
@@ -222,3 +230,4 @@ bassdux =  \context Voice=three \notes \relative c' {
     }
 }
 
+}