From 40546e21b4eedcfbe88627917c0353cbb7a346a6 Mon Sep 17 00:00:00 2001 From: Erik Sandberg Date: Thu, 24 Aug 2006 15:43:59 +0000 Subject: [PATCH] convert-ly:ed input/mutopia --- ChangeLog | 5 +++ .../J.S.Bach/baerenreiter-sarabande.ly | 12 +++++-- input/mutopia/J.S.Bach/bwv940.ly | 12 +++++-- input/mutopia/R.Schumann/romanze-op28-2.ly | 18 ++++++++--- input/mutopia/W.A.Mozart/mozart-hrn-3.ly | 32 ++++++++++++++++--- 5 files changed, 66 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f82763c45..740c5b124d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-24 Erik Sandberg + + * input/mutopia/*: upgrade to new midi tempo syntax (repairs make + web partially) + 2006-08-24 Han-Wen Nienhuys * scm/define-music-properties.scm (all-music-properties): remove diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index 38faffd006..bc4ce8a241 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -1,4 +1,4 @@ -\version "2.7.39" +\version "2.9.16" forcedLastBreak = { \break } @@ -181,7 +181,15 @@ smallerPaper = \layout { \score{ \sarabandeCelloStaff \layout { } - \midi{ \tempo 4 = 40 } + + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 40 4) + } + } + + \header{ opus= "" piece ="Sarabande" } diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index 7f8a687218..b8f1391e95 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.7.39" +\version "2.9.16" %{ Header for Petites Preludes. @@ -158,7 +158,15 @@ global = { \override SpacingSpanner #'spacing-increment = #2.0 } } - \midi{ \tempo 4 = 40 } + + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 40 4) + } + } + + } diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 9244f3a7ac..18cd54a72d 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -4,7 +4,7 @@ #(set-global-staff-size 16) -\version "2.7.39" +\version "2.9.16" \header { title = "Romanzen" @@ -255,7 +255,7 @@ leftb = \transpose c cis { \override PianoStaff.InstrumentName #'font-shape = #'italic \override PianoStaff.InstrumentName #'font-magnification = #3 - \set PianoStaff.instrument = " 2." + \set PianoStaff.instrumentName = " 2." \new Staff = "up" { \override Staff.DynamicLineSpanner #'direction = #DOWN \clef G <<\global \new Voice = "upv" \righta >> @@ -265,8 +265,8 @@ leftb = \transpose c cis { \override Staff.InstrumentName #'font-shape = #'upright \override Staff.InstrumentName #'font-magnification = #1 \override Staff.InstrumentName #'extra-offset = #'(0 . 6) - % \set Staff.instrument = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}" - \set Staff.instrument = \markup { \column { Rechte Hand } \hspace #2 } + % \set Staff.instrumentName = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}" + \set Staff.instrumentName = \markup { \column { Rechte Hand } \hspace #2 } \clef F <<\global \new Voice = "midv" \rightb>> } \new Staff = "down" { @@ -288,7 +288,15 @@ leftb = \transpose c cis { \override VerticalAlignment #'forced-distance = #13.0 } } - \midi { \tempo 8=100 } + + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 100 8) + } + } + + } diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index b572c07802..302939a014 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly @@ -41,7 +41,7 @@ virtuoso that taught in Geneva. %} -\version "2.7.39" +\version "2.9.16" \include "mozart-hrn3-defs.ily" \include "mozart-hrn3-allegro.ily" @@ -59,13 +59,29 @@ virtuoso that taught in Geneva. { \transpose c' bes \allegro } \layout { } \header { piece = "Allegro" opus = "" } - \midi { \tempo 4=90 } + + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 90 4) + } + } + + } \score { { \transpose c' bes \romanze } \header { piece = "Romanze" opus = "" } - \midi { \tempo 4 = 70 } + + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 70 4) + } + } + + \layout {} } @@ -73,7 +89,15 @@ virtuoso that taught in Geneva. { { \transpose c' bes \rondo } \header { piece = "Rondo" opus = "" } - \midi { \tempo 4 = 100 } + + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 100 4) + } + } + + \layout { } } } -- 2.39.2