lilypond-0.0.51

diff --git a/input/scales.ly b/input/scales.ly
index 727b458d5afb3417255805c8e70986240a978df5..966cfbb3b39204b2879809ec3c5084b47a307c12 100644 (file)
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -13,7 +13,7 @@ blah = \staff{  melodicregs
                        c d 
                \clef "violin" ;
                \octave  c' ;
-                       c d
+               < \transpose { d { e f } } >
                \octave  c'' ;
                        c d 
                \duration  8 ;
@@ -22,11 +22,14 @@ blah = \staff{  melodicregs
                \octave  c' ;
                 |[ a  a a a a a a a \! a ]6/9 
                \octave  c'' ; 
-                [ 'c 'g d a e' b' f'' c''' g''' ]6/9
-                [ g''' c''' f'' b' e' a d 'g 'c ]6/9
+                ['c->-.-\fermata \< 'g->-.-\fermata d->-.-\fermata a->-.-\fermata
+               e'->-.-\fermata b'-. f''-. c'''->-.-\fermata \! g'''->-.-\fermata \> ]6/9
+                [g'''->-.-\fermata c'''->-.-\fermata f''->-.-\fermata b'->-.-\fermata e'->-.-\fermata a->-.-\fermata d->-.-\fermata 'g->-.-\fermata \! 'c->-.-\fermata ]6/9
+                \octave c;
+               ['c->-.-\fermata \< 'g->-.-\fermata d->-.-\fermata a->-.-\fermata
+               e'->-.-\fermata b'-. f''-. c'''->-.-\fermata \! g'''->-.-\fermata \> ]6/9
+                [g'''->-.-\fermata c'''->-.-\fermata f''->-.-\fermata b'->-.-\fermata e'->-.-\fermata a->-.-\fermata d->-.-\fermata 'g->-.-\fermata \! 'c->-.-\fermata ]6/9
                \octave  c' ;
-                [ 'c 'g d a e' b' f'' c''' g''' ]6/9
-                [ g''' c''' f'' b' e' a d 'g 'c ]6/9
                \octave  c' ;   
                 [ c g d' ]2/3 
                 [ d' g c ]2/3  

diff --git a/lily/.version b/lily/.version
index 93a395e794f370e7bb7d89b9868b950b7808a2f0..9515322b97ba45316d7ad9e296968a4be8407267 100644 (file)
--- a/lily/.version
+++ b/lily/.version
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
-PATCH_LEVEL = 49
+PATCH_LEVEL = 51
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf
 

diff --git a/lily/lexer.l b/lily/lexer.l
index cdb62a8717fdde6e83e7c20867bae24c3fefdfc2..81dc336101ac2617f1568007023f3d2751a46a84 100644 (file)
--- a/lily/lexer.l
+++ b/lily/lexer.l
@@ -50,7 +50,7 @@ TEX           {AA}|-|{PUNCT}|{ACCENT}|{NATIONAL}
 WORD           {A}{AN}*
 ALPHAWORD      {A}+
 INT            -?{N}+
-REAL           {INT}?(\.{N}*)?
+REAL           {INT}?(\.{N}+)?
 KEYWORD                \\{WORD}
 WHITE          [ \n\t\f]
 BLACK          [^ \n\t\f]

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 1ba4fd7801d1306efb1d05b8969528fa5198b736..e9793572e7c5fa85a912c60638f730c14730f127 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -106,13 +106,18 @@ Melodic_req::Melodic_req()
 void
 Melodic_req::transpose(Melodic_req const & delta)
 {
+    int old_pitch = pitch();
+    int delta_pitch = delta.pitch();
     octave_i_ += delta.octave_i_;
     notename_i_ += delta.notename_i_;
     while  (notename_i_ >= 7 ) {
        notename_i_ -= 7;
        octave_i_ ++;
     }
-    accidental_i_ += delta.accidental_i_;
+    int new_pitch = pitch();
+    int delta_acc = new_pitch - old_pitch - delta_pitch;
+    
+    accidental_i_ -= delta_acc;
     if (abs(accidental_i_) > 2) {
        delta.warning("transposition makes accidental larger than 2");
     }