Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-commonmark for openSUSE:Factory checked in at 2024-03-20 21:13:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-commonmark (Old) and /work/SRC/openSUSE:Factory/.ghc-commonmark.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-commonmark" Wed Mar 20 21:13:57 2024 rev:17 rq:1157238 version:0.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-commonmark/ghc-commonmark.changes 2024-02-06 16:35:14.628557821 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-commonmark.new.1905/ghc-commonmark.changes 2024-03-20 21:15:51.681338971 +0100 @@ -1,0 +2,26 @@ +Mon Mar 11 18:04:00 UTC 2024 - Peter Simons <psim...@suse.com> + +- Update commonmark to version 0.2.6. + ## 0.2.6 + + * Make list tightness match the reference implementation closer (#150, + Michael Howell). This solves the problem where blank lines in the middle + of a list are attributed to the list itself instead of the item, making its + parent list become spuriously loose. + + * Fix bug with entities inside link destinations (#149). + The bug affects cases like this: `[link](\!)`; the backslash + escape was being ignored here. + + * Commonmark.Entity: export `pEntity` [API change]. + +------------------------------------------------------------------- +Thu Feb 15 04:42:01 UTC 2024 - Peter Simons <psim...@suse.com> + +- Update commonmark to version 0.2.5.1. + ## 0.2.5.1 + + * Replace `source` with `search` in list of block tags. + This is a spec 0.31 change that was forgotten in the last release. + +------------------------------------------------------------------- Old: ---- commonmark-0.2.5.tar.gz New: ---- commonmark-0.2.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-commonmark.spec ++++++ --- /var/tmp/diff_new_pack.YREi6C/_old 2024-03-20 21:15:52.333363407 +0100 +++ /var/tmp/diff_new_pack.YREi6C/_new 2024-03-20 21:15:52.333363407 +0100 @@ -20,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.5 +Version: 0.2.6 Release: 0 Summary: Pure Haskell commonmark parser License: BSD-3-Clause ++++++ commonmark-0.2.5.tar.gz -> commonmark-0.2.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/commonmark-0.2.5/changelog.md new/commonmark-0.2.6/changelog.md --- old/commonmark-0.2.5/changelog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/commonmark-0.2.6/changelog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,23 @@ # Changelog for commonmark +## 0.2.6 + + * Make list tightness match the reference implementation closer (#150, + Michael Howell). This solves the problem where blank lines in the middle + of a list are attributed to the list itself instead of the item, making its + parent list become spuriously loose. + + * Fix bug with entities inside link destinations (#149). + The bug affects cases like this: `[link](\!)`; the backslash + escape was being ignored here. + + * Commonmark.Entity: export `pEntity` [API change]. + +## 0.2.5.1 + + * Replace `source` with `search` in list of block tags. + This is a spec 0.31 change that was forgotten in the last release. + ## 0.2.5 * Fix HTML comment parser to conform to 0.31.2 spec. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/commonmark-0.2.5/commonmark.cabal new/commonmark-0.2.6/commonmark.cabal --- old/commonmark-0.2.5/commonmark.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/commonmark-0.2.6/commonmark.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: 2.2 name: commonmark -version: 0.2.5 +version: 0.2.6 synopsis: Pure Haskell commonmark parser. description: This library provides the core data types and functions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/commonmark-0.2.5/src/Commonmark/Blocks.hs new/commonmark-0.2.6/src/Commonmark/Blocks.hs --- old/commonmark-0.2.5/src/Commonmark/Blocks.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/commonmark-0.2.6/src/Commonmark/Blocks.hs 2001-09-09 03:46:40.000000000 +0200 @@ -856,10 +856,10 @@ let lidata = fromDyn (blockData ndata) (ListItemData (BulletList '*') 0 False False) -- a marker followed by two blanks is just an empty item: - guard $ null (blockBlanks ndata) || - not (null children) pos <- getPosition - gobbleSpaces (listItemIndent lidata) <|> 0 <$ lookAhead blankLine + case blockBlanks ndata of + _:_ | null children -> lookAhead blankLine + _ -> () <$ gobbleSpaces (listItemIndent lidata) <|> lookAhead blankLine return (pos, node) , blockConstructor = fmap mconcat . renderChildren , blockFinalize = \(Node cdata children) parent -> do @@ -1181,7 +1181,7 @@ "frameset", "h1", "h2", "h3", "h4", "h5", "h6", "head", "header", "hr", "html", "iframe", "legend", "li", "link", "main", "menu", "menuitem", "nav", "noframes", "ol", "optgroup", "option", - "p", "param", "section", "source", "summary", "table", "tbody", + "p", "param", "search", "section", "summary", "table", "tbody", "td", "tfoot", "th", "thead", "title", "tr", "track", "ul"]) spaceTok <|> lookAhead lineEnd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/commonmark-0.2.5/src/Commonmark/Entity.hs new/commonmark-0.2.6/src/Commonmark/Entity.hs --- old/commonmark-0.2.5/src/Commonmark/Entity.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/commonmark-0.2.6/src/Commonmark/Entity.hs 2001-09-09 03:46:40.000000000 +0200 @@ -6,11 +6,11 @@ ( lookupEntity , charEntity , numEntity + , pEntity , unEntity ) where -import Data.Functor.Identity (Identity) import qualified Data.Map.Strict as Map import Commonmark.TokParsers import Commonmark.Tokens @@ -2335,14 +2335,15 @@ unEntity :: [Tok] -> Text unEntity ts = untokenize $ - case parse (many (pEntity' <|> anyTok)) "" ts of + case parse (many (pEntity <|> anyTok)) "" ts of Left _ -> ts Right ts' -> ts' - where pEntity' :: ParsecT [Tok] () Identity Tok - pEntity' = try $ do - pos <- getPosition - symbol '&' - ent <- untokenize <$> (numEntity <|> charEntity) - case lookupEntity ent of - Just s -> return $ Tok WordChars pos s - Nothing -> mzero + +pEntity :: Monad m => ParsecT [Tok] s m Tok +pEntity = try $ do + pos <- getPosition + symbol '&' + ent <- untokenize <$> (numEntity <|> charEntity) + case lookupEntity ent of + Just s -> return $ Tok WordChars pos s + Nothing -> mzero diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/commonmark-0.2.5/src/Commonmark/Inlines.hs new/commonmark-0.2.6/src/Commonmark/Inlines.hs --- old/commonmark-0.2.5/src/Commonmark/Inlines.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/commonmark-0.2.6/src/Commonmark/Inlines.hs 2001-09-09 03:46:40.000000000 +0200 @@ -58,7 +58,8 @@ import qualified Data.Set as Set import Data.Text (Text) import qualified Data.Text as T -import Commonmark.Entity (unEntity, charEntity, numEntity) +import Commonmark.Entity (unEntity, charEntity, numEntity, + pEntity) import Text.Parsec hiding (State, space) import Text.Parsec.Pos @@ -906,7 +907,7 @@ pInlineLink = try $ do _ <- symbol '(' optional whitespace - target <- unEntity <$> pLinkDestination + target <- untokenize <$> pLinkDestination optional whitespace title <- option "" $ unEntity <$> (pLinkTitle <* optional whitespace) @@ -922,7 +923,8 @@ pAngleDest = do _ <- symbol '<' res <- many (noneOfToks [Symbol '<', Symbol '>', Symbol '\\', - LineEnd] <|> pEscaped) + Symbol '&', LineEnd] + <|> pEscaped <|> pEntity <|> symbol '&') _ <- symbol '>' return res @@ -935,7 +937,8 @@ pNormalDest' numparens | numparens > 32 = mzero | otherwise = (do - t <- satisfyTok (\case + t <- pEntity <|> + satisfyTok (\case Tok (Symbol '\\') _ _ -> True Tok (Symbol ')') _ _ -> numparens >= 1 Tok Spaces _ _ -> False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/commonmark-0.2.5/test/regression.md new/commonmark-0.2.6/test/regression.md --- old/commonmark-0.2.5/test/regression.md 2001-09-09 03:46:40.000000000 +0200 +++ new/commonmark-0.2.6/test/regression.md 2001-09-09 03:46:40.000000000 +0200 @@ -350,3 +350,103 @@ <!x > ```````````````````````````````` + +Issue #149 +```````````````````````````````` example +[link](\!) + +[link](!) +. +<p><a href="&#33;">link</a></p> +<p><a href="!">link</a></p> +```````````````````````````````` + +Issue #144 +```````````````````````````````` example ++ Is this wrapping list tight, or loose? + * This nested list is definitely tight. + - + + + - +. +<ul> +<li>Is this wrapping list tight, or loose? +<ul> +<li>This nested list is definitely tight.</li> +</ul> +<ul> +<li></li> +<li></li> +</ul> +</li> +</ul> +```````````````````````````````` +```````````````````````````````` example ++ Is this wrapping list tight, or loose? + * This nested list is definitely tight. + - First item + + + - +. +<ul> +<li>Is this wrapping list tight, or loose? +<ul> +<li>This nested list is definitely tight.</li> +</ul> +<ul> +<li> +<p>First item</p> +</li> +<li></li> +</ul> +</li> +</ul> +```````````````````````````````` +```````````````````````````````` example ++ Is this wrapping list tight, or loose? + * This nested list is definitely tight. + - + + + - Second item +. +<ul> +<li>Is this wrapping list tight, or loose? +<ul> +<li>This nested list is definitely tight.</li> +</ul> +<ul> +<li></li> +<li> +<p>Second item</p> +</li> +</ul> +</li> +</ul> +```````````````````````````````` +```````````````````````````````` example ++ Is this wrapping list tight, or loose? + * This nested list is definitely tight. + - First item + + + - Second item +. +<ul> +<li>Is this wrapping list tight, or loose? +<ul> +<li>This nested list is definitely tight.</li> +</ul> +<ul> +<li> +<p>First item</p> +</li> +<li> +<p>Second item</p> +</li> +</ul> +</li> +</ul> +````````````````````````````````