From f24393408066b8a749c173303bbf9ad5e99e8843 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 21 Dec 1998 17:23:37 +0100 Subject: [PATCH] patch::: 1.1.16.jcn2: pats en DOET JOUW MIDI HET? pl 16.jcn2 - fix: TEMPO 4., well urg, "TEMPO 4 ." - beginning of violino/violoncello (viola) duet --- NEWS | 4 +++ VERSION | 2 +- input/bugs/ctie-bug.fly | 1 + lily/parser.yy | 2 +- mutopia/J.S.Bach/global-i.ly | 4 +++ mutopia/J.S.Bach/viola-i.ly | 19 +++++++++++++ mutopia/J.S.Bach/violino-i.ly | 37 +++++++++++++++++++++++++ mutopia/J.S.Bach/violino-viola.ly | 32 +++++++++++++++++++++ mutopia/J.S.Bach/violino-violoncello.ly | 32 +++++++++++++++++++++ mutopia/J.S.Bach/violoncello-i.ly | 30 ++++++++++++++++++++ 10 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 input/bugs/ctie-bug.fly create mode 100644 mutopia/J.S.Bach/global-i.ly create mode 100644 mutopia/J.S.Bach/viola-i.ly create mode 100644 mutopia/J.S.Bach/violino-i.ly create mode 100644 mutopia/J.S.Bach/violino-viola.ly create mode 100644 mutopia/J.S.Bach/violino-violoncello.ly create mode 100644 mutopia/J.S.Bach/violoncello-i.ly diff --git a/NEWS b/NEWS index 506ccf8ef2..a5905654bb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +pl 16.jcn2 + - fix: TEMPO 4., well urg, "TEMPO 4 ." + - beginning of violino/violoncello (viola) duet + pl 16.jcn1 - resurrected po-stuff diff --git a/VERSION b/VERSION index 5d0b9b8892..cf425a7074 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=16 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/ctie-bug.fly b/input/bugs/ctie-bug.fly new file mode 100644 index 0000000000..0899018b88 --- /dev/null +++ b/input/bugs/ctie-bug.fly @@ -0,0 +1 @@ +a'' c diff --git a/lily/parser.yy b/lily/parser.yy index 319fddd88d..7898b1c676 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -711,7 +711,7 @@ midi_body: /* empty */ { ; tempo_request: - TEMPO entered_notemode_duration '=' unsigned { + TEMPO steno_duration '=' unsigned { $$ = new Tempo_req; $$->dur_ = *$2; delete $2; diff --git a/mutopia/J.S.Bach/global-i.ly b/mutopia/J.S.Bach/global-i.ly new file mode 100644 index 0000000000..c5a8fb0f8a --- /dev/null +++ b/mutopia/J.S.Bach/global-i.ly @@ -0,0 +1,4 @@ +$global_i = \notes{ + \time 12/8; + \key G; +} diff --git a/mutopia/J.S.Bach/viola-i.ly b/mutopia/J.S.Bach/viola-i.ly new file mode 100644 index 0000000000..52ec6b8cbf --- /dev/null +++ b/mutopia/J.S.Bach/viola-i.ly @@ -0,0 +1,19 @@ +\header { +\header{ +filename = "viola-i.ly"; +title = "Vier Duette"; +description = "For duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; +} + +\include "global-i.ly" +\include "violoncello-i.ly"; + +$viola_i_staff = \type Staff = viola < + \notes\transpose c'' \$violoncello_i + \clef alto; + \$global_i +> diff --git a/mutopia/J.S.Bach/violino-i.ly b/mutopia/J.S.Bach/violino-i.ly new file mode 100644 index 0000000000..a29cb50867 --- /dev/null +++ b/mutopia/J.S.Bach/violino-i.ly @@ -0,0 +1,37 @@ +\header{ +filename = "violino-i.ly"; +title = "Vier Duette"; +description = "For duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; +} + +$violino_i = \notes\relative c'' { + r4 r8 [g16(fis e)d] b'8 a r r [g16(fis e)d] c'8 | + b r r [d16(b)a g(e')c][d(b)a g(c)a][c(b)a g(a)fis] | + [g d(e fis g a][)b d(c b c a][)b g(a b c d][)e g()fis e(d)cis] | + [a'd,(e fis g a][)b a(g fis g e][)fis a(g fis e )d] + % [cis d e fis ] ~ | + [cis d e fis ] ~ | + %[ e(fis)d cis d] + [ e(fis)d cis d] + g,8 [f16 d(e)c b c] + fis,8 ~ | + [ c(d)b a b][e, b'(c)a g a][d, a'(b)g fis g][c, g'(a)fis e fis] | + [b,(d)e fis(g)a][b(d)c b(a)g][fis(g)a b(c)d][e(a)g fis e d] | + [g d(e)fis g a][b g(fis)g c, a'][b, g'(fis)g a, c] + [fis, g(a)b ] ~ + [ )b] r [d16(b a)g] e'8 d r r [c16(b a)g] g'8 | +} + +\include "global-i.ly" + +$violino_i_staff = \type Staff = violino < + < + \notes\property Voice.textstyle = "large" s4^"Moderato" + \$violino_i + > + \$global_i +> diff --git a/mutopia/J.S.Bach/violino-viola.ly b/mutopia/J.S.Bach/violino-viola.ly new file mode 100644 index 0000000000..18e360cfd9 --- /dev/null +++ b/mutopia/J.S.Bach/violino-viola.ly @@ -0,0 +1,32 @@ +\header{ +filename = "violino-viola.ly"; +title = "Vier Duette"; +description = "For duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; +} + +\include "violino-i.ly"; +\include "viola-i.ly"; + +\score{ + \type GrandStaff < + \$violino_i_staff + \$viola_i_staff + > + \paper{ + \translator { +% \BarNumberingStaffContext +% \BarNumberingScoreContext + \OrchestralScoreContext + } + } + \midi{ +%urg +% \tempo 4. = 69; + \tempo 4 . = 69; + } +} + diff --git a/mutopia/J.S.Bach/violino-violoncello.ly b/mutopia/J.S.Bach/violino-violoncello.ly new file mode 100644 index 0000000000..da628ae629 --- /dev/null +++ b/mutopia/J.S.Bach/violino-violoncello.ly @@ -0,0 +1,32 @@ +\header{ +filename = "violino-violoncello.ly"; +title = "Vier Duette"; +description = "For duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; +} + +\include "violino-i.ly"; +\include "violoncello-i.ly"; + +\score{ + \type GrandStaff < + \$violino_i_staff + \$violoncello_i_staff + > + \paper{ + \translator { +% \BarNumberingStaffContext +% \BarNumberingScoreContext + \OrchestralScoreContext + } + } + \midi{ +%urg +% \tempo 4. = 69; + \tempo 4 . = 69; + } +} + diff --git a/mutopia/J.S.Bach/violoncello-i.ly b/mutopia/J.S.Bach/violoncello-i.ly new file mode 100644 index 0000000000..323a4daaa4 --- /dev/null +++ b/mutopia/J.S.Bach/violoncello-i.ly @@ -0,0 +1,30 @@ +\header{ +filename = "violoncello.ly"; +title = "Vier Duette"; +description = "For duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; +} + +$violoncello_i = \notes\relative c{ + [g8()a d,][g b()g][d()fis a][d a()fis]| + [g()d b'][g b()c][b()e fis][g d()d,] | + g r r [d'16(b a )g] e'8 d r r [c16(b a )b]g'8 | + fis r r [g16 fis( e d b' g][)a fis( e d g)e][g fis( e d e)cis] | + [d8 d'()a][b16 c(d)b g b][c,8 c'()g][a16 b(c)a fis a] | + [b,8()b' fis][g a()e][fis g()d][e fis()d] | + g r r [g,16(fis e)d] b'8 a r r [g16(fis e )d]c'8 | + b r r [d16 b(a)g e' c][d b(a)g c a][c b(a)g a fis] | + [g d( e fis g a][)b d(c b c )a][b g(a b c b][)e g( fis e d cis] | + )a'16 +} + +\include "global-i.ly" + +$violoncello_i_staff = \type Staff = violoncello < + \$violoncello_i + \clef bass; + \$global_i +> -- 2.39.5