comparison Syncopation models/rhythm_parser.py @ 40:6371e8f21f7d

updating the syncopation functions to fix a few problems

 	return line
 
 def discard_spaces(line):
 	line = line.replace(" ", '').replace("\t", '')
 	return line
+
+def discard_linereturns(line):
+	line = line.replace("\n","").replace("\r","")
+	return line
+	
 
 # def extractInfo(line):
 # 	try:
 # 		if '{' not in line and '}' not in line:
 # 			raise RhythmSyntaxError(line)

 		if timeSignature==None:
 			(field, line) = get_next_field(line)
 			# if there is a valid field, it should be a time signature
 			if field!=None:
 				[fieldname,value] = field
-				if fieldname=="t":
+				if fieldname.lower()=="t":
 					timeSignature = TimeSignature(value)
 				else:
 					print 'Error, first field in the file should set the time signature.'
 
 		# parse the line

 	else:
 		return False
 
 def parse_line(line,  timeSignature=None, tempo=None, ticksPerQuarter=None):
 	
-	#strip the line of spaces and comments
-	line = discard_spaces(discard_comments(line)).replace("\n","")
+	#strip the line of line returns, spaces and comments
+	line = discard_linereturns(discard_spaces(discard_comments(line)))
 	
 	bars = BarList()
 
 	#work through each field in the line
 	while len(line)>0:

 			else:
 				print 'Unrecognised field type: "' + fieldname + '"'
 	
 	return bars, tempo, timeSignature, ticksPerQuarter
 
+class RhythmSyntaxError(Exception):
+	def __init__(self, value):
+		self.value = value
+	def __str__(self):
+		return repr(self.value)
 
 def get_next_field(line):
 	index = line.find("}")
 	field = None
 	if index>=0:
 		fieldtext = line[:index]
 		line = line[index+1:]
 		field = fieldtext.split("{")
 	else:
 		print 'Error, incorrect syntax: "'+line+'"'
-		#raise RhythmSyntaxError(line)
+		raise RhythmSyntaxError(line)
 
 	return field,line