X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/81557fabadd506e31a6a9a787bcebe92b0883ad2..606c97c59b4f50d8025b3b2946f6f8a4942c5fb9:/paperdoorknob.py?ds=sidebyside diff --git a/paperdoorknob.py b/paperdoorknob.py index 26a60fb..05b068f 100644 --- a/paperdoorknob.py +++ b/paperdoorknob.py @@ -4,8 +4,6 @@ # under the terms of the GNU General Public License as published by the # Free Software Foundation, version 3. -from sys import stderr - from typing import Any, Iterable from bs4 import BeautifulSoup @@ -36,19 +34,19 @@ def process(spec: Spec) -> None: spec.texout.write(b'\\usepackage[' + spec.geometry.encode('UTF-8') + b']{geometry}\n') - spec.texout.write(b'\\begin{document}\n') + spec.texout.write(b'''\\begin{document} +\\newcommand{\\href}[2]{#2\\footnote{#1}} +''') url = flatURL(spec.url) - html = parse(spec.htmlfilter(spec.fetcher.fetch(url))) - num_chunks = ilen(chunkDOMs(html)) - for i, r in enumerate(chunkDOMs(html)): + dom = parse(spec.htmlfilter(spec.fetcher.fetch(url))) + num_chunks = ilen(chunkDOMs(dom)) + for i, r in enumerate(chunkDOMs(dom)): percent = 100.0 * i / num_chunks - print( - f'Processing chunk {i} of {num_chunks} ({percent:.1f}%)', - end='\r', - file=stderr) + 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.log('') spec.texout.write(b'\\end{document}\n')