Merge branch 'master' into lineno

patacrep/build.py

@@ -109,7 +109,7 @@ class Songbook(object):
             datadirs=config.get('datadir', []),
             root_modules=['songs'],
             keyword='SONG_RENDERERS',
-            )['latex']
+            )['tsg']
 
         # Configuration set
         config['render'] = content.render

patacrep/files.py

@@ -62,17 +62,17 @@ def path2posix(string):
         )
 
 @contextmanager
-def chdir(path):
+def chdir(*path):
     """Locally change dir
 
     Can be used as:
 
-        with chdir("some/directory"):
+        with chdir("some", "directory"):
             do_stuff()
     """
     olddir = os.getcwd()
     if path:
-        os.chdir(path)
+        os.chdir(os.path.join(*path))
         yield
         os.chdir(olddir)
     else:

patacrep/songbook/__main__.py

@@ -153,7 +153,6 @@ def main():
         # Command line options
         datadirs += [item[0] for item in options.datadir]
     if 'datadir' in songbook:
-        # .sg file
         if isinstance(songbook['datadir'], str):
             songbook['datadir'] = [songbook['datadir']]
         datadirs += [

patacrep/songs/chordpro/__init__.py

@@ -131,13 +131,13 @@ class Chordpro2ChordproSong(ChordproSong):
         return filename
 
 SONG_RENDERERS = {
-    "latex": {
+    "tsg": {
-        'sgc': Chordpro2LatexSong,
+        'csg': Chordpro2LatexSong,
         },
     "html": {
-        'sgc': Chordpro2HtmlSong,
+        'csg': Chordpro2HtmlSong,
         },
-    "chordpro": {
+    "csg": {
-        'sgc': Chordpro2ChordproSong,
+        'csg': Chordpro2ChordproSong,
         },
     }

patacrep/songs/chordpro/syntax.py

@@ -27,7 +27,7 @@ class ChordproParser(Parser):
             write_tables=0,
             )
 
-    def parse(self, content):
+    def parse(self, content, *, lexer):
         """Parse file
 
         This is a shortcut to `yacc.yacc(...).parse()`. The arguments are
@@ -309,9 +309,17 @@ class ChordproParser(Parser):
             token = self.parser.token()
             if not token or token.type == "ENDOFLINE":
                 break
-        self.parser.errok()
+        if token:
+            self.parser.errok()
         return token
 
 def parse_song(content, filename=None):
     """Parse song and return its metadata."""
-    return ChordproParser(filename).parse(content)
+    parser = ChordproParser(filename)
+    parsed_content = parser.parse(
+        content,
+        lexer=ChordProLexer(filename=filename).lexer,
+        )
+    if parsed_content is None:
+        raise SyntaxError('Fatal error during song parsing: {}'.format(filename))
+    return parsed_content

patacrep/songs/convert/__main__.py

@@ -17,7 +17,7 @@ def __usage():
     return "python3 -m patacrep.songs.convert INPUTFORMAT OUTPUTFORMAT FILES"
 
 def confirm(destname):
-    while True
+    while True:
         try:
             return yesno(input("File '{}' already exist. Overwrite? [yn] ".format(destname)))
         except ValueError:
@@ -62,7 +62,7 @@ if __name__ == "__main__":
                 if not confirm(destname):
                     continue
             with open(destname, "w") as destfile:
-                destfile.write(song.render(dest))
+                destfile.write(song.render())
 
         except NotImplementedError:
             LOGGER.error("Cannot convert to format '%s'.", dest)

patacrep/songs/latex/__init__.py

@@ -49,8 +49,11 @@ class Latex2LatexSong(Song):
         self.lang = custom_lang
 
 SONG_RENDERERS = {
-    "latex": {
+    "tsg": {
-        'is': Latex2LatexSong,
+        'tis': Latex2LatexSong,
+        'tsg': Latex2LatexSong,
+
+        # For backward compatibility
         'sg': Latex2LatexSong,
     },
 }

test/test_chordpro/errors/invalid_content.csg.source

@@ -0,0 +1,3 @@
+{soc}
+Chorus
+{eoc