songsection is now yaml compatible

patacrep/content/songsection.py

@@ -20,24 +20,15 @@ class SongSection(ContentItem):
         return r'\{}{{{}}}'.format(self.keyword, self.name)
 
 #pylint: disable=unused-argument
-def parse(keyword, argument, contentlist, config):
+def parse(keyword, argument, config):
     """Parse the contentlist.
 
     Arguments:
     - keyword ("songsection" or "songchapter"): the section to use;
-    - argument: unused;
+    - argument: name of the section;
-    - contentlist: a list of one string, which is the name of the section;
     - config: configuration dictionary of the current songbook.
     """
-    try:
+    return ContentList([SongSection(keyword, argument)])
-        if (keyword not in KEYWORDS) and (len(contentlist) != 1):
-            raise ContentError(
-                keyword,
-                "Starred section names must have exactly one argument.",
-                )
-        return ContentList([SongSection(keyword, contentlist[0])])
-    except ContentError as error:
-        return EmptyContentList(errors=[error])
 
 
 CONTENT_PLUGINS = dict([

test/test_content/songsection.source

@@ -1,6 +1,6 @@
-[["songsection", "Traditional"],
+- songsection: Traditional
-                "exsong.sg",
+- "exsong.sg"
-                ["songchapter", "English"],
+- songchapter: English
-                "texsong.tsg",
+- "texsong.tsg"
-                "chordpro.csg",
+- "chordpro.csg"
-                "exsong.sg"]
+- "exsong.sg"

test/test_songbook/content.sb

@@ -9,7 +9,7 @@ chords:
 content:
   - section: Test of section
   - ["sorted"]
-  - ["songsection", "Test of song section"]
+  - songsection: Test of song section
   - ["cwd(content_datadir/content)",
     "song.csg", "song.tsg",
     ["tex", "foo.tex"]