From 2b9ceaead3f3cd80e973cccecb9a3eebc51154f7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Sun, 17 Jul 2016 19:21:56 +0200
Subject: Fixes for GHC 8.0.1

---
 server/src/Thermoprint/Server/Printer/Debug.hs   | 2 +-
 server/src/Thermoprint/Server/Printer/Generic.hs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'server/src/Thermoprint/Server/Printer')

diff --git a/server/src/Thermoprint/Server/Printer/Debug.hs b/server/src/Thermoprint/Server/Printer/Debug.hs
index d7ee12a..b8580b8 100644
--- a/server/src/Thermoprint/Server/Printer/Debug.hs
+++ b/server/src/Thermoprint/Server/Printer/Debug.hs
@@ -26,7 +26,7 @@ debugPrint :: PrinterMethod
 debugPrint = PM $ (>> return Nothing) . $(logDebugS) "Printer.Debug" . T.pack . show . cotext' 
 
 cotext' :: Printout -> Text
-cotext' = mconcat . intersperse "\n\n" . map (mconcat . map cotext'' . toList) . toList
+cotext' = mconcat . intersperse "\n\n" . map (mconcat . map cotext'' . toList . getChunks) . toList . getParagraphs
   where
     cotext'' (Cooked b) = cotext b
     cotext'' (Raw _)    = "[Raw]"
diff --git a/server/src/Thermoprint/Server/Printer/Generic.hs b/server/src/Thermoprint/Server/Printer/Generic.hs
index df84e06..f431e4f 100644
--- a/server/src/Thermoprint/Server/Printer/Generic.hs
+++ b/server/src/Thermoprint/Server/Printer/Generic.hs
@@ -114,10 +114,10 @@ intersperse' :: Monad m => m b -> (a -> m b) -> Seq a -> m ()
 intersperse' b f = sequence_ . intersperse b f
 
 render :: Printout -> Put
-render = intersperse' (newls' 2) renderPar
+render = intersperse' (newls' 2) renderPar . getParagraphs
 
 renderPar :: Paragraph -> Put
-renderPar = mapM_ renderChunk
+renderPar = mapM_ renderChunk . getChunks
   where
     renderChunk (Raw bs)       = mapM_ pushWord8 $ LBS.unpack bs
     renderChunk (Cooked block) = renderDoc $ execState (renderBlock block) (initDoc width)
-- 
cgit v1.2.3