lilypond-0.1.7

diff --git a/bin/convert-mudela.in b/bin/convert-mudela.in
index f1b640c0aecba48105c1070f305f596c9e9773e3..bad1df51ec2d9ed9b92d89d974f37f022c51c1bf 100644 (file)
--- a/bin/convert-mudela.in
+++ b/bin/convert-mudela.in
@@ -1,4 +1,5 @@
 #!@PERL@ -w
+# -*-perl-*-
 
 =head1 TODO
 
@@ -105,6 +106,10 @@ sub convert_0_0_60_to_0_0_61
    
 }
 
+sub convert_0_1_0_to_0_1_1
+{
+    s/\\tempo (.*):(.*);/\\tempo $1 = $2;/g
+}
 ###############################################################
 
 sub    last_conversion
@@ -144,19 +149,22 @@ my %minor_conversions = ("0.0.50" => \&no_conv,
                         "0.0.58" => \&convert_0_0_57_to_0_0_58,
                         "0.0.59" => \&convert_0_0_58_to_0_0_59,
                         "0.0.60" => \&convert_0_0_59_to_0_0_60,
-                        "0.0.61" => \&convert_0_0_60_to_0_0_61
+                        "0.0.61" => \&convert_0_0_60_to_0_0_61,
+                        "0.1.1" => \&convert_0_1_0_to_0_1_1
                         );
  
 
 sub versions 
 {
-    return (sort keys %minor_conversions);
+    return (sort { cmpver; } (keys %minor_conversions));
 }
     
 
-sub    show_rules
+sub show_rules
 {
-    print "Rules: ", join(", ", sort keys %minor_conversions), "\n";
+    my (@v) = versions;
+
+    print "Rules: ", join(", ", @v), "\n";
     
 }
 
@@ -167,7 +175,6 @@ sub do_conversion
     my @applicable_conversion;
     my @mudela_levels;
     
-#    die "This is too old  to convert " if $from < 50;
     my @v = versions;
     foreach $ver (@v) {
        if (version_compare($ver, $from) > 0 && version_compare($ver,$to) <= 0 ){ 

diff --git a/init/midi.ly b/init/midi.ly
index 0ee376eac48cf3d78222c2325f5a7ee07e2a84e1..95602c32357c2060ea402cf29472900568022472 100644 (file)
--- a/init/midi.ly
+++ b/init/midi.ly
@@ -1,6 +1,6 @@
 
 \include "performer.ly"
 default_midi = \midi {
-        \tempo 4:60;
+        \tempo 4=60;
        \requesttranslator{ \default_midi_perf }
 }

diff --git a/input/collisions.ly b/input/collisions.ly
index d281dc0e74e73d347401279112c09dcd5824dd00..2a9505752b4b56ec4601028b320c4f7299f8a9ea 100644 (file)
--- a/input/collisions.ly
+++ b/input/collisions.ly
@@ -10,7 +10,7 @@
  Tested Features:test the Collision resolution 
 EndMudelaHeader
 %}
-\version "0.1.0";
+\version "0.1.1";
 
 
 

diff --git a/input/coriolan-alto.ly b/input/coriolan-alto.ly
index ac772fdf9f9c1eb5bd404dc39ac2faf24a317d89..8dc5c69796ddf8eb7a73906d725bd38cf784eeaa 100644 (file)
--- a/input/coriolan-alto.ly
+++ b/input/coriolan-alto.ly
@@ -17,7 +17,7 @@ EndMudelaHeader
 % (maybe even sooner :-)
 %
 
-\version "0.0.58";
+\version "0.1.1";
 
 alto = \melodic{ 
        

diff --git a/input/keys.ly b/input/keys.ly
index 45237a2d7e3a21a1cdee781ce47b361f9a24054a..5d79a702234766c00162a59cfe905d977d728dba 100644 (file)
--- a/input/keys.ly
+++ b/input/keys.ly
@@ -10,7 +10,7 @@
  Tested Features: local key, key, forced accidentals
 EndMudelaHeader
 %}
-\version "0.1.0";
+\version "0.1.1";
 
 
 blah = \melodic{

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index 0ba3de2f7806dee3b6f480924ee4398e332650d9..6f0451ef6fe8c57e7bbe8a28c8c03afd01c16f86 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -5,12 +5,12 @@
  description:  bare bones version. (written down from memory :-)
  composers: Mozart, KV 265
  entered-by: HWN
- copyright: none
+ copyright: PD
 
  Tested Features: example file with comments
 EndMudelaHeader
 %}
-\version "0.1.0";
+\version "0.1.1";
 
 
 % the % is a comment.

diff --git a/input/multi.ly b/input/multi.ly
index 141d191a9e222360293d69a50fab69b73f3ba9cf..90ce751c7a8ffa439c5412efc8a398c3349b8867 100644 (file)
--- a/input/multi.ly
+++ b/input/multi.ly
@@ -12,7 +12,7 @@ EndMudelaHeader
 %}
 
 
