From caef362065f3965107b0d5619b5d7bbb3d3b1889 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Mon, 23 Jul 2007 00:19:00 +0000 Subject: Renamed parseFromStr -> parseFromString. git-svn-id: https://pandoc.googlecode.com/svn/trunk@779 788f1e2b-df1e-0410-8736-df70ead52e1b --- src/Text/Pandoc/Readers/Markdown.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Text/Pandoc/Readers') diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 3f37c1766..ad3b015b4 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -591,14 +591,14 @@ rawTableLine indices = do -- Parse a table line and return a list of lists of blocks (columns). tableLine indices = try $ do rawline <- rawTableLine indices - mapM (parseFromStr (many plain)) rawline + mapM (parseFromString (many plain)) rawline -- Parse a multiline table row and return a list of blocks (columns). multilineRow indices = try $ do colLines <- many1 (rawTableLine indices) option "" blanklines let cols = map unlines $ transpose colLines - mapM (parseFromStr (many plain)) cols + mapM (parseFromString (many plain)) cols -- Calculate relative widths of table columns, based on indices widthsFromIndices :: Int -- Number of columns on terminal @@ -628,7 +628,7 @@ tableWith headerParser lineParser footerParser = try $ do (rawHeads, aligns, indices) <- headerParser lines <- many1Till (lineParser indices) footerParser caption <- option [] tableCaption - heads <- mapM (parseFromStr (many plain)) rawHeads + heads <- mapM (parseFromString (many plain)) rawHeads state <- getState let numColumns = stateColumns state let widths = widthsFromIndices numColumns indices -- cgit v1.2.3