Fix bug in Capella parsing.

music21/capella/fromCapellaXML.py

@@ -278,7 +278,7 @@ def systemFromSystem(self, systemElement, systemObj=None):
         TODO: Handle multiple <voices>
         '''
         if systemObj is None:
-            systemObj = stream.System()
+            systemObj = layout.System()
 
         stavesList = systemElement.findall('staves')
         if not stavesList:
@@ -895,8 +895,17 @@ def slurFromDrawObjSlur(self, drawObj):
 
 
 class Test(unittest.TestCase):
-    pass
+    def testComplete(self):
+        from music21 import text
 
+        ci = CapellaImporter()
+        capellaDirPath = common.getSourceFilePath() / 'capella'
+        oswaldPath = capellaDirPath / r'Nu_rue_mit_sorgen.capx'
+        partScore = ci.scoreFromFile(oswaldPath)
+        self.assertEqual(len(partScore.parts), 3)
+        self.assertGreater(len(partScore.recurse().notes), 20)
+        self.assertIn('mass!', text.assembleLyrics(partScore.parts[0], 1))
+        self.assertIn('scherz', text.assembleLyrics(partScore.parts[0], 2))
 
 class TestExternal(unittest.TestCase):
     show = True
@@ -930,4 +939,4 @@ def xtestImportSorgen(self):
 
 if __name__ == '__main__':
     import music21
-    music21.mainTest(Test, TestExternal)
+    music21.mainTest(Test)  # , TestExternal)

music21/layout.py

@@ -1579,8 +1579,10 @@ class System(stream.Score):
     '''
     Designation that all the music in this Stream
     belongs on a single notated system.
-    '''
 
+    Attribute systemNumbering says at what point the numbering of
+    systems resets.  It can be either "Score" (default), "Opus", or "Page".
+    '''
     def __init__(self, *args, **keywords):
         super().__init__(*args, **keywords)
         self.systemNumber = 0
@@ -1589,6 +1591,7 @@ def __init__(self, *args, **keywords):
         self.pageSystemNumber = 0
 
         self.systemLayout = None
+        self.systemNumbering = 'Score'  # or Page; when do system numbers reset?
         self.measureStart = None
         self.measureEnd = None
 

music21/text.py

@@ -59,9 +59,9 @@ def assembleLyrics(streamIn, lineNumber=1):
     Concatenate text from a stream. The Stream is automatically flattened.
 
     The `lineNumber` parameter determines which line of text is assembled,
-    as an index in the .lyrics array.  (To be changed in v7 to go with an
-    identifier.)
-
+    as a ONE-indexed identifier in the .lyrics array.
+    (To be changed in v8 to go with an identifier.).  This means that
+    `lineNumber=0` will retrieve the last line of text.
 
     >>> s = stream.Stream()
     >>> n1 = note.Note()
@@ -83,6 +83,15 @@ def assembleLyrics(streamIn, lineNumber=1):
     >>> n1.lyrics[0] = composite
     >>> text.assembleLyrics(s)
     "He'_ya there"
+
+    To get the lyrics from another line, set the lineNumber attribute.
+    (see also :func:`~music21.text.assembleAllLyrics` to get all
+    lyrics).
+
+    >>> n1.addLyric('Bye')
+    >>> n2.addLyric('Now')
+    >>> text.assembleLyrics(s, lineNumber=2)
+    'Bye Now'
     '''
     word = []
     words = []
@@ -120,7 +129,8 @@ def assembleLyrics(streamIn, lineNumber=1):
 
 def assembleAllLyrics(streamIn, maxLyrics=10, lyricSeparation='\n'):
     r'''
-    Concatenate all Lyrics text from a stream. The Stream is automatically flattened.
+    Concatenate all Lyrics text from a stream separated by lyricSeparation.
+    The Stream is automatically recursed.
 
     uses assembleLyrics to do the heavy work.
 
@@ -130,15 +140,23 @@ def assembleAllLyrics(streamIn, maxLyrics=10, lyricSeparation='\n'):
     Here is a demo with one note and five lyrics.
 
     >>> f = corpus.parse('demos/multiple-verses.xml')
+    >>> text.assembleLyrics(f, 1)
+    '1. First'
+    >>> text.assembleLyrics(f, 2)
+    '2. Second'
     >>> l = text.assembleAllLyrics(f)
     >>> l
-    '\n1. First\n2. Second\n3. Third\n4. Fourth\n5. Fifth'
+    '1. First\n2. Second\n3. Third\n4. Fourth\n5. Fifth'
+
+    Changed in v.8: no lyric separator appears at the beginning.
     '''
     lyrics = ''
     for i in range(1, maxLyrics):
         lyr = assembleLyrics(streamIn, i)
         if lyr != '':
-            lyrics += lyricSeparation + lyr
+            if i > 1:
+                lyrics += lyricSeparation
+            lyrics += lyr
     return lyrics