-\version "0.1.0";
+\version "0.1.1";
 
 \score{
        \melodic 

diff --git a/input/pedal.ly b/input/pedal.ly
index da3290ec4440a7564a6aea41d9c6e3eb1e8120e0..76ef37688453084b90352867f0e480e76859a25d 100644 (file)
--- a/input/pedal.ly
+++ b/input/pedal.ly
@@ -24,7 +24,7 @@
 % \lbheel \lbheel \lfheel \lftoe
 % \rbheel \rbtoe \rfheel \rftoe
 
-\version "0.1.0";
+\version "0.1.1";
 
 \score{
                \melodic {

diff --git a/input/rhythm.ly b/input/rhythm.ly
index a321ca34a74da7cf90e4a9a3a62f1c859e717f9d..a2ab5383812bf7973ee8fe75d586d9e642d51cfa 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -14,7 +14,7 @@ EndMudelaHeader
 
 
 
-\version "0.1.0";
+\version "0.1.1";
 
 ritme = \melodic{ %\octave ;
        \partial 8;

diff --git a/input/scales.ly b/input/scales.ly
index 0e30979237f5500fbc243a5b9df611b2862ef9dc..f69bc1b650a9ee20adecd659a3fee9ad2bfd8144 100644 (file)
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -15,7 +15,7 @@ EndMudelaHeader
 % scales with accents.
 %
 
-\version "0.1.0";
+\version "0.1.1";
 blah =         \melodic {
                \meter 6/8;     
                \octave  'c ;

diff --git a/input/scripts.ly b/input/scripts.ly
index 51d8a9093f7b4997aa4923aed5c462dabcf36cfc..8e005edee9355bc089ca321d8824099b3548cffd 100644 (file)
--- a/input/scripts.ly
+++ b/input/scripts.ly
@@ -10,7 +10,7 @@
  Tested Features: scripts, text.
 EndMudelaHeader
 %}
-\version "0.1.0";
+\version "0.1.1";
 
 
 blah =         \melodic {

diff --git a/input/slurs.ly b/input/slurs.ly
index 87223a1b04b950b1c2c5d5e0f17e7520f4f6fd39..b49616ff9e3109e641b160267cfcf446f79669c8 100644 (file)
--- a/input/slurs.ly
+++ b/input/slurs.ly
@@ -5,13 +5,13 @@
  description: 
  composer(s): HWN
  entered-by: HWN
- copyright: GPL
+ copyright: PD
 
  Tested Features: test slurs and ties
 EndMudelaHeader
 %}
 
-\version "0.1.0";
+\version "0.1.1";
 
 \score{
        \melodic{\octave c';

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
new file mode 100644 (file)
index 0000000..41561e6
--- /dev/null
+++ b/input/twinkle-pop.ly
@@ -0,0 +1,47 @@
+%{MudelaHeader
+
+ filename: twinkle.ly
+ title: Ah, vous dirais-je, maman 
+ description: twinkle twinkle in pop-song-settings
+ composers: traditional
+
+ entered-by: HWN, chords by Johan Vromans
+ copyright: public domain
+
+ Tested Features: lyrics and chords
+EndMudelaHeader
+%}
+
+\version "0.1.1";
+
+melodie = \melodic {
+        \clef"violin";
+        \meter 2/4 ;
+        \octave  c';
+
+        c4^"C" c |      g     g |       a^"F"  a |      g2^"C"   |
+        f4^"F" f |      e^"C" e |       d^"G7" d |      c2^"C"   |
+        g4^"G" g |      f^"F" f |       e^"C"  e |      d^"G7" d |
+        g^"G"  g |      f^"F" f |       e^"C"  e |      d^"G7" d |
+        c4^"C" c |      g     g |       a^"F"  a |      g2^"C"   |
+        f4^"F" f |      e^"C" e |       d^"G7" d |      c2^"C"   |
+}
+
+texte = \lyric{ 
+         
+        \textstyle "italic";
+        Ah!4 vous dir- ai_- je ma man2
+        Ce4 qui cau- se mon tour- ment2
+        Pa-4 pa veut que je rai- so- nne
+        Comme4 un- e grand- e per- so- nne
+        Moi4 je dis que les bon- bons2
+        Val-4 ent mieux que la rai- son2
+        
+}
+
+\score {
+        <  \melodic <  \id "Piano" "";  \melodie >
+           \lyric   < \id "Lyric" "";  \texte >
+        >
+        \paper { unitspace= 2.5\cm; }
+}