From b46023c5225a6f030d35f5620dbf2f46b08e79a5 Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Thu, 7 Jan 2016 20:12:04 +0000
Subject: [PATCH] Add OL processing to RML

---
 RIGS/templates/RIGS/event_print.xml |  10 +++++++++-
 RIGS/templatetags/markdown_tags.py  |   9 ++++-----
 db.sqlite3                          | Bin 106496 -> 110592 bytes
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/RIGS/templates/RIGS/event_print.xml b/RIGS/templates/RIGS/event_print.xml
index 6d693117..4892e566 100644
--- a/RIGS/templates/RIGS/event_print.xml
+++ b/RIGS/templates/RIGS/event_print.xml
@@ -77,6 +77,14 @@
             <lineStyle kind="linebelow" start="3,0" stop="3,0" colorName="black"/>
             <lineStyle kind="linebelow" start="5,0" stop="5,0" colorName="black"/>
         </blockTableStyle>
+
+        <listStyle name="ol"
+                   bulletFormat="%s."
+                   bulletFontSize="10" />
+
+        <listStyle name="ul"
+                   start="square"
+                   bulletFontSize="8" />
     </stylesheet>
 
     <template > {# Note: page is 595x842 points (1 point=1/72in) #}
@@ -128,4 +136,4 @@
             {% include "RIGS/event_print_page.xml" %}
     </story>
 
-</document>
\ No newline at end of file
+</document>
diff --git a/RIGS/templatetags/markdown_tags.py b/RIGS/templatetags/markdown_tags.py
index 8bdf53e4..2c44595c 100644
--- a/RIGS/templatetags/markdown_tags.py
+++ b/RIGS/templatetags/markdown_tags.py
@@ -30,10 +30,9 @@ def markdown_filter(text, format='html'):
             bq.name = 'pre'
             bq.string = bq.text
 
-        for ul in soup('ul'):
-            ul['value'] = 'square'
-            ul['bulletFontSize'] = '8'
-            for li in ul.findAll('li'):
+        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 = ''
@@ -41,7 +40,7 @@ def markdown_filter(text, format='html'):
             indent = soup.new_tag('indent')
             indent['left'] = '1.2cm'
 
-            content = ul.replace_with(indent)
+            content = list.replace_with(indent)
             indent.append(content)
 
         # Paragraphs have a different tag
diff --git a/db.sqlite3 b/db.sqlite3
index a716944892dc5d5ca7e9627b23ae5d54d9a6a378..cb625ae190c8a0f9264892866ff68169d4e1f3e1 100644
GIT binary patch
delta 680
zcmZvZ%WD%+6o=<GCyz-|soHjK==hjCN@<(6GYJ!86m;CyR?<xsB3Nm})+pLE1qEwB
zlv=PD(t5>3LAn$dCDOs2=+6H@S8fIC+AMtBnRXGhn;(aJ?)M$;J+=3N+SkA{&A%Z@
zQn{|5!N%5=YB<1HA7#+kLRaHQIE7?Wi+uY|47o<|=a3Im$TdwxMq{yc*f7n!VU3*3
zWX!b1j**SDVP=O7bJ#ecr;WU6<SlE&%$iv%r@C$aT1Rhlt#vz~^wN@;E0xzfkW%O=
zEz?6<66O^+pMbaM63rV45p!`7voR6Zd7V%pMyov7jnU?z=tbhI42#6%9UfFL<da+S
zjyQMZXoNJ(l&(!z%L}ZnRvmu?e-uj6xGS+0D$*29(zu|0$=yB*A?ZfKjkp^zKFzQx
zfB_ziB6ai>jnX@ML$7F^p3r@|LnXRI<7AUX1H$rIj`|7cNV*wGcy-*XW8Bv8QJ4mK
z@Q6G5G-b)4K>>Z)g_s914^llyjq!8G@qw6B;6WWJx+fLtwl>+%0+M|or2X^ZZTr}J
ze80Ny#kS4tU34~eTz;_qLTp%xg{96=&q|+T7Z3)&FoA>o?n_j9^7=&e=GD@CX{I<|
zyk+L~^Rtx&jxqd(y1j<yvJ&^uN1gm^4P(ySGE|6`XHEQXb%gaXz;@Z>J}mnS45*Yl

delta 243
zcmW-ZFHgfz97TJ3Szpsu@ULv7Bs_y!9R^3bfaC)pNSJ_3AO;CI!ocC6W%<=E)rh5{
znIm8bmM?%M0ThCwc+8%A&K<ltg9qm(YUGw>^=|bh^6~zu=Y-8Qt|J>`A^Y-T=rZ!(
zKN#XHQ$OwUGT1`4QP0anBPj3czT+-2H4j#A7$7!#it1$>&ybWjVaQz64BF*f>yVNw
z92wLQ<xbJ7EuS9zYSzcMOU<sRMI^>urgWPq3`#_`5Qh`qbHpL9dCp@VaF;v$7i(LR
f2v0`rh+3JpzqWK%@yO6BL}|p?RnV^rjlGLM9s5Hu