aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Krewinkel <albert@zeitkraut.de>2021-02-12 16:38:00 +0100
committerAlbert Krewinkel <albert@zeitkraut.de>2021-02-12 17:15:12 +0100
commit8ffd4159d6f0ca4f13a84b27e3f8654f01c63d59 (patch)
treed355f3b60db8b27055d1fd142d2c2d38b09140df
parent8c2618ed8150d2b738b3baa4ba23c2d957450105 (diff)
downloadpandoc-8ffd4159d6f0ca4f13a84b27e3f8654f01c63d59.tar.gz
Jira: require jira-wiki-markup 1.3.3
* Modified the Doc parser to skip leading blank lines. This fixes parsing of documents which start with multiple blank lines. (#7095) * Prevent URLs within link aliases to be treated as autolinks. (#6944) Fixes: #7095 Fixes: #6944
-rw-r--r--pandoc.cabal2
-rw-r--r--stack.yaml2
-rw-r--r--test/Tests/Readers/Jira.hs7
3 files changed, 9 insertions, 2 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index e56456c68..63b1e6cd9 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -470,7 +470,7 @@ library
http-client-tls >= 0.2.4 && < 0.4,
http-types >= 0.8 && < 0.13,
ipynb >= 0.1 && < 0.2,
- jira-wiki-markup >= 1.3.2 && < 1.4,
+ jira-wiki-markup >= 1.3.3 && < 1.4,
mtl >= 2.2 && < 2.3,
network >= 2.6,
network-uri >= 2.6 && < 2.7,
diff --git a/stack.yaml b/stack.yaml
index 79e1f2a4b..dcb1c9742 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -7,7 +7,7 @@ packages:
extra-deps:
- hslua-1.3.0
- hslua-module-path-0.1.0
-- jira-wiki-markup-1.3.2
+- jira-wiki-markup-1.3.3
- commonmark-0.1.1.4
- commonmark-extensions-0.2.0.4
- commonmark-pandoc-0.2.0.1
diff --git a/test/Tests/Readers/Jira.hs b/test/Tests/Readers/Jira.hs
index e170d2aaa..189b504f7 100644
--- a/test/Tests/Readers/Jira.hs
+++ b/test/Tests/Readers/Jira.hs
@@ -34,6 +34,9 @@ tests =
[ testGroup "para"
[ "Simple sentence" =:
"Hello, World!" =?> para "Hello, World!"
+
+ , "leading blank lines" =:
+ "\n\ntext" =?> para "text"
]
, testGroup "header"
@@ -131,6 +134,10 @@ tests =
"[Example|https://example.org]" =?>
para (link "https://example.org" "" "Example")
+ , "URL in alias" =:
+ "[See https://example.com|https://example.com]" =?>
+ para (link "https://example.com" "" "See https://example.com")
+
, "email" =:
"[mailto:me@example.org]" =?>
para (link "mailto:me@example.org" "" "me@example.org")