jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RST: enable parsing of prefix roles (ref #17340) (#17514)

Browse source
This commit is contained in:
Andrey Makarov 2021-03-29 19:32:49 +03:00 • committed by GitHub
commit 861c42c258
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 70 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
lib/packages/docutils/rst.nim
View file

@ -68,7 +68,7 @@
## substitution references, standalone hyperlinks,
## internal links (inline and outline)
## + \`interpreted text\` with roles ``:literal:``, ``:strong:``,
## ``emphasis``, ``:sub:``/``:subscript:``, ``:sup:``/``:supscript:``
## ``emphasis``, ``:sub:``/``:subscript:``, ``:sup:``/``:superscript:``
## (see `RST roles list`_ for description).
## + inline internal targets
##
@ -1018,6 +1018,16 @@ proc fixupEmbeddedRef(n, a, b: PRstNode) =
for i in countup(0, sep - incr): a.add(n.sons[i])
for i in countup(sep + 1, n.len - 2): b.add(n.sons[i])
proc whichRole(sym: string): RstNodeKind =
case sym
of "idx": result = rnIdx
of "literal": result = rnInlineLiteral
of "strong": result = rnStrongEmphasis
of "emphasis": result = rnEmphasis
of "sub", "subscript": result = rnSub
of "sup", "superscript": result = rnSup
else: result = rnGeneralRole
proc parsePostfix(p: var RstParser, n: PRstNode): PRstNode =
var newKind = n.kind
var newSons = n.sons
@ -1042,22 +1052,8 @@ proc parsePostfix(p: var RstParser, n: PRstNode): PRstNode =
result = newRstNode(newKind, newSons)
elif match(p, p.idx, ":w:"):
# a role:
if nextTok(p).symbol == "idx":
newKind = rnIdx
elif nextTok(p).symbol == "literal":
newKind = rnInlineLiteral
elif nextTok(p).symbol == "strong":
newKind = rnStrongEmphasis
elif nextTok(p).symbol == "emphasis":
newKind = rnEmphasis
elif nextTok(p).symbol == "sub" or
nextTok(p).symbol == "subscript":
newKind = rnSub
elif nextTok(p).symbol == "sup" or
nextTok(p).symbol == "supscript":
newKind = rnSup
else:
newKind = rnGeneralRole
newKind = whichRole(nextTok(p).symbol)
if newKind == rnGeneralRole:
let newN = newRstNode(rnInner, n.sons)
newSons = @[newN, newLeaf(nextTok(p).symbol)]
inc p.idx, 3
@ -1318,6 +1314,12 @@ proc parseInline(p: var RstParser, father: PRstNode) =
var n = newRstNode(rnInlineLiteral)
parseUntil(p, n, "``", false)
father.add(n)
elif match(p, p.idx, ":w:") and p.tok[p.idx+3].symbol == "`":
let k = whichRole(nextTok(p).symbol)
let n = newRstNode(k)
inc p.idx, 3
parseUntil(p, n, "`", false) # bug #17260
father.add(n)
elif isInlineMarkupStart(p, "`"):
var n = newRstNode(rnInterpretedText)
parseUntil(p, n, "`", false) # bug #17260
@ -1677,7 +1679,7 @@ proc whichSection(p: RstParser): RstNodeKind =
elif predNL(p) and
currentTok(p).symbol in ["+", "*", "-"] and nextTok(p).kind == tkWhite:
result = rnBulletList
elif match(p, p.idx, ":w:") and predNL(p):
elif match(p, p.idx, ":w:E") and predNL(p):
# (currentTok(p).symbol == ":")
result = rnFieldList
elif match(p, p.idx, "(e) ") or match(p, p.idx, "e) ") or