nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

doc: wikiparser: Format text inside admonitions properly

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2020-08-26 21:07:25 -07:00 committed by James Valleroy
parent 7ae46e4ffa
commit 6c8c6758d9
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/scripts/wikiparser.py
View File

@ -878,21 +878,16 @@ def parse_multiline_wiki_admonition(starting_line, pending_lines, context):
if starting_line.strip().startswith('{{{') and '}}}' not in starting_line: if starting_line.strip().startswith('{{{') and '}}}' not in starting_line:
admonition = re.match(r'{{{#!wiki\s(.*)', starting_line) admonition = re.match(r'{{{#!wiki\s(.*)', starting_line)
if admonition: if admonition:
content = [] lines = []
paragraph = Paragraph([])
br = '<<BR>>'
while pending_lines: while pending_lines:
line = pending_lines.pop(0) line = pending_lines.pop(0)
if line == '}}}': if line == '}}}':
break break
paragraph.add_content(parse_text(line.rstrip(br), context)) lines.append(line)
if br in line:
content.append(paragraph)
paragraph = Paragraph([])
style = admonition.group(1) style = admonition.group(1)
content.append(paragraph) content = parse_wiki('\n'.join(lines), context)
return Admonition(style, content), pending_lines return Admonition(style, content), pending_lines
return None, pending_lines return None, pending_lines
@ -1057,7 +1052,7 @@ from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>')
[CodeText('nmcli connection')] [CodeText('nmcli connection')]
>>> parse_wiki("{{{#!wiki caution\\nDon't overuse admonitions\\n}}}") >>> parse_wiki("{{{#!wiki caution\\nDon't overuse admonitions\\n}}}")
[Admonition('caution', [Paragraph(\ [Admonition('caution', [Paragraph(\
[PlainText("Don't overuse admonitions")])])] [PlainText("Don't overuse admonitions ")])])]
>>> parse_wiki('a\\n\\n## END_INCLUDE\\n\\nb', \ >>> parse_wiki('a\\n\\n## END_INCLUDE\\n\\nb', \
None, None, '## END_INCLUDE') None, None, '## END_INCLUDE')
@ -1077,7 +1072,7 @@ typing https://myfreedombox.rocks/plinth/ into the browser. <<BR>>\\n\
as the home page, you can only navigate to the FreedomBox Service (Plinth) by \ as the home page, you can only navigate to the FreedomBox Service (Plinth) by \
typing '), Url('https://myfreedombox.rocks/plinth/'), PlainText(' into the \ typing '), Url('https://myfreedombox.rocks/plinth/'), PlainText(' into the \
browser. ')]), Paragraph([PlainText('/freedombox can also be used as an alias \ browser. ')]), Paragraph([PlainText('/freedombox can also be used as an alias \
to /plinth')])])] to /plinth ')])])]
>>> parse_wiki('{{{\\nmulti-line\\n\ >>> parse_wiki('{{{\\nmulti-line\\n\
preformatted text (source code)\\n}}}''') preformatted text (source code)\\n}}}''')