lilypond-0.1.44

diff --git a/bin/convert-mudela.pl b/bin/convert-mudela.pl
index e10af3b07777d4ee4aef28f0b155abc1d594b434..06578f3157fe4dfd2f3ede34960a8eeae71ac9f6 100644 (file)
--- a/bin/convert-mudela.pl
+++ b/bin/convert-mudela.pl
@@ -159,6 +159,12 @@ sub convert_0_1_7_to_0_1_8
     s/\\plet *([1-9][0-9]*) *\/ *([2-9][0-9]*) *;/\\[$1\/$2/;    
 }  
 
+sub convert_0_1_8_to_0_1_9
+{
+# sticky plet shorthand...
+#  print "introduced plet and finger shorthands...\n";
+}
+
 ###############################################################
 
 sub    last_conversion
@@ -207,6 +213,7 @@ my %minor_conversions = ("0.0.50" => \&no_conv,
                         "0.1.6" => \&convert_0_1_5_to_0_1_6
                         ,"0.1.7" => \&convert_0_1_6_to_0_1_7
                         ,"0.1.8" => \&convert_0_1_7_to_0_1_8
+                        ,"0.1.9" => \&convert_0_1_8_to_0_1_9
                         );
 
  

diff --git a/init/lily-init.ly b/init/lily-init.ly
index 97c252cbd925a42dfa25e6770c03f2a9fe20c88b..c609918c57c42a3227e97c2049bf8b160cbebf3b 100644 (file)
--- a/init/lily-init.ly
+++ b/init/lily-init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "0.1.8";
+\version "0.1.9";
   
 breve = \duration { -1 0 }
 longa = \duration { -2 0 }

diff --git a/input/beams.ly b/input/beams.ly
index e821fb164bed6d4ef45670f5ecf29fc97374e4e5..953bd7c02ab8914d2a4a2e923a9a562f1ff47b6f 100644 (file)
--- a/input/beams.ly
+++ b/input/beams.ly
@@ -7,7 +7,7 @@ copyright =      "PD";
 
 TestedFeatures =        "beams and beamflags";
 }
