lilypond-1.0.9

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 5d80bab7143fba5c386ebfce340e2139f38b31ff..97dacd591df9479793eb69967ab0928482ba8690 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly
@@ -11,7 +11,7 @@ n = { \slurnormal }
 d = { \slurdotted }
 comma = "\\sethuge\\ \\ ,";
 
-allemande_a = \melodic \relative c {
+allemande_a = \notes \relative c {
        \voiceone a'16 | 
        [a8 bes16()a] \onevoice
        [g()f e()d][d()cis d()e][a,8 \d bes16()g] |
@@ -67,7 +67,7 @@ allemande_a = \melodic \relative c {
        \stemup [d,16 \stemboth d''(c!)a][bes!(g)e cis'][d a f d] d,8.
 }
 
-allemande_b = \melodic \relative c {
+allemande_b = \notes \relative c {
        \voicetwo
        s16 |
        % <d'8 g' f'> s8 s2. |
@@ -93,7 +93,7 @@ allemande_b = \melodic \relative c {
        bes8. 
 }
 
-allemande = \type Staff \melodic<
+allemande = \type Staff \notes<
        \$allemande_a
        \$allemande_b
 >

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 3d540b4378c9d821288a5bc06a876a97bb7386e7..9a96b3123592c418b4d6c21564b380f20f0a0b91 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly
@@ -10,7 +10,7 @@ But merging melodic and scripts doen't work too well yet (see viola_scripts).
 n = { \slurnormal }
 d = { \slurdotted }
 
-courante_a = \melodic \relative c {
+courante_a = \notes \relative c {
        d'16 |
        [d a f a] [d, f g a]\d[bes()a bes()g] |
        \voiceone <g4 a> s4 \onevoice \d[g16()f g()e] |
@@ -59,7 +59,7 @@ courante_a = \melodic \relative c {
        d,8.
 }
 
-courante_b = \melodic \relative c {
+courante_b = \notes \relative c {
        \voicetwo
        \stemdown
        s16 |
@@ -78,7 +78,7 @@ courante_b = \melodic \relative c {
        bes4 s s
 }
 
-courante =  \type Staff \melodic<
+courante =  \type Staff \notes<
  \$courante_a
  \$courante_b
 >

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 8f36fb38bd4d6087d5c06897af9ce2429025d4b5..d2beebc3d92f570849116009377478b3f02b1246 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
@@ -17,9 +17,9 @@ d = { \slurdotted }
 % 
 
 % urg, Thread is gone, try Voice
-% gigue_notes = \type Thread = gigue \melodic \relative c {
+% gigue_notes = \type Thread = gigue \notes \relative c {
 
-gigue_notes = \type Voice = gigue \melodic \relative c {
+gigue_notes = \type Voice = gigue \notes \relative c {
        a'8 |
        d,4 bes'8 | cis,4 g'8 | f16 e f g a8 |
        d,4 d'8 | e,16(f)g8 bes | c,16(d)e8 c' | a16 g a bes c a |
@@ -74,7 +74,7 @@ gigue_notes = \type Voice = gigue \melodic \relative c {
        d4
 }
 
-gigue_b = \melodic \relative c {
+gigue_b = \notes \relative c {
        \voicetwo 
        s8
        s4.*14
@@ -98,11 +98,11 @@ gigue_b = \melodic \relative c {
        <g4 e'>
 }
 
-gb = \melodic { [s16 s s s s s] }
+gb = \notes { [s16 s s s s s] }
 
 % urg, Thread is gone, try Voice
-% gigue_beams = \type Thread = gigue \melodic{
-gigue_beams = \type Voice = gigue \melodic{
+% gigue_beams = \type Thread = gigue \notes{
+gigue_beams = \type Voice = gigue \notes{
        s8 |
        s4. s4. \gb 
        s4. \gb \gb \gb 
@@ -133,12 +133,12 @@ gigue_beams = \type Voice = gigue \melodic{
        \gb \gb \gb 
 }
 
-gigue_a = \type Voice \melodic<
+gigue_a = \type Voice \notes<
        \$gigue_notes
        \$gigue_beams
 >
 
-gigue = \melodic<
+gigue = \notes<
        \$gigue_a
        \$gigue_b
 >

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 76c93f5fb792b27ba93b67b66572fe2cf4f9d418..aeff5f2fd24d5e42b5da2d65385306b361fca489 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
@@ -7,7 +7,7 @@ Well, there are still some scripts in this "urtext".
 But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
-menuetto_i_a = \melodic \relative c {
+menuetto_i_a = \notes \relative c {
        <d2\f f a> bes'4  |
        [bes8 a bes g] a4 |
        <d,4 bes> g [f8 e] |
@@ -40,7 +40,7 @@ menuetto_i_a = \melodic \relative c {
        <d2. a d,> |
 }
 
-menuetto_i_b = \melodic \relative c {
+menuetto_i_b = \notes \relative c {
        \slurdotted
        \skip 2.*1; |
        <e8 c> \skip 8*5; |
@@ -66,7 +66,7 @@ menuetto_i_b = \melodic \relative c {
 }
 
 % UGH, fix this like in sarabande
-menuetto_i_a_voice_urg = \melodic{
+menuetto_i_a_voice_urg = \notes{
        \skip 2.*1; \voiceone
        \skip 2.*1; \onevoice
        \skip 2.*1; \voiceone
@@ -89,28 +89,28 @@ menuetto_i_a_voice_urg = \melodic{
 %      \bar "|.";
 }
 
-menuetto_i_a_voice_urg_urg = \melodic<
+menuetto_i_a_voice_urg_urg = \notes<
        \$menuetto_i_a_voice_urg
        \$menuetto_i_a
 >
 
-menuetto_i_b_voice_urg = \melodic{
+menuetto_i_b_voice_urg = \notes{
        \voicetwo
        % urg urg, huh?
        \skip 2.*8; \voicetwo
 }
 
-menuetto_i_b_voice_urg_urg = \melodic<
+menuetto_i_b_voice_urg_urg = \notes<
        \$menuetto_i_b_voice_urg
        \$menuetto_i_b
 >
 
-menuetto_i = \type Staff \melodic<
+menuetto_i = \type Staff \notes<
        { \$menuetto_i_a_voice_urg_urg }
        { \$menuetto_i_b_voice_urg_urg }
 >
 
-menuetto_ii = \melodic \relative c {
+menuetto_ii = \notes \relative c {
        \slurdotted
        fis4^\trill [d8( e fis )g] |
        a4 fis, a' |

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 2c31ae382dc8f8e0904df33fd39feb88b1e488d4..005f22f01d6dc21990f1e5ba02cd7bbe56dec45e 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly
@@ -8,8 +8,8 @@ But merging melodic and scripts doen't work too well yet see viola_scripts .
 %}
 
 % urg, Thread is gone, try Voice
-% prelude_notes = \type Thread = prelude \melodic \relative c {
-prelude_notes = \type Voice = prelude \melodic \relative c {
+% prelude_notes = \type Thread = prelude \notes \relative c {
+prelude_notes = \type Voice = prelude \notes \relative c {
        d8 f a4 ~ a16 f e d |
        cis e g a bes4 ~ bes16 a g f |
        e g bes cis e8. bes16 a16 g f e |
@@ -89,7 +89,7 @@ prelude_notes = \type Voice = prelude \melodic \relative c {
        \voiceone <cis2. g> | <d f,> | <d e,> | <cis e,> | <d f,>
 }
 
-prelude_b = \melodic \relative c {
+prelude_b = \notes \relative c {
        \voicetwo 
        s2.*47
        %48
@@ -101,15 +101,15 @@ prelude_b = \melodic \relative c {
        a'2. a a a <a d,>
 }
 
-% pat1 = \melodic { [s8 s]s4[s16 s s s] }
-pat1 = \melodic { [s16 s s s]s4[s16 s s s] }
-pat2 = \melodic { [s16 s s s][s8.s16][s s s s] }
-pat3 = \melodic { [s16 s s s][s8 s s s] }
+% pat1 = \notes { [s8 s]s4[s16 s s s] }
+pat1 = \notes { [s16 s s s]s4[s16 s s s] }
+pat2 = \notes { [s16 s s s][s8.s16][s s s s] }
+pat3 = \notes { [s16 s s s][s8 s s s] }
 
 % of course, i just type pat1, and add the \ and the silly $ later
 % urg, Thread is gone, try Voice
-% prelude_beams = \type Thread = prelude \melodic{
-prelude_beams = \type Voice = prelude \melodic{
+% prelude_beams = \type Thread = prelude \notes{
+prelude_beams = \type Voice = prelude \notes{
        \$pat1
        \$pat1
        \$pat2
@@ -183,23 +183,23 @@ prelude_beams = \type Voice = prelude \melodic{
 
 %{
 properties, urg!
-fig1 = \melodic{ s16( s s )s }
-fig2 = \melodic{ s16( s ) s s }
-fig3 = \melodic{ s16 s( s )s }
-fig4 = \melodic{ s16( s s s s s s )s }
-fig5 = \melodic{ s8.()s16 }
+fig1 = \notes{ s16( s s )s }
+fig2 = \notes{ s16( s ) s s }
+fig3 = \notes{ s16 s( s )s }
+fig4 = \notes{ s16( s s s s s s )s }
+fig5 = \notes{ s8.()s16 }
 %}
 
-fig1 = \melodic{ \slurnormal s16( s s )s }
-fig2 = \melodic{ \slurnormal s16( s ) s s }
-fig3 = \melodic{ s16 \slurnormal s( s )s }
-fig4 = \melodic{ \slurnormal s16( s s s s s s )s }
-fig5 = \melodic{ \slurnormal s8.()s16 }
+fig1 = \notes{ \slurnormal s16( s s )s }
+fig2 = \notes{ \slurnormal s16( s ) s s }
+fig3 = \notes{ s16 \slurnormal s( s )s }
+fig4 = \notes{ \slurnormal s16( s s s s s s )s }
+fig5 = \notes{ \slurnormal s8.()s16 }
 
 % of course, i just type fig1, and add the \ and the silly $ later
 % urg, Thread is gone, try Voice
-% prelude_slurs = \type Thread = prelude \melodic{
-prelude_slurs = \type Voice = prelude \melodic{
+% prelude_slurs = \type Thread = prelude \notes{
+prelude_slurs = \type Voice = prelude \notes{
        s4 s4 \$fig3 |
        \$fig1 s4 \$fig3 |
        \$fig1 s4 \$fig3 |
@@ -273,16 +273,16 @@ prelude_slurs = \type Voice = prelude \melodic{
        s4 \$fig3 s4 |
 }
 
-fig1 = \melodic{ \slurdotted s16( s s )s }
-fig2 = \melodic{ \slurdotted s16( s ) s s }
-fig3 = \melodic{ s16 \slurdotted s( s )s }
-fig4 = \melodic{ \slurdotted s16( s s s s s s )s }
-fig5 = \melodic{ \slurdotted s8.()s16 }
-fig6 = \melodic{ \slurdotted s16()s \slurdotted s()s }
+fig1 = \notes{ \slurdotted s16( s s )s }
+fig2 = \notes{ \slurdotted s16( s ) s s }
+fig3 = \notes{ s16 \slurdotted s( s )s }
+fig4 = \notes{ \slurdotted s16( s s s s s s )s }
+fig5 = \notes{ \slurdotted s8.()s16 }
+fig6 = \notes{ \slurdotted s16()s \slurdotted s()s }
 
 % urg, Thread is gone, try Voice
-% prelude_suggested_slurs = \type Thread = prelude \melodic{
-prelude_suggested_slurs = \type Voice = prelude \melodic{
+% prelude_suggested_slurs = \type Thread = prelude \notes{
+prelude_suggested_slurs = \type Voice = prelude \notes{
        \slurdotted
        s2. |
        s2. |
@@ -351,14 +351,14 @@ prelude_suggested_slurs = \type Voice = prelude \melodic{
        \$fig3 s2 |
 }
 
-prelude_a = \type Voice \melodic<
+prelude_a = \type Voice \notes<
        \$prelude_notes
        \$prelude_beams
        \$prelude_slurs
        \$prelude_suggested_slurs
 >
 
-prelude = \melodic<
+prelude = \notes<
        \$prelude_a
        \$prelude_b
 >

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 1a82029959d3d954d0b2f3fdc2e74b2039be60bf..9ea3ccc38f30f481d4c4e87f5673b12b2042fc48 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly
@@ -13,7 +13,7 @@ d = { \slurdotted }
 %
 % ugh, the non-shortened beamstems of voice in forced direction
 % look ugly here!
-sarabande_a = \melodic \relative c {
+sarabande_a = \notes \relative c {
        \voiceone \d[d8.()e16] e4.-\trill([d16 )e] |
        f4. \onevoice [e8(d)c] |
        [bes g']\n[f e16(f][g a bes)d,] |
@@ -51,7 +51,7 @@ sarabande_a = \melodic \relative c {
        d4 d,,2 |
 }
 
-sarabande_b = \melodic \relative c {
+sarabande_b = \notes \relative c {
        \voicetwo
 % dispute
 %      d4 a2 |
@@ -87,7 +87,7 @@ sarabande_b = \melodic \relative c {
 }
 
 
-sarabande = \type Staff \melodic<
+sarabande = \type Staff \notes<
        \$sarabande_a
        \$sarabande_b
 >

diff --git a/mutopia/J.S.Bach/wtk1-prelude2.ly.m4 b/mutopia/J.S.Bach/wtk1-prelude2.ly.m4
index 8d8eb6f5d03c9fc788a40106d6a54019606bdcf5..617f681e583540b5063fbbb80937bc839829abae 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-prelude2.ly.m4
+++ b/mutopia/J.S.Bach/wtk1-prelude2.ly.m4
@@ -12,7 +12,7 @@ define(handymeasure, `intromeasure(translit($*,` ', `,'))')
 
 
 
-trebleIntro=\melodic \transpose c'' {
+trebleIntro=\notes \transpose c'' {
 handymeasure(c' es d c)
 handymeasure(as f e c)
 handymeasure(b f es d)
@@ -38,7 +38,7 @@ handymeasure(g c B d)
 handymeasure(as c B d)
 }
 
-bassIntro = \melodic {
+bassIntro = \notes {
 handymeasure(c g f es)
 handymeasure(c as g f)
 handymeasure(c as g f)
@@ -67,7 +67,7 @@ handymeasure(G es d f)
 }
 
 
-middlepiece = \melodic
+middlepiece = \notes
 {
        \stemdown
        [G B d]