pitches = []
basepitch = None
for x in note_events:
- pitches.append (x.pitch.ly_expression ())
+ pitches.append (x.chord_element_ly ())
if not basepitch:
basepitch = previous_pitch
printer ('<%s>' % string.join (pitches))
else:
return ''
+
+class FunctionWrapperEvent (Event):
+ def __init__ (self, function_name = None):
+ Event.__init__ (self)
+ self.function_name = function_name
+ def pre_note_ly (self, is_chord_element):
+ if self.function_name:
+ return "\\%s" % self.function_name
+ else:
+ return ''
+ def pre_chord_ly (self):
+ return ''
+ def ly_expression (self):
+ if self.function_name:
+ return "\\%s" % self.function_name
+ else:
+ return ''
+
+class ParenthesizeEvent (FunctionWrapperEvent):
+ def __init__ (self):
+ FunctionWrapperEvent.__init__ (self, "parenthesize")
+
+class NotestyleEvent (Event):
+ def __init__ (self):
+ Event.__init__ (self)
+ self.style = None
+ self.filled = None
+ def pre_chord_ly (self):
+ if self.style:
+ return "\\once \\override NoteHead #'style = #%s" % self.style
+ else:
+ return ''
+ def pre_note_ly (self, is_chord_element):
+ if self.style and is_chord_element:
+ return "\\tweak #'style #%s" % self.style
+ else:
+ return ''
+ def ly_expression (self):
+ return self.pre_chord_ly ()
+
+
class ChordPitch:
def __init__ (self):
self.alteration = 0
def __init__ (self):
Event.__init__ (self)
self.duration = Duration()
-
+ self.associated_events = []
+
+ def add_associated_event (self, ev):
+ if ev:
+ self.associated_events.append (ev)
+
+ def pre_chord_ly (self):
+ return [ev.pre_chord_ly () for ev in self.associated_events]
+
+ def pre_note_ly (self, is_chord_element):
+ return [ev.pre_note_ly (is_chord_element) for ev in self.associated_events]
+
+ def ly_expression_pre_note (self, is_chord_element):
+ res = string.join (self.pre_note_ly (is_chord_element), ' ')
+ if res != '':
+ res = res + ' '
+ return res
+
def get_length (self):
return self.duration.get_length()
def __init__ (self):
RhythmicEvent.__init__ (self)
self.pitch = None
+
def ly_expression (self):
+ res = self.ly_expression_pre_note (False)
if self.pitch:
- return "%s%s\\rest" % (self.pitch.ly_expression (), self.duration.ly_expression ())
+ return res + "%s%s\\rest" % (self.pitch.ly_expression (), self.duration.ly_expression ())
else:
return 'r%s' % self.duration.ly_expression ()
def print_ly (self, printer):
+ for ev in self.associated_events:
+ ev.print_ly (printer)
if self.pitch:
self.pitch.print_ly (printer)
self.duration.print_ly (printer)
excl_question += '!'
return excl_question
-
+
def ly_expression (self):
+ # obtain all stuff that needs to be printed before the note:
+ res = self.ly_expression_pre_note (True)
if self.pitch:
- return '%s%s%s' % (self.pitch.ly_expression (),
+ return res + '%s%s%s' % (self.pitch.ly_expression (),
self.pitch_mods(),
self.duration.ly_expression ())
elif self.drum_type:
- return '%s%s' (self.drum_type,
+ return res + '%s%s' (self.drum_type,
self.duration.ly_expression ())
+ def chord_element_ly (self):
+ # obtain all stuff that needs to be printed before the note:
+ res = self.ly_expression_pre_note (True)
+ if self.pitch:
+ return res + '%s%s' % (self.pitch.ly_expression (),
+ self.pitch_mods())
+ elif self.drum_type:
+ return res + '%s%s' (self.drum_type)
+
+
def print_ly (self, printer):
+ for ev in self.associated_events:
+ ev.print_ly (printer)
if self.pitch:
self.pitch.print_ly (printer)
printer (self.pitch_mods ())
class TimeSignatureChange (Music):
def __init__ (self):
Music.__init__ (self)
- self.fraction = (4,4)
+ self.fractions = [4,4]
def ly_expression (self):
- return '\\time %d/%d ' % self.fraction
+ # Easy case: self.fractions = [n,d] => normal \time n/d call:
+ if len (self.fractions) == 2 and isinstance (self.fractions[0], int):
+ return '\\time %d/%d ' % tuple (self.fractions)
+ elif self.fractions and not isinstance (self.fractions[0], list):
+ # TODO: Implement non-standard time-signatures
+ return ''
+ else:
+ # TODO: Implement non-standard time-signatures
+ return ''
class ClefChange (Music):
def __init__ (self):