aboutsummaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authorJohn MacFarlane <[email protected]>2017-08-07 08:33:26 -0700
committerJohn MacFarlane <[email protected]>2017-08-07 08:33:26 -0700
commitc82ce46dd40a7fed393584ea309a685236c55122 (patch)
tree091069a83f2381c5b23d0c5a85b8411b43abc998 /src/Text
parent43506477bd27546f176af4cc9be90688b4c57290 (diff)
Use cmark-gfm-0.1.1, which fixes bugs.
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Readers/GFM.hs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Readers/GFM.hs b/src/Text/Pandoc/Readers/GFM.hs
index 89b0a2914..8726a6c3f 100644
--- a/src/Text/Pandoc/Readers/GFM.hs
+++ b/src/Text/Pandoc/Readers/GFM.hs
@@ -38,11 +38,11 @@ import Data.Text (Text, unpack)
import Text.Pandoc.Class (PandocMonad)
import Text.Pandoc.Definition
import Text.Pandoc.Options
-import Debug.Trace
+
-- | Parse a CommonMark formatted string into a 'Pandoc' structure.
readGFM :: PandocMonad m => ReaderOptions -> Text -> m Pandoc
readGFM opts s = return $
- nodeToPandoc $ traceShowId $ commonmarkToNode opts' exts s
+ nodeToPandoc $ commonmarkToNode opts' exts s
where opts' = [optSmart | enabled Ext_smart]
exts = [extStrikethrough, extTable, extAutolink]
enabled x = extensionEnabled x (readerExtensions opts)
@@ -91,10 +91,10 @@ addBlock (Node _ (LIST listAttrs) nodes) =
addBlock (Node _ (TABLE alignments) nodes) = do
(Table [] aligns widths headers rows :)
where aligns = map fromTableCellAlignment alignments
- fromTableCellAlignment None = AlignDefault
- fromTableCellAlignment CMarkGFM.Left = AlignLeft
- fromTableCellAlignment CMarkGFM.Right = AlignRight
- fromTableCellAlignment Center = AlignCenter
+ fromTableCellAlignment NoAlignment = AlignDefault
+ fromTableCellAlignment LeftAligned = AlignLeft
+ fromTableCellAlignment RightAligned = AlignRight
+ fromTableCellAlignment CenterAligned = AlignCenter
widths = replicate numcols 0.0
numcols = if null rows'
then 0