From c35429871450860e51d71ad95a868311ed28a1a6 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 14 Aug 1998 11:53:31 +0200 Subject: [PATCH] patch::: 1.0.1.jcn2: vix pl 1.jcn2 - renamed -alto -> viola - bf: avant-gardish six preludes - bf: ly2dvi warnings --- NEWS | 5 + VERSION | 2 +- lily/VERSION | 2 +- make/STATE-VECTOR | 1 + .../Solo-Cello-Suites/allemande-alto.ly | 49 ---------- .../Solo-Cello-Suites/allemande-cello.ly | 3 +- .../Solo-Cello-Suites/allemande-urtext.ly | 4 +- .../Solo-Cello-Suites/allemande-viola.ly | 50 ++++++++++ .../Solo-Cello-Suites/courante-alto.ly | 49 ---------- .../Solo-Cello-Suites/courante-cello.ly | 3 +- .../Solo-Cello-Suites/courante-urtext.ly | 4 +- .../Solo-Cello-Suites/courante-viola.ly | 50 ++++++++++ .../J.S.Bach/Solo-Cello-Suites/gigue-alto.ly | 50 ---------- .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 3 +- .../Solo-Cello-Suites/gigue-urtext.ly | 4 +- .../J.S.Bach/Solo-Cello-Suites/gigue-viola.ly | 51 ++++++++++ .../Solo-Cello-Suites/menuetto-alto.ly | 95 ------------------- .../Solo-Cello-Suites/menuetto-cello.ly | 8 +- .../Solo-Cello-Suites/menuetto-urtext.ly | 4 +- .../Solo-Cello-Suites/menuetto-viola.ly | 93 ++++++++++++++++++ .../Solo-Cello-Suites/prelude-alto.ly | 44 --------- .../Solo-Cello-Suites/prelude-cello.ly | 3 +- .../Solo-Cello-Suites/prelude-urtext.ly | 4 +- .../Solo-Cello-Suites/prelude-viola.ly | 45 +++++++++ .../Solo-Cello-Suites/sarabande-alto.ly | 46 --------- .../Solo-Cello-Suites/sarabande-cello.ly | 3 +- .../Solo-Cello-Suites/sarabande-urtext.ly | 4 +- .../Solo-Cello-Suites/sarabande-viola.ly | 47 +++++++++ .../J.S.Bach/Solo-Cello-Suites/scsii-alto.ly | 7 -- .../J.S.Bach/Solo-Cello-Suites/scsii-viola.ly | 7 ++ scripts/ly2dvi.sh | 30 ++++-- stepmake/make/STATE-VECTOR | 1 + 32 files changed, 397 insertions(+), 374 deletions(-) create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly create mode 100644 mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly diff --git a/NEWS b/NEWS index ce7487d7af..664e3e0c7b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +pl 1.jcn2 + - renamed -alto -> viola + - bf: avant-gardish six preludes + - bf: ly2dvi warnings + pl 1.jcn1 - www.digicash.com www.xs4all.nl - fake msgfmt diff --git a/VERSION b/VERSION index 086a3d5dbe..b79339f1e0 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=1 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches, always empty for released version: # please don't move these comments up; the patch should fail if diff --git a/lily/VERSION b/lily/VERSION index 086a3d5dbe..b79339f1e0 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=1 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches, always empty for released version: # please don't move these comments up; the patch should fail if diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR index 713e336d07..a546effdaa 100644 --- a/make/STATE-VECTOR +++ b/make/STATE-VECTOR @@ -59,3 +59,4 @@ 1.0.0.hwn2 1.0.1 1.0.1.jcn1 +1.0.1.jcn2 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly index e8fbc3bda3..e69de29bb2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly @@ -1,49 +0,0 @@ -\header{ -filename = "allemande-alto.ly"; -title = "Solo Cello Suites"; -subtitle = "Suite II"; -piece = "Allemande"; -% opus = "BWV 1008"; -opus = ""; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "JCN"; -copyright = "public domain"; -} - -%{ - Tested Features:breaking algorithm, chords, multivoice, accents, - dotted slurs -%} - -\version "1.0.0"; - -\include "allemande-urtext.ly"; - -allemande_alto_global = \melodic{ - \time 4/4; - \key f; - \partial 16; - \clef alto; - \skip 1*11; - s2. s8. - \bar ":|:"; - \skip 1*11; - s2. s4 s8 - \bar ":|"; -} - -allemande_alto_scripts = \melodic{ -} - -allemande_alto_staff = \type Staff < - \melodic \transpose c'' \$allemande - \$allemande_alto_global - \$allemande_alto_scripts -> - -\score{ - \$allemande_alto_staff - \include "scs-paper.ly"; - \midi{ \tempo 4 = 45; } -} - diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly index 114480452c..c1f7e46dca 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -2,7 +2,7 @@ filename = "allemande-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Allemande"; +%piece = "Allemande"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -45,5 +45,6 @@ allemande_cello_staff = \type Staff < \$allemande_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 45; } + \header{ piece = "Allemande"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly index 0b9c0fb9bb..5d80bab714 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -1,10 +1,10 @@ % allemande-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see alto_scripts). +But merging melodic and scripts doen't work too well yet (see viola_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly new file mode 100644 index 0000000000..cd01a3a74b --- /dev/null +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -0,0 +1,50 @@ +\header{ +filename = "allemande-viola.ly"; +title = "Solo Cello Suites"; +subtitle = "Suite II"; +% piece = "Allemande"; +% opus = "BWV 1008"; +opus = ""; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "JCN"; +copyright = "public domain"; +} + +%{ + Tested Features:breaking algorithm, chords, multivoice, accents, + dotted slurs +%} + +\version "1.0.0"; + +\include "allemande-urtext.ly"; + +allemande_viola_global = \melodic{ + \time 4/4; + \key f; + \partial 16; + \clef alto; + \skip 1*11; + s2. s8. + \bar ":|:"; + \skip 1*11; + s2. s4 s8 + \bar ":|"; +} + +allemande_viola_scripts = \melodic{ +} + +allemande_viola_staff = \type Staff < + \melodic \transpose c'' \$allemande + \$allemande_viola_global + \$allemande_viola_scripts +> + +\score{ + \$allemande_viola_staff + \include "scs-paper.ly"; + \midi{ \tempo 4 = 45; } + \header{ piece = "Allemande"; } +} + diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly index 8e7f0970be..e69de29bb2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly @@ -1,49 +0,0 @@ -\header{ -filename = "courante-alto.ly"; -title = "Solo Cello Suites"; -subtitle = "Suite II"; -piece = "Courante"; -% opus = "BWV 1008"; -opus = ""; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "JCN"; -copyright = "public domain"; -} - -%{ - Tested Features:breaking algorithm, chords, multivoice, accents, - dotted slurs -%} - -\version "1.0.0"; - -\include "courante-urtext.ly"; - -courante_alto_global = \melodic{ - \time 3/4; - \key f; - \partial 16; - \clef alto; - \skip 2.*15; - s2 s8. - \bar ":|:"; - \skip 2.*15; - s2 s8. - \bar ":|"; -} - -courante_alto_scripts = \melodic{ -} - -courante_alto_staff = \type Staff < - \melodic \transpose c' \$courante - \$courante_alto_global - \$courante_alto_scripts -> - -\score{ - \$courante_alto_staff - \include "scs-paper.ly"; - \midi{ \tempo 4 = 55; } -} - diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly index 5909c0be7d..da6812acd7 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -2,7 +2,7 @@ filename = "courante-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Courante"; +% piece = "Courante"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -45,5 +45,6 @@ courante_cello_staff = \type Staff < \$courante_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 55; } + \header{ piece = "Courante"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly index c04de2dac6..3d540b4378 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -1,10 +1,10 @@ % courante-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see alto_scripts). +But merging melodic and scripts doen't work too well yet (see viola_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly new file mode 100644 index 0000000000..a6097d0770 --- /dev/null +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -0,0 +1,50 @@ +\header{ +filename = "courante-viola.ly"; +title = "Solo Cello Suites"; +subtitle = "Suite II"; +% piece = "Courante"; +% opus = "BWV 1008"; +opus = ""; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "JCN"; +copyright = "public domain"; +} + +%{ + Tested Features:breaking algorithm, chords, multivoice, accents, + dotted slurs +%} + +\version "1.0.0"; + +\include "courante-urtext.ly"; + +courante_viola_global = \melodic{ + \time 3/4; + \key f; + \partial 16; + \clef alto; + \skip 2.*15; + s2 s8. + \bar ":|:"; + \skip 2.*15; + s2 s8. + \bar ":|"; +} + +courante_viola_scripts = \melodic{ +} + +courante_viola_staff = \type Staff < + \melodic \transpose c' \$courante + \$courante_viola_global + \$courante_viola_scripts +> + +\score{ + \$courante_viola_staff + \include "scs-paper.ly"; + \midi{ \tempo 4 = 55; } + \header{ piece = "Courante"; } +} + diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly index 784dea6b29..e69de29bb2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly @@ -1,50 +0,0 @@ -\header{ -filename = "gigue-cello.ly"; -title = "Solo Cello Suites"; -subtitle = "Suite II"; -piece = "Pr\\'elude"; % duh -% opus = "BWV 1008"; -opus = ""; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "JCN"; -copyright = "public domain"; -} - -%{ - Tested Features:breaking algorithm, chords, multivoice, accents, - dotted slurs -%} - -\version "1.0.0"; - -\include "gigue-urtext.ly"; - -gigue_cello_global = \melodic{ - \time 3/8; - \key f; - \clef bass; - \partial 8 - \skip 4.*31; - s4 - \bar ":|:"; - \skip 4.*44; - s4 - \bar ":|"; -} - -gigue_cello_scripts = \melodic{ -} - -gigue_cello_staff = \type Staff < - \melodic \transpose c' \$gigue - \$gigue_cello_global - \$gigue_cello_scripts -> - -\score{ - \$gigue_cello_staff - \include "scs-paper.ly"; -%broken - \midi{ \tempo 4 = 60; } -} - diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly index 70c72a36f6..8d08d1de8a 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -2,7 +2,7 @@ filename = "gigue-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Pr\\'elude"; % duh +% piece = "Gigue"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -45,5 +45,6 @@ gigue_cello_staff = \type Staff < \$gigue_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 60; } + \header{ piece = "Gigue"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly index 100156c7d7..8f36fb38bd 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly @@ -1,10 +1,10 @@ % gigue-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see alto_scripts). +But merging melodic and scripts doen't work too well yet (see viola_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly new file mode 100644 index 0000000000..384768575f --- /dev/null +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -0,0 +1,51 @@ +\header{ +filename = "gigue-cello.ly"; +title = "Solo Cello Suites"; +subtitle = "Suite II"; +% piece = "Gigue"; +% opus = "BWV 1008"; +opus = ""; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "JCN"; +copyright = "public domain"; +} + +%{ + Tested Features:breaking algorithm, chords, multivoice, accents, + dotted slurs +%} + +\version "1.0.0"; + +\include "gigue-urtext.ly"; + +gigue_cello_global = \melodic{ + \time 3/8; + \key f; + \clef bass; + \partial 8; + \skip 4.*31; + s4 + \bar ":|:"; + \skip 4.*44; + s4 + \bar ":|"; +} + +gigue_cello_scripts = \melodic{ +} + +gigue_cello_staff = \type Staff < + \melodic \transpose c' \$gigue + \$gigue_cello_global + \$gigue_cello_scripts +> + +\score{ + \$gigue_cello_staff + \include "scs-paper.ly"; +%broken + \midi{ \tempo 4 = 60; } + \header{ piece = "Gigue"; } +} + diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly index 96ed306a9f..e69de29bb2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly @@ -1,95 +0,0 @@ -\header{ -filename = "menuetto-alto.ly"; -title = "Solo Cello Suites"; -subtitle = "Suite II"; -piece = "Menuetto I"; -description = "Transcribed for Alto"; -source = "?"; -% opus = "BWV 1008 no. 5"; -opus = ""; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "JCN"; -copyright = "public domain"; -} - -%{ - Tested Features:breaking algorithm, chords, multivoice, accents, - dotted slurs -%} - -\version "1.0.0"; - -\include "menuetto-urtext.ly"; - -menuetto_i_alto_global = \melodic{ - \time 3/4; - \key f; - \clef alto; - \skip 2.*8; - \bar ":|:"; - \clef violin; - \skip 2.*1; - \slurdotted - \skip 2.*3; - \clef alto; - \skip 2.*11; - s2._"Fine" - \bar ":|"; -} - -menuetto_i_alto_scripts = \melodic{ - s2. - s8^"~"^1_2_4 s8*5 - s2.*5 - s4 s-\upbow s-\downbow - s2.-\upbow - s2.*5 - s2 s4-\upbow - s4-\downbow s2 - s2.*1 - s2^0 s4 - s2.*1 - s4-\downbow s4-\upbow -} - -menuetto_i_alto_staff = \type Staff < - \melodic \transpose c' \$menuetto_i - \$menuetto_i_alto_global -% \$menuetto_i_alto_scripts -> - -\score{ - \$menuetto_i_alto_staff - \include "scs-paper.ly"; - \midi{ \tempo 4 = 110; } -} - -menuetto_ii_alto_global = \melodic{ - \time 3/4; - \key D; - \clef alto; - \skip 2.*8; - \bar ":|:"; - \skip 2.*1; - \slurdotted - \skip 2.*14; - s2._"Menuetto I da Capo" - \bar ":|"; -} - -menuetto_ii_alto_staff = \type Staff < - \melodic \transpose c' \$menuetto_ii - \$menuetto_ii_alto_global -% \$menuetto_ii_alto_scripts -> - -\header{ -piece = "Menuetto II"; -opus = ""; -} -\score{ - \$menuetto_ii_alto_staff - \include "scs-paper.ly"; - \midi{ \tempo 4 = 130; } -} - diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index 5d5f9c4d0d..461c6ffca8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -2,7 +2,7 @@ filename = "menuetto-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Menuetto I"; +%piece = "Menuetto I"; source = "?"; % opus = "BWV 1008 no. 5"; opus = ""; @@ -63,6 +63,7 @@ menuetto_i_cello_staff = \type Staff < \$menuetto_i_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 110; } + \header{ piece = "Menuetto I"; } } menuetto_ii_cello_global = \melodic{ @@ -84,13 +85,10 @@ menuetto_ii_cello_staff = \type Staff < % \$menuetto_ii_cello_scripts > -\header{ -piece = "Menuetto II"; -opus = ""; -} \score{ \$menuetto_ii_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 130; } + \header{ piece = "Menuetto II"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly index 67e2f44128..76c93f5fb7 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -1,10 +1,10 @@ % menuetto-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see alto_scripts). +But merging melodic and scripts doen't work too well yet (see viola_scripts). %} menuetto_i_a = \melodic \relative c { diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly new file mode 100644 index 0000000000..b2fee93df9 --- /dev/null +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -0,0 +1,93 @@ +\header{ +filename = "menuetto-viola.ly"; +title = "Solo Cello Suites"; +subtitle = "Suite II"; +% piece = "Menuetto I"; +description = "Transcribed for Viola"; +source = "?"; +% opus = "BWV 1008 no. 5"; +opus = ""; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "JCN"; +copyright = "public domain"; +} + +%{ + Tested Features:breaking algorithm, chords, multivoice, accents, + dotted slurs +%} + +\version "1.0.0"; + +\include "menuetto-urtext.ly"; + +menuetto_i_viola_global = \melodic{ + \time 3/4; + \key f; + \clef alto; + \skip 2.*8; + \bar ":|:"; + \clef violin; + \skip 2.*1; + \slurdotted + \skip 2.*3; + \clef alto; + \skip 2.*11; + s2._"Fine" + \bar ":|"; +} + +menuetto_i_viola_scripts = \melodic{ + s2. + s8^"~"^1_2_4 s8*5 + s2.*5 + s4 s-\upbow s-\downbow + s2.-\upbow + s2.*5 + s2 s4-\upbow + s4-\downbow s2 + s2.*1 + s2^0 s4 + s2.*1 + s4-\downbow s4-\upbow +} + +menuetto_i_viola_staff = \type Staff < + \melodic \transpose c' \$menuetto_i + \$menuetto_i_viola_global +% \$menuetto_i_viola_scripts +> + +\score{ + \$menuetto_i_viola_staff + \include "scs-paper.ly"; + \midi{ \tempo 4 = 110; } + \header{ piece = "Menuetto I"; } +} + +menuetto_ii_viola_global = \melodic{ + \time 3/4; + \key D; + \clef alto; + \skip 2.*8; + \bar ":|:"; + \skip 2.*1; + \slurdotted + \skip 2.*14; + s2._"Menuetto I da Capo" + \bar ":|"; +} + +menuetto_ii_viola_staff = \type Staff < + \melodic \transpose c' \$menuetto_ii + \$menuetto_ii_viola_global +% \$menuetto_ii_viola_scripts +> + +\score{ + \$menuetto_ii_viola_staff + \include "scs-paper.ly"; + \midi{ \tempo 4 = 130; } + \header{ piece = "Menuetto II"; } +} + diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly index 2219165c5e..e69de29bb2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly @@ -1,44 +0,0 @@ -\header{ -filename = "prelude-alto.ly"; -title = "Solo Cello Suites"; -subtitle = "Suite II"; -piece = "Pr\\'elude"; % duh -opus = "BWV 1008"; -% opus = ""; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "JCN"; -copyright = "public domain"; -} - -%{ - Tested Features:breaking algorithm, chords, multivoice, accents, - dotted slurs -%} - -\version "1.0.0"; - -\include "prelude-urtext.ly"; - -prelude_alto_global = \melodic{ - \time 3/4; - \key f; - \clef alto; - \skip 2.*63; - \bar "|."; -} - -prelude_alto_scripts = \melodic{ -} - -prelude_alto_staff = \type Staff < - \melodic \transpose c' \$prelude - \$prelude_alto_global - \$prelude_alto_scripts -> - -\score{ - \$prelude_alto_staff - \include "scs-paper.ly"; - \midi{ \tempo 4 = 40; } -} - diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly index d872e5ccb8..fd071234ce 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -2,7 +2,7 @@ filename = "prelude-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Pr\\'elude"; % duh +%piece = "Pr\\'elude"; % duh opus = "BWV 1008"; % opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -40,5 +40,6 @@ prelude_cello_staff = \type Staff < \$prelude_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 40; } + \header{ piece = "Pr\\'elude"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly index f93032b967..2c31ae382d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly @@ -1,10 +1,10 @@ % prelude-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % who is going to make a -violin.ly? %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet see alto_scripts . +But merging melodic and scripts doen't work too well yet see viola_scripts . %} % urg, Thread is gone, try Voice diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly new file mode 100644 index 0000000000..dd8ff62712 --- /dev/null +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -0,0 +1,45 @@ +\header{ +filename = "prelude-viola.ly"; +title = "Solo Cello Suites"; +subtitle = "Suite II"; +% piece = "Pr\\'elude"; % duh +opus = "BWV 1008"; +% opus = ""; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "JCN"; +copyright = "public domain"; +} + +%{ + Tested Features:breaking algorithm, chords, multivoice, accents, + dotted slurs +%} + +\version "1.0.0"; + +\include "prelude-urtext.ly"; + +prelude_viola_global = \melodic{ + \time 3/4; + \key f; + \clef alto; + \skip 2.*63; + \bar "|."; +} + +prelude_viola_scripts = \melodic{ +} + +prelude_viola_staff = \type Staff < + \melodic \transpose c' \$prelude + \$prelude_viola_global + \$prelude_viola_scripts +> + +\score{ + \$prelude_viola_staff + \include "scs-paper.ly"; + \midi{ \tempo 4 = 40; } + \header{ piece = "Pr\\'elude"; } +} + diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly index b39274e169..e69de29bb2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly @@ -1,46 +0,0 @@ -\header{ -filename = "sarabande-alto.ly"; -title = "Solo Cello Suites"; -subtitle = "Suite II"; -piece = "Sarabande"; -% opus = "BWV 1008"; -opus = ""; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "JCN"; -copyright = "public domain"; -} - -%{ - Tested Features:breaking algorithm, chords, multivoice, accents, - dotted slurs -%} - -\version "1.0.0"; - -\include "sarabande-urtext.ly"; - -sarabande_alto_global = \melodic{ - \time 3/4; - \key f; - \clef alto; - \skip 2.*12; - \bar ":|:"; - \skip 2.*16; - \bar ":|"; -} - -sarabande_alto_scripts = \melodic{ -} - -sarabande_alto_staff = \type Staff < - \melodic \transpose c' \$sarabande - \$sarabande_alto_global - \$sarabande_alto_scripts -> - -\score{ - \$sarabande_alto_staff - \include "scs-paper.ly"; - \midi{ \tempo 4 = 40; } -} - diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly index 4a8002713e..db57bec6c8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -2,7 +2,7 @@ filename = "sarabande-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Sarabande"; +% piece = "Sarabande"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -42,5 +42,6 @@ sarabande_cello_staff = \type Staff < \$sarabande_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 40; } + \header{ piece = "Sarabande"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly index 00db06b77e..1a82029959 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -1,10 +1,10 @@ % sarabande-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see alto_scripts). +But merging melodic and scripts doen't work too well yet (see viola_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly new file mode 100644 index 0000000000..864fb0d7b3 --- /dev/null +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -0,0 +1,47 @@ +\header{ +filename = "sarabande-viola.ly"; +title = "Solo Cello Suites"; +subtitle = "Suite II"; +% piece = "Sarabande"; +% opus = "BWV 1008"; +opus = ""; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "JCN"; +copyright = "public domain"; +} + +%{ + Tested Features:breaking algorithm, chords, multivoice, accents, + dotted slurs +%} + +\version "1.0.0"; + +\include "sarabande-urtext.ly"; + +sarabande_viola_global = \melodic{ + \time 3/4; + \key f; + \clef alto; + \skip 2.*12; + \bar ":|:"; + \skip 2.*16; + \bar ":|"; +} + +sarabande_viola_scripts = \melodic{ +} + +sarabande_viola_staff = \type Staff < + \melodic \transpose c' \$sarabande + \$sarabande_viola_global + \$sarabande_viola_scripts +> + +\score{ + \$sarabande_viola_staff + \include "scs-paper.ly"; + \midi{ \tempo 4 = 40; } + \header{ piece = "Sarabande"; } +} + diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly index e0ba58142c..e69de29bb2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly @@ -1,7 +0,0 @@ -\header{ -instrument="Alto"; -} - -instrument="alto"; -\include "solo-cello-suite-ii.ly" - diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly new file mode 100644 index 0000000000..b6db279eec --- /dev/null +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly @@ -0,0 +1,7 @@ +\header{ +instrument="Alto"; +} + +instrument="viola"; +\include "solo-cello-suite-ii.ly" + diff --git a/scripts/ly2dvi.sh b/scripts/ly2dvi.sh index 07226c8932..31d86c250d 100644 --- a/scripts/ly2dvi.sh +++ b/scripts/ly2dvi.sh @@ -10,7 +10,7 @@ # Original LaTeX file made by Mats Bengtsson, 17/8 1997 # -VERSION="0.12" +VERSION="0.12.jcn1" NAME=ly2dvi.sh IDENTIFICATION="$NAME $VERSION" NOW=`date` @@ -21,9 +21,11 @@ echo "$IDENTIFICATION" 1>&2 # NEWS +# 0.12.jcn1 +# - mudelaDefs really fixed (sorry, PC) + # 0.12 # - -S/--sourcedir switch -# # #0.11.jcn3 @@ -638,20 +640,28 @@ regexp_quote(){ # mudelaDefs(){ # Include \def\mudela-definitions +# The aim here is to pick up the definition for the +# current file, then any other file. # +mudelatmp=$TMP/mudelaDefs$$ +# Use `cat' to prevent filenames being prepended +# +cat "$File" $OF | fgrep "$MU_DEF" > $mudelatmp for L in $MU_DEF do - for F in "$File" "$OF" - do - LL=`sed -n 's/\\\\def\\\\'"$L"'{\([^}]*\)}.*$/\1/p' "$F"` - [ "$LL" ] && { - Echo "$1\\"$L'{'"$LL"'}%' >> $LatF - break - } - done + # This converts \def\mudelatitle{fred} + # to \mudelatitle{fred} or to + # \def\mudelatitle{fred} + # and stops after the first one found. + sed -n '/\\def\\'"$L"'{\([^}]*\)}.*$/{ + s//'"`regexp_quote \"$1\"`"'\\'"$L"'{\1}%/p + q + }' $mudelatmp >> $LatF done +rm -f $mudelatmp } # +# startFile(){ # # LaTeX file name diff --git a/stepmake/make/STATE-VECTOR b/stepmake/make/STATE-VECTOR index 29637a2eba..845eee732c 100644 --- a/stepmake/make/STATE-VECTOR +++ b/stepmake/make/STATE-VECTOR @@ -16,3 +16,4 @@ 0.1.38 0.1.39 0.1.40 +0.1.41 -- 2.39.5