aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Krewinkel <albert@zeitkraut.de>2020-03-18 18:15:38 +0100
committerAlbert Krewinkel <albert@zeitkraut.de>2020-03-18 21:32:05 +0100
commit81d46435f6c60d4011de46c3d81c127bc293468d (patch)
treef085856b071aa53a1bd1670e2961fa7c80100890
parent525edb86c0e4286f0ce061bddd8c98e194f92dde (diff)
downloadpandoc-81d46435f6c60d4011de46c3d81c127bc293468d.tar.gz
Jira reader: fix parsing of strikeout, emphasis
A bug was fixed which caused non-emphasized text containing digits and/or non-special symbols (like dots) to sometimes be parsed incorrectly. Fixes: #6196
-rw-r--r--pandoc.cabal2
-rw-r--r--stack.yaml2
-rw-r--r--test/Tests/Readers/Jira.hs4
3 files changed, 6 insertions, 2 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index 5dd7dafc5..27aaa7b0f 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -412,7 +412,7 @@ library
blaze-html >= 0.9 && < 0.10,
blaze-markup >= 0.8 && < 0.9,
vector >= 0.10 && < 0.13,
- jira-wiki-markup >= 1.1 && < 1.2,
+ jira-wiki-markup >= 1.1.2 && < 1.2,
hslua >= 1.0.1 && < 1.1,
hslua-module-system >= 0.2 && < 0.3,
hslua-module-text >= 0.2 && < 0.3,
diff --git a/stack.yaml b/stack.yaml
index 69e9ca1dc..0a2fa8fc4 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -20,7 +20,7 @@ extra-deps:
- regex-pcre-builtin-0.95.0.8.8.35
- doclayout-0.3
- emojis-0.1
-- jira-wiki-markup-1.1.0
+- jira-wiki-markup-1.1.2
- HsYAML-0.2.0.0
- HsYAML-aeson-0.2.0.0
- doctemplates-0.8.1
diff --git a/test/Tests/Readers/Jira.hs b/test/Tests/Readers/Jira.hs
index 69550dcb5..4ed8194fd 100644
--- a/test/Tests/Readers/Jira.hs
+++ b/test/Tests/Readers/Jira.hs
@@ -114,5 +114,9 @@ tests =
, "HTML entity" =:
"me &amp; you" =?> para "me & you"
+
+ , "non-strikeout dashes" =:
+ "20.09-15 2-678" =?>
+ para "20.09-15 2-678"
]
]