diff --git a/markdown-pap.cabal b/markdown-pap.cabal --- a/markdown-pap.cabal +++ b/markdown-pap.cabal @@ -2,7 +2,7 @@ cabal-version: >= 1.8 name: markdown-pap -version: 0.0.1.3 +version: 0.0.1.4 stability: Experimental author: Yoshikuni Jujo maintainer: Yoshikuni Jujo @@ -15,7 +15,7 @@ description: Now. Implemented only following features. . - Paragraph, header, code, list + Paragraph, header, code, list, image . Not yet implemented following features. . @@ -28,7 +28,7 @@ source-repository this type: git location: git://github.com/YoshikuniJujo/markdown-pap.git - tag: 0.0.1.3 + tag: 0.0.1.4 library hs-source-dirs: src diff --git a/src/Text/Markdown/Pap/Parser.hs b/src/Text/Markdown/Pap/Parser.hs --- a/src/Text/Markdown/Pap/Parser.hs +++ b/src/Text/Markdown/Pap/Parser.hs @@ -52,6 +52,7 @@ markdown1 :: Text = h:header { return h } / l:link { return l } + / i:image { return i } / l:list '\n'* { return $ List l } / c:code { return $ Code c } / p:paras { return $ Paras p } @@ -109,7 +110,7 @@ = ps:para+ { return ps } para :: String - = ls:(!_:listHead !_:nListHead !_:header !_:fourSpaces l:line '\n' { return l })+ _:('\n' / !_ / !_:para) + = ls:(!_:('!') !_:listHead !_:nListHead !_:header !_:fourSpaces l:line '\n' { return l })+ _:('\n' / !_ / !_:para) { return $ unwords ls } shllw :: () @@ -120,6 +121,11 @@ dmmy :: () = link :: Text - = '[' t:<(/= ']')>+ ']' '(' a:<(/= ')')>+ ')' { return $ Link t a "" } + = '[' t:<(/= ']')>+ ']' ' '* '(' a:<(/= ')')>+ ')' { return $ Link t a "" } + +image :: Text + = '!' '[' alt:<(/= ']')>+ ']' ' '* '(' addrs:<(`notElem` ")\"")>+ ' '* + '"' t:<(/= '"')>+ '"' ')' + { return $ Image alt addrs t } |] diff --git a/src/Text/Markdown/Pap/Text.hs b/src/Text/Markdown/Pap/Text.hs --- a/src/Text/Markdown/Pap/Text.hs +++ b/src/Text/Markdown/Pap/Text.hs @@ -7,6 +7,7 @@ | Code String | List List | Link String Address Title + | Image String Address Title deriving Show -- type TextString = [TextString1]