X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/62043b2bafbcb57beae7559235bd6984b6275b55..5f230208bb5e858cfeadb3d9c822579d2b7b8300:/glowfic.py?ds=inline

diff --git a/glowfic.py b/glowfic.py
index 8561cd7..b7e7ba7 100644
--- a/glowfic.py
+++ b/glowfic.py
@@ -111,13 +111,6 @@ def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:
                  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
@@ -136,51 +129,49 @@ class ContentOnlyLayout(Layout):
 
 class BelowIconLayout(Layout):
 
-    def __init__(self, texifier: Texifier, image_size: float) -> None:
+    def __init__(self, texifier: Texifier) -> None:
         self._texifier = texifier
-        self._image_size = image_size
 
     def renderChunk(self, chunk: Chunk) -> bytes:
-        icon = renderIcon(chunk.icon, self._image_size)
-        meta = [icon] if icon else []
+        meta = []
+        if chunk.icon:
+            meta += [br'\glowicon{%s}' % chunk.icon.encode('UTF-8')]
         meta += [self._texifier.texify(x)
                  for x in [chunk.character, chunk.screen_name, chunk.author]
                  if x is not None]
 
-        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}
+        return br'''\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{center}
+\end{varwidth}
 }
-\\end{wrapstuff}
+\end{wrapstuff}
 
-\\strut
+\strut
 
-\\noindent %s
+\noindent %s
 ''' % (
-            b'\\\\*'.join(meta),
+            br'\\*'.join(meta),
             self._texifier.texify(chunk.content))
 
 
 class BesideIconLayout(Layout):
 
-    def __init__(self, texifier: Texifier, image_size: float) -> None:
+    def __init__(self, texifier: Texifier) -> 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,
@@ -189,20 +180,20 @@ class BesideIconLayout(Layout):
 
         # Why is \textwidth not the width of the text?
         # Why is the width of the text .765\textwidth?
-        return b'''\\noindent\\fbox{
+        return br'''\noindent\fbox{
 %s
-\\parbox[b]{.765\\textwidth}{
-\\begin{center}
+\parbox[b]{.765\textwidth}{
+\begin{center}
 %s
-\\end{center}
+\end{center}
 }
-}\\\\*
-\\vspace{-0.75em}\\\\*
-\\noindent %s
+}\\*
+\vspace{-0.75em}\\*
+\noindent %s
 
-\\strut
+\strut
 
 ''' % (
-            icon if icon else b'',
-            b'\\\\*'.join(self._texifier.texify(x) for x in meta if x is not None),
+            br'\glowicon{%s}' % chunk.icon.encode('UTF-8') if chunk.icon else b'',
+            br'\\*'.join(self._texifier.texify(x) for x in meta if x is not None),
             self._texifier.texify(chunk.content))