Use new doctemplates, doclayout.

+ Remove Text.Pandoc.Pretty; use doclayout instead. [API change]
+ Text.Pandoc.Writers.Shared: remove metaToJSON, metaToJSON'
  [API change].
+ Text.Pandoc.Writers.Shared: modify `addVariablesToContext`,
  `defField`, `setField`, `getField`, `resetField` to work with
  Context rather than JSON values. [API change]
+ Text.Pandoc.Writers.Shared: export new function `endsWithPlain` [API
  change].
+ Use new templates and doclayout in writers.
+ Use Doc-based templates in all writers.
+ Adjust three tests for minor template rendering differences.
+ Added indentation to body in docbook4, docbook5 templates.

The main impact of this change is better reflowing of content
interpolated into templates.  Previously, interpolated variables
were rendered independently and intepolated as strings, which could lead
to overly long lines.  Now the templates interpolated as Doc values
which may include breaking spaces, and reflowing occurs
after template interpolation rather than before.

1 files changed, 6 insertions, 10 deletions

diff --git a/src/Text/Pandoc/Class.hs b/src/Text/Pandoc/Class.hs
index cd71448fe..34b04b266 100644
--- a/src/Text/Pandoc/Class.hs
+++ b/src/Text/Pandoc/Class.hs
@@ -315,18 +315,14 @@ readFileFromDirs (d:ds) f = catchError
     (\_ -> readFileFromDirs ds f)
 
 instance TemplateMonad PandocIO where
-  getPartial fp =
-    lift $ UTF8.toText <$>
-      catchError (readFileStrict fp)
-        (\_ -> readDataFile ("templates" </> fp))
+  getPartial fp = UTF8.toText <$> catchError
+                      (readFileStrict fp)
+                      (\_ -> readDataFile ("templates" </> fp))
 
 instance TemplateMonad PandocPure where
-  getPartial fp =
-    lift $ UTF8.toText <$>
-      catchError (readFileStrict fp)
-        (\_ -> readDataFile ("templates" </> fp))
-
---
+  getPartial fp = UTF8.toText <$> catchError
+                      (readFileStrict fp)
+                      (\_ -> readDataFile ("templates" </> fp))
 
 -- | 'CommonState' represents state that is used by all
 -- instances of 'PandocMonad'.  Normally users should not