Reduce the number of places we keep our version number: 3 → 2

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index f2a81d2247b898f7450f2e9d037e976db3821762..4ee4dbc2a0fca7208d62ec9fd8c6e212087c5062 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, makeChunk
+from glowfic import chunkDOMs, flatURL, makeChunk

 from spec import Spec
 
 
 from spec import Spec
 
 


@@ -19,6 +19,7 @@ def parse(content: bytes) -> BeautifulSoup:
 def process(spec: Spec) -> None:
     spec.texout.write(b'''\\documentclass{article}
 \\usepackage{graphicx}
 def process(spec: Spec) -> None:
     spec.texout.write(b'''\\documentclass{article}
 \\usepackage{graphicx}

+\\usepackage{varwidth}

 \\usepackage{wrapstuff}
 ''')
     if spec.geometry is not None:
 \\usepackage{wrapstuff}
 ''')
     if spec.geometry is not None:


@@ -26,17 +27,9 @@ def process(spec: Spec) -> None:
                           spec.geometry.encode('UTF-8') +
                           b']{geometry}\n')
     spec.texout.write(b'\\begin{document}\n')
                           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
+    url = flatURL(spec.url)
+    html = parse(spec.htmlfilter(spec.fetcher.fetch(url)))

     for r in chunkDOMs(html):
     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)
         chunk = makeChunk(r, spec.images)
         spec.texout.write(spec.layout.renderChunk(chunk))
         spec.domfilter(r)
         chunk = makeChunk(r, spec.images)
         spec.texout.write(spec.layout.renderChunk(chunk))