Documentation tool does not add escapes to code and codeblocks
Instead of adding the escapes to all * and _ the tool now excludes
the characters inside [code] and [codeblock].
Resolves: #15156
(cherry picked from commit 84e8c49f5d
)
This commit is contained in:
parent
57f707f951
commit
5c2b2ca95b
|
@ -155,8 +155,9 @@ def rstize_text(text, cclass):
|
||||||
|
|
||||||
# Escape * character to avoid interpreting it as emphasis
|
# Escape * character to avoid interpreting it as emphasis
|
||||||
pos = 0
|
pos = 0
|
||||||
|
next_brac_pos = text.find('[');
|
||||||
while True:
|
while True:
|
||||||
pos = text.find('*', pos)
|
pos = text.find('*', pos, next_brac_pos)
|
||||||
if pos == -1:
|
if pos == -1:
|
||||||
break
|
break
|
||||||
text = text[:pos] + "\*" + text[pos + 1:]
|
text = text[:pos] + "\*" + text[pos + 1:]
|
||||||
|
@ -165,7 +166,7 @@ def rstize_text(text, cclass):
|
||||||
# Escape _ character at the end of a word to avoid interpreting it as an inline hyperlink
|
# Escape _ character at the end of a word to avoid interpreting it as an inline hyperlink
|
||||||
pos = 0
|
pos = 0
|
||||||
while True:
|
while True:
|
||||||
pos = text.find('_', pos)
|
pos = text.find('_', pos, next_brac_pos)
|
||||||
if pos == -1:
|
if pos == -1:
|
||||||
break
|
break
|
||||||
if not text[pos + 1].isalnum(): # don't escape within a snake_case word
|
if not text[pos + 1].isalnum(): # don't escape within a snake_case word
|
||||||
|
@ -264,6 +265,27 @@ def rstize_text(text, cclass):
|
||||||
if escape_post and post_text and post_text[0].isalnum(): # not punctuation, escape
|
if escape_post and post_text and post_text[0].isalnum(): # not punctuation, escape
|
||||||
post_text = '\ ' + post_text
|
post_text = '\ ' + post_text
|
||||||
|
|
||||||
|
next_brac_pos = post_text.find('[',0)
|
||||||
|
iter_pos = 0
|
||||||
|
while not inside_code:
|
||||||
|
iter_pos = post_text.find('*', iter_pos, next_brac_pos)
|
||||||
|
if iter_pos == -1:
|
||||||
|
break
|
||||||
|
post_text = post_text[:iter_pos] + "\*" + post_text[iter_pos + 1:]
|
||||||
|
iter_pos += 2
|
||||||
|
|
||||||
|
iter_pos = 0
|
||||||
|
while not inside_code:
|
||||||
|
iter_pos = post_text.find('_', iter_pos, next_brac_pos)
|
||||||
|
if iter_pos == -1:
|
||||||
|
break
|
||||||
|
if not post_text[iter_pos + 1].isalnum(): # don't escape within a snake_case word
|
||||||
|
post_text = post_text[:iter_pos] + "\_" + post_text[iter_pos + 1:]
|
||||||
|
iter_pos += 2
|
||||||
|
else:
|
||||||
|
iter_pos += 1
|
||||||
|
|
||||||
|
|
||||||
text = pre_text + tag_text + post_text
|
text = pre_text + tag_text + post_text
|
||||||
pos = len(pre_text) + len(tag_text)
|
pos = len(pre_text) + len(tag_text)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue