From 245a5ee46eabb4f57a3786f083ba68064cb6eb3b Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Wed, 11 Sep 2019 11:25:33 +1000
Subject: [PATCH] Render table row number in separate column

---
 example.pdf               | Bin 12718 -> 12719 bytes
 legalmd/latex_renderer.py |  27 +++++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/example.pdf b/example.pdf
index 05b92a0025e7070c0e5cf1cebca4c3af09c28165..200abca909f6a3a11c14af6e134bb69eb8e87dc1 100644
GIT binary patch
delta 1062
zcmV+>1ljwpW3OYdCISI5lYt2plRN?%f5@ptPR*gG{(ec#YG>>;hB1&VX-K|D@@aOb
z&9|qVLyk2AVmQ5RFo69qh(@gxa@9yI;q)F}9sno-Wa&_Bjt2nVcUzx}*u2_4b=#DS
zt#I*w_Uyaqa2+?(lf7c5(jGvMZl*uXHrL1Q_4Mp<X{fPkQeMVYBm&itRbnYLf5yd!
zZj0c7q^^x-#ofBmbQlfhHG`NSGUQ8(YG@ejF$+4QI{Sx*Y5jQS8b{w!XE2yz6=YgE
zPl+R=Ik!#CI64>Zw6W&=fCn==5&}%<C;A;vh*Qlz?uPNu%`bQ4^Q?<F(BcqtdY)~P
z610>^FmWJ;6iWl6si(uUrfAU&e@KV0^l{+kajJuf^EH2kqiPMR6f5ahI3E)0$0jEQ
zR-GUxBR5@oN!-WSN)o1$JYT&TJywV{>80VbWUrI#Eu~bW82AzNej?d3HdIm_Nrk?U
z8s|Ab%qt!!4P^OC)@YwnZjG!cF+rMQ)>cy>*`h$MLlnvTX4ec(pphaKe+^>b3-QF}
zt}lwdb?0!rty}-Yg%#_9>Rf1K&C4(x&@zmJr@hBWW!;D+7?&nIi5Dh($z_HH+Nexa
z&2@q?Qwm0yjkBhV<hr)yCSPlOaJ5n8PCkaLuogp9mRNLuhQ%e*o1OB16&bS`rimQg
z&7EAk%nNd6+0IS0I&^m~fAX*pc|I3;58-&){JE56PFCBNnV;{Qmsi{PWzTc4ZV?TC
z+tK&HLQzZxA^Z+MHs3e9(^avr7{TC~LPn||DX#PF!N*x49cn4^=}FyR$6?em*AF<v
za&$iqsx>lAy+?TvH|#G_rKO~L(XPdgnQ2tycD?QAf+P6k?Q3|+e~TFOj=betcne0H
z8??U<w~}}jeAD&Cm4a<yyj62cYiie`^*}392Wb04>3T6Y(ZK64vqZE|zn<2cFzp&Z
z&a<E|ao$eT8b~eJGB{{_p6~wQW6Set{dpCn<Om7x%H`UJAaO*oPZfzGy7)90{Qm>*
zbsGK(Wo~41baG{3vs48$BLp!rH8GQmC?5ndGBq)?t|-O_MMFe1LNz!;GciO$GC4vq
zF-1i~LPaq_GB`vrI5apgJ|H|dLqs$}H8?{vF+@T#IYKcpMMXnGMKM7#I7BfxG&nFm
zAYGGD8Xf~NH8_)j2^D`8%u7<j01$-X?vOwrq7ehgOH>Rmf#NC@E04qlI1L-l<wE~i
zeA6{kGb5#ci4u7;p(d7^(Kn<#GL<@!nWV@j+Ex|2Eqo!zJC;cBfG!^KglBZ@-?%9-
zMTs81@q!9l^fAB&L%d>*5yqG}`;oJo+&;y>8Qw5=F_VjnJUku8`~#m@cyyP?Te-f*
gyv7PU>~Zkg^0CxE$B+<ElZG)M2s8>MB}Gq03JwkHK>z>%

delta 1055
zcmV+)1mOFxW3FScCISI9kw6ubJOUbj=&40d&7r6Meo4*ljFZMN1|w@B`5wuqIb3#M
zo^lR3)(nW@@@t0y?1w=#YNe2?Mq&w<*YNTHKnWmAhhk$q0r0Wg`&h)r)z+!or(A4?
zi~qCd*iD=3xR{>oh?z=906n{zely!xAG`0DXOBxmja8HKGOi*KsD`W(OQA7;E<Sa8
z1P>&2?QK@vts70J(O}*(hzTM?zP6}_hQS`Qpfjq~KRiwI=ap+5eM_CeV2V|cY3V#A
zj*RBq7B%DOT)5N5n)3r5%;-o6Frn}0S3Dt3HT(N8yieVHxFa8DUBrPFhnUlKwn<9R
zQX;{`ff!OO4UDFq4$qpRMKd6O9m3Mbft$yv4kpgG{1uL>HK<aoq@Uq@NUU$0oD|q}
zf}D)pbnPW^A7d*?m`ZXz`)>4DA=aeVhF8hnCfQp`sYWsIBk1EqvS)0lq&kuceIYf@
zbAFg-JWv|Q@<Y~WA5w0OtSB)-nqt;gQy|%*K(0d+$@}Ke3{IetA{7mPV&Dt$#O9$d
zioSK{aJ;Qs|HG9P>w@ZBXk^XHFdWb_jFYFm$4F({h$R@8COnB(CVa|eh6dWGOjONv
zf-zGHMwq>4O&Q5`ZOcu*w)o&`Z<Raw7_!1z3{hEP(c=n>OQttF<^L)&W;09^IeM5o
zxptWs<jk_2n`m|D?p)-5VIlIo7I_cheA)fEmSs*>+m@Lhue+D;w(!%Q=V09;8veGe
zuYrZ4m<&Sr9lq_p?hcomVqY<W!83)7RNqou=i7tNvqC!51p47lJ>JG))H2sMIK*;v
zKMtxjGEKclc@Q`3FHxnXq<YbA#g3Xq2Sskz+i@;9f)7sL!b@I%#GrTNZSzhwiO5s}
z6^uAHXn!B>kyJO)H(_7gDcB~)Yc*5Do>M#9SE(bk^`UmXnwx6iZJb#mTCAVXYkn`U
zb`K!uS<zQO-%r#QN=dch8B{*cxBu|D<r%dOy@^tCgoJlxbL&%(IHK6cibN4zd>jn^
z{{b418)^z=Ze(+_Oa(V11TZo-HIs)Z9|SNmHZ`-VD8>gxH8(gjG%!RoF+xT$L@+T$
zML0%AH%2x^Fhw&%H#kE+AUroUH#jpiFhn#lLPjw}Ffm0%I7UV{Mm9w-MKeP;I72=l
zU6Y|D9s@BoGm$_Qe-+Hf5yAirMA4POCYX##CTE*8G{bPBBpRR^E>y(<z79`2(nyku
zzd(U3pHl;qBJT@Q*|R8BJwr*J5h|v{cT3oyj0JWGP(vLJG|@)Y?CUo%CTO99Bf3a%
zKo5Q77+{DDBcvEx_>hHfS>@*crkG)F@lqB)WrMrVmsnwK7^9CYy~wsNpKr0p31?g^
Z3uV_tf78$qfRl$YAP6`LB_%~qMhYi4<GBC;

diff --git a/legalmd/latex_renderer.py b/legalmd/latex_renderer.py
index a41e94f..1def506 100644
--- a/legalmd/latex_renderer.py
+++ b/legalmd/latex_renderer.py
@@ -145,10 +145,10 @@ class LaTeXRenderer(mistletoe.latex_renderer.LaTeXRenderer):
 		)
 	
 	def render_table(self, token):
-		align = ['X' for col in token.column_align]
+		align = [r'l@{\hspace{1ex}}'] + ['X' for col in token.column_align]
 		if hasattr(token, 'header'):
 			for i, col in enumerate(token.header.children):
-				align[i] += '[{}]'.format(col.weight)
+				align[i+1] += '[{}]'.format(col.weight)
 		
 		result = [
 			format('{\\footnotesize\\begin{longtabu} to \\dimexpr\\columnwidth-<lmarg>\\relax [r] {'),
@@ -168,22 +168,25 @@ class LaTeXRenderer(mistletoe.latex_renderer.LaTeXRenderer):
 		return ''.join(result)
 	
 	def render_table_header(self, token):
-		cells1 = ['{\\bfseries Column ' + child.label + '}' for child in token.children]
-		cells2 = ['{\\bfseries ' + self.render_inner(child) + '}' for child in token.children]
+		cells1 = []
+		cells2 = []
+		
+		for cell in token.children:
+			if cell.colnum == 0:
+				cells1.append('\\multicolumn{2}{l}{\\bfseries Column ' + cell.label + '}')
+				cells2.append('\\multicolumn{2}{l}{\\bfseries ' + self.render_inner(cell) + '}')
+			else:
+				cells1.append('{\\bfseries Column ' + cell.label + '}')
+				cells2.append('{\\bfseries ' + self.render_inner(cell) + '}')
+		
 		return ' & '.join(cells1) + ' \\\\\\midrule\n' + ' & '.join(cells2) + ' \\\\'
 	
 	def render_table_row(self, token):
-		cells = [self.render_table_cell(child) for child in token.children]
+		cells = [(token.children[0].label + '.') if token.children[0].label else ''] + [self.render_table_cell(child) for child in token.children]
 		return ' & '.join(cells) + ' \\\\'
 	
 	def render_table_cell(self, token):
-		if token.colnum == 0 and token.label:
-			return format(r'\makebox[2.2em][l]{<rownum>.}<content>',
-				rownum=token.label,
-				content=self.render_inner(token)
-			)
-		else:
-			return self.render_inner(token)
+		return self.render_inner(token)
 	
 	def render_document(self, token):
 		template = r'''