From: fred <fred>
Date: Sun, 24 Mar 2002 19:39:18 +0000 (+0000)
Subject: lilypond-0.0.51
X-Git-Tag: release/1.5.59~4957
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=28071f6b815738fcc1a3e7b2368f6ce2e41d3de3;p=lilypond.git

lilypond-0.0.51
---

diff --git a/input/scales.ly b/input/scales.ly
index 727b458d5a..966cfbb3b3 100644
--- 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 93a395e794..9515322b97 100644
--- 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 cdb62a8717..81dc336101 100644
--- 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 1ba4fd7801..e9793572e7 100644
--- 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");
     }