sys.stderr.write (' In: <%s %s>\n' % (p._name, ' '.join (['%s=%s' % item for item in p._attribute_dict.items ()])))
p = p.get_parent ()
+ def dump (self, indent = ''):
+ sys.stderr.write ('%s<%s%s>' % (indent, self._name, ''.join ([' %s=%s' % item for item in self._attribute_dict.items ()])))
+ non_text_children = [c for c in self._children if not isinstance (c, Hash_text)]
+ if non_text_children:
+ sys.stderr.write ('\n')
+ for c in self._children:
+ c.dump (indent + " ")
+ if non_text_children:
+ sys.stderr.write (indent)
+ sys.stderr.write ('</%s>\n' % self._name)
+
+
def get_typed_children (self, klass):
if not klass:
return []
class Identification (Xml_node):
def get_rights (self):
- rights = self.get_maybe_exist_named_child ('rights')
- if rights:
- return rights.get_text ()
- else:
- return ''
+ rights = self.get_named_children ('rights')
+ ret = []
+ for r in rights:
+ ret.append (r.get_text ())
+ return string.join (ret, "\n")
def get_creator (self, type):
creators = self.get_named_children ('creator')
software.append (s.get_text ())
return software
+ def get_file_description (self):
+ misc = self.get_named_children ('miscellaneous')
+ for m in misc:
+ misc_fields = m.get_named_children ('miscellaneous-field')
+ for mf in misc_fields:
+ if hasattr (mf, 'name') and mf.name == 'description':
+ return mf.get_text ()
+ return None
+
class Duration (Music_xml_node):
class Hash_comment (Music_xml_node):
pass
class Hash_text (Music_xml_node):
- pass
+ def dump (self, indent = ''):
+ sys.stderr.write ('%s' % string.strip (self._data))
class Pitch (Music_xml_node):
def get_step (self):
key = self.get_named_attribute ('key')
mode_node = key.get_maybe_exist_named_child ('mode')
- mode = 'major'
+ mode = None
if mode_node:
mode = mode_node.get_text ()
+ if not mode or mode == '':
+ mode = 'major'
fifths = int (key.get_maybe_exist_named_child ('fifths').get_text ())
return (fifths, mode)
+
+ def get_transposition (self):
+ return self.get_named_attribute ('transpose')
+
+
class Barline (Measure_element):
pass
def __init__ (self):
Measure_element.__init__ (self)
self.instrument_name = ''
-
+ self._after_grace = False
+ def is_grace (self):
+ return self.get_maybe_exist_named_child (u'grace')
+ def is_after_grace (self):
+ if not self.is_grace():
+ return False;
+ gr = self.get_maybe_exist_typed_child (Grace)
+ return self._after_grace or hasattr (gr, 'steal-time-previous');
+
def get_duration_log (self):
ch = self.get_maybe_exist_named_child (u'type')
# FIXME: is it ok to default to eight note for grace notes?
return 3
else:
- self.message (_ ("Encountered note at %s with %s duration (no <type> element):") % (self.start, self.duration) )
- return 0
+ return None
+
+ def get_duration_info (self):
+ log = self.get_duration_log ()
+ if log != None:
+ dots = len (self.get_typed_children (Dot))
+ return (log, dots)
+ else:
+ return None
def get_factor (self):
return 1
return self._lyrics
+def graces_to_aftergraces (pending_graces):
+ for gr in pending_graces:
+ gr._when = gr._prev_when
+ gr._measure_position = gr._prev_measure_position
+ gr._after_grace = True
+
+
class Part (Music_xml_node):
def __init__ (self):
Music_xml_node.__init__ (self)
n = n._parent
return n.get_named_child ('part-list')
-
+
def interpret (self):
"""Set durations and starting points."""
"""The starting point of the very first note is 0!"""
measure_start_moment = now
is_first_measure = True
previous_measure = None
+ # Graces at the end of a measure need to have their position set to the
+ # previous number!
+ pending_graces = []
for m in measures:
# implicit measures are used for artificial measures, e.g. when
# a repeat bar line splits a bar into two halves. In this case,
if n.get_name() == 'backup':
dur = - dur
+ # reset all graces before the backup to after-graces:
+ graces_to_aftergraces (pending_graces)
+ pending_graces = []
if n.get_maybe_exist_typed_child (Grace):
dur = Rational (0)
rest._is_whole_measure = True
- if (dur > Rational (0)
+ if (dur > Rational (0)
and n.get_maybe_exist_typed_child (Chord)):
now = last_moment
measure_position = last_measure_position
n._when = now
n._measure_position = measure_position
+
+ # For all grace notes, store the previous note, in case need
+ # to turn the grace note into an after-grace later on!
+ if isinstance(n, Note) and n.is_grace ():
+ n._prev_when = last_moment
+ n._prev_measure_position = last_measure_position
+ # After-graces are placed at the same position as the previous note
+ if isinstance(n, Note) and n.is_after_grace ():
+ # TODO: We should do the same for grace notes at the end of
+ # a measure with no following note!!!
+ n._when = last_moment
+ n._measure_position = last_measure_position
+ elif isinstance(n, Note) and n.is_grace ():
+ pending_graces.append (n)
+ elif (dur > Rational (0)):
+ pending_graces = [];
+
n._duration = dur
if dur > Rational (0):
last_moment = now
if instrument:
n.instrument_name = part_list.get_instrument (instrument.id)
+ # reset all graces at the end of the measure to after-graces:
+ graces_to_aftergraces (pending_graces)
+ pending_graces = []
# Incomplete first measures are not padded, but registered as partial
if is_first_measure:
is_first_measure = False
vid = None
if voice_id:
vid = voice_id.get_text ()
+ elif isinstance (n, Note):
+ vid = "None"
staff_id = n.get_maybe_exist_named_child (u'staff')
sid = None
id = None
for n in elements:
voice_id = n.get_maybe_exist_typed_child (get_class ('voice'))
+ if voice_id:
+ id = voice_id.get_text ()
+ else:
+ id = "None"
- if not (voice_id or isinstance (n, Attributes) or
+ # We don't need backup/forward any more, since we have already
+ # assigned the correct onset times.
+ # TODO: Let Grouping through. Also: link, print, bokmark sound
+ if not (isinstance (n, Note) or isinstance (n, Attributes) or
isinstance (n, Direction) or isinstance (n, Partial) or
isinstance (n, Barline) or isinstance (n, Harmony) or
isinstance (n, FiguredBass) ):
assign_to_next_note.append (n)
continue
- id = voice_id.get_text ()
if hasattr (n, 'print-object') and getattr (n, 'print-object') == "no":
#Skip this note.
pass
projects / lilypond.git / blobdiff