wrapfig → wrapstuff, for \wrapstuffclear

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 4291bb4e613659b29ec21eecd77c60777f6e97a6..a89e8bb37c98d6f1df4c0bc22097c9069dbc3fd6 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -15,6 +15,7 @@ import paperdoorknob
 from testing.fakeserver import FakeGlowficServer
 from domfilter import ApplyDOMFilters
 from fetch import DirectFetcher, FakeFetcher, Fetcher
+from glowfic import ContentOnlyLayout, BelowIconLayout
 from images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
@@ -40,16 +41,23 @@ class BaseTestProcess(ABC):
             FakeImageStore(),
             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-            PandocTexifier('pandoc'),
+            ContentOnlyLayout(PandocTexifier('pandoc')),
             'margin=20mm',
             buf)
         paperdoorknob.process(spec)
         assert buf.getvalue() == b'''\\documentclass{article}
-\\usepackage{wrapfig}
+\\usepackage{graphicx}
+\\usepackage{wrapstuff}
 \\usepackage[margin=20mm]{geometry}
 \\begin{document}
 This is glowfic
+
+\\wrapstuffclear\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
+
 You \\emph{sure}?
+
+\\wrapstuffclear\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
+
 Pretty sure.
 \\end{document}
 '''
@@ -64,7 +72,7 @@ Pretty sure.
             FakeImageStore(),
             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-            texifier,
+            ContentOnlyLayout(texifier),
             None,
             buf)
         paperdoorknob.process(spec)
@@ -77,7 +85,7 @@ Pretty sure.
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-                PandocTexifier('pandoc'),
+                BelowIconLayout(PandocTexifier('pandoc'), 20),
                 None,
                 out)
             paperdoorknob.process(spec)