From 3f7b3f5fd06d46c7824f482219ffa4a461f4fef2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenthal Date: Wed, 30 Nov 2016 13:26:32 -0500 Subject: Add Text2Tags to Text.Pandoc --- src/Text/Pandoc.hs | 6 ++---- src/Text/Pandoc/Readers/Txt2Tags.hs | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs index 02217c376..a49d52e25 100644 --- a/src/Text/Pandoc.hs +++ b/src/Text/Pandoc.hs @@ -86,7 +86,6 @@ module Text.Pandoc , readJSON , readTWiki , readTxt2Tags - , readTxt2TagsNoMacros , readEPUB -- * Writers: converting /from/ Pandoc format , Writer(..) @@ -179,8 +178,7 @@ import Text.Pandoc.Writers.Custom import Text.Pandoc.Writers.TEI import Text.Pandoc.Templates import Text.Pandoc.Options -import Text.Pandoc.Shared (safeRead, warn, mapLeft, pandocVersion) -import Text.Pandoc.MediaBag (MediaBag) +import Text.Pandoc.Shared (safeRead, mapLeft, pandocVersion) import Text.Pandoc.Error import Text.Pandoc.Class (PandocMonad, runIOorExplode, PandocExecutionError(..)) import Data.Aeson @@ -266,7 +264,7 @@ readers = [ ("native" , StringReader $ \_ s -> readNative s) ,("twiki" , StringReader readTWiki) ,("docx" , ByteStringReader readDocx) ,("odt" , ByteStringReader readOdt) - -- ,("t2t" , mkStringReader readTxt2TagsNoMacros) + ,("t2t" , StringReader readTxt2Tags) ,("epub" , ByteStringReader readEPUB) ] diff --git a/src/Text/Pandoc/Readers/Txt2Tags.hs b/src/Text/Pandoc/Readers/Txt2Tags.hs index 00b37503e..29457ee6a 100644 --- a/src/Text/Pandoc/Readers/Txt2Tags.hs +++ b/src/Text/Pandoc/Readers/Txt2Tags.hs @@ -29,7 +29,7 @@ Conversion of txt2tags formatted plain text to 'Pandoc' document. module Text.Pandoc.Readers.Txt2Tags ( readTxt2Tags , getT2TMeta , T2TMeta (..) - , readTxt2TagsNoMacros) + ) where import qualified Text.Pandoc.Builder as B @@ -102,8 +102,8 @@ readTxt2Tags opts s = do -- | Read Txt2Tags (ignoring all macros) from an input string returning -- a Pandoc document -readTxt2TagsNoMacros :: PandocMonad m => ReaderOptions -> String -> m Pandoc -readTxt2TagsNoMacros = readTxt2Tags +-- readTxt2TagsNoMacros :: PandocMonad m => ReaderOptions -> String -> m Pandoc +-- readTxt2TagsNoMacros = readTxt2Tags parseT2T :: T2T Pandoc parseT2T = do -- cgit v1.2.3