From 99e1def1bb58507d0429345ac8b37b8c955cb63b Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Thu, 7 Jan 2016 23:56:01 +0000
Subject: [PATCH] Improved list handling in RML

---
 RIGS/templates/RIGS/event_print_page.xml |   2 +-
 RIGS/templatetags/markdown_tags.py       |  17 ++++++++---------
 db.sqlite3                               | Bin 122880 -> 126976 bytes
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/RIGS/templates/RIGS/event_print_page.xml b/RIGS/templates/RIGS/event_print_page.xml
index 2de4b74f..83b53fe6 100644
--- a/RIGS/templates/RIGS/event_print_page.xml
+++ b/RIGS/templates/RIGS/event_print_page.xml
@@ -189,7 +189,7 @@
             <para>{{ item.name }}
                 {% if item.description %}
                     </para>
-                    <indent left="0.5cm">
+                    <indent left="0.6cm">
                         {{ item.description|markdown:"rml" }}
                     </indent>
                     <para>
diff --git a/RIGS/templatetags/markdown_tags.py b/RIGS/templatetags/markdown_tags.py
index ce8826d6..52d04cf4 100644
--- a/RIGS/templatetags/markdown_tags.py
+++ b/RIGS/templatetags/markdown_tags.py
@@ -32,16 +32,15 @@ def markdown_filter(text, format='html'):
 
         for list in soup.findAll(['ul','ol']):
             list['style'] = list.name
-            for li in list.findAll('li'):
-                p = soup.new_tag('p')
-                p.string = li.text
-                li.string = ''
-                li.append(p)
-            indent = soup.new_tag('indent')
-            indent['left'] = '1.2cm'
+            for li in list.findAll('li', recursive=False):
+                text = li.find(text=True)
+                text.wrap(soup.new_tag('p'))
 
-            content = list.replace_with(indent)
-            indent.append(content)
+            if list.parent.name != 'li':
+                indent = soup.new_tag('indent')
+                indent['left'] = '0.6cm'
+
+                list.wrap(indent)
 
         # Paragraphs have a different tag
         for p in soup('p'):
diff --git a/db.sqlite3 b/db.sqlite3
index 315850dbfffb33f9f2c17f4bc6c452df50509cef..44083137ab4692098be8faa69e25a79ad52af61e 100644
GIT binary patch
delta 747
zcmZ{hOK1~O6o&7)C+$ooQ*3Q)LZ@?Sp^^%1GBYtX4b&tB@qy5V=|WJd_^j2gEci$z
zsYG{@GL}n_iY^pEP|JX$yROrfi`Ipu7(rCTt^;nonQ9SAH$Ml?`Tp}NEJ=mWQdw(q
z2qF2o?ld@yXQq{A7TSw(uot1--cb6%a<stD7rr#XwA0p`K)HAj{6w3bu#dWrov&_B
zt8bLhQO67(qVnA+bP~NZ<D9Ij;GA22+K-Hk+fqG+cgXl$R<jrCtx+>&7^(eMbTA$t
zGUAM37A(UY95BoQ<3P9Nr7bIJCKCzM)SZR;B}wkXq!^Rr=T$f&<6#`ZVN5zjbqd@n
zz!U^U^0q1DmLcS3OvsHWKaTJY8BTI32*YCh2=d7gRFKgMmt+|7(Py+GMjxZ$0BUgl
z!o{=GSFf}GV%=R-;DjG7lo}?dW$eH<R8bOck7&?`ey|#1HpFO1jB6qIffiliQn=CL
z8~wyHVd(YI8eI|C1PwPKfNC`~V0y9P#WD9+Cxk$-t6b_5&FFXfg|5+6L0#FTm`5>>
z(mhI#xf={R=66f9M(`uP!V;dsI4ZOzuw|Nyux65N@oU>|y!C>=dq?yg3b&r|uds{1
zaUp2GuB+~t3orYW7IAMNIYM%FQ9Y*I-xpKJF8`hf5jXoDGQgjFfU0}B3LHRxy9N)b
zY<LBwcAhD~h`YWHJrK~h*_b=o1ejM#%Y>H2n)j$Od(GOk40)DZSkCa@d3X-&4-`_d
A0{{R3

delta 298
zcmW-aze_?<97pfxezp62KEg;+e6L?%<RC&wgb{>L=-}cIE=Dc>0S$(2YB<zVagj?y
zwFY4&ceo7=&GrYhwnc=_Z|vcE&VkeZ7VQsl?S==8vDVGXE(XKnraj{&)+i4-#Jrr?
zS>&`E{d)`*85Q+hW{a%O4kFC$He|`%>mRcm3so7f>Wz4bTjyD%*kbQY*G3L><MSa)
z9=nsm-<DmcE|2_}9{4q3rKu83S*!1$tUJyr%xE87s0!hYJZdTtLLt~~l4=TEk;jKh
zSW|Su)vb-FdACuHP>x(B;y4Ui!<C!BFXi}Hi6jbYFNt)(FSr?}kU$_NN_f-ulAFmA
i7W%Vc$}{?+XX;U%@<F{yeBD#8266e~JLbUPDf17S{Z*O(