X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/85bcacb0cabcb41468ade664041315162c2c9248..131deef1eba442d6e05c2ff6c6f7669b4b9e2b24:/paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 24ccccd..b364f4d 100644
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -8,7 +8,7 @@
 from bs4 import BeautifulSoup
 
 from args import spec_from_commandline_args
-from glowfic import chunkDOMs, makeChunk
+from glowfic import chunkDOMs, flatURL, makeChunk
 from spec import Spec
 
 
@@ -18,28 +18,23 @@ def parse(content: bytes) -> BeautifulSoup:
 
 def process(spec: Spec) -> None:
     spec.texout.write(b'''\\documentclass{article}
+\\usepackage{booktabs}
 \\usepackage{graphicx}
-\\usepackage{wrapfig}
+\\usepackage{longtable}
+\\usepackage{varwidth}
+\\usepackage{wrapstuff}
 ''')
     if spec.geometry is not None:
         spec.texout.write(b'\\usepackage[' +
                           spec.geometry.encode('UTF-8') +
                           b']{geometry}\n')
     spec.texout.write(b'\\begin{document}\n')
-    html = parse(spec.htmlfilter(spec.fetcher.fetch(spec.url)))
-    first = True
+    url = flatURL(spec.url)
+    html = parse(spec.htmlfilter(spec.fetcher.fetch(url)))
     for r in chunkDOMs(html):
-        if first:
-            first = False
-        else:
-            # h/t https://tex.stackexchange.com/questions/309856
-            spec.texout.write(b'''
-\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
-
-''')
         spec.domfilter(r)
         chunk = makeChunk(r, spec.images)
-        spec.texout.write(spec.layout.renderChunk(chunk))
+        spec.texout.write(spec.texfilter(spec.layout.renderChunk(chunk)))
     spec.texout.write(b'\\end{document}\n')