From: fred <fred>
Date: Mon, 2 Dec 1996 00:01:44 +0000 (+0000)
Subject: lilypond-0.0.13
X-Git-Tag: release/1.5.59~6703
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=858e231e91a40c8fd0ef972745c3a724ac26fcd0;p=lilypond.git

lilypond-0.0.13
---

diff --git a/src/note.cc b/src/note.cc
index 1c1a4cb571..f5911c0eda 100644
--- a/src/note.cc
+++ b/src/note.cc
@@ -34,16 +34,11 @@ parse_duration(const char *a, int &j, int &intdur, int &dots)
 }
 
 
-
-void 
-parse_pitch( const char *a, int &j, int &oct, bool & overide_acc,
-	     int & large, int & small)
-{
-    // octave
-    oct =default_octave;
-    
+void
+parse_octave (const char *a, int &j, int &oct)
+{    
     while (1) 
-	{	
+    {	
 	if (a[j] == '\'')
 	    oct ++;
 	else if (a[j] == '`')
@@ -51,10 +46,18 @@ parse_pitch( const char *a, int &j, int &oct, bool & overide_acc,
 	else
 	    break;
 	j++;
-	
-	}
+    }
+}
+
+void 
+parse_pitch( const char *a, int &j, int &oct, bool & overide_acc,
+	     int & large, int & small)
+{
+    // octave
+    oct =default_octave;
+    parse_octave(a,j,oct);
 
-	mtor << "oct " << oct;
+    mtor << "oct " << oct;
 	
     // accidental
     overide_acc = false;
@@ -152,9 +155,8 @@ void
 set_default_pitch(String d)
 {
     int i=0;
-    bool b;
-    int l,s;
-    parse_pitch(d, i, default_octave, b, l,s);
+    default_octave=0;
+    parse_octave(d, i, default_octave);
 }
 
 Request*