Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-jira-wiki-markup for
openSUSE:Factory checked in at 2023-04-04 21:21:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-jira-wiki-markup (Old)
and /work/SRC/openSUSE:Factory/.ghc-jira-wiki-markup.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-jira-wiki-markup"
Tue Apr 4 21:21:01 2023 rev:11 rq:1075935 version:1.5.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-jira-wiki-markup/ghc-jira-wiki-markup.changes
2022-08-01 21:30:13.061625263 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-jira-wiki-markup.new.19717/ghc-jira-wiki-markup.changes
2023-04-04 21:21:13.093468070 +0200
@@ -1,0 +2,33 @@
+Thu Mar 30 17:07:19 UTC 2023 - Peter Simons <[email protected]>
+
+- Updated spec file to conform with ghc-rpm-macros-2.5.2.
+
+-------------------------------------------------------------------
+Mon Mar 13 16:43:59 UTC 2023 - Peter Simons <[email protected]>
+
+- Update jira-wiki-markup to version 1.5.1.
+ 1.5.1
+ -----
+
+ Released 2023-03-13.
+
+ * Parser: Disallow image paths that start with a space.
+
+-------------------------------------------------------------------
+Wed Jan 11 13:22:31 UTC 2023 - Peter Simons <[email protected]>
+
+- Update jira-wiki-markup to version 1.5.0.
+ 1.5.0
+ -----
+
+ Released 2023-01-11.
+
+ * Relaxed upper bounds for mtl, allow mtl 2.3.
+
+ * Fixed handling of character sequences that would be interpreted
+ as icons if they weren't followed by an alphanumeric character.
+ See also [pandoc issue #8511][].
+
+ [pandoc issue #8511]: https://github.com/jgm/pandoc/issues/8511
+
+-------------------------------------------------------------------
Old:
----
jira-wiki-markup-1.4.0.tar.gz
jira-wiki-markup.cabal
New:
----
jira-wiki-markup-1.5.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-jira-wiki-markup.spec ++++++
--- /var/tmp/diff_new_pack.7vI3Gb/_old 2023-04-04 21:21:13.813472147 +0200
+++ /var/tmp/diff_new_pack.7vI3Gb/_new 2023-04-04 21:21:13.817472170 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-jira-wiki-markup
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,25 +17,32 @@
%global pkg_name jira-wiki-markup
+%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.4.0
+Version: 1.5.1
Release: 0
Summary: Handle Jira wiki markup
License: MIT
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: chrpath
BuildRequires: ghc-Cabal-devel
+BuildRequires: ghc-base-devel
+BuildRequires: ghc-base-prof
BuildRequires: ghc-mtl-devel
+BuildRequires: ghc-mtl-prof
BuildRequires: ghc-parsec-devel
+BuildRequires: ghc-parsec-prof
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-text-devel
+BuildRequires: ghc-text-prof
ExcludeArch: %{ix86}
%if %{with tests}
BuildRequires: ghc-tasty-devel
BuildRequires: ghc-tasty-hunit-devel
+BuildRequires: ghc-tasty-hunit-prof
+BuildRequires: ghc-tasty-prof
%endif
%description
@@ -53,9 +60,24 @@
This package provides the Haskell %{pkg_name} library development
files.
+%package -n ghc-%{pkg_name}-doc
+Summary: Haskell %{pkg_name} library documentation
+Requires: ghc-filesystem
+BuildArch: noarch
+
+%description -n ghc-%{pkg_name}-doc
+This package provides the Haskell %{pkg_name} library documentation.
+
+%package -n ghc-%{pkg_name}-prof
+Summary: Haskell %{pkg_name} profiling library
+Requires: ghc-%{pkg_name}-devel = %{version}-%{release}
+Supplements: (ghc-%{pkg_name}-devel and ghc-prof)
+
+%description -n ghc-%{pkg_name}-prof
+This package provides the Haskell %{pkg_name} profiling library.
+
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
@@ -80,4 +102,9 @@
%files devel -f %{name}-devel.files
%doc CHANGELOG.md README.md
+%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files
+%license LICENSE
+
+%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files
+
%changelog
++++++ jira-wiki-markup-1.4.0.tar.gz -> jira-wiki-markup-1.5.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/CHANGELOG.md
new/jira-wiki-markup-1.5.1/CHANGELOG.md
--- old/jira-wiki-markup-1.4.0/CHANGELOG.md 2001-09-09 03:46:40.000000000
+0200
+++ new/jira-wiki-markup-1.5.1/CHANGELOG.md 2001-09-09 03:46:40.000000000
+0200
@@ -4,6 +4,26 @@
`jira-wiki-markup` uses [PVP Versioning][1].
The changelog is available [on GitHub][2].
+1.5.1
+-----
+
+Released 2023-03-13.
+
+* Parser: Disallow image paths that start with a space.
+
+1.5.0
+-----
+
+Released 2023-01-11.
+
+* Relaxed upper bounds for mtl, allow mtl 2.3.
+
+* Fixed handling of character sequences that would be interpreted
+ as icons if they weren't followed by an alphanumeric character.
+ See also [pandoc issue #8511][].
+
+[pandoc issue #8511]: https://github.com/jgm/pandoc/issues/8511
+
1.4.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/LICENSE
new/jira-wiki-markup-1.5.1/LICENSE
--- old/jira-wiki-markup-1.4.0/LICENSE 2001-09-09 03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/LICENSE 2001-09-09 03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
MIT License
-Copyright © 2019â2021 Albert Krewinkel
+Copyright © 2019â2023 Albert Krewinkel
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/README.md
new/jira-wiki-markup-1.5.1/README.md
--- old/jira-wiki-markup-1.4.0/README.md 2001-09-09 03:46:40.000000000
+0200
+++ new/jira-wiki-markup-1.5.1/README.md 2001-09-09 03:46:40.000000000
+0200
@@ -4,7 +4,7 @@
[![MIT license][License badge]](LICENSE)
[![Stackage Lts][Stackage Lts
badge]](http://stackage.org/lts/package/jira-wiki-markup)
[![Stackage Nightly][Stackage Nightly
badge]](http://stackage.org/nightly/package/jira-wiki-markup)
-[![Build status][Travis badge]](https://travis-ci.com/tarleb/jira-wiki-markup)
+[![GitHub build status][CI badge]][CI workflow]
[![Windows build status][AppVeyor
badge]](https://ci.appveyor.com/project/tarleb/jira-wiki-markup)
This package provides a parser and printer for [Jira wiki markup]. It
@@ -14,10 +14,12 @@
[License badge]: https://img.shields.io/badge/license-MIT-blue.svg
[Stackage Lts badge]: http://stackage.org/package/jira-wiki-markup/badge/lts
[Stackage Nightly badge]:
http://stackage.org/package/jira-wiki-markup/badge/nightly
-[Travis badge]: https://travis-ci.com/tarleb/jira-wiki-markup.svg?branch=master
+[CI badge]:
https://img.shields.io/github/actions/workflow/status/pandoc-ext/multibib/ci.yaml?logo=github&branch=main
[AppVeyor badge]:
https://ci.appveyor.com/api/projects/status/github/tarleb/jira-wiki-markup?branch=master&svg=true
[Jira wiki markup]:
https://jira.atlassian.com/secure/WikiRendererHelpAction.jspa?section=all
+[CI workflow]:
https://github.com/tarleb/jira-wiki-markup/actions/workflows/ci.yaml
+
# License
This package is licensed under the MIT license. See the `LICENSE` file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/jira-wiki-markup.cabal
new/jira-wiki-markup-1.5.1/jira-wiki-markup.cabal
--- old/jira-wiki-markup-1.4.0/jira-wiki-markup.cabal 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/jira-wiki-markup.cabal 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
-cabal-version: 2.0
+cabal-version: 2.4
name: jira-wiki-markup
-version: 1.4.0
+version: 1.5.1
synopsis: Handle Jira wiki markup
description: Parse jira wiki text into an abstract syntax tree for easy
transformation to other formats.
@@ -10,7 +10,7 @@
license-file: LICENSE
author: Albert Krewinkel
maintainer: [email protected]
-copyright: © 2019â2021 Albert Krewinkel
+copyright: © 2019â2023 Albert Krewinkel
category: Text
build-type: Simple
extra-doc-files: README.md
@@ -21,13 +21,39 @@
, GHC == 8.6.5
, GHC == 8.8.3
, GHC == 8.10.4
- , GHC == 9.0
+ , GHC == 9.0.2
+ , GHC == 9.2.5
+ , GHC == 9.4.4
source-repository head
type: git
location: https://github.com/tarleb/jira-wiki-markup.git
+common common-options
+ build-depends: base >= 4.9 && < 5
+ , text >= 1.1.1 && < 1.3 || >= 2.0 && < 2.1
+ default-language: Haskell2010
+ default-extensions: OverloadedStrings
+ ghc-options: -Wall
+ -Widentities
+ -Wincomplete-record-updates
+ -Wincomplete-uni-patterns
+ -Wmissing-export-lists
+ -Wredundant-constraints
+ -Wunused-type-patterns
+ if impl(ghc >= 8.2)
+ ghc-options: -Wmissing-home-modules
+ if impl(ghc >= 8.4)
+ ghc-options: -fhide-source-paths
+ -Wpartial-fields
+ if impl(ghc >= 8.10)
+ ghc-options: -Wunused-packages
+
+ if impl(ghc >= 9.0)
+ ghc-options: -Winvalid-haddock
+
library
+ import: common-options
hs-source-dirs: src
exposed-modules: Text.Jira.Markup
, Text.Jira.Parser
@@ -38,47 +64,21 @@
, Text.Jira.Parser.Shared
, Text.Jira.Printer
- build-depends: base >= 4.9 && < 5
- , mtl >= 2.2 && < 2.3
+ build-depends: mtl >= 2.2 && < 2.4
, parsec >= 3.1 && < 3.2
- , text >= 1.1.1 && < 1.3
- ghc-options: -Wall
- -Wincomplete-uni-patterns
- -Wincomplete-record-updates
- -Wcompat
- -Widentities
- -Wredundant-constraints
- if impl(ghc >= 8.4)
- ghc-options: -fhide-source-paths
-
- default-language: Haskell2010
- default-extensions: OverloadedStrings
executable jira-wiki-markup
+ import: common-options
hs-source-dirs: app
main-is: Main.hs
-
- build-depends: base >= 4.9 && < 5
- , text >= 1.1.1 && < 1.3
- , jira-wiki-markup
-
- ghc-options: -Wall
- -threaded
+ build-depends: jira-wiki-markup
+ ghc-options: -threaded
-rtsopts
-with-rtsopts=-N
- -Wincomplete-uni-patterns
- -Wincomplete-record-updates
- -Wcompat
- -Widentities
- -Wredundant-constraints
- if impl(ghc >= 8.4)
- ghc-options: -fhide-source-paths
-
- default-language: Haskell2010
- default-extensions: OverloadedStrings
test-suite jira-wiki-markup-test
+ import: common-options
type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: jira-wiki-markup-test.hs
@@ -86,25 +86,10 @@
, Text.Jira.Parser.BlockTests
, Text.Jira.Parser.InlineTests
, Text.Jira.PrinterTests
-
- build-depends: base >= 4.9 && < 5
- , jira-wiki-markup
+ build-depends: jira-wiki-markup
, parsec >= 3.1 && < 3.2
, tasty
, tasty-hunit
- , text >= 1.1.1 && < 1.3
-
- ghc-options: -Wall
- -threaded
+ ghc-options: -threaded
-rtsopts
-with-rtsopts=-N
- -Wincomplete-uni-patterns
- -Wincomplete-record-updates
- -Wcompat
- -Widentities
- -Wredundant-constraints
- if impl(ghc >= 8.4)
- ghc-options: -fhide-source-paths
-
- default-language: Haskell2010
- default-extensions: OverloadedStrings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/src/Text/Jira/Markup.hs
new/jira-wiki-markup-1.5.1/src/Text/Jira/Markup.hs
--- old/jira-wiki-markup-1.4.0/src/Text/Jira/Markup.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/src/Text/Jira/Markup.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,7 +1,7 @@
{-# LANGUAGE LambdaCase #-}
{-|
Module : Text.Jira.Markup
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser/Block.hs
new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser/Block.hs
--- old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser/Block.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser/Block.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
{-|
Module : Text.Jira.Parser.Block
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser/Core.hs
new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser/Core.hs
--- old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser/Core.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser/Core.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
{-|
Module : Text.Jira.Parser.Core
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser/Inline.hs
new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser/Inline.hs
--- old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser/Inline.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser/Inline.hs 2001-09-09
03:46:40.000000000 +0200
@@ -3,7 +3,7 @@
{-# LANGUAGE TupleSections #-}
{-|
Module : Text.Jira.Parser.Inline
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
@@ -35,7 +35,7 @@
) where
import Control.Monad (guard, void)
-import Data.Char (isAlphaNum, isAscii, isPunctuation, ord)
+import Data.Char (isAlphaNum, isAscii, isPunctuation, isSpace, ord)
#if !MIN_VERSION_base(4,13,0)
import Data.Monoid ((<>), All (..))
#else
@@ -110,7 +110,7 @@
-- | Parses textual representation of an icon into an @'Emoji'@ element.
emoji :: JiraParser Inline
-emoji = try (Emoji <$> icon <* notFollowedBy' letter <?> "emoji")
+emoji = try (Emoji <$> icon <?> "emoji")
-- | Parses ASCII representation of en-dash or em-dash.
dash :: JiraParser Inline
@@ -121,11 +121,15 @@
, pure (Str "â") -- en dash
] <* lookAhead (void (char ' ') <|> eof)
--- | Parses a special character symbol as a @Str@.
+-- | Parses a special character symbol as a 'SpecialChar'.
specialChar :: JiraParser Inline
-specialChar = SpecialChar <$> (escapedChar <|> plainSpecialChar)
+specialChar = SpecialChar <$> (backslash <|> escapedChar <|> plainSpecialChar)
<?> "special char"
where
+ -- backslash before an icon-sequence that's not an emoji does *not*
+ -- work as an escape character.
+ backslash = try (char '\\' <* lookAhead (icon' *> alphaNum))
+
escapedChar = try (char '\\' *> satisfy isPunctuation)
plainSpecialChar = do
@@ -151,7 +155,9 @@
image :: JiraParser Inline
image = try $ do
-- does not use @url@, as is may contain relative locations.
- src <- char '!' *> (URL . pack <$> many1 (noneOf "\r\t\n|]!"))
+ src <- char '!'
+ *> lookAhead (satisfy $ not . isSpace)
+ *> (URL . pack <$> many1 (noneOf "\r\t\n|]!"))
params <- option [] (char '|' *> (thumbnail <|> imgParams `sepBy` comma))
_ <- char '!'
return $ Image params src
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser/PlainText.hs
new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser/PlainText.hs
--- old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser/PlainText.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser/PlainText.hs
2001-09-09 03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
{-|
Module : Text.Jira.Parser.PlainText
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
@@ -40,7 +40,7 @@
-- | Escapes text which would otherwise render as an icon.
escapeIcon :: Parsec Text u Inline
-escapeIcon = Str . ("\\" `append`) . iconText <$> icon
+escapeIcon = Str . ("\\" `append`) . iconText <$> try icon
plainSpecialChar :: Parsec Text u Inline
plainSpecialChar = SpecialChar <$> oneOf specialChars
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser/Shared.hs
new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser/Shared.hs
--- old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser/Shared.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser/Shared.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,7 +1,7 @@
{-# LANGUAGE LambdaCase #-}
{-|
Module : Text.Jira.Parser.Shared
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
@@ -12,6 +12,7 @@
-}
module Text.Jira.Parser.Shared
( icon
+ , icon'
, colorName
) where
@@ -22,7 +23,12 @@
-- | Parses an icon
icon :: Parsec Text u Icon
-icon = smiley <|> otherIcon
+icon = icon' <* notFollowedBy alphaNum
+
+-- | Like 'icon', but doesn't check whether the sequence is followed by
+-- a character that would prevent the interpretation as an icon.
+icon' :: Parsec Text u Icon
+icon' = smiley <|> otherIcon
smiley :: Parsec Text u Icon
smiley = try $ choice
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser.hs
new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser.hs
--- old/jira-wiki-markup-1.4.0/src/Text/Jira/Parser.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/src/Text/Jira/Parser.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
{-|
Module : Text.Jira.Parser
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/src/Text/Jira/Printer.hs
new/jira-wiki-markup-1.5.1/src/Text/Jira/Printer.hs
--- old/jira-wiki-markup-1.4.0/src/Text/Jira/Printer.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/src/Text/Jira/Printer.hs 2001-09-09
03:46:40.000000000 +0200
@@ -2,7 +2,7 @@
{-# LANGUAGE LambdaCase #-}
{-|
Module : Text.Jira.Parser
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jira-wiki-markup-1.4.0/test/Text/Jira/Parser/BlockTests.hs
new/jira-wiki-markup-1.5.1/test/Text/Jira/Parser/BlockTests.hs
--- old/jira-wiki-markup-1.4.0/test/Text/Jira/Parser/BlockTests.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/test/Text/Jira/Parser/BlockTests.hs
2001-09-09 03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
{-|
Module : Text.Jira.Parser.BlockTests
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jira-wiki-markup-1.4.0/test/Text/Jira/Parser/InlineTests.hs
new/jira-wiki-markup-1.5.1/test/Text/Jira/Parser/InlineTests.hs
--- old/jira-wiki-markup-1.4.0/test/Text/Jira/Parser/InlineTests.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/test/Text/Jira/Parser/InlineTests.hs
2001-09-09 03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
{-|
Module : Text.Jira.Parser.InlineTests
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
@@ -344,6 +344,10 @@
parseJira image "!foo.jpg|alt=\"some foo!\"!" @?=
let params = [ Parameter "alt" "some foo!"]
in Right (Image params (URL "foo.jpg"))
+
+ , testCase "first character cannot be a space" $
+ isLeft (parseJira image "! foo.jpg!") @?
+ "An image cannot start with a space."
]
, testGroup "color"
@@ -406,6 +410,10 @@
parseJira (normalizeInlines <$> many1 inline) "C:DE" @?=
Right [ Str "C", SpecialChar ':', Str "DE" ]
+ , testCase "backslash is literal if it's not necessary" $
+ parseJira (normalizeInlines <$> many1 inline) "\\:PA" @?=
+ Right [ SpecialChar '\\', SpecialChar ':', Str "PA"]
+
, testCase "dash with spaces" $
parseJira (many1 inline) "one -- two" @?=
Right [Str "one", Space, Str "â", Space, Str "two"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/test/Text/Jira/ParserTests.hs
new/jira-wiki-markup-1.5.1/test/Text/Jira/ParserTests.hs
--- old/jira-wiki-markup-1.4.0/test/Text/Jira/ParserTests.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/test/Text/Jira/ParserTests.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
{-|
Module : Text.Jira.ParserTests
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
@@ -50,10 +50,23 @@
plainText ":)" @?=
Right [Str "\\:)"]
+ , testCase "smiley and text" $
+ plainText ":D lol" @?=
+ Right [Str "\\:D", Space, Str "lol"]
+
, testCase "icon after word" $
plainText "f(x)" @?=
Right [Str "f\\(x)"]
+ , testCase "icon-sequence at start of word" $
+ plainText ":PA" @?=
+ Right [SpecialChar ':', Str "PA"]
+
+ , testCase "icon-sequence followed by digit" $
+ plainText ":P2" @?=
+ Right [SpecialChar ':', Str "P2"]
+
+
, testCase "special chars" $
plainText "*not strong*" @?=
Right [SpecialChar '*', Str "not", Space, Str "strong", SpecialChar '*']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jira-wiki-markup-1.4.0/test/Text/Jira/PrinterTests.hs
new/jira-wiki-markup-1.5.1/test/Text/Jira/PrinterTests.hs
--- old/jira-wiki-markup-1.4.0/test/Text/Jira/PrinterTests.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/test/Text/Jira/PrinterTests.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,7 +1,7 @@
{-# OPTIONS_GHC -fno-warn-orphans #-}
{-|
Module : Text.Jira.PrinterTests
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
@@ -244,6 +244,10 @@
prettyInlines [SpecialChar ':', Space, Str "end"] @?=
": end"
+ , testCase "colon is not escaped before non-emoji word" $
+ prettyInlines [Space, SpecialChar ':', Str "PA"] @?=
+ " :PA"
+
, testCase "closing brace between spaces" $
prettyInlines [Space, SpecialChar '}', Space] @?=
" \\} "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jira-wiki-markup-1.4.0/test/jira-wiki-markup-test.hs
new/jira-wiki-markup-1.5.1/test/jira-wiki-markup-test.hs
--- old/jira-wiki-markup-1.4.0/test/jira-wiki-markup-test.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/jira-wiki-markup-1.5.1/test/jira-wiki-markup-test.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
{-|
Module : Main
-Copyright : © 2019â2021 Albert Krewinkel
+Copyright : © 2019â2023 Albert Krewinkel
License : MIT
Maintainer : Albert Krewinkel <[email protected]>
