Merge branch 'main' into feature/table

renderer/fifty_ohm_latex_renderer.py

@@ -115,7 +115,7 @@ class FiftyOhmLaTeXRenderer(LaTeXRenderer):
 \label{{{ref}}}"""
 
     def render_photo(self, token) :
-        return self.render_picture_helper(token.id, token.ref, token.text, token.number)
+        return self.render_photo_helper(token.id, token.ref, token.text, token.number)
 
     def render_table(self, token):
         alignments = token.alignment

renderer/photo.py

@@ -10,7 +10,7 @@ class Photo(SpanToken):
     """
 
     parse_inner = False
-    pattern = re.compile(r"\[photo:(\d+):(.+):(.+)\]")
+    pattern = re.compile(r"\[photo:(\d+):([^:\]]+):([^:\]]+)\]")
 
     def __init__(self, match_object):
         self.id = match_object.group(1)