FakeFetcher: Show bad URLs in error messages

[paperdoorknob] / glowfic.py

diff --git a/glowfic.py b/glowfic.py
index 1249663c3a184b2d827fab78c2a004dfe3868f7c..d1966cae628267177b08789aaf8714c81c01f6d3 100644 (file)
--- a/glowfic.py
+++ b/glowfic.py
@@ -81,9 +81,9 @@ def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:
                  content)
 
 
-def renderIcon(icon_path: str | None, image_size: float) -> bytes:
-    return b'\\includegraphics[width=%fmm,height=%fmm,keepaspectratio]{%s}' % (
-        image_size, image_size, icon_path.encode('UTF-8')) if icon_path else b''
+def renderIcon(icon_path: str | None, image_size: float) -> str | None:
+    params = f'width={image_size}mm,height={image_size}mm,keepaspectratio'
+    return f'\\includegraphics[{params}]{{{icon_path}}}' if icon_path else None
 
 
 class Layout(ABC):
@@ -99,7 +99,7 @@ class ContentOnlyLayout(Layout):
         self._texifier = texifier
 
     def renderChunk(self, chunk: Chunk) -> bytes:
-        return self._texifier.texify(chunk.content)
+        return self._texifier.texify(chunk.content) + b'\n'
 
 
 class BelowIconLayout(Layout):
@@ -109,18 +109,69 @@ class BelowIconLayout(Layout):
         self._image_size = image_size
 
     def renderChunk(self, chunk: Chunk) -> bytes:
-        icon_width = b'0.25\\textwidth'  # TODO: Make this configurable
-        return b'''\\begin{wrapfigure}{l}{%s}
-%s
-%s
+        meta = [
+            renderIcon(chunk.icon, self._image_size),
+            chunk.character,
+            chunk.screen_name,
+            chunk.author,
+        ]
+
+        return b'''\\wrapstuffclear
+\\begin{wrapstuff}[l]
+\\fbox{
+\\begin{varwidth}{0.5\\textwidth}
+  \\smash{\\parbox[t][0pt]{0pt}{
+    \\setlength{\\fboxrule}{0.2pt}
+    \\setlength{\\fboxsep}{0pt}
+    \\vspace{-3.4pt}
+    \\fbox{\\hspace{107mm}}
+  }\\\\*}
+  \\vspace{-1em}
+\\begin{center}
 %s
+\\end{center}
+\\end{varwidth}
+}
+\\end{wrapstuff}
+
+\\strut
+
+\\noindent %s
+''' % (
+            b'\\\\*'.join(x.encode('UTF-8') for x in meta if x is not None),
+            self._texifier.texify(chunk.content))
+
+
+class BesideIconLayout(Layout):
+
+    def __init__(self, texifier: Texifier, image_size: float) -> None:
+        self._texifier = texifier
+        self._image_size = image_size
+
+    def renderChunk(self, chunk: Chunk) -> bytes:
+        icon = renderIcon(chunk.icon, self._image_size)
+        meta = [
+            chunk.character,
+            chunk.screen_name,
+            chunk.author,
+        ]
+
+        # Why is \textwidth not the width of the text?
+        # Why is the width of the text .765\textwidth?
+        return b'''\\noindent\\fbox{
 %s
-\\end{wrapfigure}
+\\parbox[b]{.765\\textwidth}{
+\\begin{center}
 %s
+\\end{center}
+}
+}\\\\*
+\\vspace{-0.75em}\\\\*
+\\noindent %s
+
+\\strut
+
 ''' % (
-            icon_width,
-            renderIcon(chunk.icon, self._image_size),
-            chunk.character.encode('UTF-8') if chunk.character else b'',
-            chunk.screen_name.encode('UTF-8') if chunk.screen_name else b'',
-            chunk.author.encode('UTF-8') if chunk.author else b'',
+            icon.encode('UTF-8') if icon else b'',
+            b'\\\\*'.join(x.encode('UTF-8') for x in meta if x is not None),
             self._texifier.texify(chunk.content))