X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/d2a41ff4f433a29173259359dcf477fd59ee3c78..a8a47f7846509d22b123f4ab9cfdd7e65ac0d32e:/paperdoorknob.py diff --git a/paperdoorknob.py b/paperdoorknob.py index f8b3361..4ee4dbc 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 @@ -19,14 +19,16 @@ def parse(content: bytes) -> BeautifulSoup: def process(spec: Spec) -> None: spec.texout.write(b'''\\documentclass{article} \\usepackage{graphicx} -\\usepackage{wrapfig} +\\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))) + url = flatURL(spec.url) + html = parse(spec.htmlfilter(spec.fetcher.fetch(url))) for r in chunkDOMs(html): spec.domfilter(r) chunk = makeChunk(r, spec.images)