`beside` layout

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 160f0db769416c6cd034486d8dcb513b756e8cdd..5e5747c90e5c6483754e23d2a2d51014f656a312 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -8,7 +8,7 @@
 from bs4 import BeautifulSoup
 
 from args import spec_from_commandline_args
 from bs4 import BeautifulSoup
 
 from args import spec_from_commandline_args

-from glowfic import chunkDOMs
+from glowfic import chunkDOMs, makeChunk

 from spec import Spec
 
 
 from spec import Spec
 
 


@@ -17,7 +17,11 @@ def parse(content: bytes) -> BeautifulSoup:
 
 
 def process(spec: Spec) -> None:
 
 
 def process(spec: Spec) -> None:

-    spec.texout.write(b'\\documentclass{article}\n\\usepackage{wrapfig}\n')
+    spec.texout.write(b'''\\documentclass{article}
+\\usepackage{graphicx}
+\\usepackage{varwidth}
+\\usepackage{wrapstuff}
+''')

     if spec.geometry is not None:
         spec.texout.write(b'\\usepackage[' +
                           spec.geometry.encode('UTF-8') +
     if spec.geometry is not None:
         spec.texout.write(b'\\usepackage[' +
                           spec.geometry.encode('UTF-8') +


@@ -26,7 +30,8 @@ def process(spec: Spec) -> None:
     html = parse(spec.htmlfilter(spec.fetcher.fetch(spec.url)))
     for r in chunkDOMs(html):
         spec.domfilter(r)
     html = parse(spec.htmlfilter(spec.fetcher.fetch(spec.url)))
     for r in chunkDOMs(html):
         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')
 
 
     spec.texout.write(b'\\end{document}\n')