Improve asciidoc escaping for --
in URLs. Closes #7529.
This commit is contained in:
parent
6180d42434
commit
5dcd4610e2
2 changed files with 18 additions and 3 deletions
|
@ -546,6 +546,7 @@ inlineToAsciiDoc opts (Link _ txt (src, _tit)) = do
|
|||
-- or my@email.com[email john]
|
||||
linktext <- inlineListToAsciiDoc opts txt
|
||||
let isRelative = T.all (/= ':') src
|
||||
let needsPassthrough = "--" `T.isInfixOf` src
|
||||
let prefix = if isRelative
|
||||
then text "link:"
|
||||
else empty
|
||||
|
@ -553,9 +554,16 @@ inlineToAsciiDoc opts (Link _ txt (src, _tit)) = do
|
|||
let useAuto = case txt of
|
||||
[Str s] | escapeURI s == srcSuffix -> True
|
||||
_ -> False
|
||||
return $ if useAuto
|
||||
then literal srcSuffix
|
||||
else prefix <> literal src <> "[" <> linktext <> "]"
|
||||
return $
|
||||
if needsPassthrough
|
||||
then
|
||||
if useAuto
|
||||
then "link:++" <> literal srcSuffix <> "++[]"
|
||||
else "link:++" <> literal src <> "++[" <> linktext <> "]"
|
||||
else
|
||||
if useAuto
|
||||
then literal srcSuffix
|
||||
else prefix <> literal src <> "[" <> linktext <> "]"
|
||||
inlineToAsciiDoc opts (Image attr alternate (src, tit)) =
|
||||
("image:" <>) <$> imageArguments opts attr alternate src tit
|
||||
inlineToAsciiDoc opts (Note [Para inlines]) =
|
||||
|
|
7
test/command/7529.md
Normal file
7
test/command/7529.md
Normal file
|
@ -0,0 +1,7 @@
|
|||
```
|
||||
pandoc -f html -t asciidoc
|
||||
<a href="https://example.com/show.cgi?id=hi--there--everyone">https://example.com/show.cgi?id=hi--there--everyone</a>
|
||||
^D
|
||||
link:++https://example.com/show.cgi?id=hi--there--everyone++[]
|
||||
```
|
||||
|
Loading…
Add table
Reference in a new issue