Merge pull request #109 from FelippeRoza/fix-scale-rest

Improve Mediator.scale_rest()

Author: PeterBjuhr

ly/musicxml/ly2xml_mediator.py

@@ -47,6 +47,7 @@ def __init__(self):
         self.current_note = None
         self.current_lynote = None
         self.current_is_rest = False
+        self.current_time = Fraction(4, 4)
         self.action_onnext = []
         self.divisions = 1
         self.dur_token = "4"
@@ -355,6 +356,7 @@ def new_key(self, key_name, mode):
             self.current_attr.set_key(get_fifths(key_name, mode), mode)
 
     def new_time(self, num, den, numeric=False):
+        self.current_time = Fraction(num, den.denominator)
         if self.bar is None:
             self.new_bar()
         self.current_attr.set_time([num, den.denominator], numeric)
@@ -491,7 +493,7 @@ def check_duration(self, rest):
                 if rs == bs[1]:
                     self.current_note.duration = (bs[0], 1)
                     self.current_note.dot = 0
-                    self.scale_rest(rs)
+                    self.scale_rest(bs)
                     return
         self.current_note.dot = dots
         self.dots = dots
@@ -582,12 +584,13 @@ def note2rest(self):
         self.bar.obj_list.pop()
         self.bar.add(self.current_note)
 
-    def scale_rest(self, multp):
+    def scale_rest(self, bs):
         """ create multiple whole bar rests """
         dur = self.current_note.duration
         voc = self.current_note.voice
         st = self.current_note.show_type
         sk = self.current_note.skip
+        multp = int(bs[1] * (bs[0]/self.current_time))
         for i in range(1, int(multp)):
             self.new_bar()
             rest_copy = xml_objs.BarRest(dur, voice=voc, show_type=st, skip=sk)