git.iko.soy/typeable/pandoc
on master help sign in
Use Data.Maybe.fromMaybe
621e864Alexander Krotov
src/Text/Pandoc/Readers/Org/Meta.hs+3−6
compare with master
unifiedsplit
@@ -50,6 +50,7 @@ import Text.Pandoc.Shared (safeRead)
50import Control.Monad (mzero, void, when)
50import Control.Monad (mzero, void, when)
51import Data.Char (toLower)
51import Data.Char (toLower)
52import Data.List (intersperse)
52import Data.List (intersperse)
53+import Data.Maybe (fromMaybe)
53import qualified Data.Map as M
54import qualified Data.Map as M
54import Network.HTTP (urlEncode)
55import Network.HTTP (urlEncode)
55
56
@@ -191,16 +192,12 @@ parseFormat = try $ replacePlain <|> replaceUrl <|> justAppend
191
192
192setEmphasisPreChar :: Maybe [Char] -> OrgParserState -> OrgParserState
193setEmphasisPreChar :: Maybe [Char] -> OrgParserState -> OrgParserState
193setEmphasisPreChar csMb st =
194setEmphasisPreChar csMb st =
194− let preChars = case csMb of
195+ let preChars = fromMaybe (orgStateEmphasisPostChars defaultOrgParserState) csMb
195− Nothing -> orgStateEmphasisPreChars defaultOrgParserState
196− Just cs -> cs
197 in st { orgStateEmphasisPreChars = preChars }
196 in st { orgStateEmphasisPreChars = preChars }
198
197
199setEmphasisPostChar :: Maybe [Char] -> OrgParserState -> OrgParserState
198setEmphasisPostChar :: Maybe [Char] -> OrgParserState -> OrgParserState
200setEmphasisPostChar csMb st =
199setEmphasisPostChar csMb st =
201− let postChars = case csMb of
202− Nothing -> orgStateEmphasisPostChars defaultOrgParserState
200+ let postChars = fromMaybe (orgStateEmphasisPostChars defaultOrgParserState) csMb
203− Just cs -> cs
204 in st { orgStateEmphasisPostChars = postChars }
201 in st { orgStateEmphasisPostChars = postChars }
205
202
206emphChars :: Monad m => OrgParser m (Maybe [Char])
203emphChars :: Monad m => OrgParser m (Maybe [Char])