X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/d70acaef01c7e1501d06fda7b0e3f05de021427d..1fac41bf2d403d35d43dd532a37a8225f682bae2:/paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 0fd1fde..86b8766 100644
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -9,7 +9,7 @@ from typing import Any, Iterable
 from bs4 import BeautifulSoup
 
 from args import spec_from_commandline_args
-from glowfic import chunkDOMs, flatURL, makeChunk
+from glowfic import chunkDOMs, flatURL, makeChunk, renderChunk
 from spec import Spec
 
 
@@ -22,21 +22,28 @@ def ilen(it: Iterable[Any]) -> int:
 
 
 def process(spec: Spec) -> None:
-    spec.texout.write(b'''\\documentclass{article}
-\\usepackage{booktabs}
-\\usepackage{graphicx}
-\\usepackage{longtable}
-\\usepackage{soul}
-\\usepackage{varwidth}
-\\usepackage{wrapstuff}
+    spec.texout.write(br'''\documentclass{article}
+\usepackage{booktabs}
+\usepackage{graphicx}
+\usepackage{longtable}
+\usepackage{soul}
+\usepackage{varwidth}
+\usepackage{wrapstuff}
 ''')
     if spec.geometry is not None:
-        spec.texout.write(b'\\usepackage[' +
+        spec.texout.write(br'\usepackage[' +
                           spec.geometry.encode('UTF-8') +
                           b']{geometry}\n')
-    spec.texout.write(b'''\\begin{document}
-\\newcommand{\\href}[2]{#2\\footnote{#1}}
-''')
+    spec.texout.write(br'''\begin{document}
+\newcommand{\href}[2]{#2\footnote{\detokenize{#1}}}
+\def\glowiconsize{%fmm}
+\newcommand{\glowicon}[1]{\includegraphics[
+  width=\glowiconsize,height=\glowiconsize,keepaspectratio
+]{#1}}
+\newcommand{\ifnotempty}[2]{\expandafter\ifx\expandafter\relax
+  \detokenize{#1}\relax\else #2\fi}
+%s
+''' % (spec.icon_size, spec.layout))
     url = flatURL(spec.url)
     spec.log('Fetching HTML...\r')
     html = spec.fetcher.fetch(url)
@@ -49,7 +56,7 @@ def process(spec: Spec) -> None:
         spec.log(f'Processing chunk {i} of {num_chunks} ({percent:.1f}%)\r')
         spec.domfilter(r)
         chunk = makeChunk(r, spec.images)
-        spec.texout.write(spec.texfilter(spec.layout.renderChunk(chunk)))
+        spec.texout.write(spec.texfilter(renderChunk(spec.texifier, chunk)))
     spec.log('')
     spec.texout.write(b'\\end{document}\n')