Pick up more of PR cuthbertLab#1636 (no rests for the forwards).

Author: gregchapman-dev

music21/musicxml/xmlToM21.py

@@ -866,6 +866,21 @@ def xmlRootToScore(self, mxScore, inputM21=None):
             self.spannerBundle.remove(sp)
 
         s.coreElementsChanged()
+        for m in s[stream.Measure]:
+            for v in m.voices:
+                if v:  # do not bother with empty voices
+                    # the musicDataMethods use insertCore, thus the voices need to run
+                    # coreElementsChanged
+                    v.coreElementsChanged()
+                    # Fill mid-measure gaps, and find end of measure gaps by ref to measure stream
+                    # https://github.com/cuthbertlab/music21/issues/444
+                    # but only when the score comes from Finale
+                    if any("Finale" in software for software in md.software):
+                        v.makeRests(refStreamOrTimeRange=m,
+                                    fillGaps=True,
+                                    inPlace=True,
+                                    hideRests=True)
+
         s.definesExplicitSystemBreaks = self.definesExplicitSystemBreaks
         s.definesExplicitPageBreaks = self.definesExplicitPageBreaks
         for p in s.parts:
@@ -2576,16 +2591,7 @@ def parse(self):
 
         if self.useVoices is True:
             for v in self.stream.iter().voices:
-                if v:  # do not bother with empty voices
-                    # the musicDataMethods use insertCore, thus the voices need to run
-                    # coreElementsChanged
-                    v.coreElementsChanged()
-                    # Fill mid-measure gaps, and find end of measure gaps by ref to measure stream
-                    # https://github.com/cuthbertlab/music21/issues/444
-                    v.makeRests(refStreamOrTimeRange=self.stream,
-                                fillGaps=True,
-                                inPlace=True,
-                                hideRests=True)
+                v.coreElementsChanged()
         self.stream.coreElementsChanged()
 
         if (self.restAndNoteCount['rest'] == 1