X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/8d583d5bdb7c8c2c6f7dfc3336c48a9ac04393ca..372211762c57033dfef33075bd593ec5d426f3c7:/paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 160f0db..4e7cdf6 100644
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -4,11 +4,12 @@
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation, version 3.
 
+from typing import Any, Iterable
 
 from bs4 import BeautifulSoup
 
 from args import spec_from_commandline_args
-from glowfic import chunkDOMs
+from glowfic import chunkDOMs, flatURL, makeChunk
 from spec import Spec
 
 
@@ -16,17 +17,34 @@ def parse(content: bytes) -> BeautifulSoup:
     return BeautifulSoup(content, 'html.parser')
 
 
+def ilen(it: Iterable[Any]) -> int:
+    return sum(1 for _ in it)
+
+
 def process(spec: Spec) -> None:
-    spec.texout.write(b'\\documentclass{article}\n\\usepackage{wrapfig}\n')
+    spec.texout.write(b'''\\documentclass{article}
+\\usepackage{booktabs}
+\\usepackage{graphicx}
+\\usepackage{longtable}
+\\usepackage{soul}
+\\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)))
-    for r in chunkDOMs(html):
+    url = flatURL(spec.url)
+    html = parse(spec.htmlfilter(spec.fetcher.fetch(url)))
+    num_chunks = ilen(chunkDOMs(html))
+    for i, r in enumerate(chunkDOMs(html)):
+        percent = 100.0 * i / num_chunks
+        spec.log(f'Processing chunk {i} of {num_chunks} ({percent:.1f}%)\r')
         spec.domfilter(r)
-        spec.texout.write(spec.texifier.texify(r))
+        chunk = makeChunk(r, spec.images)
+        spec.texout.write(spec.texfilter(spec.layout.renderChunk(chunk)))
+    spec.log('')
     spec.texout.write(b'\\end{document}\n')