X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/39db9a10878f8bac785178a85b2f548f4b24684b..1fac41bf2d403d35d43dd532a37a8225f682bae2:/glowfic.py?ds=sidebyside

diff --git a/glowfic.py b/glowfic.py
index 065c715..012bd06 100644
--- a/glowfic.py
+++ b/glowfic.py
@@ -5,7 +5,6 @@
 # Free Software Foundation, version 3.
 
 
-from abc import ABC, abstractmethod
 from dataclasses import dataclass
 import itertools
 from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
@@ -89,108 +88,90 @@ def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:
         assert tag is None or isinstance(tag, Tag)
         return tag
 
+    def stripHREF(tag: Tag) -> None:
+        for c in tag.findChildren("a"):
+            if "href" in c.attrs:
+                del c.attrs["href"]
+
+    def getMeta(css_class: str) -> Tag | None:
+        tag = getByClass(css_class)
+        if tag is None:
+            return None
+        stripHREF(tag)
+        return tag
+
     content = chunk_dom.findChild('div', class_='post-content')
     assert isinstance(content, Tag)
 
     return Chunk(getIcon(),
-                 getByClass('post-character'),
-                 getByClass('post-screenname'),
-                 getByClass('post-author'),
+                 getMeta('post-character'),
+                 getMeta('post-screenname'),
+                 getMeta('post-author'),
                  content)
 
 
-def renderIcon(icon_path: str | None, image_size: float) -> bytes | None:
-    if icon_path is None:
-        return None
-    return b'\\includegraphics[width=%fmm,height=%fmm,keepaspectratio]{%s}' % (
-        image_size, image_size, icon_path.encode('UTF-8'))
-
-
-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(texifier: Texifier, chunk: Chunk) -> bytes:
+    return b''.join([
+        br'\glowhead{',
+        br'\glowicon{%s}' % chunk.icon.encode('UTF-8') if chunk.icon else b'',
+        b'}{',
+        texifier.texify(chunk.character) if chunk.character else b'',
+        b'}{',
+        texifier.texify(chunk.screen_name) if chunk.screen_name else b'',
+        b'}{',
+        texifier.texify(chunk.author) if chunk.author else b'',
+        b'}',
+        texifier.texify(chunk.content)])
+
+
+ContentOnlyLayout = br'''
+\newcommand{\glowhead}[4]{}
+'''
+
+
+BelowIconLayout = br'''
+\newcommand{\glowhead}[4]{\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}
+#1\ifnotempty
+{#1}{\\*}#2\ifnotempty
+{#2}{\\*}#3\ifnotempty
+{#3}{\\*}#4
+\end{center}
+\end{varwidth}
+}
+\end{wrapstuff}
 
-    def renderChunk(self, chunk: Chunk) -> bytes:
-        return self._texifier.texify(chunk.content) + b'\n'
+\strut
 
+\noindent}'''
 
-class BelowIconLayout(Layout):
 
-    def __init__(self, texifier: Texifier, image_size: float) -> None:
-        self._texifier = texifier
-        self._image_size = image_size
+# Why is \textwidth not the width of the text?
+# Why is the width of the text .765\textwidth?
+BesideIconLayout = br'''
+\newcommand{\glowhead}[4]{
 
-    def renderChunk(self, chunk: Chunk) -> bytes:
-        icon = renderIcon(chunk.icon, self._image_size)
-        meta = [icon] if icon else []
-        meta += [self._texifier.texify(x)
-                 for x in [chunk.character, chunk.screen_name, chunk.author]
-                 if x is not None]
+\strut
 
-        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}
+\noindent\fbox{
+#1
+\parbox[b]{.765\textwidth}{
+\begin{center}
+#2\ifnotempty
+{#2}{\\*}#3\ifnotempty
+{#3}{\\*}#4
+\end{center}
 }
-\\end{wrapstuff}
-
-\\strut
-
-\\noindent %s
-''' % (
-            b'\\\\*'.join(meta),
-            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
-\\parbox[b]{.765\\textwidth}{
-\\begin{center}
-%s
-\\end{center}
-}
-}\\\\*
-\\vspace{-0.75em}\\\\*
-\\noindent %s
-
-\\strut
-
-''' % (
-            icon if icon else b'',
-            b'\\\\*'.join(self._texifier.texify(x) for x in meta if x is not None),
-            self._texifier.texify(chunk.content))
+}\\*
+\vspace{-0.75em}\\*
+\noindent}'''