From 58e4e4a608de489f993c36234048014d93b39116 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Thu, 11 Dec 2014 19:14:28 +0000
Subject: Text.Pandoc.Parsing: Change parseFromString to fail if not all input
 is consumed.

---
 src/Text/Pandoc/Parsing.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs
index 18f38e564..28ea2bd2f 100644
--- a/src/Text/Pandoc/Parsing.hs
+++ b/src/Text/Pandoc/Parsing.hs
@@ -314,12 +314,14 @@ stringAnyCase (x:xs) = do
   return (firstChar:rest)
 
 -- | Parse contents of 'str' using 'parser' and return result.
-parseFromString :: Stream s m t => ParserT s st m a -> s -> ParserT s st m a
+parseFromString :: Monad m => ParserT String st m a -> String -> ParserT String st m a
 parseFromString parser str = do
   oldPos <- getPosition
   oldInput <- getInput
   setInput str
   result <- parser
+  spaces
+  eof
   setInput oldInput
   setPosition oldPos
   return result
-- 
cgit v1.2.3


From a17f6f2f39c2bcd0bc1a788f49c1cc0c08102874 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Thu, 11 Dec 2014 20:14:23 +0000
Subject: Text.Pandoc.Readers.HTML: Retain display type of MathML output

Closes #1719
---
 src/Text/Pandoc/Writers/HTML.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index e261cfca8..1760ee006 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -60,7 +60,7 @@ import qualified Text.Blaze.XHtml1.Transitional.Attributes as A
 import Text.Blaze.Renderer.String (renderHtml)
 import Text.TeXMath
 import Text.XML.Light.Output
-import Text.XML.Light (unode, elChildren, add_attr, unqual)
+import Text.XML.Light (unode, elChildren, unqual)
 import qualified Text.XML.Light as XML
 import System.FilePath (takeExtension)
 import Data.Monoid
@@ -639,7 +639,9 @@ annotateMML e tex = math (unode "semantics" [cs, unode "annotation" (annotAttrs,
           [] -> unode "mrow" ()
           [x] -> x
           xs -> unode "mrow" xs
-    math = add_attr (XML.Attr (unqual "xmlns") "http://www.w3.org/1998/Math/MathML") . unode "math"
+    math childs = XML.Element q as [XML.Elem childs] l
+      where
+        (XML.Element q as _ l) = e
     annotAttrs = [XML.Attr (unqual "encoding") "application/x-tex"]
 
 
-- 
cgit v1.2.3


From e6bd29e9b81ff40f59bb7f7cbca54d352a519576 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Thu, 11 Dec 2014 20:28:47 +0000
Subject: Text.Pandoc.Writers.RTF: Add blankline at end of output

Closes #1732
---
 src/Text/Pandoc/Writers/RTF.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Text/Pandoc/Writers/RTF.hs b/src/Text/Pandoc/Writers/RTF.hs
index 43405ce3c..dfad4b0e2 100644
--- a/src/Text/Pandoc/Writers/RTF.hs
+++ b/src/Text/Pandoc/Writers/RTF.hs
@@ -106,7 +106,9 @@ writeRTF options (Pandoc meta@(Meta metamap) blocks) =
               $ metadata
   in  if writerStandalone options
          then renderTemplate' (writerTemplate options) context
-         else body
+         else case reverse body of
+                ('\n':_) -> body
+                _        -> body ++ "\n"
 
 -- | Construct table of contents from list of header blocks.
 tableOfContents :: [Block] -> String
-- 
cgit v1.2.3