Put Texifier in spec

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index bafce174a1f0af81b46796297cd813d5adf14c57..28408d6138003d0ce616bc0e034cb9f9d52a250f 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -15,7 +15,7 @@ import paperdoorknob
 
 from testing.fakeserver import FakeGlowficServer
 from fetch import DirectFetcher, FakeFetcher, Fetcher
 
 from testing.fakeserver import FakeGlowficServer
 from fetch import DirectFetcher, FakeFetcher, Fetcher

-from glowfic import ContentOnlyLayout, BelowIconLayout
+from glowfic import ContentOnlyLayout, BesideIconLayout

 from images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 from images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier


@@ -35,21 +35,26 @@ class BaseTestProcess(ABC):
 
     def testProcess(self) -> None:
         buf = io.BytesIO()
 
     def testProcess(self) -> None:
         buf = io.BytesIO()

+        texifier = PandocTexifier('pandoc')

         spec = Spec(
             self.url(),
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             lambda x: None,
         spec = Spec(
             self.url(),
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             lambda x: None,

+            texifier,

             lambda x: x,
             lambda x: x,

-            ContentOnlyLayout(PandocTexifier('pandoc')),
+            20,
+            ContentOnlyLayout(texifier),

             'margin=20mm',
             'margin=20mm',

-            buf)
+            buf,
+            lambda _: None)

         paperdoorknob.process(spec)
         assert re.match(br'''\\documentclass{article}
 (\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}
         paperdoorknob.process(spec)
         assert re.match(br'''\\documentclass{article}
 (\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}

-This is glowfic
+(.|\n)*
+This is \\href{https://glowfic.com}{glowfic}

 
 You \\emph{sure}\?
 
 
 You \\emph{sure}\?
 


@@ -68,13 +73,17 @@ Pretty sure.
             FakeImageStore(),
             lambda x: x,
             lambda x: None,
             FakeImageStore(),
             lambda x: x,
             lambda x: None,

+            texifier,

             lambda x: x,
             lambda x: x,

+            20,

             ContentOnlyLayout(texifier),
             None,
             ContentOnlyLayout(texifier),
             None,

-            buf)
+            buf,
+            lambda _: None)

         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:

+        texifier = PandocTexifier('pandoc')

         with open("test.tex", 'wb') as out:
             spec = Spec(
                 self.url(),
         with open("test.tex", 'wb') as out:
             spec = Spec(
                 self.url(),


@@ -82,10 +91,13 @@ Pretty sure.
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: None,
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: None,

+                texifier,

                 lambda x: x,
                 lambda x: x,

-                BelowIconLayout(PandocTexifier('pandoc'), 20),
+                20,
+                BesideIconLayout(texifier),

                 None,
                 None,

-                out)
+                out,
+                lambda _: None)

             paperdoorknob.process(spec)
         subprocess.run(['pdflatex', 'test.tex'],
                        stdin=subprocess.DEVNULL, check=True)
             paperdoorknob.process(spec)
         subprocess.run(['pdflatex', 'test.tex'],
                        stdin=subprocess.DEVNULL, check=True)