Language errors are now added to song errors

patacrep/latex/__init__.py

@@ -78,7 +78,7 @@ BABEL_LANGUAGES = OrderedDict((
     # ('??_??', 'welsh'),
 ))
 
-class UnknownLanguage(Exception):
+class UnknownLanguage(errors.SharedError):
     """Error: Unknown language."""
 
     def __init__(self, *, original, fallback, message):
@@ -87,6 +87,11 @@ class UnknownLanguage(Exception):
         self.fallback = fallback
         self.message = message
 
+    @property
+    def babel(self):
+        """Return the fallback babel language."""
+        return BABEL_LANGUAGES[self.fallback]
+
     def __str__(self):
         return self.message
 
@@ -128,10 +133,12 @@ def checklanguage(lang):
             )
     )
 
-def lang2babel(lang):
+def lang2babel(lang, *, raise_unknown=False):
     """Return the language used by babel, corresponding to the language code"""
     try:
         return BABEL_LANGUAGES[checklanguage(lang)]
     except UnknownLanguage as error:
         LOGGER.warning(str(error))
-        return BABEL_LANGUAGES[error.fallback]
+        if raise_unknown:
+            raise
+        return error.babel

patacrep/songs/chordpro/__init__.py

@@ -4,14 +4,15 @@ import logging
 import operator
 import os
 
-from jinja2 import Environment, FileSystemLoader, contextfunction, ChoiceLoader
+from jinja2 import Environment, FileSystemLoader, ChoiceLoader
+from jinja2 import contextfunction
 import jinja2
 
 from patacrep import encoding, files, pkg_datapath
 from patacrep.songs import Song
 from patacrep.songs.chordpro.syntax import parse_song
 from patacrep.templates import Renderer
-from patacrep.latex import lang2babel
+from patacrep.latex import lang2babel, UnknownLanguage
 from patacrep.files import path2posix
 
 LOGGER = logging.getLogger(__name__)
@@ -39,6 +40,11 @@ class ChordproSong(Song):
             'song': song,
             }
 
+    @staticmethod
+    def _jinja2_filters():
+        """Return additional jinja2 filters."""
+        return {}
+
     def render(self, template="song"): # pylint: disable=arguments-differ
         context = {
             'lang': self.lang,
@@ -54,9 +60,9 @@ class ChordproSong(Song):
             ))
         jinjaenv.filters['search_image'] = self.search_image
         jinjaenv.filters['search_partition'] = self.search_partition
-        jinjaenv.filters['lang2babel'] = lang2babel
         jinjaenv.filters['sortargs'] = sort_directive_argument
         jinjaenv.filters['path2posix'] = path2posix
+        jinjaenv.filters.update(self._jinja2_filters())
 
         try:
             return Renderer(
@@ -123,6 +129,26 @@ class Chordpro2LatexSong(ChordproSong):
                 )
             return None
 
+    def _jinja2_filters(self):
+        return {
+            'lang2babel': self.lang2babel,
+            }
+
+    def lang2babel(self, lang):
+        """Return the LaTeX babel code corresponding to `lang`.
+
+        Add an error to the list of errors if argument is invalid.
+        """
+        try:
+            return lang2babel(lang, raise_unknown=True)
+        except UnknownLanguage as error:
+            error.message = "Song {}: {}".format(
+                self.fullpath,
+                error.message,
+                )
+            self.errors.append(error)
+            return error.babel
+
 class Chordpro2ChordproSong(ChordproSong):
     """Render chordpro song to chordpro code"""
 

patacrep/songs/errors.py

@@ -31,5 +31,3 @@ class SongSyntaxError(SongError):
 
 # class FileError(SongError):
 #     type = "file"
-#
-# class LanguageError(SongError):

patacrep/templates.py

@@ -84,11 +84,19 @@ class Renderer:
         self.jinjaenv.filters['escape_tex'] = _escape_tex
         self.jinjaenv.trim_blocks = True
         self.jinjaenv.lstrip_blocks = True
-        self.jinjaenv.filters["path2posix"] = files.path2posix
-        self.jinjaenv.filters["iter_datadirs"] = files.iter_datadirs
-        self.jinjaenv.filters["lang2babel"] = lang2babel
+        self._fill_filters()
         self.template = self.jinjaenv.get_template(template)
 
+    def _fill_filters(self):
+        """Define some jinja2 filters, if not set yet."""
+        for key, value in [
+                ("path2posix", files.path2posix),
+                ("iter_datadirs", files.iter_datadirs),
+                ("lang2babel", lang2babel),
+            ]:
+            if key not in self.jinjaenv.filters:
+                self.jinjaenv.filters[key] = value
+
 
 class TexBookRenderer(Renderer):
     """Tex renderer for the whole songbook"""