ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly handle nested lists in the motion PDF

Browse Source 
See #1217
This commit is contained in:
Roland Geider 2014-03-31 22:07:14 +02:00
parent 74bf3b58f9
commit 5bac8ec1e4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openslides/motion/pdf.py
View File

@ -157,25 +157,25 @@ def convert_html_to_reportlab(pdf, text):
for element in soup.find_all('li'): for element in soup.find_all('li'):
# ... and replace ul list elements with <para><bullet>&bull;</bullet>...<para> # ... and replace ul list elements with <para><bullet>&bull;</bullet>...<para>
if element.parent.name == "ul": if element.parent.name == "ul":
if element.ul: # nested lists
# for nested ul lists use simple spaces (pragmatic solution) if element.ul or element.ol:
element.li.insert(0, '&nbsp;&nbsp;&nbsp;&nbsp;') for i in element.find_all('li'):
element.insert_before(element.find_all('li')) element.insert_before(i)
element.clear() element.clear()
else: else:
element.name = "para" element.name = "para"
bullet_tag = soup.new_tag("bullet") bullet_tag = soup.new_tag("bullet")
bullet_tag.string = "&bull;" bullet_tag.string = u"•"
element.insert(0, bullet_tag) element.insert(0, bullet_tag)
# ... and replace ol list elements with <para><bullet><seq id="%id"></seq>.</bullet>...</para> # ... and replace ol list elements with <para><bullet><seq id="%id"></seq>.</bullet>...</para>
if element.parent.name == "ol": if element.parent.name == "ol":
# set list id if element is the first of numbered list # set list id if element is the first of numbered list
if not element.find_previous_sibling(): if not element.find_previous_sibling():
id = random.randrange(0, 101) id = random.randrange(0, 101)
if element.ol: # nested lists
# nested ol list if element.ul or element.ol:
element.li.insert(0, '&nbsp;&nbsp;&nbsp;&nbsp;') for i in element.find_all('li'):
element.insert_before(element.find_all('li')) element.insert_before(i)
element.clear() element.clear()
else: else:
element.name = "para" element.name = "para"