Less space between icon and post-separation line

[paperdoorknob] / glowfic.py

diff --git a/glowfic.py b/glowfic.py
index 41697867b2453e0af35175de866f02fe71409c54..eb34c1b39df37a5b712d022d5d454196db1aabd5 100644 (file)
--- a/glowfic.py
+++ b/glowfic.py
@@ -5,6 +5,7 @@
 # Free Software Foundation, version 3.
 
 
+from abc import ABC, abstractmethod
 from dataclasses import dataclass
 import itertools
 
@@ -14,6 +15,7 @@ from bs4 import BeautifulSoup
 from bs4.element import Tag
 
 from images import ImageStore
+from texify import Texifier
 
 
 @dataclass(frozen=True)
@@ -77,3 +79,49 @@ def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:
                  getTextByClass('post-screenname'),
                  getTextByClass('post-author'),
                  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''
+
+
+class Layout(ABC):
+
+    @abstractmethod
+    def renderChunk(self, chunk: Chunk) -> bytes:
+        raise NotImplementedError()
+
+
+class ContentOnlyLayout(Layout):
+
+    def __init__(self, texifier: Texifier) -> None:
+        self._texifier = texifier
+
+    def renderChunk(self, chunk: Chunk) -> bytes:
+        return self._texifier.texify(chunk.content)
+
+
+class BelowIconLayout(Layout):
+
+    def __init__(self, texifier: Texifier, image_size: float) -> None:
+        self._texifier = texifier
+        self._image_size = image_size
+
+    def renderChunk(self, chunk: Chunk) -> bytes:
+        return b'''\\begin{wrapstuff}[l,abovesep=-1\\ht\\strutbox]
+\\oalign{
+%s\\cr
+%s\\cr
+%s\\cr
+%s\\cr
+}\\end{wrapstuff}
+
+%s
+
+''' % (
+            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'',
+            self._texifier.texify(chunk.content))