aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Krewinkel <albert@zeitkraut.de>2021-03-13 14:31:43 +0100
committerAlbert Krewinkel <albert@zeitkraut.de>2021-03-13 14:53:58 +0100
commitf8b49e77f89f8bef613a823a6fbf30e7c4ebd71b (patch)
treef8cbdb87b37726b0fc30ac29cc0f8800c790856d
parent00e8d0678edac34af7a412642fbf7d85442b15aa (diff)
downloadpandoc-f8b49e77f89f8bef613a823a6fbf30e7c4ebd71b.tar.gz
Use jira-wiki-markup 1.3.4
Jira reader: * Fixed parsing of autolinks (i.e., of bare URLs in the text). Previously an autolink would take up the rest of a line, as spaces were allowed characters in these items. * Emoji character sequences no longer cause parsing failures. This was due to missing backtracking when emoji parsing fails. Jira writer: * Block quotes are only rendered as `bq.` if they do not contain a linebreak.
-rw-r--r--pandoc.cabal2
-rw-r--r--test/jira-reader.native2
-rw-r--r--test/writer.jira3
3 files changed, 3 insertions, 4 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index f277d5e6c..0fc7bc6f0 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -469,7 +469,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.3 && < 1.4,
+ jira-wiki-markup >= 1.3.4 && < 1.4,
mtl >= 2.2 && < 2.3,
network >= 2.6,
network-uri >= 2.6 && < 2.7,
diff --git a/test/jira-reader.native b/test/jira-reader.native
index fd9c21480..12fc88adc 100644
--- a/test/jira-reader.native
+++ b/test/jira-reader.native
@@ -164,7 +164,7 @@ Pandoc (Meta {unMeta = fromList []})
,Para [Str "[Not",Space,Str "a",Space,Str "link|not",Space,Str "a",Space,Str "URL]."]
,Header 2 ("",[],[]) [Str "Reference"]
,Para [Str "With",Space,Link ("",[],[]) [Str "embedded",Space,Str "[brackets]"] ("https://example.net/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "https://pandoc.org by itself should be a link."] ("https://pandoc.org by itself should be a link.","")]
+,Para [Link ("",[],[]) [Str "https://pandoc.org"] ("https://pandoc.org",""),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."]
,Header 2 ("",[],[]) [Str "With",Space,Str "ampersands"]
,Para [Str "Here\8217s",Space,Str "a",Space,Link ("",[],[]) [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."]
,Para [Str "Here\8217s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link ("",[],[]) [Str "AT&T"] ("http://att.com/",""),Str "."]
diff --git a/test/writer.jira b/test/writer.jira
index 71b720d65..268abb0d9 100644
--- a/test/writer.jira
+++ b/test/writer.jira
@@ -45,8 +45,7 @@ A list:
Nested block quotes:
bq. nested
-bq. nested
-{quote}
+bq. nested{quote}
This should not be a block quote: 2 > 1.
And a following paragraph.