markdown 0.1.10 → 0.1.11

raw patch · 25 files changed

+118/−5 lines, 25 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Text/Markdown/Block.hs +11/−3
• markdown.cabal +1/−1
• test/examples/html-blocks-spec1.html +7/−0
• test/examples/html-blocks-spec1.md +9/−0
• test/examples/html-blocks-spec10.html +4/−0
• test/examples/html-blocks-spec10.md +4/−0
• test/examples/html-blocks-spec11.html +2/−0
• test/examples/html-blocks-spec11.md +2/−0
• test/examples/html-blocks-spec2.html +3/−0
• test/examples/html-blocks-spec2.md +3/−0
• test/examples/html-blocks-spec3.html +1/−0
• test/examples/html-blocks-spec3.md +5/−0
• test/examples/html-blocks-spec4.html +4/−0
• test/examples/html-blocks-spec4.md +4/−0
• test/examples/html-blocks-spec5.html +3/−0
• test/examples/html-blocks-spec5.md +3/−0
• test/examples/html-blocks-spec6.html +3/−0
• test/examples/html-blocks-spec6.md +3/−0
• test/examples/html-blocks-spec7.html +13/−0
• test/examples/html-blocks-spec7.md +13/−0
• test/examples/html-blocks-spec8.html +1/−0
• test/examples/html-blocks-spec8.md +3/−0
• test/examples/html-blocks-spec9.html +3/−0
• test/examples/html-blocks-spec9.md +4/−0
• test/main.hs +9/−1

@@ -231,22 +231,27 @@                     isNonPara LineBlank = True                     isNonPara LineFenced{} = True                     isNonPara LineBlockQuote{} = not $ msBlankBeforeBlockquote ms+                    isNonPara LineHtml{} = True -- See example 95 in Common Markdown spec                     isNonPara _ = False                 (mfinal, ls) <- takeTillConsume (\x -> isNonPara (lineType ms x) || listStartIndent x)                 maybe (return ()) leftover mfinal                 yield $ Right $ BlockPara $ T.intercalate "\n" $ t' : ls  isHtmlStart :: T.Text -> Bool+-- Allow for up to three spaces before the opening tag.+isHtmlStart t | "    " `T.isPrefixOf` t = False isHtmlStart t =-    case T.stripPrefix "<" t of+    case T.stripPrefix "<" $ T.dropWhile (== ' ') t of         Nothing -> False         Just t' ->             let (name, rest)                     | Just _ <- T.stripPrefix "!--" t' = ("--", t')                     | otherwise = T.break (\c -> c `elem` " >") t'-             in T.all isValidTagName name &&+             in (T.all isValidTagName name &&                 not (T.null name) &&-                (not ("/" `T.isPrefixOf` rest) || ("/>" `T.isPrefixOf` rest))+                (not ("/" `T.isPrefixOf` rest) || ("/>" `T.isPrefixOf` rest)))++                || isPI t' || isCommentCData t'   where     isValidTagName :: Char -> Bool     isValidTagName c =@@ -257,6 +262,9 @@         (c == '_') ||         (c == '/') ||         (c == '!')++    isPI = ("?" `T.isPrefixOf`)+    isCommentCData = ("!" `T.isPrefixOf`)  takeTill :: Monad m => (i -> Bool) -> Conduit i m i takeTill f =

@@ -1,5 +1,5 @@ Name:                markdown-Version:             0.1.10+Version:             0.1.11 Synopsis:            Convert Markdown to HTML, with XSS protection Description:         This library leverages existing high-performance libraries (attoparsec, blaze-html, text, and conduit), and should integrate well with existing codebases. Homepage:            https://github.com/snoyberg/markdown

@@ -0,0 +1,7 @@+<table>+  <tr>+    <td>+           hi+    </td>+  </tr>+</table><p>okay.</p>

@@ -0,0 +1,9 @@+<table>+  <tr>+    <td>+           hi+    </td>+  </tr>+</table>++okay.

@@ -0,0 +1,4 @@+<div>+bar+</div>+*foo*

@@ -0,0 +1,4 @@+<div>+bar+</div>+*foo*

@@ -0,0 +1,2 @@+<div class+foo

@@ -0,0 +1,2 @@+<div class+foo

@@ -0,0 +1,3 @@+ <div>+  *hello*+         <foo><a>

@@ -0,0 +1,3 @@+ <div>+  *hello*+         <foo><a>

@@ -0,0 +1,1 @@+<DIV CLASS="foo"><p><i>Markdown</i></p></DIV>

@@ -0,0 +1,5 @@+<DIV CLASS="foo">++*Markdown*++</DIV>

@@ -0,0 +1,4 @@+<div></div>+``` c+int x = 33;+```

@@ -0,0 +1,4 @@+<div></div>+``` c+int x = 33;+```

@@ -0,0 +1,3 @@+<!-- Foo+bar+   baz -->

@@ -0,0 +1,3 @@+<!-- Foo+bar+   baz -->

@@ -0,0 +1,3 @@+<?php+  echo 'foo'+  ?>

@@ -0,0 +1,3 @@+<?php+  echo 'foo'+  ?>

@@ -0,0 +1,13 @@+<![CDATA[+function matchwo(a,b)+{+if (a < b && a < 0) then+  {+  return 1;+  }+else+  {+  return 0;+  }+}+]]>

@@ -0,0 +1,13 @@+<![CDATA[+function matchwo(a,b)+{+if (a < b && a < 0) then+  {+  return 1;+  }+else+  {+  return 0;+  }+}+]]>

@@ -0,0 +1,1 @@+  <!-- foo --><pre><code>&lt;!-- foo --&gt;</code></pre>

@@ -0,0 +1,3 @@+  <!-- foo -->++    <!-- foo -->

@@ -0,0 +1,3 @@+<p>Foo</p><div>+bar+</div>

@@ -0,0 +1,4 @@+Foo+<div>+bar+</div>

@@ -10,6 +10,8 @@ import Control.Monad (forM_) import qualified Data.Set as Set import qualified Data.Map as Map+import Data.List (isInfixOf)+import Data.Maybe (fromMaybe)  import qualified Filesystem.Path.CurrentOS as F import qualified Filesystem as F@@ -233,7 +235,13 @@     go fp = do         input <- F.readTextFile fp         output <- F.readTextFile $ F.replaceExtension fp "html"-        return $ it (F.encodeString $ F.basename fp) $ check (fromStrict $ T.strip output) (fromStrict input)+        let (checker, stripper)+                | "-spec" `isInfixOf` F.encodeString fp = (check', dropFinalLF)+                | otherwise = (check, T.strip)++        return $ it (F.encodeString $ F.basename fp) $ checker (fromStrict $ stripper output) (fromStrict input)++    dropFinalLF t = fromMaybe t $ T.stripSuffix "\n" t  getGruber :: IO [Spec] getGruber = do