diff --git a/lib/packages/docutils/rst.nim b/lib/packages/docutils/rst.nim
index b5eef76105..11768c7da0 100644
--- a/lib/packages/docutils/rst.nim
+++ b/lib/packages/docutils/rst.nim
@@ -852,6 +852,9 @@ proc isInlineMarkupEnd(p: RstParser, markup: string): bool =
if not result: return
# Rule 4:
if p.idx > 0:
+ # see bug #17260; for now `\` must be written ``\``, likewise with sequences
+ # ending in an un-escaped `\`; `\\` is legal but not `\\\` for example;
+ # for this reason we can't use `["``", "`"]` here.
if markup != "``" and prevTok(p).symbol == "\\":
result = false
@@ -1089,11 +1092,19 @@ proc parseUntil(p: var RstParser, father: PRstNode, postfix: string,
if isInlineMarkupEnd(p, postfix):
inc p.idx
break
- elif interpretBackslash:
- parseBackslash(p, father)
else:
- father.add(newLeaf(p))
- inc p.idx
+ if postfix == "`":
+ if prevTok(p).symbol == "\\" and currentTok(p).symbol == "`":
+ father.sons[^1] = newLeaf(p) # instead, we should use lookahead
+ else:
+ father.add(newLeaf(p))
+ inc p.idx
+ else:
+ if interpretBackslash:
+ parseBackslash(p, father)
+ else:
+ father.add(newLeaf(p))
+ inc p.idx
of tkAdornment, tkWord, tkOther:
father.add(newLeaf(p))
inc p.idx
@@ -1243,7 +1254,7 @@ proc parseInline(p: var RstParser, father: PRstNode) =
father.add(n)
elif isInlineMarkupStart(p, "`"):
var n = newRstNode(rnInterpretedText)
- parseUntil(p, n, "`", true)
+ parseUntil(p, n, "`", false) # bug #17260
n = parsePostfix(p, n)
father.add(n)
elif isInlineMarkupStart(p, "|"):
diff --git a/lib/system.nim b/lib/system.nim
index 5740431259..4c31f20a21 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -2827,7 +2827,7 @@ when declared(initDebugger):
proc addEscapedChar*(s: var string, c: char) {.noSideEffect, inline.} =
## Adds a char to string `s` and applies the following escaping:
##
- ## * replaces any `\` by `\\`
+ ## * replaces any ``\`` by `\\`
## * replaces any `'` by `\'`
## * replaces any `"` by `\"`
## * replaces any `\a` by `\\a`
@@ -2838,7 +2838,7 @@ proc addEscapedChar*(s: var string, c: char) {.noSideEffect, inline.} =
## * replaces any `\f` by `\\f`
## * replaces any `\r` by `\\r`
## * replaces any `\e` by `\\e`
- ## * replaces any other character not in the set `{'\21..'\126'}
+ ## * replaces any other character not in the set `{\21..\126}`
## by `\xHH` where `HH` is its hexadecimal value.
##
## The procedure has been designed so that its output is usable for many
diff --git a/nimdoc/rst2html/expected/rst_examples.html b/nimdoc/rst2html/expected/rst_examples.html
index 23d1920097..8253289a44 100644
--- a/nimdoc/rst2html/expected/rst_examples.html
+++ b/nimdoc/rst2html/expected/rst_examples.html
@@ -300,7 +300,7 @@ stmt = IND{>} stmt ^+ IND{=} DED # list of statements
However, this does not work. The problem is that the procedure should not only return, but return and continue after an iteration has finished. This return and continue is called a yield statement. Now the only thing left to do is to replace the proc keyword by iterator and here it is - our first iterator:
| A1 header | A2 | not fooled |
|---|
| C1 | C2 bold |
-| D1 code | | D2 |
+| D1 code \| | D2 |
| E1 | text | |
| F2 without pipe |
not in table
diff --git a/tests/stdlib/trstgen.nim b/tests/stdlib/trstgen.nim
index cf82cdf915..d6055cc11e 100644
--- a/tests/stdlib/trstgen.nim
+++ b/tests/stdlib/trstgen.nim
@@ -196,9 +196,15 @@ suite "RST/Markdown general":
| | F2 without pipe
not in table"""
let output1 = input1.toHtml
- doAssert output1 == """| A1 header | A2 | not fooled |
|---|
+ #[
+ TODO: `\|` inside a table cell should render as `|`
+ `|` outside a table cell should render as `\|`
+ consistently with markdown, see https://stackoverflow.com/a/66557930/1426932
+ ]#
+ doAssert output1 == """
+| A1 header | A2 | not fooled |
|---|
| C1 | C2 bold |
-| D1 code | | D2 |
+| D1 code \| | D2 |
| E1 | text | |
| F2 without pipe |
not in table
@@ -549,6 +555,18 @@ let x = 1
let output2 = input2.toHtml
doAssert "foo.bar"""
+ check """`foo\`\`bar`""".toHtml == """foo``bar"""
+ check """`foo\`bar`""".toHtml == """foo`bar"""
+ check """`\`bar`""".toHtml == """`bar"""
+ check """`a\b\x\\ar`""".toHtml == """a\b\x\\ar"""
+
+ test "inline literal":
+ check """``foo.bar``""".toHtml == """foo.bar"""
+ check """``foo\bar``""".toHtml == """foo\bar"""
+ check """``f\`o\\o\b`ar``""".toHtml == """f\`o\\o\b`ar"""
+
test "RST comments":
let input1 = """
Check that comment disappears: