diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,25 @@ # Changelog for commonmark-extensions +## 0.2.7 + + * Math extension: bail out on pathological nestings. + This means we can't handle TeX math with more than 1000 levels of + `{..}` nesting, but no real formula will go this far. + + * Math extension: do not allow math closer followed by digit (#167, + Michael Howell). With this change, closing `$` cannot be + followed by a decimal digit. For example, `$1$` is fine, but + `$1$2` is not. This avoids some false positives like `Current + conversion rate makes US$99 about A$137`. + + * Fix the blank line scanner after the `]` (Michael Howell). + + * Fix disagreement with GitHub about block nesting in tasklists + (Michael Howell). Text on the same line as the task marker can't + start a block. It has to be paragraph text. + + * Fix incorrectly computed indent on `task_list` (Michael Howell). + ## 0.2.6 * Track wikilinks with a class instead of the title (Evan diff --git a/commonmark-extensions.cabal b/commonmark-extensions.cabal --- a/commonmark-extensions.cabal +++ b/commonmark-extensions.cabal @@ -1,5 +1,5 @@ name: commonmark-extensions -version: 0.2.6 +version: 0.2.7 synopsis: Pure Haskell commonmark parser. description: This library provides some useful extensions to core commonmark @@ -60,7 +60,7 @@ , transformers , filepath , network-uri - , commonmark >= 0.2.4.1 && < 0.3 + , commonmark >= 0.2.4.1 && < 0.4 -- for extensions: , emojis >= 0.1.4.1 && < 0.2 exposed-modules: @@ -101,7 +101,7 @@ ghc-options: -threaded -rtsopts -with-rtsopts=-K40K build-depends: base >= 4.9 && <5 - , commonmark >= 0.2.4.1 && < 0.3 + , commonmark >= 0.2.4.1 && < 0.4 , commonmark-extensions , text , tasty @@ -114,7 +114,7 @@ main-is: benchmark.hs hs-source-dirs: benchmark build-depends: - commonmark >= 0.2.4.1 && < 0.3 + commonmark >= 0.2.4.1 && < 0.4 , commonmark-extensions , base >= 4.9 && < 5 , text diff --git a/src/Commonmark/Extensions/Math.hs b/src/Commonmark/Extensions/Math.hs --- a/src/Commonmark/Extensions/Math.hs +++ b/src/Commonmark/Extensions/Math.hs @@ -4,7 +4,7 @@ ( HasMath(..) , mathSpec ) where -import Control.Monad (mzero) +import Control.Monad (guard, mzero) import Commonmark.Types import Commonmark.Tokens import Commonmark.Syntax @@ -15,6 +15,7 @@ import Text.Parsec import Data.Text (Text) import qualified Data.Text as T +import Data.Char (isDigit) mathSpec :: (Monad m, IsBlock il bl, IsInline il, HasMath il) => SyntaxSpec m il bl @@ -44,14 +45,20 @@ let isWs c = c == ' ' || c == '\t' || c == '\r' || c == '\n' if display then displayMath contents <$ symbol '$' - else if T.null contents || isWs (T.last contents) - -- don't allow math to end with SPACE + $ - then mzero - else return $ inlineMath contents + else do + -- don't allow empty inline math + guard $ not $ T.null contents + -- don't allow inline math to end with SPACE + $ + guard $ not $ isWs $ T.last contents + -- don't allow the closer followed by numbers ($5) + let startsWithDigit = maybe False (isDigit . fst) . T.uncons + notFollowedBy $ satisfyWord startsWithDigit + pure $ inlineMath contents -- Int is number of embedded groupings pDollarsMath :: Monad m => Int -> InlineParser m [Tok] pDollarsMath n = do + guard (n <= 1000) -- bail on pathological inputs tk@(Tok toktype _ _) <- anyTok case toktype of Symbol '$' diff --git a/src/Commonmark/Extensions/TaskList.hs b/src/Commonmark/Extensions/TaskList.hs --- a/src/Commonmark/Extensions/TaskList.hs +++ b/src/Commonmark/Extensions/TaskList.hs @@ -133,6 +133,17 @@ listItemType lidata -> addNodeToStack linode _ -> addNodeToStack listnode >> addNodeToStack linode + blankAfterMarker <- optionMaybe blankLine + pos' <- getPosition + case blankAfterMarker of + Just _ -> return () + Nothing -> do + toks <- many (satisfyTok (not . hasType LineEnd)) + addNodeToStack $ + Node (defBlockData paraSpec){ + blockStartPos = [pos'] + , blockLines = [toks] } + [] return BlockStartMatch , blockCanContain = const True , blockContainsLines = False @@ -184,11 +195,11 @@ pos <- getPosition ty <- bulletListMarker aftercol <- sourceColumn <$> getPosition - checked <- parseCheckbox lookAhead whitespace numspaces <- try (gobbleUpToSpaces 4 <* notFollowedBy whitespace) <|> gobbleSpaces 1 - <|> 1 <$ lookAhead lineEnd + checked <- parseCheckbox + lookAhead whitespace return $! (pos, ListItemData{ listItemType = ty , listItemChecked = checked diff --git a/test/math.md b/test/math.md --- a/test/math.md +++ b/test/math.md @@ -87,3 +87,27 @@ .

\(b<a>c\)

```````````````````````````````` + +The inline math closer cannot be immediately followed by a digit. +The opener can be, though. +Display math isn't subject to this rule. +```````````````````````````````` example +$1$2$3 + +$1$2$3$ + +$1{$2$}3$ + +$$1$$2$$3 + +$$1$$2$$3$$ + +$$1{$$2$$}3$$ +. +

$1$2$3

+

$1$2\(3\)

+

\(1{$2$}3\)

+

\[1\]2$$3

+

\[1\]2\[3\]

+

\[1{$$2$$}3\]

+```````````````````````````````` diff --git a/test/task_lists.md b/test/task_lists.md --- a/test/task_lists.md +++ b/test/task_lists.md @@ -28,3 +28,66 @@ ```````````````````````````````` + +```````````````````````````````` example +- [x]unreal +. + +```````````````````````````````` + + +```````````````````````````````` example +- [x] real + + not indented enough +. + +

not indented enough

+```````````````````````````````` + + +```````````````````````````````` example +- [x] * some text +- [ ] > some text +- [x] + * some text +- [ ] + > some text +. + +```````````````````````````````` + +There is no empty paragraph after the `]`. + +```````````````````````````````` example +- [x] * some text + +- [x] + + some text + +- [x]→ + + some text +. + +````````````````````````````````