From: Han-Wen Nienhuys Date: Thu, 19 Jun 2003 15:11:21 +0000 (+0000) Subject: (romanze): new X-Git-Tag: release/1.7.23~36 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=876df389270b5356e41a9da7f20b3c4ca53d5519;p=lilypond.git (romanze): new syntax. --- diff --git a/ChangeLog b/ChangeLog index 37024ecc56..89d64316f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-06-19 Han-Wen Nienhuys + + * input/mutopia/J.S.Bach/Petites-Preludes/*.ly (opus): update + to postfix syntax + + * input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly (romanze): new + syntax. + + * VERSION: release 1.7.22 + 2003-06-18 Graham Percival * input/test/[h-k]*.ly: added texidoc index. diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 161fae9970..2b7205e87f 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -55,13 +55,13 @@ upper = \context Staff=upper \notes\relative c { \lowstaff \stemUp r16 g,, b d - [ f \upstaff \stemDown g16 b d ] | + f-[ \upstaff \stemDown g16 b d ] | \stemUp b \lowstaff \stemDown - [ g b d ] f + g-[ b d ] f \upstaff - [ g16 b d ] b - [ g b d ] + g16-[ b d ] b + g-[ b d ] \stemUp % urg, below translator change affects previous beam too!? diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 73f8880179..0f8ecba68c 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -17,7 +17,7 @@ upper = \context Staff \notes\relative c{ <>2 r4 <> - < { \stemUp [d8 g, 8 b d] } + < { \stemUp d8-[ g, 8 b d] } \context Voice = ii < \stemDown b g > > diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 1ddf4721a9..6a14883154 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -18,51 +18,51 @@ This file was partly generated using m4. upper = \notes \transpose c c' { - r16 [c es g] [es c es c] r c r c | - r16 [c es g] [es c es c] r c r c | - r16 [c f as] [f c f c] r c r c | - r16 [c f as] [f c f c] r c r c | - r16 [b, d f] [d b, d b,] r b, r b, | - r16 [b, d f] [d b, d b,] r b, r b, | - r16 [g, c es] [c g, c g,] r g, r g, | - r16 [g, c es] [c g, c g,] r g, r g, | - r16 [g, c es] [c g, c g,] r g, r g, | - r16 [g, c es] [c g, c g,] r g, r g, | - r16 [a, c es] [c a, c a,] r a, r a, | - r16 [a, c es] [c a, c a,] r a, r a, | - r16 [a, bes, d] [bes, a, bes, a,] r a, r a, | - r16 [g, bes, d] [bes, g, bes, g,] r g, r g, | - r16 [bes, d g] [d bes, d bes,] r bes, r bes, | - r16 [a, es g] [es a, es a,] r a, r a, | - r16 [a, c fis] [c a, c a,] r a, r a, | - r16 [a, c fis] [c a, c a,] r a, r a, | - r16 [bes, d g] [d bes, d bes,] r bes, r bes, | - - r16 [c fis a] [fis c fis c] r c r c | - r16 [d g bes] [g d g d] r d r d | - r16 [d fis c'] [fis d fis d] r d r d | - - r16 [cis g bes] [g cis g cis] r cis r cis | - r16 [c! es a] [es c es c] r c r c | - r16 [bes, e g] [e bes, e bes,] r bes, r bes, | - r16 [a, c g] [c a, c a,] r a, r a, | - - r16 [a, c fis] [c a, c a,] r a, r a, | - r16 [g, bes, e] [bes, g, bes, g,] r g, r g, | - r16 [fis, a, es] [a, fis, a, fis,] r fis, r fis, | - r16 [g, bes, d] [bes, g, bes, g,] r g, r g, | - r16 [g, a, c] [a, g, a, g,] r g, r g, | - r16 [fis, a, c] [a, fis, a, fis,] r fis, r fis, | - r16 [fis, a, c] [a, fis, a, fis,] r fis, r fis, | - r16 [g, a, c] [b, g, b, g,] r g, r g, - r16 [a, c fis] [c a, c a,] r a, r a, | - r16 [c fis a] [fis c fis c] r c r c | - r16 [b, d g] [d b, d b,] r b, r b, | - r16 [b, d f] [d b, d b,] r b, r b, | - r16 [g, c es] [c g, c g,] r g, r g, | - r16 [fis, c es] [c fis, c fis,] r fis, r fis, | - r16 [fis, c es] [c fis, c fis,] r fis, r fis, | - r16 [g, b, d] [b, g, b, d] [es c a, fis] | + r16 c-[ es g] es-[ c es c] r c r c | + r16 c-[ es g] es-[ c es c] r c r c | + r16 c-[ f as] f-[ c f c] r c r c | + r16 c-[ f as] f-[ c f c] r c r c | + r16 b,-[ d f] d-[ b, d b,] r b, r b, | + r16 b,-[ d f] d-[ b, d b,] r b, r b, | + r16 g,-[ c es] c-[ g, c g,] r g, r g, | + r16 g,-[ c es] c-[ g, c g,] r g, r g, | + r16 g,-[ c es] c-[ g, c g,] r g, r g, | + r16 g,-[ c es] c-[ g, c g,] r g, r g, | + r16 a,-[ c es] c-[ a, c a,] r a, r a, | + r16 a,-[ c es] c-[ a, c a,] r a, r a, | + r16 a,-[ bes, d] bes,-[ a, bes, a,] r a, r a, | + r16 g,-[ bes, d] bes,-[ g, bes, g,] r g, r g, | + r16 bes,-[ d g] d-[ bes, d bes,] r bes, r bes, | + r16 a,-[ es g] es-[ a, es a,] r a, r a, | + r16 a,-[ c fis] c-[ a, c a,] r a, r a, | + r16 a,-[ c fis] c-[ a, c a,] r a, r a, | + r16 bes,-[ d g] d-[ bes, d bes,] r bes, r bes, | + + r16 c-[ fis a] fis-[ c fis c] r c r c | + r16 d-[ g bes] g-[ d g d] r d r d | + r16 d-[ fis c'] fis-[ d fis d] r d r d | + + r16 cis-[ g bes] g-[ cis g cis] r cis r cis | + r16 c!-[ es a] es-[ c es c] r c r c | + r16 bes,-[ e g] e-[ bes, e bes,] r bes, r bes, | + r16 a,-[ c g] c-[ a, c a,] r a, r a, | + + r16 a,-[ c fis] c-[ a, c a,] r a, r a, | + r16 g,-[ bes, e] bes,-[ g, bes, g,] r g, r g, | + r16 fis,-[ a, es] a,-[ fis, a, fis,] r fis, r fis, | + r16 g,-[ bes, d] bes,-[ g, bes, g,] r g, r g, | + r16 g,-[ a, c] a,-[ g, a, g,] r g, r g, | + r16 fis,-[ a, c] a,-[ fis, a, fis,] r fis, r fis, | + r16 fis,-[ a, c] a,-[ fis, a, fis,] r fis, r fis, | + r16 g,-[ a, c] b,-[ g, b, g,] r g, r g, + r16 a,-[ c fis] c-[ a, c a,] r a, r a, | + r16 c-[ fis a] fis-[ c fis c] r c r c | + r16 b,-[ d g] d-[ b, d b,] r b, r b, | + r16 b,-[ d f] d-[ b, d b,] r b, r b, | + r16 g,-[ c es] c-[ g, c g,] r g, r g, | + r16 fis,-[ c es] c-[ fis, c fis,] r fis, r fis, | + r16 fis,-[ c es] c-[ fis, c fis,] r fis, r fis, | + r16 g,-[ b, d] b,-[ g, b, d] es-[ c a, fis] | <>4 @@ -70,60 +70,60 @@ upper = \notes \transpose c c' { } lower = \notes{ - c4 r [g8 es] | - c4 r [g8 es] | - c4 r [as8 f] | + c4 r g8-[ es] | + c4 r g8-[ es] | + c4 r as8-[ f] | - c4 r [as8 f] | - c4 r [as8 f] | - c4 r [as8 f] | + c4 r as8-[ f] | + c4 r as8-[ f] | + c4 r as8-[ f] | - c4 r [es8 c] | - bes,!4 r [es8 c] | - as,!4 r [es8 c] | + c4 r es8-[ c] | + bes,!4 r es8-[ c] | + as,!4 r es8-[ c] | - g,4 r [es8 c] | - fis,4 r [es8 c] | - fis,4 r [fis8 d] | + g,4 r es8-[ c] | + fis,4 r es8-[ c] | + fis,4 r fis8-[ d] | - g,4 r [d8 bes,] | - g,4 r [bes,8 g,] | - es,4 r [g8 es] | + g,4 r d8-[ bes,] | + g,4 r bes,8-[ g,] | + es,4 r g8-[ es] | - c4 r [c8 a,] | - d,4 r [d8 a,] | - d,4 r [d8 a,] | - d,4 r [d8 bes,] | + c4 r c8-[ a,] | + d,4 r d8-[ a,] | + d,4 r d8-[ a,] | + d,4 r d8-[ bes,] | - d,4 r [es8 c] | - d,4 r [g8 d] | - d,4 r [a8 fis] | + d,4 r es8-[ c] | + d,4 r g8-[ d] | + d,4 r a8-[ fis] | - d,4 r [g8 es] | - d,4 r [fis8 d] | - d,4 r [e8 cis] | - d,4 r [es8 c] | + d,4 r g8-[ es] | + d,4 r fis8-[ d] | + d,4 r e8-[ cis] | + d,4 r es8-[ c] | - d,4 r [d8 a,] | - d,4 r [cis8 bes,] | - d,4 r [c!8 a,] | + d,4 r d8-[ a,] | + d,4 r cis8-[ bes,] | + d,4 r c!8-[ a,] | - d,4 r [bes,8 g,] | - d,4 r [es8 c] | - d,4 r [d8 a,] | + d,4 r bes,8-[ g,] | + d,4 r es8-[ c] | + d,4 r d8-[ a,] | - g,4 r [es8 c] | - g,4 r [d8 b,] | - g,4 r [es8 c] | + g,4 r es8-[ c] | + g,4 r d8-[ b,] | + g,4 r es8-[ c] | - g,4 r [es8 c] | - g,4 r [g8 d] | - g,4 r [as8 f] | - g,4 r [es8 c] | + g,4 r es8-[ c] | + g,4 r g8-[ d] | + g,4 r as8-[ f] | + g,4 r es8-[ c] | - g,4 r [es8 c] | - g,4 r [es8 c] | + g,4 r es8-[ c] | + g,4 r es8-[ c] | g,4 r r | %% FIXME: \fermata? g,4_\fermata diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index a16e579dbc..29b36d39f6 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -8,13 +8,9 @@ piece = "4" one = \context Staff \notes\relative c { \context Voice=i - \property Voice.TextScript \set #'font-style = #'italic -% r16_"legato" r16 - \property Voice.TextScript \set #'font-style = #'finger d' fis d a' b cis a d cis d e d fis e d | - \property Voice.TextScript \set #'font-style = #'finger \stemUp\tieUp cis4 fis ~ fis8 fis e4 ~ | e16 \stemBoth\tieBoth a,16 cis a d e fis d @@ -26,13 +22,8 @@ one = \context Staff \notes\relative c { <>4 <> << g! d>>16 fis g a \stemBoth g b a g | - \property Voice.TextScript \set #'font-style = #'italic - fis e fis g fis a g fis - \property Voice.TextScript \set #'font-style = #'finger -% e4-"2\\_5" ~ e16 e, fis g | e4 ~ e16 e, fis g | - \property Voice.TextScript \set #'font-style = #'italic a g a b a c b a g fis g a g b a g | @@ -40,14 +31,8 @@ one = \context Staff \notes\relative c { fis4 \skip 4*7 | %10 - \property Voice.TextScript \set #'font-style = #'finger -% d'4. cis8-"4\\_5" ~ cis b4 a8-"4\\_5" ~ | d'4. cis8 ~ cis b4 a8 ~ | - \property Voice.TextScript \set #'font-style = #'italic - a g4 fis8 ~ fis16 fis e d - \property Voice.TextScript \set #'font-style = #'finger -% e4-"3\\_5" ~ | e4 ~ | e16 e d cis d4 ~ d16 d cis b cis4 | \stemBoth @@ -65,10 +50,11 @@ one = \context Staff \notes\relative c { \bar "|." } -two = \context Staff \notes\relative c{ +two = \context Staff \notes\relative c \context Voice=ii +{ + \stemUp - \property Voice.TextScript \set #'font-style = #'finger fis4 e8 a4 a4 gis8 | a8 \translator Staff=upper \stemDown\tieDown @@ -110,15 +96,13 @@ two = \context Staff \notes\relative c{ a g~ g16 e fis8~ fis16 d8.~ d8. cis!16 | % \translator Staff=lower \stemUp \context Staff < -% \context Voice=i { \stemUp\tieU d8 a~ a4 } -% \context Voice=ii { \stemDown a8 g fis16 e fis d } - \context Voice=ii { - \translator Staff = upper - \stemDown\tieDown d8 a~ a4 - } - \context Voice=iii { + { \translator Staff = lower - \stemUp a8 g fis16 e fis d + a8 g fis16 e fis d + }\\ + { + \translator Staff = upper + d8 a~ a4 } > \translator Staff=lower @@ -128,8 +112,8 @@ two = \context Staff \notes\relative c{ \bar "|." } -three = \notes\relative c{ - \context Voice=iii +three = \notes\relative c \context Voice=iii +{ \stemDown d4 cis b e | a16 a, cis a d e fis d diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index f65b8dea9f..809dadd111 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -10,7 +10,7 @@ upper = \context Staff \notes\relative c \property Voice.TextScript \set #'font-style = #'italic - [d'8 a' f d a' f] | + d'8-[ a' f d a' f] | d a' f d a' f | d bes' g d bes' g | d bes' g d bes' g | @@ -24,13 +24,13 @@ upper = \context Staff \notes\relative c a gis fis e d' b | < { - \stemUp + \property Voice.TextScript \set #'font-style = #'roman c4-\mordent^#'(music "accidentals-1") r r | c4-\mordent^#'(music "accidentals-1") r r \property Voice.TextScript \set #'font-style = #'italic - } - \context Voice=ii { \stemDown a4 r r | a4 r r } + } \\ + { \stemDown a4 r r | a4 r r } > | \stemBoth a'8 es d c bes a | @@ -45,12 +45,10 @@ upper = \context Staff \notes\relative c f d f a d g, | < { - \stemUp % ... textnatural -% cis8-\prall e8-"poco cresc." cis a e' cis cis8-\prall e8 cis a e' cis - } - \context Voice=ii { \stemDown a4 } + }\\ + { \stemDown a4 } > \stemBoth a8 e' cis a bes! a | @@ -80,18 +78,18 @@ upper = \context Staff \notes\relative c % s1 | s4 s4 s4 | %40 - s4 s16 [d16 f a] \stemDown [d, f a] \stemUp d | + s4 s16 d16-[ f a] \stemDown d,-[ f a] \stemBoth \stemUp d | \stemBoth f a f d f d b d gis, b a gis | % arpeggio <>4. a8 << f d a >>4 ~ - [f8 e] - < { \stemUp + f8-[ e] + < { e4.^\prall d8 - } - \context Voice=ii { \stemDown cis2 } + } \\ + { cis2 } > \stemBoth d8 c! a d bes g | @@ -151,14 +149,15 @@ lower = \context Staff \notes\relative c{ cis cis' cis, | d s16 \stemDown - [g'16 f e] f a d, f | - a, \stemUp [d c bes] - a \stemDown [ g f e] d f a d | + g'16-[ f e] f a d, f | + a, \stemUp d-[ c bes] + + a \stemDown g-[ f e] d f a d | \stemUp - [f a] + f-[ a] \stemDown - [d, f] a s s8 s4 | + d,-[ f] a s s8 s4 | \stemBoth % ugh whole rest has duration of one bar R2. | diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly index 21b5eff195..32bdba0fbb 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly @@ -14,63 +14,63 @@ allegro = c'2^"Tutti" g c, r R1*1 - r8 [g' g g] [g g e c] + r8 [g' g g] g-[ g e c] g'4 g, r2 R1*18 r2 r4^"Solo" g'4 | \mark "A" - e'4. () c8 [f (d c )b ] - [b()c] g4 r8 [g c e] - g2. [g16( f e )f] - dis4 () e4 r8 [c8-. c-. c-.] - c4.( [d16 e] f4 ) e - a,( d g,) c - d-. d-. \grace e16( [)d8. c16 d8. e16] + e'4. ( c8-) f-[ (d c b-) ] + b-[( c-)] g4 r8 g-[ c e] + g2. g16-[( f e f-)] + dis4 ( e4-) r8 c8-[-. c-. c-.] + c4.( d16-[ e] f4 e-) + a,( d g, c-) + d-. d-. \grace e16( [ d8.-) c16 d8. e16] c4 r r2 R1*3 - c,2 ~ [c8 e g c] - [c b ] b4 r2 - [c,8 () e g c] [e()g e c] - [c()b] b4 r2 - c4.( g8 e'4.) c8 - [g'()d ] d4 r4 d - [d8 () c] c4.( [d16 e] [d8 )c] - [c8(-\trill )b] b4 r2 | - d2( ~ [d8 e16 d] [c8 )b] | - [b()a] a4 r8 [a a a] - a4( cis e )g + c,2 ~ c8-[ e g c] + c-[ b ] b4 r2 + c,8-[ ( e-) g c] e-[( g-) e c] + c-[( b-)] b4 r2 + c4.( g8 e'4. c8-) + g'-[( d-) ] d4 r4 d + d8-[ ( c-)] c4.( d16-[ e] d8-[ c-)] + c8-[(-\trill b-)] b4 r2 | + d2( ~ d8-[ e16 d] c8-[ b-)] | + b-[( a-)] a4 r8 a-[ a a] + a4( cis e g-) \grace { \longgrace g16( \endlonggrace } - [ )fis8( e16 )d] d4-. r2 | + [ fis8-)( e16 d-)] d4-. r2 | \mark "B" R1*3 - r2 r4 [d8-(_\markup { \italic \bold "con espressione" } b-) ] - [a( )g d'( )b] [a( )g e'( )c ] - [b8( )a] a4 r4 [a8 a] - [a( \< b c \!cis\> ] d4 \! )c - [ais8() b] r8 \cresc b [b()c] r c - [cis ()d] r4 r2 - \endcresc g,1-\f ~ g2 ~ [g8 a16 b] [c()d e c] + r2 r4 d8-[-(_\markup { \italic \bold "con espressione" } b-) ] + a-[( g-) d'( b-)] a-[( g-) e'( c-) ] + b8-[( a-)] a4 r4 a8-[ a] + a-[( \< b c \!cis\> ] d4 \! c-) + ais8-[( b-)] r8 \cresc b b-[( c-)] r c + cis-[ ( d-)] r4 r2 + \endcresc g,1-\f ~ g2 ~ g8-[ a16 b] c-[( d-) e c] %% 64 f4-. d-. b-. g-. R1 c,2-\p e4 g c \cresc e g4. e8 | - \endcresc d4.-\f [e16 fis] [g () fis e d] [c() b a g] + \endcresc d4.-\f e16-[ fis] g-[ ( fis-) e d] c-[( b-) a g] < a1(-\trill - { s2 \grace{ [g16 a] } } > + { s2 \grace{ g16-[ a] } } > \mark "C" - )g4 r r2 + g4-) r r2 R1*15 \mark "D" bes2-\mf d4 f - g,2~ [g8 g' es c]| - bes4( )a4. [c8( d )es] - cis4()d r8 [bes (c )d] - es2 () d4 r - es2 () d4 r - [c8( g' es )c] bes4()c - c4.( cis8 )d4 r + g,2~ g8-[ g' es c]| + bes4( a4.-) c8-[( d es-)] + cis4( d-) r8 bes-[ (c d-)] + es2 ( d4-) r + es2 ( d4-) r + c8-[( g' es c-)] bes4( c-) + c4.( cis8 d4-) r R1*2 es1~es1| e! @@ -79,80 +79,80 @@ allegro = c, e' e, - c'2 [b8( a gis )a] - [gis8 e gis b ] e4 r | - r8 [e, a c] dis4 r - r8 [e, a c] dis4 r - r8 [e, g b] e4 r - r8 [fis, b dis] fis4 r - r8 [gis, b d] f4 r - r8 [g, b d_\ritenuto ] f4 r + c'2 b8-[( a gis a-)] + gis8-[ e gis b ] e4 r | + r8 e,-[ a c] dis4 r + r8 e,-[ a c] dis4 r + r8 e,-[ g b] e4 r + r8 fis,-[ b dis] fis4 r + r8 gis,-[ b d] f4 r + r8 g,-[ b d_\ritenuto ] f4 r \mark "E" R1*8 - r2 r8 [g, g g] - e'4.() c8 [f( d c )b] - [b()c] g4 r8 [g c e] | - g2. [g16( f e )f] - dis4()e r8 [c-. c-. c-.] - c4.( [d16 e] f4 )e - a, ( d g, )c + r2 r8 g,-[ g g] + e'4.( c8-) f-[( d c b-)] + b-[( c-)] g4 r8 g-[ c e] | + g2. g16-[( f e f-)] + dis4( e-) r8 c-[-. c-. c-.] + c4.( d16-[ e] f4 e-) + a, ( d g, c-) d d \grace { e8( } - [)d8. c16 d8. e16] + [ d8.-) c16 d8. e16] c4 r r2 \mark "F" R1*3 - c,2~[c8 e g c] - [c8()b] b4 r2 - [c,8 e g c ] [e ()g e c] - [c()b] b4 r2 - c2 (bes )a [a8(b c )cis] - d2( ~ [d8 e16 d] \grace { \longgrace d16( \endlonggrace } [)c8 b16 )c] - \grace { \longgrace c16 \endlonggrace }[ b8( a16 )g] g4 r2 | + c,2~ c8-[ e g c] + c8-[( b-)] b4 r2 + c,8-[ e g c ] e-[ ( g-) e c] + c-[( b-)] b4 r2 + c2 (bes a-) a8-[(b c cis-)] + d2( ~ d8-[ e16 d] \grace { \longgrace d16( \endlonggrace } [ c8-) b16 c-)] + \grace { \longgrace c16 \endlonggrace } b8-[( a16 g-)] g4 r2 | R1*3 - r2 r4 [g'8()e] + r2 r4 g'8-[( e-)] \mark "G" - [d()c g'()e] [d()c a'()f] - [e()d] d4 r [d8 d] - d4(~ [d16 e d )e] [g8() f e d] | + d-[( c-) g'( e-)] d-[( c-) a'( f-)] + e-[( d-)] d4 r d8-[ d] + d4(~ d16-[ e d e-)] g8-[( f-) e d] | c4 r r2 R1 c1 ~ c | - [c8-. c-.] r c-. [cis()d] r\cresc d-. | - [dis()e] r e-. [e()f] r f-. | + c8-[-. c-.] r c-. cis-[( d-)] r\cresc d-. | + dis-[( e-)] r e-. e-[( f-)] r f-. | g4-.-\f\endcresc e-. c-. bes-. | g-.-\ff e-. c-. r | - a'2 ~ [a8_""_\markup { \bold \italic "sempre " \dynamic "f" } b16 c] [d( e d )e] + a'2 ~ a8-[_""_\markup { \bold \italic "sempre " \dynamic "f" } b16 c] d-[( e d e-)] - f4. () d8 [f8 ()d f d] - [c (e] )g2 \grace { \longgrace f16( \endlonggrace } [)e8( d16 )c] + f4. ( d8-) f8-[ ( d-) f d] + c-[ (e] g2-) \grace { \longgrace f16( \endlonggrace } [ e8-)( d16 c-)] < d1-\trill ( - { s2 \grace { [c16 d] } } > + { s2 \grace { c16-[ d] } } > - ) c4 r r2 + c4-) r r2 R1 | \mark "H" - \times 2/3 { [ c8 b a ] } \times 2/3 { [ g a b] } - \times 2/3 { [ c d e] } \times 2/3 { [ f e d] } | - \times 2/3 { [ c b a ] } \times 2/3 { [ g a b] } - \times 2/3 { [ c d e] } \times 2/3 { [ f e d] }| - c4 \times 2/3 { r8 [g'()e]} c4 \times 2/3 { r8 [e () c]} | - g4 \times 2/3 { r8 [c8() g] } \times 2/3 { [ e ()g e-. ] } \times 2/3 { [c () e c-.] }| - g4 r8 g'-\f [a b c d]| + \times 2/3 { c8-[ b a ] } \times 2/3 { g-[ a b] } + \times 2/3 { c-[ d e] } \times 2/3 { f-[ e d] } | + \times 2/3 { c-[ b a ] } \times 2/3 { g-[ a b] } + \times 2/3 { c-[ d e] } \times 2/3 { f-[ e d] }| + c4 \times 2/3 { r8 g'-[( e-)]} c4 \times 2/3 { r8 e-[ ( c-)]} | + g4 \times 2/3 { r8 c8-[( g-)] } \times 2/3 { e-[ ( g-) e-. ] } \times 2/3 { c-[ ( e-) c-.] }| + g4 r8 g'-\f a-[ b c d]| < d1(-\trill - { s2 \grace { [c16 d] } } > - )c4 r r2 + { s2 \grace { c16-[ d] } } > + c4-) r r2 R1*3 - c4.^\fermata_"Cadenza ad lib." () d8 d4.-\trill^\fermata ( [c16 )d] + c4.^\fermata_"Cadenza ad lib." ( d8-) d4.-\trill^\fermata ( c16-[ d-)] c4 r r2 R1*8 - r4 [c8.^"tutti"-\f c16] c4 c - c [c,8. c16] c4 c| + r4 c8.-[^"tutti"-\f c16] c4 c + c c,8.-[ c16] c4 c| c2 r2 \bar "|." } diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly index b5c9ca9df1..f1c6b06563 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly @@ -8,43 +8,43 @@ romanze = \notes \relative c' { \property Score.skipBars = ##t c'4.( _\markup { \dynamic "p" \italic { "" con molto espressione } } - )f8 a,4 a - [bes8( c d bes] )g4 r8 g - a r bes r c r [d()bes] - a2( [)g8 a( bes )b] - c4. () f8 a,4 a | + f8-) a,4 a + bes8-[( c d bes] g4-) r8 g + a r bes r c r d-[( bes-)] + a2( [ g8-) a( bes b-)] + c4. ( f8-) a,4 a | % 6 - [bes8 (c d) bes] g4 r8 c, - [c8( e g )bes] [a( c f ) d] + bes8-[ (c d bes-)] g4 r8 c, + c8-[( e g bes-)] a-[( c f d-)] c r e r f r r4 \mark "A" R1*8 - g4.-\mf f8 [e d c bes] + g4.-\mf f8 e-[ d c bes] % 18 - [bes( a d )c] c4 r + bes-[( a d c-)] c4 r R1*2 - g'4. f8 [e d c bes] - [bes (a d ) c] c4 r + g'4. f8 e-[ d c bes] + bes-[ (a d c-)] c4 r R1 % 25 - [c16 ( d c )d] [e ( f e )f] [g()e c-. c-.] [f()d b-. b-.] - [c16-\p () d c )d] [e ( f e )f] [g()e c-. c-.] [f()d b-. b-.] - [c8 \< c, c c] [c c c \! c ] + c16-[ ( d c d-)] e-[ ( f e f-)] g-[( e-) c-. c-.] f-[( d-) b-. b-.] + c16-[-\p ( d c d-)] e-[ ( f e f-)] g-[( e-) c-. c-.] f-[( d-) b-. b-.] + c8-[ \< c, c c] c-[ c c \! c ] \mark "B" c1-\f R1*9 - f'4.(-\p )d8 b4 r8 g - g'4.() e8 c4 r8 cis | + f'4.(-\p d8-) b4 r8 g + g'4.( e8-) c4 r8 cis | % 39 - d4(~ [d16 e d )e] [f8 () d f() d] - c2()b4 r + d4(~ d16-[ e d e-)] f8-[ ( d-) f( d-)] + c2( b4-) r R1*4 - e4. ()g8 c,4 ()cis - [d8( e f )d] b4 r8 g - [c ()e g g] [g( f e )d] + e4. ( g8-) c,4 ( cis-) + d8-[( e f d-)] b4 r8 g + c-[ ( e-) g g] g-[( f e d-)] c4( \grace { \longgrace e16 \endlonggrace } - [d8. )c16 \< ] [c8 c-.( c-. \! )c-.] + d8.-[ c16-) \< ] c8-[ c-.( c-. \! c-)-.] \mark "C" %% this is a trick to get the sfp-s to align. @@ -55,30 +55,30 @@ romanze = \notes \relative c' { c,\sfp \property Voice.Hairpin \revert #'transparent R1*3 - r8 [c-\p c c] c2~ - [c8 c' c c] c2~ - [c8 \< e( g f] [e \! d \> c bes] + r8 c-[-\p c c] c2~ + c8-[ c' c c] c2~ + c8-[ \< e( g f] e-[ \! d \> c bes] \mark "D" - \! )a4 r r2 + \! a4-) r r2 R1*3 - c4.-\p () f8 a,4 a | - [bes8 (c d) bes] g4 r8 c, - [c8( e g )bes] [a( c f ) d] + c4.-\p ( f8-) a,4 a | + bes8-[ (c d bes-)] g4 r8 c, + c8-[( e g bes-)] a-[( c f d-)] c r e r f4 r4 R1*3 r2 r4 r8 c,8 - [c8( e g )bes] [a( c f ) d] + c8-[( e g bes-)] a-[( c f d-)] c r e r f4 r4 g,1 c,2 c4. c8 - [c8( e g )bes] [a( c f ) d] + c8-[( e g bes-)] a-[( c f d-)] c r e r f4 r4 % -. ? R1 c8-. r e-. r f4 r4 % Finish with F if played separately - c8-.( r c,-. r ) c4 r4| + c8-.( r c,-. r c4-) r4| \bar "|." } diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly index 346b6a3e62..26321c7ad7 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly @@ -3,22 +3,22 @@ % \include "mozart-hrn3-defs.ly" rondotheme = \notes \relative c' { - [c'8 c c] [c c c] - c4( cis8 )d r g, - [d'8 d d] [d d d] - d4( dis8 )e r c | - [c()d e] [f g a] - [g ()e c] c4 d8 - e4()d8 e4()f8 - e4.()d8 r r | + c'8-[ c c] c-[ c c] + c4( cis8 d-) r g, + d'8-[ d d] d-[ d d] + d4( dis8 e-) r c | + c-[( d-) e] f-[ g a] + g-[ ( e-) c] c4 d8 + e4( d8-) e4( f8-) + e4.( d8-) r r | } lipbreaker = \notes \relative c' { - r8 [g'-. g-.] [c()e g,-.] - [c()e g,-.] [c()e g,-.] - [c c, c] [c c c] - [c c c] [c c c] + r8 g'-[-. g-.] c-[( e-) g,-.] + c-[( e-) g,-.] c-[( e-) g,-.] + c-[ c, c] c-[ c c] + c-[ c c] c-[ c c] } rightsixteenth = { \property Voice.stemLeftBeamCount = 1 @@ -39,51 +39,51 @@ rondo = \notes \relative c' \rondotheme R2.*13 | - r8 r^\fermata d [d e f] - [g ()e c-.] [d()e d-.] - c4 c8 [d e f] - [g()e c-.] [d()e d-.] + r8 r^\fermata d d-[ e f] + g-[ ( e-) c-.] d-[( e-) d-.] + c4 c8 d-[ e f] + g-[( e-) c-.] d-[( e-) d-.] c4 r8 r4 r8 | R2.*7 \mark "A" - c4.-\p \grace { e16( } [)d8 c d] + c4.-\p \grace { e16( } d8-[-) c d] c4 r8 r4 r8 - e4. \grace g16( [)f8 e f] + e4. \grace g16( f8-[-) e f] e4 r8 r4 r8 g4. e4 c8 g2.~ - [g8 a b] [c d e ] - e4.()d8 r r + g8-[ a b] c-[ d e ] + e4.( d8-) r r R2.*4 e2.~ | - [e8 d c] [c b a] + e8-[ d c] c-[ b a] d2.~ - [d8 c b] [b a g] - g'4()e8 b4()cis8 + d8-[ c b] b-[ a g] + g'4( e8-) b4( cis8-) \mark "B" d4 r8 r4 r8 R2.*3 | - r8 [d-. d-.] [d()g d-.] - [d()g d-.] [d d d] - [d()g] r r4 r8 + r8 d-[-. d-.] d-[( g-) d-.] + d-[( g-) d-.] d-[ d d] + d-[( g-)] r r4 r8 R2.*1 \lipbreaker - c4 r8 [c' d e] - d4()g8 [c, d e] + c4 r8 c'-[ d e] + d4( g8-) c,-[ d e] d4 r8 r4 r8 R2. | - r4 r8 [c-. d-. e-.] - d4()g8 [c, d e] - [d()g fis] [e d c] - [b () e d] [c b a] + r4 r8 c-[-. d-. e-.] + d4( g8-) c,-[ d e] + d-[( g-) fis] e-[ d c] + b-[ ( e-) d] c-[ b a] \mark "C" g4 r8 r4 r8 R2. | % - r8 [g-\f g] [g( )b b-.] - [b()d d-.] [d()g g-.] + r8 g-[-\f g] g-[( b-) b-.] + b-[( d-) d-.] d-[( g-) g-.] g2.~ - [g8 \> a g] [f e d] + g8-[ \> a g] f-[ e d] < \rondotheme { \! s8-\p } > @@ -97,45 +97,45 @@ rondo = \notes \relative c' R2.*3 r4 r8 r4 c8 a4. c - f ~ [f8. \rightsixteenth e16( \bothsixteenth d )c] + f ~ f8.-[ \rightsixteenth e16( \bothsixteenth d c-)] bes4 g8 e4 g8 c,4. ~ c8 r r R2.*3| r4 r8 r4 c'8 - b4()c8 b4()c8 + b4( c8-) b4( c8-) bes4. ~ bes4 g8 - a4 () c8 f4 () b,8 - d4. () c8 r r + a4 ( c8-) f4 ( b,8-) + d4. ( c8-) r r R2.*3| r4 r8 r4 c'8 - b4()c8 b4()c8 + b4( c8-) b4( c8-) bes4. ~ bes4 g8 - a4 c8 [f () d b!] - d4. () c8 r r + a4 c8 f-[ ( d-) b!] + d4. ( c8-) r r \mark "E" R2.*9 | \lipbreaker - [c8 c' c] c4.~ - [c8 c d] [e e fis] + c8-[ c' c] c4.~ + c8-[ c d] e-[ e fis] g4 r8 r4 r8 R2. - r8 [g, g] [g g g] | - es'4. ~ [es8 d c] + r8 g,-[ g] g-[ g g] | + es'4. ~ es8-[ d c] b4 r8 r4 r8 R2. | - r8 [g g] [g g g] - es'4. ~ [es8 d c] + r8 g-[ g] g-[ g g] + es'4. ~ es8-[ d c] \cresc b4. c4. d4. e4. \mark "F" \endcresc f2.-\f ~ | f4 r8 r4 r8 - r8 [g,\> g] [g g g] + r8 g,-[\> g] g-[ g g] % Edition breitkopf says a-flat (silly!) - [fis g gis] - [a bes \! b] + fis-[ g gis] + a-[ bes \! b] %% EB does the slur in the Rondo differently from the 1st adn 2nd time. %% why. Should check with MS. @@ -150,30 +150,30 @@ rondo = \notes \relative c' g4. g,4 g8 c4 r8 r4 r8 r4 r8 r4 g'8 - [c ()e g,-.] [c ()e g,-.] - [c ()e g,-.] [c ()e g,-.] + c-[ ( e-) g,-.] c-[ ( e-) g,-.] + c-[ ( e-) g,-.] c-[ ( e-) g,-.] \mark "H" \cresc g'2. bes,2. - a4. [b16 c d e f g] + a4. b16-[ c d e f g] a4. f4 d8 - [\endcresc c8-\f g' e] [c g e] - [ c e' c] [g e c] - g4 r8 [g''8 e c] + [\endcresc c8-\f g' e] c-[ g e] + c-[ e' c] g-[ e c] + g4 r8 g''8-[ e c] < d2.(-\trill - { s2 \grace { [c16 d] } } > + { s2 \grace { c16-[ d] } } > - )c4 r8 r4 r8 + c4-) r8 r4 r8 R2.*5 - r8 r8^\fermata d8-\p [d e f] - [g ()e c] [d()e d] - \cresc [c c c] [d e f] - [g()e c] [d()e d] + r8 r8^\fermata d8-\p d-[ e f] + g-[ ( e-) c] d-[( e-) d] + \cresc c-[ c c] d-[ e f] + g-[( e-) c] d-[( e-) d] \endcresc c4-\f r8 r4 r8 R2.*5 - [c8-\f c, c] [c c c] + c8-[-\f c, c] c-[ c c] c4 r8 c4 r8 %This is technically incorrect, since we started with an 8th