-\version "0.1.8";
+\version "0.1.9";
 
 \score{
        \melodic { \multi 3 < 

diff --git a/input/cadenza.ly b/input/cadenza.ly
index a4e49199f6eb8ed1af2860556862848403d7b245..e05e2b6ad8ed4b46202597e2dfe82f96aa834b3e 100644 (file)
--- a/input/cadenza.ly
+++ b/input/cadenza.ly
@@ -13,7 +13,7 @@ Tested Features: cadenza mode
 Ugh.. Wish we had grace notes....  It adds another dimension to this
 piece of music.  %}
 
-\version "0.1.8";
+\version "0.1.9";
 
 
 cad = \melodic  {

diff --git a/input/collisions.ly b/input/collisions.ly
index ac8d5db146d2f44b95bcdf71d0f0c180d192c2f1..475f2e238b2019ad4676120b206072426d58eedd 100644 (file)
--- a/input/collisions.ly
+++ b/input/collisions.ly
@@ -5,7 +5,7 @@ enteredby =      "HWN,JCN";
 copyright =     "public domain";
 Tested =        "test the Collision resolution ";
 }
-\version "0.1.8";
+\version "0.1.9";
 
 
 

diff --git a/input/font-body.ly b/input/font-body.ly
index a7dd41d9647e09a09cc729b4986ca50cbaf34a41..cd6938ef44913e700cb3f70266864102a3233991 100644 (file)
--- a/input/font-body.ly
+++ b/input/font-body.ly
@@ -1,4 +1,4 @@
-\version "0.1.8";
+\version "0.1.9";
 FontBody=      \melodic{ 
                \octave c';
                \bar "|:";

diff --git a/input/font.ly b/input/font.ly
index c683dc73627df09497f56fe64ee003c12c3e4de1..0e92c3145d471483e8d24ea66caf6154c4b805ca 100644 (file)
--- a/input/font.ly
+++ b/input/font.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.8";
+\version "0.1.9";
 
 \include "font-body.ly"
 \score{

diff --git a/input/font16.ly b/input/font16.ly
index d836e27edb6b6315677435c93068b25eeb031704..9ba966fdf2b476cd4c16497a9de0a4864c89a600 100644 (file)
--- a/input/font16.ly
+++ b/input/font16.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.8";
+\version "0.1.9";
 \include "font-body.ly"
 
 \score{

diff --git a/input/gourlay.ly b/input/gourlay.ly
index 26542f3b700120a3a934c0ad96654780d1bfe093..4d66ace0dd953ce1ea9474ecf7c3881d3bd88052 100644 (file)
--- a/input/gourlay.ly
+++ b/input/gourlay.ly
@@ -4,7 +4,7 @@ copyright =      "PD";
 TestedFeatures =        "This file tests some nasty Gourlay spacings";
 }
 
-\version "0.1.8";
+\version "0.1.9";
 
 %{
 

diff --git a/input/keys.ly b/input/keys.ly
index 67ee8f5a91b8aa10f8dc4e02dde2a879f09f9700..fc17241fbd4d4ef6012acafbad6a1ce664a40e82 100644 (file)
--- a/input/keys.ly
+++ b/input/keys.ly
@@ -1,4 +1,4 @@
-\version "0.1.8";
+\version "0.1.9";
 
 
 blah = \melodic{

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index 25ed78778436ac91303bc754af4acff3dd66a5a5..f011d7bf27b6575fb513516661f965021935c689 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -11,7 +11,7 @@ copyright =    "public domain";
 Tested Features: example file with comments
 
 %}
-\version "0.1.8";
+\version "0.1.9";
 
 
 % the % is a comment.

diff --git a/input/pedal.ly b/input/pedal.ly
index d2a9c01c2a20b8122fe9b9a869054235e80eb99d..d82a03e7102d027e36a5ce2b22ff0b6214fe2882 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.8";
+\version "0.1.9";
 
 \score{
                \melodic {

diff --git a/input/rhythm.ly b/input/rhythm.ly
index 11569bf0f140dccab510806b9d298ab969502718..5b5289306ac1a32a5dd0dec0a431dfb26d9e6436 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -7,7 +7,7 @@ TestedFeatures =         "multiple meters, beaming, unsynced bars, userdefd engravers";
 
 
 
-\version "0.1.8";
+\version "0.1.9";
 
 ritme = \melodic{ %\octave ;
        \partial 8;

diff --git a/input/scales.ly b/input/scales.ly
index 3e715106f91fe67a3ff8e5693c02e999802d18bc..793e2205859eeb09a4d6e62ac820a0241053d39c 100644 (file)
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -12,7 +12,7 @@ copyright =    "public domain";
 % scales with accents.
 %
 
-\version "0.1.8";
+\version "0.1.9";
 blah =         \melodic {
                \meter 6/8;     
                \octave  'c ;

diff --git a/input/scripts.ly b/input/scripts.ly
index 7198bc1b83bba16e8f0dc02bcf88e806d0ced6bb..7e9bc76163462f9962ff925d0b88120f2d5ca77e 100644 (file)
--- a/input/scripts.ly
+++ b/input/scripts.ly
@@ -1,5 +1,5 @@
        
-\version "0.1.8";
+\version "0.1.9";
 
 
 blah =         \melodic {

diff --git a/input/sleur.ly b/input/sleur.ly
index d6e30d3b2ff7a67d678ae74423018abfd99c6bd1..1226a9b7c05e1dbfeec74874c94d8a8ac6bd09b1 100644 (file)
--- a/input/sleur.ly
+++ b/input/sleur.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.8";
+\version "0.1.9";
 
 shortlong = \melodic{
        c4()c( c c  |

diff --git a/input/slurs.ly b/input/slurs.ly
index ef66c1e9e8fe22cc1181a6054bdf42ce1aaa6693..3d45dea955525af4d161e5f77b68b8bcea8d3085 100644 (file)
--- a/input/slurs.ly
+++ b/input/slurs.ly
@@ -1,5 +1,5 @@
 
-\version "0.1.8";
+\version "0.1.9";
 
 \score{
        \melodic{\octave c';

diff --git a/input/spacing.ly b/input/spacing.ly
index f92428fbcfaf42c7b7e06fd23c0645982d116178..9da213e905acfff0fd016b4cddbc762f6bd0ae1b 100644 (file)
--- a/input/spacing.ly
+++ b/input/spacing.ly
@@ -6,7 +6,7 @@ copyright =      "public domain";
 TestedFeatures =        "This file tests various spacings";
 }
 
-\version "0.1.8";
+\version "0.1.9";
 
 multipart = \melodic{ 
     \multi 3 < 

diff --git a/input/stem.ly b/input/stem.ly
index ee58946ea120af104d61d52b86fd7983012f1fc2..7bf1a4f42fdf8962303474ee2cd381289bfa8205 100644 (file)
--- a/input/stem.ly
+++ b/input/stem.ly
@@ -8,7 +8,7 @@ of beams";
        
 }
 
-\version "0.1.8";
+\version "0.1.9";
 
 beamintervals = \melodic{
                \meter 7/4;

diff --git a/input/toccata-fuga-E.ly b/input/toccata-fuga-E.ly
index 124d0e385590b961741581166c936f9855adaac2..1c5c9c42c3e0447b2ff0bb56949ff489c7bc1461 100644 (file)
--- a/input/toccata-fuga-E.ly
+++ b/input/toccata-fuga-E.ly
@@ -20,7 +20,7 @@ copyright =    "public domain";
 %}
 
 
-\version "0.1.8";
+\version "0.1.9";
 
 toccata_commands = \melodic{
        \meter 4/4;

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 4d11d3a6e2e980f522586635e9425d3c9e700532..0984052f5308ac5b654a00ee4df41827cd3fded1 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -12,7 +12,7 @@ copyright =    "public domain";
 Tested Features                lyrics and chords
 %}
 
-\version "0.1.8";
+\version "0.1.9";
 
 melodie = \melodic {
         \clef"violin";

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 050bfda51830a9ff9fcb24fecb64c5ba490e4df4..2575f80979a571616cc41cd093308a06fde0af36 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
 Tested Features: lyrics, interleaving lyrics and staffs
 %}
 
-\version "0.1.8";
+\version "0.1.9";
 
 melody = \melodic{
        \clef violin;

diff --git a/lily/lexer.l b/lily/lexer.l
index ab97828bc16aa720d4f8b27a8e0dbb7a60b6a866..c7df7be95ebf466b81bc027c7dd06418b72f07a7 100644 (file)
--- a/lily/lexer.l
+++ b/lily/lexer.l
@@ -73,7 +73,9 @@ NATIONAL  [\001-\006\021-\027\031\036\200-\377]
 TEX            {AA}|-|{PUNCT}|{ACCENT}|{NATIONAL}
 WORD           {A}{AN}*
 ALPHAWORD      {A}+
-INT            -?{N}+
+DIGIT          {N}
+UNSIGNED       {N}+
+INT            -?{UNSIGNED}
 REAL           ({INT}\.{N}*)|(-?\.{N}+)
 KEYWORD                \\{WORD}
 WHITE          [ \n\t\f]
@@ -188,9 +190,14 @@ TELP               \\\]
                return scan_escaped_word (YYText ()+1);
        }
 
-       {INT}           {
+       {DIGIT}         {
                yylval.i = String_convert::dec2_i (String (YYText ()));
-               return INT;
+               return DIGIT;
+       }
+
+       {UNSIGNED}              {
+               yylval.i = String_convert::dec2_i (String (YYText ()));
+               return UNSIGNED;
        }
 
        \" {
@@ -223,9 +230,9 @@ TELP                \\\]
        \" {
                start_quote ();
        }
-       {INT}           {
+       {UNSIGNED}              {
                yylval.i = String_convert::dec2_i (String (YYText ()));
-               return INT;
+               return UNSIGNED;
        }
        {NOTECOMMAND}   {
                return scan_escaped_word (YYText ()+1);
@@ -272,9 +279,9 @@ TELP                \\\]
        return REAL;
 }
 
-{INT}  {
+{UNSIGNED}     {
        yylval.i = String_convert::dec2_i (String (YYText ()));
-       return INT;
+       return UNSIGNED;
 }
 
 [{}]   {

diff --git a/mi2mu/mudela-item.cc b/mi2mu/mudela-item.cc
index a7feee56dd2dd8b70c62b4dca7801722ec635ea0..136e03a7d69e0bcda710f368107a84f222754aaa 100644 (file)
--- a/mi2mu/mudela-item.cc
+++ b/mi2mu/mudela-item.cc
@@ -192,10 +192,10 @@ Mudela_note::str ()
     = mudela_column_l_->mudela_score_l_->mudela_key_l_->notename_str (pitch_i_);
 
   if (simple_plet_b_s)
-       return name_str + Duration_convert::dur2_str (dur) + " ";
+    return name_str + Duration_convert::dur2_str (dur) + " ";
 
-  //ugh
   String str;
+  //ugh
   if (dur.plet_b ())
        str += String ("\\[")
            + String_convert::i2dec_str (dur.plet_.iso_i_, 0, 0)

diff --git a/mi2mu/mudela-staff.cc b/mi2mu/mudela-staff.cc
index 86972df41b19a6e74466da2a64d0a57e64b291e4..8507335f9dea1d5c663869610af3e9c70eee2f90 100644 (file)
--- a/mi2mu/mudela-staff.cc
+++ b/mi2mu/mudela-staff.cc
@@ -100,6 +100,8 @@ Mudela_staff::output (Mudela_stream& mudela_stream_r)
   mudela_stream_r << _("% midi copyright:") << copyright_str_ << "\n";
   mudela_stream_r << _("% instrument:") << instrument_str_ << "\n";
 
+  // don't use last duration mode
+  mudela_stream_r << "\\duration 4;\n";
   if  (mudela_voice_p_list_.size() == 1)
     mudela_voice_p_list_.top()->output (mudela_stream_r);
   else

diff --git a/mi2mu/mudela-stream.cc b/mi2mu/mudela-stream.cc
index 02e4858a44fd04f82e746d8f1431f7c29a3b3c78..d54b9cea57bcabb1d6ef22e681a9a196bab57df5 100644 (file)
--- a/mi2mu/mudela-stream.cc
+++ b/mi2mu/mudela-stream.cc
@@ -81,7 +81,7 @@ Mudela_stream::header()
   *os_p_ << filename_str_g;
   *os_p_ << "\n\n";
   // ugh
-  *os_p_ << "\\version \"0.1.8\";\n";
+  *os_p_ << "\\version \"0.1.9\";\n";
 }
 
 void