lilypond-1.0.9

diff --git a/init/book-fragment.ly b/init/book-fragment.ly
index 0139e592cc766f4d7bbce50a20ffca4adfb45a3e..91645e70c70baf6a8fdcb9d9764c736ad697cd3d 100644 (file)
--- a/init/book-fragment.ly
+++ b/init/book-fragment.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly"
@@ -8,7 +8,7 @@
 \include "paper16.ly"
 
 \score { 
-  \melodic {
+  \notes {
     \maininput
   }
   \paper { \paper_sixteen

diff --git a/init/book-init.ly b/init/book-init.ly
index a2908e5e8dff428be45336f1023d557976c14422..2975e48249b77fda5c40b8520d00b05c942fc0a2 100644 (file)
--- a/init/book-init.ly
+++ b/init/book-init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly";

diff --git a/init/center-fragment.ly b/init/center-fragment.ly
index 421c98e7813a5df9139ce1906ee75f0f7426ab28..192f0f031faa4470ef0f3443a644c368438a4c14 100644 (file)
--- a/init/center-fragment.ly
+++ b/init/center-fragment.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly"
@@ -13,8 +13,8 @@ default_paper = \paper {
 }
 
 \score { 
-%  \melodic\relative c {
-  \melodic {
+%  \notes\relative c {
+  \notes {
     \maininput
   }
   \paper { 

diff --git a/init/center.ly b/init/center.ly
index 39699af865168541ec89b8db4f112f81c8d399db..feafaedcb4b5d6c27e311b0ecd6ae426641a88e7 100644 (file)
--- a/init/center.ly
+++ b/init/center.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly"

diff --git a/init/fragment.ly b/init/fragment.ly
index 421c98e7813a5df9139ce1906ee75f0f7426ab28..192f0f031faa4470ef0f3443a644c368438a4c14 100644 (file)
--- a/init/fragment.ly
+++ b/init/fragment.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly"
@@ -13,8 +13,8 @@ default_paper = \paper {
 }
 
 \score { 
-%  \melodic\relative c {
-  \melodic {
+%  \notes\relative c {
+  \notes {
     \maininput
   }
   \paper { 

diff --git a/init/init.fly b/init/init.fly
index 31fbbe0698fbc6c02b64e0f2512f11831df16c1c..9a2fa1d688e37a42b194163f1cbb5f7de44d67ab 100644 (file)
--- a/init/init.fly
+++ b/init/init.fly
@@ -1,12 +1,12 @@
 % Toplevel initialisation file. 
        
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly"
 
 \score { 
-  \melodic\relative c {
+  \notes\relative c {
     \maininput
   }
   \paper { }  

diff --git a/init/init.ly b/init/init.ly
index 7f6291927228685f64945fd79564886225cbad57..e076b2102da8ba4b77a15f09e38ed29e26995551 100644 (file)
--- a/init/init.ly
+++ b/init/init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly";

diff --git a/init/paper16.ly b/init/paper16.ly
index 8ce2fb67ed0f3368d1f690f09ba0c80b649bfafb..4ccaea135122fd206d20bf301df39a1896ce4599 100644 (file)
--- a/init/paper16.ly
+++ b/init/paper16.ly
@@ -6,7 +6,7 @@
 
 
 
-\version "1.0.1";
+\version "1.0.3";
 
 paper_sixteen = \paper {
        staffheight = 16.0\pt;

diff --git a/init/paper20.ly b/init/paper20.ly
index c156edb8dd2153ed0758202aaf6158ed48e5f4c0..4da2520dd5ddf42792a168703a39f01f81c1a8e2 100644 (file)
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -5,7 +5,7 @@
  \include "table13.ly";
  \include "table16.ly";
 
-\version "1.0.1";
+\version "1.0.3";
 
 paper_twenty = \paper {
        staffheight = 20.0\pt;

diff --git a/input/keys.ly b/input/keys.ly
index b384b7a3a112fe5a78c76d5a38902e88e5c421f6..7f4bc62a6b69c7214ec2be0e7fed7b7771880624 100644 (file)
--- a/input/keys.ly
+++ b/input/keys.ly
@@ -1,7 +1,7 @@
-\version "1.0.2";
+\version "1.0.3";
 
 
-blah = \melodic {
+blah = \notes {
 
 \transpose c'' {
        \time 4/4;

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index 8710a3ab34a20013a996437a0bcf4dca1b8ae62d..c823ab99f9538b292917602df48159b2c25036e8 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -10,14 +10,14 @@ copyright =  "public domain";
 Tested Features: example file with comments
 
 %}
-\version "1.0.2";
+\version "1.0.3";
 
 
 % the % is a comment.
 
 
 % declare melody (which will be in *one* staff ) for the lead voice
-melodie = \melodic \relative c' {
+melodie = \notes \relative c' {
                                % switch Lilypond in note-mode
        \clef"violin";
        \time 2/4 ;
@@ -39,7 +39,7 @@ melodie = \melodic \relative c' {
 }
 
                                % more of this.
-begeleiding = \melodic \relative c { 
+begeleiding = \notes \relative c { 
        \clef "bass";
        \time 2/4 ;
 

diff --git a/input/pedal.ly b/input/pedal.ly
index 494fecc6e494981ce386a782e2763a78c07bb9ca..dde473995ce1b4ecc1d351367dfc9ece0f1c1723 100644 (file)
--- a/input/pedal.ly
+++ b/input/pedal.ly
@@ -24,10 +24,10 @@
 % \lbheel \lbheel \lfheel \lftoe
 % \rbheel \rbtoe \rfheel \rftoe
 
-\version "1.0.2";
+\version "1.0.3";
 
 \score{
-               \melodic {
+               \notes {
                        \time 4/4;
                        \key D;
                        \clef bass;

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index d9f89d4c3aac0ce9494e29832947f29b86900598..c9cb4f6da8b30c840a6ad3bb9f5506175aaf601e 100644 (file)
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -23,16 +23,16 @@
    * organ staff...
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 
 
-praeludium_commands = \melodic {
+praeludium_commands = \notes {
   \time 4/4;
    \key e;
 }
 
-praeludium_right = \melodic\transpose c'' {
+praeludium_right = \notes\transpose c'' {
   \$praeludium_commands
   \clef violin;
 
@@ -64,7 +64,7 @@ praeludium_right = \melodic\transpose c'' {
   % 16
 }
 
-praeludium_left = \melodic {
+praeludium_left = \notes {
   \$praeludium_commands
   \clef bass;
 
@@ -85,7 +85,7 @@ praeludium_left = \melodic {
   % 16
 }
 
-praeludium_pedal = \melodic {
+praeludium_pedal = \notes {
   \$praeludium_commands  
   \clef bass;
 
@@ -97,12 +97,12 @@ praeludium_pedal = \melodic {
 }
 
 
-fuga2_commands = \melodic{
+fuga2_commands = \notes{
   \time 3/4;
   \key e;              % E-major
 }
 
-fuga2_right = \melodic\transpose c'' {
+fuga2_right = \notes\transpose c'' {
   \$fuga2_commands
   \clef violin;
 
@@ -140,7 +140,7 @@ fuga2_right = \melodic\transpose c'' {
   % 19
 }
 
-fuga2_left = \melodic {
+fuga2_left = \notes {
   \$fuga2_commands  
   \clef bass;
 
@@ -156,7 +156,7 @@ fuga2_left = \melodic {
   % 19
 }
 
-fuga2_pedal = \melodic {
+fuga2_pedal = \notes {
   \$fuga2_commands  
   \clef bass;
 
@@ -168,7 +168,7 @@ fuga2_pedal = \melodic {
   % 19
 }
 
-breakmusic = \melodic { 
+breakmusic = \notes { 
   %\time 4/4;
   r1
 }

diff --git a/input/rhythm.ly b/input/rhythm.ly
index 1ef9d13d0a37ee438b7fba52bb3a0dae79ae0abb..b0e2e1cd66b9c0f7aaedf922562e1423300cf55e 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -7,9 +7,9 @@ TestedFeatures =         "multiple meters, beaming, unsynced bars, userdefd engravers";
 
 
 
-\version "1.0.2";
+\version "1.0.3";
 
-ritme = \melodic\transpose c'' {
+ritme = \notes\transpose c'' {
        \partial 8;
 
        \time  4/4;
@@ -37,13 +37,13 @@ ritme = \melodic\transpose c'' {
        
 
 another = 
-       \melodic{ \time 4/4; 
+       \notes{ \time 4/4; 
                c1.  c1. c4 c4 c4 c4  \time  4/4; c1 c1 c1
         }
 
 
 yanother = 
-       \melodic{ \time 4/4; 
+       \notes{ \time 4/4; 
                c1 c1 c1 c4 c4 c4 c4  c1 c1 c1
         }
 

diff --git a/input/scales.ly b/input/scales.ly
index 215a51d90cdbc86b47d5d48f978446a521f12f88..81375258ceafe835741bfab25ee94dc26ee69745 100644 (file)
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -12,8 +12,8 @@ copyright =    "public domain";
 % scales with accents.
 %
 
-\version "1.0.2";
-blah =         \melodic {
+\version "1.0.3";
+blah =         \notes {
                \time 6/8;      
 \transpose c {
                \clef "bass";
@@ -84,7 +84,7 @@ c1}
 
 
 \score{
-       \melodic {\blah}
+       \notes {\blah}
        \paper{
         castingalgorithm = \Wordwrap;
        }

diff --git a/input/scripts.ly b/input/scripts.ly
index 85fad377e890983163c6b613c4d747a48926d10a..b4386c953885f55ba68ecc77689b2e6082def1dd 100644 (file)
--- a/input/scripts.ly
+++ b/input/scripts.ly
@@ -1,8 +1,8 @@
        
-\version "1.0.2";
+\version "1.0.3";
 
 
-blah =         \melodic{ \transpose c'' {
+blah =         \notes{ \transpose c'' {
 
        c,4 ->-.-\fermata-"text"
        c ->-.-\fermata-"text"

diff --git a/input/tril.ly b/input/tril.ly
index 64b2a357a12edc11a5e3e42a444bbdd529eb8a98..26e1dc5b39a1e134220e3b7dababccb8bef57ea0 100644 (file)
--- a/input/tril.ly
+++ b/input/tril.ly
@@ -5,10 +5,10 @@ TestedFeatures =       "This file tests trills"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \score{
-       \melodic{ 
+       \notes{ 
                c-\prall c-\mordent c-\prallprall c-\prallmordent
                c-\upprall c-\downprall
        }

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index de7b6036aba3a3b972e3b98e861a27ea2cf3f361..153d3d65aea445c3ef50e404de110d05e5ee8cb4 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -12,9 +12,9 @@ copyright =    "public domain";
 Tested Features                lyrics and chords
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
-melodie = \melodic\relative c {
+melodie = \notes\relative c {
         \clef"violin";
         \time 2/4 ;
 
@@ -39,7 +39,7 @@ text = \lyric{
 }
 
 \score {
-        <  \melodic \type Staff \melodie
+        <  \notes \type Staff \melodie
            \lyric   \type Lyrics \text
         >
         \paper {  }

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 5be1280c2a45d3fe0ca6d0be4071027b492234fb..70e18c964a55deef652c170cc7fa05318039cc2c 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -20,9 +20,9 @@ traditional song in various languages.
 Tested Features: lyrics, interleaving lyrics and staffs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
-melody = \melodic \relative c'' {
+melody = \notes \relative c'' {
        \clef violin;
        \property Staff.instrument = "alto sax"
        
@@ -36,7 +36,7 @@ melody = \melodic \relative c'' {
        f f | e e | d d8.( e16 | )c2 |
 }
 
-accompany = \melodic \relative c {
+accompany = \notes \relative c {
        \clef "bass";
        c4 c' | e c | f c | e c | 
        d b | c a | f g | c,2 | 
@@ -48,7 +48,7 @@ accompany = \melodic \relative c {
        d b | c a | f g | c,2 
 }
 
-global = \melodic {
+global = \notes {
        \time 2/4;
        \skip 2*24;
        \bar ":|";

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 869d5527bd81098aca03a036a5649eb9f5e76451..01b33c406eaaeddd4fdcf602832abba91c85c806 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -35,19 +35,18 @@ static Keyword_ent the_key_tab[]={
   {"duration", DURATION},
   {"font", FONT},
   {"grouping", GROUPING},
+  {"header", HEADER},
   {"in", IN_T},
   {"lyric", LYRIC},
   {"key", KEY},
   {"keysignature", KEYSIGNATURE},
   {"mark", MARK},
-  {"melodic" , MELODIC},
   {"musicalpitch", MUSICAL_PITCH},
   {"time", TIME_T},
   {"midi", MIDI},
   {"mm", MM_T},
-  {"multi", MULTI},
-  {"header", HEADER},
   {"notenames", NOTENAMES},
+  {"notes" , NOTES},
   {"octave", OCTAVE},
   {"output", OUTPUT},
   {"partial", PARTIAL},
@@ -60,7 +59,6 @@ static Keyword_ent the_key_tab[]={
   {"script", SCRIPT},
   {"shape", SHAPE},
   {"skip", SKIP},
-  {"staff", STAFF},
   {"table", TABLE},
   {"spandynamic", SPANDYNAMIC},
   {"symboltables", SYMBOLTABLES},

diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly
index f8c6a0dc4404982923d06438d832852dc720622c..a5dc6dd7dcd91c0ce37cc55301b371ed1a6dd448 100644 (file)
--- a/mutopia/Coriolan/bassi-part.ly
+++ b/mutopia/Coriolan/bassi-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "violoncello.ly"

diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly
index 2698afa816ee30795f787a07ad73d653bab8f9ee..352c0031d402b398359643ec04896927c22e0a73 100644 (file)
--- a/mutopia/Coriolan/clarinetti-part.ly
+++ b/mutopia/Coriolan/clarinetti-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "clarinetti.ly"

diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly
index be6fc080a9c358b51a34d63701164cba1f253654..5456ca95735551dad0b29841e9937debf899ae34 100644 (file)
--- a/mutopia/Coriolan/clarinetti.ly
+++ b/mutopia/Coriolan/clarinetti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "clarinetto-1.ly"
 \include "clarinetto-2.ly"
@@ -21,7 +21,7 @@ $clarinetti_staff = \type Staff = clarinetti <
        % urg: can't; only My_midi_lexer:<non-static> () parses pitch?
        %\property Staff.transposing = "bes"
        \property Staff.transposing = -3
-       \melodic \type Voice=one < 
+       \notes \type Voice=one < 
                \time 4/4;
                \key F;
                \$clarinetto1

diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly
index ef713c0441260adacf1edda9a6bf49fe7aaeb9ff..7c18d193f9dd5139e7fecbcfc4d3a883b878d0de 100644 (file)
--- a/mutopia/Coriolan/clarinetto-1.ly
+++ b/mutopia/Coriolan/clarinetto-1.ly
@@ -9,9 +9,9 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-clarinetto1 = \melodic \relative c {
+clarinetto1 = \notes \relative c {
        R1 *2 | d''4-.\ff r r2 | R1 *3 | e4-. r r2 | R1 *3 |
        f4-. r r2 | r1 | f4-. r r2 | e4-. r r2 | R1 *4 |
        bes'2\p_"\ \ \ cresc." ( a | 

diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly
index be27d99bb92f3968a97096a3670091515136c0b3..d87a791b58073fed7a5e5e0e15f11a1385aea633 100644 (file)
--- a/mutopia/Coriolan/clarinetto-2.ly
+++ b/mutopia/Coriolan/clarinetto-2.ly
@@ -9,9 +9,9 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-clarinetto2 = \melodic \relative c { 
+clarinetto2 = \notes \relative c { 
        R1*2 bes''4-.\ff r r2 | R1*3 | cis4-. r r2 | R1 *3 | 
        d4-. r r2 | r1 | d4-. r r2 | cis4-. r r2 | R1 *5 |
        %20

diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly
index 420d022a91e6dc6dab5f81346f0c832ea6c40f60..72b14e59c627afa584c8e3c42bbbb92c4f5f4dc9 100644 (file)
--- a/mutopia/Coriolan/contrabasso-part.ly
+++ b/mutopia/Coriolan/contrabasso-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "contrabasso.ly"

diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly
index b0a5617c7168db6e92266d6072668ba4be96d2af..0a272c9e337814d8b1f8ae4e99be421ea4a09185 100644 (file)
--- a/mutopia/Coriolan/contrabasso.ly
+++ b/mutopia/Coriolan/contrabasso.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-contrabasso = \melodic \relative c {
+contrabasso = \notes \relative c {
 %      \translator Staff=violoncello
        \skip 1*21;
 %      \translator Staff=contrabasso
@@ -144,7 +144,7 @@ $contrabasso_staff = \type Staff = contrabasso <
        \property Staff.instrument = "Contrabasso"
        \property Staff.instr = "Cb."
        \clef "bass";
-       \melodic \type Voice=one< 
+       \notes \type Voice=one< 
                \global
                \$contrabasso
        >

diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index c044c050fa5ccc3ba5e626ae20cb2170c6da28a5..baed0a99b0391f7147519f5c8aef685782e96943 100644 (file)
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 
@@ -39,7 +39,7 @@ koper = \type StaffGroup = koper_group <
 
 $timpani_g = \type StaffGroup = timpani_group <
        \$timpani_staff
-       \type Staff = urgtimpany \melodic{ \skip 1*34; }
+       \type Staff = urgtimpany \notes{ \skip 1*34; }
 >
 
 $violini = \type GrandStaff = violini_group <

diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly
index 2c7009e73b5fff573ac826fd8d301b6be5106b07..77231a65664a6c30f76b1cad26ff7e84c40ca270 100644 (file)
--- a/mutopia/Coriolan/corni-part.ly
+++ b/mutopia/Coriolan/corni-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "corni.ly"

diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly
index 966b68376c21e1c1b10e71696ea909bfd8f7b3a9..2d85377244c3197cc98ad92fae00d990fe22edc6 100644 (file)
--- a/mutopia/Coriolan/corni.ly
+++ b/mutopia/Coriolan/corni.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "corno-1.ly"
 \include "corno-2.ly"
@@ -21,7 +21,7 @@ $corni_staff = \type Staff = corni <
        % urg: can't; only My_midi_lexer:<non-static> () parses pitch?
        %\property Staff.transposing = "es"
        \property Staff.transposing = 3
-       \melodic \type Voice=corni < 
+       \notes \type Voice=corni < 
                \time 4/4;
                \$corno1
                \$corno2

diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly
index c2af389e4149531892ebdd8dffa859927d857d80..52f04de55acf9fee5706ce0806b401a569a0b283 100644 (file)
--- a/mutopia/Coriolan/corno-1.ly
+++ b/mutopia/Coriolan/corno-1.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-corno1 = \melodic \relative c {
+corno1 = \notes \relative c {
        R1 *2 | f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
        c4-. r r2 | r1 | e4-. r r2 | e4-. r r2 | R1 *5 |
        %20

diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly
index b203ddaa6baa167374c5f32348678cd7afdb68ef..17d91e4c23511dcd2b2ef5725ab4be6cacfab044 100644 (file)
--- a/mutopia/Coriolan/corno-2.ly
+++ b/mutopia/Coriolan/corno-2.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-corno2 = \melodic \relative c {
+corno2 = \notes \relative c {
        R1 *2 | d''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 |
        c4-. r r2 | r1 | e,4-. r r2 | e4-. r r2 | R1 *5 |
        %20

diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly
index bb255eb527a0d2bbf86cd814f9cd33f5a4483bb0..12acc984da47868fb355c3023768110749c01de9 100644 (file)
--- a/mutopia/Coriolan/fagotti-part.ly
+++ b/mutopia/Coriolan/fagotti-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "fagotti.ly"

diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly
index f98dbd3cc46ab2456e30ea7bfb2db4e1abe1ec2a..88120d81b02c7a5311f911fb48c5d7808f911f62 100644 (file)
--- a/mutopia/Coriolan/fagotti.ly
+++ b/mutopia/Coriolan/fagotti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "fagotto-1.ly"
 \include "fagotto-2.ly"
@@ -19,7 +19,7 @@ $fagotti_staff = \type Staff = fagotti <
        \property Staff.instrument = "2 Fagotti"
        \property Staff.instr = "Fg."
        \clef "bass";
-       \melodic \type Voice=fagotti < 
+       \notes \type Voice=fagotti < 
                \global
                \$fagotto1
                \$fagotto2

diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly
index 34447df55fd38cf71304e06aeab358ad6e63b5df..8674d66d75aee094cde056b24ef52d6d5287563b 100644 (file)
--- a/mutopia/Coriolan/fagotto-1.ly
+++ b/mutopia/Coriolan/fagotto-1.ly
@@ -9,9 +9,9 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-fagotto1 = \melodic \relative c {
+fagotto1 = \notes \relative c {
        R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 |
        a4-. r r2 | r1 | c4-. r r2 | b4-. r r2 | R1 *5 |
        %20

diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly
index ab55c98ce15762679d098f45a15d4c85d83d950b..2b4c5d59acb17d846fae7469a72fcace3c102baf 100644 (file)
--- a/mutopia/Coriolan/fagotto-2.ly
+++ b/mutopia/Coriolan/fagotto-2.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-fagotto2 = \melodic \relative c {
+fagotto2 = \notes \relative c {
        R1 *2 | f4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
        fis4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
        %20

diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly
index 9c45290df261d34d969eedddd789f93019e09a0d..92e2575a71786a5cc8edcda043ad983ee1f8a19d 100644 (file)
--- a/mutopia/Coriolan/flauti-part.ly
+++ b/mutopia/Coriolan/flauti-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "flauti.ly"

diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly
index ea4f964420e7ea781d5178a5594ebc72926ae658..861a962152d6eb517815110112b2f8334a320dc2 100644 (file)
--- a/mutopia/Coriolan/flauti.ly
+++ b/mutopia/Coriolan/flauti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "flauto-1.ly"
 \include "flauto-2.ly"
@@ -18,7 +18,7 @@ $flauti_staff = \type Staff = flauti <
        \property Staff.midi_instrument = "flute"
        \property Staff.instrument = "2 Flauti"
        \property Staff.instr = "Fl."
-       \melodic \type Voice=flauti < 
+       \notes \type Voice=flauti < 
                \global
                \$flauto1
                \$flauto2

diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly
index 51fcf1f1d10f5292391745d620c8d57c64b2b805..84ca0c5e9da90fe24712052bcc00ddbd3698efd3 100644 (file)
--- a/mutopia/Coriolan/flauto-1.ly
+++ b/mutopia/Coriolan/flauto-1.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-flauto1 = \melodic \relative c {
+flauto1 = \notes \relative c {
        R1 *2 | c'''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 |
        es4-. r r2 | r1 | g4-. r r2 | b,4-. r r2 | R1 *4 |
        r2 es\p_"\ \ \ cresc." ( | 

diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly
index 56a4f4c71897731a3ea368e0749a0561b81509e7..1efc09e28fdf288b1d5513e2f1799856a83de673 100644 (file)
--- a/mutopia/Coriolan/flauto-2.ly
+++ b/mutopia/Coriolan/flauto-2.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-flauto2 = \melodic \relative c {
+flauto2 = \notes \relative c {
        R1 *2 | as'''4-.\ff r r2 | R1 *3 | b4-. r r2 | R1 *3 | 
        c4-. r r2 | r1 | es4-. r r2 | d,4-. r r2 | R1 *4 |
        r2 r2 | 

diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly
index 1849424a1af8c4325ea81bbae30f99c77f1b66eb..7e51a44d45f88d77e0df1101e0ba43958ccc158b 100644 (file)
--- a/mutopia/Coriolan/global.ly
+++ b/mutopia/Coriolan/global.ly
@@ -9,9 +9,9 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-global = \melodic {
+global = \notes {
        \time 4/4;
        \key es;
        \skip 1*314;

diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly
index d35301bc6587ecc2620c39742e6dee88c7c72f88..2bc57696a8dd640d89cecb6da21d6f225eee1c60 100644 (file)
--- a/mutopia/Coriolan/oboe-1.ly
+++ b/mutopia/Coriolan/oboe-1.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-oboe1 = \melodic \relative c'' {
+oboe1 = \notes \relative c'' {
        R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 |
        a4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *4 |
        as2\p_"\ \ \ cresc." ( g |

diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly
index c5506b5d805546c3b30319a5b55728881ff633f4..2e66374c279af71164ddd0f68a8fa3de4efccf01 100644 (file)
--- a/mutopia/Coriolan/oboe-2.ly
+++ b/mutopia/Coriolan/oboe-2.ly
@@ -9,9 +9,9 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-oboe2 = \melodic \relative c{
+oboe2 = \notes \relative c{
        R1 *2| f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
        es4-. r r2 | r1 | es4-. r r2 | b4-. r r2 | R1 *5 | 
        %20

diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly
index b389779b57d23ca79d8e8b38b3a7dc53bb3e17e9..f2153e900f14cff1963d43c1147c91c9127402f7 100644 (file)
--- a/mutopia/Coriolan/oboi-part.ly
+++ b/mutopia/Coriolan/oboi-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "oboi.ly"

diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly
index 1c90c9e922842682a30c07827d41c525271636ac..4df66776c70771b80cb20d3b002fd08c15bfbec1 100644 (file)
--- a/mutopia/Coriolan/oboi.ly
+++ b/mutopia/Coriolan/oboi.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "oboe-1.ly"
 \include "oboe-2.ly"
@@ -18,7 +18,7 @@ $oboi_staff = \type Staff = oboi <
        \property Staff.midi_instrument = "oboe"
        \property Staff.instrument = "2 Oboi"
        \property Staff.instr = "Ob."
-       \melodic \type Voice=oboi < 
+       \notes \type Voice=oboi < 
                \global
                \$oboe1
                \$oboe2

diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly
index 1c7f7642cfa6e8c1fa4c78363bab8c04e3127661..9eab4995724edcb0ba91abbfbcbc0f4b8e8bc345 100644 (file)
--- a/mutopia/Coriolan/timpani.ly
+++ b/mutopia/Coriolan/timpani.ly
@@ -9,9 +9,9 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-timpani = \melodic \relative c {
+timpani = \notes \relative c {
        R1 *2 | c4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
        c4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
        %20
@@ -25,7 +25,7 @@ $timpani_staff = \type Staff = timpani <
        \property Staff.instrument = "2 Timpani (C-G)"
        \property Staff.instr = "Timp."
        \clef "bass";
-       \melodic< 
+       \notes< 
 %              \global
                \time 4/4;
                \$timpani

diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly
index 5ee208541b0010ab843897d278ff49fa67903283..75e41015dd4cb64196bd6d126e6b3341a1b6d556 100644 (file)
--- a/mutopia/Coriolan/trombe-part.ly
+++ b/mutopia/Coriolan/trombe-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "trombe.ly"

diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly
index 50489f6d5c22bfe3cf96870bcbd924d1181c2ef9..6955a46757dc2737b6a0e6fa2d6b1fe2ca62380f 100644 (file)
--- a/mutopia/Coriolan/trombe.ly
+++ b/mutopia/Coriolan/trombe.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "trombo-1.ly"
 \include "trombo-2.ly"
@@ -18,7 +18,7 @@ $trombe_staff = \type Staff = trombe <
        \property Staff.midi_instrument = "trumpet"
        \property Staff.instrument = "2 Trombe (C)"
        \property Staff.instr = "Tbe."
-       \melodic \type Voice=trombe < 
+       \notes \type Voice=trombe < 
 %              \global
                \time 4/4;
                \$trombo1

diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly
index 92d525704896a661a712bc7a721cf47b4d8a1985..7b98c1f2c96617239bbab9f6f71fd74daab7ec78 100644 (file)
--- a/mutopia/Coriolan/trombo-1.ly
+++ b/mutopia/Coriolan/trombo-1.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-trombo1 = \melodic \relative c {
+trombo1 = \notes \relative c {
        R1 *2 | c''4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
        c4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
        %20

diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly
index afdf2fd34f5f69fc65f8a0cc7497bc25aec5d63e..d51c389d17714689682cbbe12218ce2bcb4c5132 100644 (file)
--- a/mutopia/Coriolan/trombo-2.ly
+++ b/mutopia/Coriolan/trombo-2.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-trombo2 = \melodic \relative c {
+trombo2 = \notes \relative c {
        R1 *2 | c'4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
        c4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
        %20

diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly
index 4ea6f86b9c3a0aeb3359b168e99c57aeeee8d04a..29d873adf5f75a32149e3e9a40087d0f9b88fc02 100644 (file)
--- a/mutopia/Coriolan/viola-1.ly
+++ b/mutopia/Coriolan/viola-1.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-viola1 = \melodic \relative c {
+viola1 = \notes \relative c {
        \type Voice=one
        c'1\ff ~ | c | f,4-. r r2 | r1 |
        % copied 3 bars from three back...
@@ -296,7 +296,7 @@ $viola1_staff = \type Staff = violai <
        \property Staff.instrument = "Viola"
        \property Staff.instr = "Vla."
        \clef "alto";
-       \melodic \type Voice=one < 
+       \notes \type Voice=one < 
                \global
                \$viola1
        >

diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly
index d1b7a2074f2e5569e0797bd151d99a4812f028ad..f45118959ec5727efe24bd8a4a3961635e97d85f 100644 (file)
--- a/mutopia/Coriolan/viola-2.ly
+++ b/mutopia/Coriolan/viola-2.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-viola2 = \melodic \relative c {
+viola2 = \notes \relative c {
        % starts on (actualy, most part is on) same staff as viola1
        %urg, parse error
 %urg   \translator Staff=viola1
@@ -36,7 +36,7 @@ $viola2_staff = \type Staff = violaii <
        \property Staff.instrument = "Viola II"
        \property Staff.instr = "Vla. II"
        \clef "alto";
-       \melodic \type Voice=one< 
+       \notes \type Voice=one< 
                \global
                \$viola2
        >

diff --git a/mutopia/Coriolan/viola-part.ly b/mutopia/Coriolan/viola-part.ly
index cd17993ab9af4ebdcf392e2be607270b2130bb10..072df6244a6905ae64c8981d6d5123f1ea428906 100644 (file)
--- a/mutopia/Coriolan/viola-part.ly
+++ b/mutopia/Coriolan/viola-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "viola-1.ly"
@@ -18,7 +18,7 @@ $viola_staff = \type Staff = violai <
        \property Staff.instrument = "Viola"
        \property Staff.instr = "Vla."
        \clef "alto";
-       \melodic \type Voice=one < 
+       \notes \type Voice=one < 
                \global 
                \$viola1
                \$viola2

diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly
index 23482fc138efd61a5b9f1f5ddd92ccaeb075b0a2..3dd9bbc20c02b0794d37413f976299451030617b 100644 (file)
--- a/mutopia/Coriolan/violino-1-part.ly
+++ b/mutopia/Coriolan/violino-1-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "violino-1.ly"

diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly
index 355ff61d77ae34fe7d16e2f14e612e7fff7d2082..6e71c6f065cff2dda7badd4398841ce58fd14819 100644 (file)
--- a/mutopia/Coriolan/violino-1.ly
+++ b/mutopia/Coriolan/violino-1.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-violino1 = \melodic \relative c {
+violino1 = \notes \relative c {
        c'1\ff ~ | c | <f4-. c'-. as'-.> r r2 | R1 |
        c1 ~ | c | <d4-. d'-. d'-.> r r2 | R1 |
        c1 ~ | c | <es'4-. es'-.> r r2 | R1 |
@@ -276,7 +276,7 @@ $violino1_staff = \type Staff = violino1 <
        \property Staff.midi_instrument = "violin"
        \property Staff.instrument = "Violino I"
        \property Staff.instr = "Vl. I"
-       \melodic< 
+       \notes< 
                \global
                \$violino1
        >

diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly
index e31f101382ed387001d47c9a732d6b2489717979..0179102b870f424da1640f96028909770f242e55 100644 (file)
--- a/mutopia/Coriolan/violino-2-part.ly
+++ b/mutopia/Coriolan/violino-2-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "violino-2.ly"

diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly
index 8c5993484512fd25df15b5eb4bf970ca7f2c42d4..b4a6d19ef5622e27b6bc648022392279cac0e20a 100644 (file)
--- a/mutopia/Coriolan/violino-2.ly
+++ b/mutopia/Coriolan/violino-2.ly
@@ -7,9 +7,9 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-violino2 = \melodic \relative c {
+violino2 = \notes \relative c {
        c'1\ff ~ | c | <f4-. c'-. as'-.> r r2 | R1 |
        c1 ~ | c | <d4-. b'-. as'-.> r r2 | R1 |
        c1 ~ | c | <fis4-. es'-. c'-.> r r2 | R1 |
@@ -296,7 +296,7 @@ $violino2_staff = \type Staff = violino2 <
        \property Staff.midi_instrument = "violin"
        \property Staff.instrument = "Violino II"
        \property Staff.instr = "Vl. II"
-       \melodic< 
+       \notes< 
                \global
                \$violino2
        >

diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly
index 78bd4822ed340230333c7caf52d8e9682935f1b8..677223d1110adb02bb5426580d51d1f6af164c3c 100644 (file)
--- a/mutopia/Coriolan/violoncello-part.ly
+++ b/mutopia/Coriolan/violoncello-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "violoncello.ly"

diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly
index 3b86a7306cb42037ec6a8ca9527dc4bbb3af1737..0f5941ca9b113e58bdf05694c287e1e5e64e18d3 100644 (file)
--- a/mutopia/Coriolan/violoncello.ly
+++ b/mutopia/Coriolan/violoncello.ly
@@ -9,9 +9,9 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-violoncello = \melodic \relative c {
+violoncello = \notes \relative c {
        c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 |
        \property Staff.instr = "Vc. \& Cb."
        r1 |
@@ -304,7 +304,7 @@ $violoncello_staff = \type Staff = violoncello <
        \property Staff.instrument = "Violoncello"
        \property Staff.instr = "Vc."
        \clef "bass";
-       \melodic \type Voice=one< 
+       \notes \type Voice=one< 
                \global
                \$violoncello
        >

diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly
index d8a9a7cfabd0b8cf744f57bda563e775888c85a5..5d6789756a972ef7123b3c86e35ea729d6544c37 100644 (file)
--- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly
+++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly
@@ -4,9 +4,9 @@
        piece = "Allemande";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-global = \melodic{
+global = \notes{
        \time 4/4;
        \partial 8*3;
        \key es;
@@ -19,7 +19,7 @@ global = \melodic{
        \bar ":|";
 }
 
-hoyreEn = \melodic\relative c'''{
+hoyreEn = \notes\relative c'''{
 %      \partial 4.; 
        [as16 g f] |
        [g16 d es b][c f es d][es b c g][as d c b] |
@@ -79,7 +79,7 @@ hoyreEn = \melodic\relative c'''{
        >       s8
 }
 
-venstreEn = \melodic\relative c{
+venstreEn = \notes\relative c{
        \clef bass; 
 %      \partial 4.; 
        r16 r8 |

diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly
index ce919822dc1735059e34324a5259d1138fa899e0..98aa397f915fa01141a9b9093e822a15c766057b 100644 (file)
--- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly
+++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly
@@ -10,9 +10,9 @@
   copyright =   "Public Domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-global = \melodic {
+global = \notes {
        \time 4/4;
        \key es;
        \skip 1*7;
@@ -23,7 +23,7 @@ global = \melodic {
        \bar "|.";
 }
   
-hoyreOpp = \melodic\relative c''  {
+hoyreOpp = \notes\relative c''  {
        \stemup
        es4^"Grave adagio" r16 [es d. es32] f4 r16 [f16 f. g32] |
        [as8. as16] [as16 g32 f g16. d32] es4 r16 [g g. as32] |
@@ -44,7 +44,7 @@ hoyreOpp = \melodic\relative c''  {
        > g2
 }
 
-hoyreNed = \melodic\relative c'' {
+hoyreNed = \notes\relative c'' {
        \clef violin;
        \stemdown
        <c4 g> r16 [c b. c32] d4 r16 [d d. es32] |
@@ -57,7 +57,7 @@ hoyreNed = \melodic\relative c'' {
        g4 <c8 a> r <d2 b>
 }
 
-venstreOpp = \melodic\relative c' {
+venstreOpp = \notes\relative c' {
        \clef bass;
        \stemup
        <c4 g es> r <b as f d> r |
@@ -75,7 +75,7 @@ venstreOpp = \melodic\relative c' {
        r <a es c> <g2 d>
 }
 
-venstreNed = \melodic\relative c{
+venstreNed = \notes\relative c{
        \stemdown
        c4 r c r | r c c r | c r r c | c r r16 [c c. bes32] bes4 |
        r16 [bes bes. as32] as4_"tr" g r16 [d' d. es32] |
@@ -86,7 +86,7 @@ venstreNed = \melodic\relative c{
        r g g2  
 }
 
-andanteEn = \melodic\relative c''{
+andanteEn = \notes\relative c''{
        [g16^"andante" c32 d es8~] [es16 d32 c es d c b] [c16 g as f] [g c g f] |
        [es16 c'32 d es d c16] [g' c, as' c,] [b c d b] g16 r16 r8 |
 %10
@@ -141,7 +141,7 @@ andanteEn = \melodic\relative c''{
    >
 }
 
-andanteTo = \melodic\relative c{
+andanteTo = \notes\relative c{
 %8
        [c8 c'] [f, g] [es c] [es g] |
        [c as] [es f] [g g,]
@@ -179,7 +179,7 @@ andanteTo = \melodic\relative c{
        >
 }
 
-allegroEn = \melodic\relative c''{
+allegroEn = \notes\relative c''{
 %30
        [g8^"allegro" g16 a] [b8 c d es] |
        [f16 es d es] [f8 g as d,] |
@@ -253,7 +253,7 @@ allegroEn = \melodic\relative c''{
                { \stemdown r8 r16 <a16 es> <g2 d> | <g es> }
        >
 }
-allegroTo = \melodic\relative c'{
+allegroTo = \notes\relative c'{
        \clef bass;
 %30
        \type Staff <

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
index cdfbc5c30e4aec295d45a263c4caa0db9e45f922..18084f2ccf1e9e3b09860ae7a342589ae008e676 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
@@ -14,9 +14,9 @@ enteredby =    "jcn";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-one = \melodic\relative c {
+one = \notes\relative c {
        \property Voice . textstyle =  "italic"
        r16\p_"legato"\< [g''-1( c-3 )e-5] r [g,-1( c )e]
        r [g,( c )d] r [b-1( d-2 \!)g-5] |
@@ -68,7 +68,7 @@ one = \melodic\relative c {
        \bar "|.";
 }
 
-two = \melodic\relative c{
+two = \notes\relative c{
        \property Voice . textstyle =  "roman"
        c4-5 e-3 g-\mordent^"(\\textsharp)" g,4 |
        d'-\mordent-5 f-3 a-\mordent^"(\\textsharp)" a,4 |
@@ -90,7 +90,7 @@ two = \melodic\relative c{
        \bar "|.";
 }
 
-global  = \melodic{
+global  = \notes{
        \time 4/4;
 }
 

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
index f2b5e97956e199716f5f9f21cdb2ce456cf6aa77..5b3e102358d44c80cf28090480144b626580ef58 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
@@ -14,8 +14,8 @@ enteredby =    "jcn";
 copyright =     "public domain";
 }
 
-\version "1.0.2";
-one = \melodic\relative c{
+\version "1.0.3";
+one = \notes\relative c{
        \property Voice . textstyle =  "italic"
        r8\mf [c'-1( e-2 g-4] [e-2 c-1 bes'-5 g-3] |
        [)a-4\< c,-1( f-2 a-4] [f c c'-5 a-3] |
@@ -73,7 +73,7 @@ one = \melodic\relative c{
        \bar "|.";
 }
 
-two = \melodic\relative c{
+two = \notes\relative c{
        \type Staff <
                { \voiceone c1 ~ | c ~ | c }
                { \voicetwo c,1 ~ | c ~ | c }
@@ -97,7 +97,7 @@ two = \melodic\relative c{
        \bar "|.";
 }
 
-global = \melodic{
+global = \notes{
        \time 4/4;
 }
 

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
index 0b25e9f2838b2014c2d3320b569cad8cbd1aea8a..d2166be60b71fa3be7b3293f1c31d4b4d2b8e441 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
@@ -21,10 +21,10 @@ enteredby =  "jcn";
 copyright =     "public domain";
 }
 
-\version "1.0.0";
+\version "1.0.3";
 
 
-one = \melodic  \transpose c`` {
+one = \notes  \transpose c`` {
        \textstyle "italic";
 %#     s(^c@ ^es@ ^g@ ^\p(\<@ ^\!@ ^)\!@ ^\>@)
        t(c,es,g,^\p(\<@,\!,^)\!@,\>)
@@ -86,7 +86,7 @@ one = \melodic  \transpose c`` {
        \bar "|.";
 }
 
-two = \melodic{
+two = \notes{
        \clef bass;
        % c4 r [g8-.(\ped )es-.\*] |
        c4 r [g8-.( )es-.] |
@@ -148,7 +148,7 @@ two = \melodic{
        \bar "|.";
 }
 
-global  = \melodic{
+global  = \notes{
        \meter 3/4;
        \key es;
 }

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
index ac4eb265a605b0e7b0ea889be9a7e2db4e86a449..19a5f1082d6a460df255fe6ca6f13b9d15bcfd8e 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
@@ -12,9 +12,9 @@ composer =     "Johann Sebastian Bach (1685-1750)";
 enteredby =     "jcn";
 copyright =     "public domain";
 }
-\version "1.0.2";
+\version "1.0.3";
 
-one = \melodic\relative c{
+one = \notes\relative c{
        \property Voice . textstyle =  "italic"
        r16\p_"legato" 
        \property Voice . textstyle =  "finger"
@@ -63,7 +63,7 @@ one = \melodic\relative c{
        \bar "|.";
 }
 
-two = \melodic\relative c{
+two = \notes\relative c{
        \property Voice . textstyle =  "finger"
        fis4-1( e8-2 a4 a4 gis8-2 | 
        ) a8
@@ -118,7 +118,7 @@ two = \melodic\relative c{
        \bar "|.";
 }
 
-three = \melodic\relative c{
+three = \notes\relative c{
 %      \stemdown 
        d4-3 c-4 b e-3 |
        a16 [a,-5\mf( cis-3 a-5] [d-2 e-1 fis-2 d-4]
@@ -154,7 +154,7 @@ three = \melodic\relative c{
        [d a-2~] [a16 a-2 b cis-2] d2 |
 }
 
-four = \melodic\relative c{
+four = \notes\relative c{
        \skip 1*9;
 %      \stemup 
 %      \property Voice.hshift = 1 
@@ -174,7 +174,7 @@ four = \melodic\relative c{
        d2 d2
 }
 
-global  = \melodic{
+global  = \notes{
        \time 4/4;
        \key D;
 }

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
index a259ee6f19d184f8abc99ec9c38e4017aa5d1e6a..3d4d462d25ef3fef42de9b5f850428e9a2e39a7b 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
@@ -12,10 +12,10 @@ composer =   "Johann Sebastian Bach (1685-1750)";
 enteredby =     "jcn";
 copyright =     "public domain";
 }
-\version "1.0.2";
+\version "1.0.3";
 
 
-one = \melodic\relative c{
+one = \notes\relative c{
        \property Voice . textstyle =  "italic"
        [d'8-1\p a'-5-"legato" f-3 d-1 a'-5 f-3] |
        [d-1 a'-5 f-3 d-1 a'-5 f-3] |
@@ -108,7 +108,7 @@ one = \melodic\relative c{
 }
 
 
-two = \melodic\relative c{
+two = \notes\relative c{
        \clef "bass";
 %      [d32( cis )d8.] r4 r |
        d4-\mordent r r |
@@ -185,7 +185,7 @@ Aborted (core dumped)
        \bar "|.";
 }
 
-global = \melodic{
+global = \notes{
        \time 3/4;
        \key F;
 }

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
index 708000efaf5a6775068642d75bb78d5f8cb49b54..db680f0af47e77fbe0f461dabbd1b6a599edd193 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
@@ -12,10 +12,10 @@ composer =   "Johann Sebastian Bach (1685-1750)";
 enteredby =     "jcn";
 copyright =     "public domain";
 }
-\version "1.0.2";
+\version "1.0.3";
 
 
-one = \melodic\relative c{
+one = \notes\relative c{
        \skip 1; |
        \stemup
        r4 d''2-5( cis4-4 |
@@ -35,7 +35,7 @@ one = \melodic\relative c{
        \bar "|.";
 }
 
-two = \melodic\relative c{
+two = \notes\relative c{
        r16\p [d''-5( c-4 bes-3] [a-2 bes-3 f-1 g-2] 
        [a8.-\mordent bes16-1] [g8.-\prall f16-1] |
        \stemdown
@@ -54,7 +54,7 @@ two = \melodic\relative c{
        fis1-2
 }
 
-three = \melodic\relative c{
+three = \notes\relative c{
        \stemup
        f2-1( e-2 |
        \stemboth
@@ -76,7 +76,7 @@ three = \melodic\relative c{
        \bar "|.";
 }
 
-four = \melodic\relative c{
+four = \notes\relative c{
        \stemdown 
        d2-3 cis-4 |
        \skip 1*3; |
@@ -95,7 +95,7 @@ four = \melodic\relative c{
        d,1-5
 }
 
-global = \melodic{
+global = \notes{
        \time 4/4;
        \key F;
 }

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 5b3564a9344f58b9bffb357054bb46c8ec0c3557..538ae831721fe95f922c8693d49cbbe289a0abfc 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
@@ -15,11 +15,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "allemande-urtext.ly";
 
-allemande_cello_global = \melodic{
+allemande_cello_global = \notes{
        \time 4/4;
        \key f;
        \partial 16;
@@ -32,7 +32,7 @@ allemande_cello_global = \melodic{
        \bar ":|";
 }
 
-allemande_cello_scripts = \melodic{
+allemande_cello_scripts = \notes{
 }
 
 allemande_cello_staff = \type Staff <

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly
index 3c072bb4b1a67c78db9158d70cfd4132df6de18f..a523205ecee8a463c51a4e52c88373a80e2060d7 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly
@@ -15,11 +15,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "allemande-urtext.ly";
 
-allemande_viola_global = \melodic{
+allemande_viola_global = \notes{
        \time 4/4;
        \key f;
        \partial 16;
@@ -32,11 +32,11 @@ allemande_viola_global = \melodic{
        \bar ":|";
 }
 
-allemande_viola_scripts = \melodic{
+allemande_viola_scripts = \notes{
 }
 
 allemande_viola_staff = \type Staff <
-       \melodic \transpose c'' \$allemande
+       \notes \transpose c'' \$allemande
        \$allemande_viola_global
        \$allemande_viola_scripts
 >

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 a5125efd67a33083332085dbd49dd59c5cedb912..5d79e6204ba64482dd360bd64afd12b39cf57ab8 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
@@ -15,11 +15,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "courante-urtext.ly";
 
-courante_cello_global = \melodic{
+courante_cello_global = \notes{
        \time 3/4;
        \key f;
        \partial 16;
@@ -32,7 +32,7 @@ courante_cello_global = \melodic{
        \bar ":|";
 }
 
-courante_cello_scripts = \melodic{
+courante_cello_scripts = \notes{
 }
 
 courante_cello_staff = \type Staff <

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly
index b0df15d92d249904008a9fde724ac5f34caa149a..585b13464f8ff49819d716d77db3bf41c2bf5d45 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly
@@ -15,11 +15,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "courante-urtext.ly";
 
-courante_viola_global = \melodic{
+courante_viola_global = \notes{
        \time 3/4;
        \key f;
        \partial 16;
@@ -32,11 +32,11 @@ courante_viola_global = \melodic{
        \bar ":|";
 }
 
-courante_viola_scripts = \melodic{
+courante_viola_scripts = \notes{
 }
 
 courante_viola_staff = \type Staff <
-       \melodic \transpose c' \$courante
+       \notes \transpose c' \$courante
        \$courante_viola_global
        \$courante_viola_scripts
 >

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 4e848b5551c22c319aebbfb572268ec4e0c0b270..a864e15460b800853301367e4df042ceebb7e4b5 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
@@ -15,11 +15,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "gigue-urtext.ly";
 
-gigue_cello_global = \melodic{
+gigue_cello_global = \notes{
        \time 3/8;
        \key f;
        \clef bass;
@@ -32,7 +32,7 @@ gigue_cello_global = \melodic{
        \bar ":|";
 }
 
-gigue_cello_scripts = \melodic{
+gigue_cello_scripts = \notes{
 }
 
 gigue_cello_staff = \type Staff <

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly
index 043b1890007f254730906438c29805d65c6cd201..9e3317146ac00bc43c9f55f05e72b47dfbcfe44d 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly
@@ -15,11 +15,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "gigue-urtext.ly";
 
-gigue_cello_global = \melodic{
+gigue_cello_global = \notes{
        \time 3/8;
        \key f;
        \clef bass;
@@ -32,11 +32,11 @@ gigue_cello_global = \melodic{
        \bar ":|";
 }
 
-gigue_cello_scripts = \melodic{
+gigue_cello_scripts = \notes{
 }
 
 gigue_cello_staff = \type Staff <
-       \melodic \transpose c' \$gigue
+       \notes \transpose c' \$gigue
        \$gigue_cello_global
        \$gigue_cello_scripts
 >

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 c3e8b8471dfb670947c2025058780f4295323d6c..7b9a4b75ee42fa13063c339a6d8bd467105db8f3 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
@@ -16,11 +16,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "menuetto-urtext.ly";
 
-menuetto_i_cello_global = \melodic{
+menuetto_i_cello_global = \notes{
        \time 3/4;
        \key f;
        \clef bass;
@@ -33,7 +33,7 @@ menuetto_i_cello_global = \melodic{
        \bar ":|";
 }
 
-menuetto_i_cello_scripts = \melodic{
+menuetto_i_cello_scripts = \notes{
        s2.
        s8^"~"^1_2_4 s8 s4 s^4
        s4^0_1 s_4 s
@@ -66,7 +66,7 @@ menuetto_i_cello_staff = \type Staff <
        \header{ piece = "Menuetto I"; }
 }
 
-menuetto_ii_cello_global = \melodic{
+menuetto_ii_cello_global = \notes{
        \time 3/4;
        \key D;
        \clef bass;

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
index 6250ba4690e81ad174a8541fc860135ab2c0f1f1..5e55a3571a3a8dc2396f482ba137e14e25f8b284 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
@@ -17,11 +17,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "menuetto-urtext.ly";
 
-menuetto_i_viola_global = \melodic{
+menuetto_i_viola_global = \notes{
        \time 3/4;
        \key f;
        \clef alto;
@@ -37,7 +37,7 @@ menuetto_i_viola_global = \melodic{
        \bar ":|";
 }
 
-menuetto_i_viola_scripts = \melodic{
+menuetto_i_viola_scripts = \notes{
        s2.
        s8^"~"^1_2_4 s8*5
        s2.*5
@@ -53,7 +53,7 @@ menuetto_i_viola_scripts = \melodic{
 }
 
 menuetto_i_viola_staff = \type Staff <
-       \melodic \transpose c' \$menuetto_i
+       \notes \transpose c' \$menuetto_i
        \$menuetto_i_viola_global
 %      \$menuetto_i_viola_scripts
 >
@@ -65,7 +65,7 @@ menuetto_i_viola_staff = \type Staff <
        \header{ piece = "Menuetto I"; }
 }
 
-menuetto_ii_viola_global = \melodic{
+menuetto_ii_viola_global = \notes{
        \time 3/4;
        \key D;
        \clef alto;
@@ -79,7 +79,7 @@ menuetto_ii_viola_global = \melodic{
 }
 
 menuetto_ii_viola_staff = \type Staff <
-       \melodic \transpose c' \$menuetto_ii
+       \notes \transpose c' \$menuetto_ii
        \$menuetto_ii_viola_global
 %      \$menuetto_ii_viola_scripts
 >

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 47a7da3e526408322982ad50db9eb3d164ef6fac..6b0c12f7432125d95bdfa92719c5b110913849e3 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
@@ -15,11 +15,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "prelude-urtext.ly";
 
-prelude_cello_global = \melodic{
+prelude_cello_global = \notes{
        \time 3/4;
        \key f;
        \clef bass;
@@ -27,7 +27,7 @@ prelude_cello_global = \melodic{
        \bar "|.";
 }
 
-prelude_cello_scripts = \melodic{
+prelude_cello_scripts = \notes{
 }
 
 prelude_cello_staff = \type Staff <

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly
index 67e342d027058282c1fdbe701700c1420fffc747..99b826deaf48432fa261ebf84e3de84006bf198d 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly
@@ -15,11 +15,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "prelude-urtext.ly";
 
-prelude_viola_global = \melodic{
+prelude_viola_global = \notes{
        \time 3/4;
        \key f;
        \clef alto;
@@ -27,11 +27,11 @@ prelude_viola_global = \melodic{
        \bar "|.";
 }
 
-prelude_viola_scripts = \melodic{
+prelude_viola_scripts = \notes{
 }
 
 prelude_viola_staff = \type Staff <
-       \melodic \transpose c' \$prelude
+       \notes \transpose c' \$prelude
        \$prelude_viola_global
        \$prelude_viola_scripts
 >

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 f4ba6eaa5fec33f1f1efe663116dc663acbdddc3..e3dbc0f64963a4f239051e74a456226b4fad9ebc 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
@@ -15,11 +15,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "sarabande-urtext.ly";
 
-sarabande_cello_global = \melodic{
+sarabande_cello_global = \notes{
        \time 3/4;
        \key f;
        \clef bass;
@@ -29,7 +29,7 @@ sarabande_cello_global = \melodic{
        \bar ":|";
 }
 
-sarabande_cello_scripts = \melodic{
+sarabande_cello_scripts = \notes{
 }
 
 sarabande_cello_staff = \type Staff <

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly
index cfb4b8e5a88a5ade0624977822dae55a60ee9f16..99e82955f8f3ec1bdd6aeaaf99fab2db6938a378 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly
@@ -15,11 +15,11 @@ copyright =  "public domain";
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "sarabande-urtext.ly";
 
-sarabande_viola_global = \melodic{
+sarabande_viola_global = \notes{
        \time 3/4;
        \key f;
        \clef alto;
@@ -29,11 +29,11 @@ sarabande_viola_global = \melodic{
        \bar ":|";
 }
 
-sarabande_viola_scripts = \melodic{
+sarabande_viola_scripts = \notes{
 }
 
 sarabande_viola_staff = \type Staff <
-       \melodic \transpose c' \$sarabande
+       \notes \transpose c' \$sarabande
        \$sarabande_viola_global
        \$sarabande_viola_scripts
 >

diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly
index 614311e8bc888205b46ac4b5a14f3db17674b896..f6cacd4df46c07ae28cdb728f8179726805f04f9 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue1.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue1.ly
@@ -11,16 +11,16 @@ copyright =  "Public Domain";
 %{
        
 %}
-\version "1.0.2";
+\version "1.0.3";
 
 
 global = 
-       \melodic {
+       \notes {
        \time 4/4;                % should be \time C
        }
        
 tenor =
-       \melodic \relative c' {
+       \notes \relative c' {
        \clef "violin";
 
        \stemdown
@@ -61,7 +61,7 @@ tenor =
 
 
 soprane =
-       \melodic \relative c' {
+       \notes \relative c' {
 
        \stemup
        r1 |
@@ -99,7 +99,7 @@ soprane =
        }
 
 alt =
-       \melodic \relative c {
+       \notes \relative c {
        \clef "bass";
 
        
@@ -139,7 +139,7 @@ alt =
        }
 
 bass =
-       \melodic \relative c {
+       \notes \relative c {
        \clef "bass";
 
 
@@ -180,7 +180,7 @@ bass =
 
        
 \score {
-       \melodic \type GrandStaff < 
+       \notes \type GrandStaff < 
                \type Staff = one <
                        \global 
                        \soprane

diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly
index 49b0dab5b722feba34133c11835cfc489e652e3a..f8df5be8fb5f1ae8293183ba7041a8f8bd95b5de 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -13,18 +13,18 @@
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "nederlands.ly"                 % for correct parsing of note names
 
-global = \melodic {
+global = \notes {
   \time 4/4;
   \keysignature bes es as;
   \skip 1*31;
   \bar "|."; |
 }
   
-dux = \melodic \relative c'' {
+dux = \notes \relative c'' {
   \clef violin;
 
   \stemdown
@@ -72,7 +72,7 @@ dux = \melodic \relative c'' {
 }
 
 
-comes = \melodic \relative c''  {
+comes = \notes \relative c''  {
   \stemup
 
   r1 |
@@ -115,7 +115,7 @@ comes = \melodic \relative c''  {
 }
 
 
-bassdux = \melodic \relative c' {
+bassdux = \notes \relative c' {
   \clef bass;
 
   r1 |

diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly
index de0bfa0fae542cabfd5180843d6c8e681275358b..179e70471b514a53061b5b9345b0eaab4a76736b 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-prelude1.ly
+++ b/mutopia/J.S.Bach/wtk1-prelude1.ly
@@ -8,10 +8,10 @@ enteredby =    "Shay Rojansky";
 copyright =     "Public Domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 global = 
-    \melodic {
+    \notes {
         \time 4/4;                % should be \time C
     }
   
@@ -19,7 +19,7 @@ global =
 % should do programmable input.
 
 soprane =
-    \melodic \transpose c'' {
+    \notes \transpose c'' {
         \clef "violin";
 
        \type Staff <
@@ -78,7 +78,7 @@ soprane =
     }
 
 bass =
-    \melodic {
+    \notes {
         \clef "bass";
 
 
@@ -161,7 +161,7 @@ bass =
 
         
 \score {
-    \melodic \type GrandStaff < 
+    \notes \type GrandStaff < 
                   <
                        \global 
                        \soprane

diff --git a/mutopia/W.A.Mozart/cadenza.ly b/mutopia/W.A.Mozart/cadenza.ly
index 1aa9c48de24c4bd9fdd76a68f5fc70ece9f4b9a7..64eb8eda2207e7c0aa71dd4356e417be6a3e7d5f 100644 (file)
--- a/mutopia/W.A.Mozart/cadenza.ly
+++ b/mutopia/W.A.Mozart/cadenza.ly
@@ -13,10 +13,10 @@ Tested Features: cadenza mode
 Ugh.. Wish we had grace notes....  It adds another dimension to this
 piece of music.  %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 
-cad = \melodic  \relative c' {
+cad = \notes  \relative c' {
        \property Score.instrument = "french horn"
        \type Staff {
        \cadenza 1;
@@ -58,7 +58,7 @@ cad = \melodic  \relative c' {
        c4
        }}
 \score {
-       \melodic { \cad }
+       \notes { \cad }
        \midi { \tempo 4 = 90; }
        \paper {
        }

diff --git a/mutopia/W.A.Mozart/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3.ly
index b8069a47d4d5f9c352f377298476edd568a395a3..2e014d83cfabf381cfd740906b132d9532d319da 100644 (file)
--- a/mutopia/W.A.Mozart/horn-concerto-3.ly
+++ b/mutopia/W.A.Mozart/horn-concerto-3.ly
@@ -9,10 +9,10 @@ copyright =    "public domain";
 }
 
 
-\version "1.0.2";
+\version "1.0.3";
 
 allegro =
-       \melodic
+       \notes
        \relative c'
 {
        \time 4/4;
@@ -147,7 +147,7 @@ allegro =
        
 }
 
-romanze = \melodic \relative c' {
+romanze = \notes \relative c' {
 
        \key F;
        \time 2/2;
@@ -213,7 +213,7 @@ romanze = \melodic \relative c' {
         \bar "|.";
 }
 
-rondotheme = \melodic \relative c' {
+rondotheme = \notes \relative c' {
        [c'8 c c] [c c c]
        c4( cis8 )d r g,
        [d'8 d d] [d d d]
@@ -224,7 +224,7 @@ rondotheme = \melodic \relative c' {
        e4.()d8 r r |
 }
 
-lipbreaker = \melodic \relative c'
+lipbreaker = \notes \relative c'
 {
        r8 [g'-. g-.] [c()e g,-.]
        [c()e g,-.] [c()e g,-.]
@@ -232,7 +232,7 @@ lipbreaker = \melodic \relative c'
        [c c c] [c c c]
 }
 
-rondo = \melodic       \relative c'
+rondo = \notes         \relative c'
 {
        \partial 8;
        g'8 |

diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly
index b3db2ae149884f79b4cc30b57e9c72e05508b85e..cd7a5d0eb1b4370fc77c5a8acb536c3ef42822b3 100644 (file)
--- a/mutopia/gallina.ly
+++ b/mutopia/gallina.ly
@@ -45,9 +45,9 @@ Voice engraver by uncommenting the lines in the paper
 definition below. --MB
 %} 
 
-\version "1.0.2";
+\version "1.0.3";
 
-vi1=\melodic \relative c'' {
+vi1=\notes \relative c'' {
   \time 4/4;
 
   [d8 d d d] d4 [a16 b c a] |
@@ -117,7 +117,7 @@ vi1=\melodic \relative c'' {
   \bar "|.";
 }
 
-vi2=\melodic \relative c'' {
+vi2=\notes \relative c'' {
   \time 4/4;
 
   r1 | r | r | 
@@ -183,7 +183,7 @@ vi2=\melodic \relative c'' {
 }
 
 
-bc=\melodic\transpose c'{
+bc=\notes\transpose c'{
   \clef "bass";
   \time 4/4;
 

diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index 2381e61ca28a86088a1a2280e201f0ec7aec57c2..29bc8a371efb6298acfee0a911fb2516fc9d2ce3 100644 (file)
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -8,7 +8,7 @@ enteredby =      "jcn";
 copyright =     "public domain";
 latexheaders=    "headers";
 } 
-\version "1.0.2";
+\version "1.0.3";
 
 %{
 Silly latex file dropped; use ly2dvi
@@ -27,7 +27,7 @@ Converted to relative octave from los-toros-oboe.ly:
 
 \include "paper16.ly"
 
-hoboonestart = \melodic
+hoboonestart = \notes
   \relative c'{
 % ugh: cant copy: allegro/primo tempo
        \property Voice . textstyle =  "large"
@@ -35,7 +35,7 @@ hoboonestart = \melodic
        \property Voice . textstyle =  "italic"
 }
 
-hobooneintro = \melodic  \relative c'{
+hobooneintro = \notes  \relative c'{
 
 %      \property Voice . textstyle =  "roman"
 %      [es''16-.-"Allegro" es-. es-. es-.] [es8-. d-.] |
@@ -60,7 +60,7 @@ hobooneintro = \melodic  \relative c'{
        [)g8  r d'] r |
 }
 
-hoboonemid = \melodic  \relative c'{
+hoboonemid = \notes    \relative c'{
 
        [g'16-. g-. g-. g-.] [g8-. f-.] |
        as2-> |
@@ -151,7 +151,7 @@ hoboonemid = \melodic       \relative c'{
 }
 
 
-hoboonesecondstart = \melodic   \relative c'{
+hoboonesecondstart = \notes   \relative c'{
 
 % ugh: cant copy: allegro/primo tempo
        \property Voice . textstyle =  "large"
@@ -160,7 +160,7 @@ hoboonesecondstart = \melodic   \relative c'{
        
 }
        
-hoboonelast = \melodic   \relative c'{
+hoboonelast = \notes   \relative c'{
        % could transpose/copy from measure 19...
        [d''16-.\p  d-. d-. d-.] [d8-. c-.] |
        es2-> |
@@ -272,7 +272,7 @@ hoboonelast = \melodic   \relative c'{
        g8-. r r4 |
 }
 
-hoboone = \melodic {
+hoboone = \notes {
        \hoboonestart
        \hobooneintro
        \hoboonemid
@@ -281,7 +281,7 @@ hoboone = \melodic {
        \hoboonelast
 }
 
-global = \melodic{
+global = \notes{
        \key es;
        \time 2/4;
        \skip 4*110;

diff --git a/mutopia/standchen-16.ly b/mutopia/standchen-16.ly
index 36799f37f342ddf0a095d91ec6f4ccbea5c6bfa4..1525accfd8ee9edce4468e9d0c98b87cdc25a1f1 100644 (file)
--- a/mutopia/standchen-16.ly
+++ b/mutopia/standchen-16.ly
@@ -9,6 +9,6 @@ description = "A schubert song in 16 pt";
 copyright =     "public domain";
 } 
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "standchen.ly"

diff --git a/mutopia/standchen-20.ly b/mutopia/standchen-20.ly
index fa1f7219b048e81dcf15fe07f52bc843b3b8e8d8..4ffffeaae86dfe47085b72fd67064e9f65c1e7e1 100644 (file)
--- a/mutopia/standchen-20.ly
+++ b/mutopia/standchen-20.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 description = "A schubert song in 20 pt";
 } 
 
-\version "1.0.2";
+\version "1.0.3";
 
 % fool make-website
 % \include "standchen.ly";

diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly
index 3ceec46169dc24ea980c2f16a811163c40c12793..fdd3ee056e06701c9ebd88b6c2d7b3d2dfe0c44e 100644 (file)
--- a/mutopia/standchen.ly
+++ b/mutopia/standchen.ly
@@ -16,9 +16,9 @@ multiple \paper{}s in one \score
 Note: Original key F.
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
-$vocal_verse1 = \melodic\relative c{
+$vocal_verse1 = \notes\relative c{
        % ugh: treble/bass
 %      \clef treble;
 %      \clef violin;
@@ -58,7 +58,7 @@ $vocal_verse1 = \melodic\relative c{
        c!2. |
 }
 
-$vocal_through = \melodic\relative c{
+$vocal_through = \notes\relative c{
        \property Voice.dynamicdir=1
        g''8. g16 b8. b16 d8. d16 |
        c4 b r |
@@ -166,7 +166,7 @@ $lyric_through = \lyric{
        mich!2 _4 |
 }
 
-$treble_intro = \melodic\relative c{
+$treble_intro = \notes\relative c{
        \clef violin;
        % ugh: id like to type this!
        %r8\pp [<g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.>] |
@@ -177,7 +177,7 @@ $treble_intro = \melodic\relative c{
        \break
 }
 
-$treble_verse1 = \melodic\relative c{
+$treble_verse1 = \notes\relative c{
 %      \clef violin;
        %5
        r8 <[g' c> <c es> <g c> <c es> <g c]> |
@@ -210,7 +210,7 @@ $treble_verse1 = \melodic\relative c{
        <{[/3 f'8\f( e f]1/1 a4.-> )f8 } {\[/3 f' e f \]/1 a4. f8 } > |
 }
 
-$treble_eentje = \melodic\relative c'{
+$treble_eentje = \notes\relative c'{
        <e2 e'> <e4 g>|
        <f2\mf as!(> <[as8.->( c> <)f16 )as]> |
        <e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
@@ -223,7 +223,7 @@ $treble_eentje = \melodic\relative c'{
        <e2. g> |
 }
 
-$treble_through = \melodic\relative c'{
+$treble_through = \notes\relative c'{
        <e2. e'> |
        %61
        R2. |
@@ -271,7 +271,7 @@ $treble_through = \melodic\relative c'{
        <g2.-\fermata e' g> |
 }
 
-$bass_intro = \melodic\relative c{
+$bass_intro = \notes\relative c{
        \clef bass;
        \property Voice.dynamicdir=1
 %1
@@ -281,7 +281,7 @@ $bass_intro = \melodic\relative c{
        <g2 g'> r4 |
 }
 
-$bass_verse1 = \melodic\relative c{
+$bass_verse1 = \notes\relative c{
 %      \clef bass;
        \property Voice.dynamicdir=1
 %5
@@ -313,7 +313,7 @@ $bass_verse1 = \melodic\relative c{
        c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
 }
 
-$bass_eentje = \melodic\relative c{
+$bass_eentje = \notes\relative c{
        \property Voice.dynamicdir=1
        <c,8 c'> <[c' f as!> <f as c> <c f as> <f as c> <c f as]> |
        c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
@@ -325,7 +325,7 @@ $bass_eentje = \melodic\relative c{
        c,8 <[e' g> <g c> <e g> <g c> <e g]> |
 }
 
-$bass_through = \melodic\relative c{
+$bass_through = \notes\relative c{
        \property Voice.dynamicdir=1
        %61
        <g,8^"cresc." g'> <[g' b d> <b d f> <g b d> <as!-> b-> d->> <b d f]> |
@@ -359,7 +359,7 @@ $bass_through = \melodic\relative c{
        <c,2._\fermata g' c> |
 }
                
-global = \melodic{
+global = \notes{
        \time 3/4; 
        \key es;
        \skip 4 * 12;
@@ -392,7 +392,7 @@ $lyric_staff = \type Lyrics = lyric<
        \$lyrics
 >
                
-vocals = \melodic{
+vocals = \notes{
        \property Voice.dynamicdir=UP
        \skip 4 * 12; 
        \$vocal_verse1 
@@ -444,9 +444,9 @@ $grand_staff = \type GrandStaff<
        % To get original, \transpose d'
        % \transpose a gives a' to d'' (for basses, who sing an octave down)
        <
-               { \melodic \transpose a { \$vocal_staff } }
+               { \notes \transpose a { \$vocal_staff } }
                \$lyric_staff
-               { \melodic \transpose a { \$grand_staff } }
+               { \notes \transpose a { \$grand_staff } }
        >
        \include "score-paper.ly";
        \midi{

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index f0792639b284ed79f9c58399f15af8155aee79f6..4fa4ecdffb14df7aa4d1924241e0e4e05c209287 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -17,7 +17,6 @@ program_name = 'convert-mudela'
 version = '0.2'
 
 
-
 import os
 import sys
 import __main__
@@ -181,6 +180,17 @@ if 1:
        
        conversions.append ((1,0,2), conv, '\header { key = concat + with + operator }\n')
 
+if 1:
+       def conv(lines):
+               newlines =[]
+               for x in lines:
+                       x =  regsub.gsub ('\\\\melodic', '\\\\notes',x)
+                       newlines.append (x)
+               return newlines
+       
+       conversions.append ((1,0,3), conv, '\melodic -> \notes\n')
+
+
 ############################
 
 def get_conversions (from_version, to_version):
@@ -219,6 +229,7 @@ class UnknownVersion:
        pass
 
 def do_one_file (infile_name):
+       sys.stderr.write ('Processing `%s\' ... '% infile_name)
        outfile_name = ''
        if __main__.edit:
                outfile_name = infile_name + '.NEW'