wrapfig → wrapstuff, for \wrapstuffclear

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 160f0db769416c6cd034486d8dcb513b756e8cdd..f2a81d2247b898f7450f2e9d037e976db3821762 100644 (file)
--- 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
+from glowfic import chunkDOMs, makeChunk
 from spec import Spec
 
 
@@ -17,16 +17,29 @@ def parse(content: bytes) -> BeautifulSoup:
 
 
 def process(spec: Spec) -> None:
-    spec.texout.write(b'\\documentclass{article}\n\\usepackage{wrapfig}\n')
+    spec.texout.write(b'''\\documentclass{article}
+\\usepackage{graphicx}
+\\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
     for r in chunkDOMs(html):
+        if first:
+            first = False
+        else:
+            # h/t https://tex.stackexchange.com/questions/309856
+            spec.texout.write(b'''
+\\wrapstuffclear\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
+
+''')
         spec.domfilter(r)
-        spec.texout.write(spec.texifier.texify(r))
+        chunk = makeChunk(r, spec.images)
+        spec.texout.write(spec.layout.renderChunk(chunk))
     spec.texout.write(b'\\end{document}\n')