From dbc94bc119ffba01fc627f34f2e95b4f845b2c93 Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Wed, 11 Sep 2019 10:34:54 +1000
Subject: [PATCH] Do not autodetect note alignment

---
 example.pdf               | Bin 12718 -> 12718 bytes
 example.rtf               |   2 +-
 legalmd/latex_renderer.py |  12 ++++++------
 legalmd/legal_token.py    |  12 ++++++------
 legalmd/rtf_renderer.py   |   9 ++-------
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/example.pdf b/example.pdf
index c23c983e92f01da417a44eaf58029b1bee0ee768..05b92a0025e7070c0e5cf1cebca4c3af09c28165 100644
GIT binary patch
delta 906
zcmV;519kkaW3FScJ_3KqZW}QSz56Tl16E0Kkpu(-#7hpj74<FXsYOrCp{M?SNzLwz
zlg2OxBWoe~9?7RUTy|fcat=Ax42a?KYli{she0%IrI4#eVhNYm@bUma2_Q>{Vq-i3
z@Uh$bSj5KF)~Va4Tx^Dm|Fh@VO`Geun4av2nMy|hJ-eBHGuwYyAG`0DXOBxmja8HK
zGOi*KsD`W(OQA6?K6QHp4<vQ%ZC2c^8%?LtVBRu_2_i$jwy1`N!5*`qGpf};JWccG
zm1`V*OP#@BidB$l={zNljON@HHRI@9xYNd(^8+5t=tu}Kq3`HdJRwds`};7wPu+aD
zBOhm7#DNxvnA3lCwn<9RQX;{`ff!OO4UDFq4$qpRMKd5B!qUfqo5!gRCeF9~6^^Pk
zs8Xz?pW%E+tZ$o~6xeivoQ&Lb?Im#^V=GCRN^(8>ZuD3o)}+^lSIOQc*;`7fMltXs
z=;K7PXKbjXI+6-~AvMl(ewb%GP#VbcL)K^?Qf`f`C^3IQnqt;gQy|%*K(0d+$@}Ke
z3{IetA{7l{;0y7@=Akc&zIEqtyscaR!<7~5g6dpoWX;Pk9MCe1lc&AMNM+lIB^Z|`
zJc(B(e9C2p2HL1hRLymQF;fagn7wCB8Oe2R%T2zv_~2@9l{@(uvcg&nQCVWq;|hyQ
zrZ+p~|0;hnW;09^IeM5oxptWs<jk_2n`m|D?p)+yA@aNyc@N=y+5NeeWlmPxmYE-~
zyO-~_@Y9~>VBI1b{<f{JfrX-&3_|!FzU{v54wsu^UonEgGlh&)-%?!X+k?-uLORq0
z`r%GJ-o|0nGS@da#By{$4yrXWO}$5X5I5{EQKf&Sq<YbA#g3Xq2Sskz+i@;9f)7sL
z!b@Jnpm*eL^G-F1$W#Iqj5s%Fe;@9VR5#H#VPD)S*e1qnHB-Z$Q#;#NsUx)Yp?1BR
zn`+=~oLM4Tte?+oelM?f4<P4R(N{p<Pt+DlNwwh_R6ftQ|M0ox8MO|*iBfWegm-0g
z>r)euIHK6cibN4zd>jn^{{b418)~yl1vw)KF)=YPGB!0ilZ+@E2r)4+FfukZIkT@Q
z#0N$<H8(gjG%!RoF+xT$L@+T$ML0%AH%2x^Fhw&%H#kE+AUroUH#jpiFhn#lLPjw}
gFfm0%I7UV{Mm9w-MKeP;I72=lU6WB79+THF*WIF~JOBUy

delta 906
zcmV;519kkaW3FScJ_3KaZX7WT?e{D616D}!kOUY5cn=ruf^27`N{}ipQswtUY7Wh=
zXYJTn3`VPi<a;EaW`Ev&dCWQFSTi7o^RFESupb7|sFgyl8i^&GU&8Y}040Dd1B#9D
z2*8Ko&c`A)uC`9YUCPB~xcEPN4#Tp!&Wq{Mj+m)*0ML`088?5kjrC#petz<}G}Kr%
zDR0H45=)^uE<O%-2p&ip+S{zSTQ{1Hv%$P&u%-xlZBGpggFSX$JEn_&cwFXB7mjiE
zEVV<y6ssW9+I31C8I68h)Qq!p;XxZ`&JK7mvm+tEguY{3@pL%R?C<^bJ`VlxKt9g8
ziUTbUF{hWDl9Yd-r9^^-12Lpn8W>F@9iB5qi)KPPg{2P@HxEk{ER1jYD;!m8P^DN&
zKf?KxR^PTbDX{4TIT^X>+Dqaw##WH96y)XXo6%#1Sd(5GzDV{q$zHfhHHv|sK_3>9
zJ!4ZP)tOWn3#oCQ^L?N3Kxrb&4_TYNOS!eNqQnGgiCKSJO@U;K0=Z66B=4GiGq`|8
zic~a+fiJ`hoBOdS#>Va8cvH9Thbt@A1=YFG$ePz-IG}YHM^F2Rk;=9aOE9iYcoMHn
z_>_wbO|(&2sOoisF;fagn7zBA%;dVV<tAQRd~mh5$|w1lvcg&nQCVZr!vz)>OmB9|
z|5aqnW|)5#a&+H2xel3E<aE)_O|%AdcP{a;l6bz9cn{%p-u>w~Bm&jI$!gm&^W$ar
z{M{CQ+Vd2wTSUX(w)G{jP!y9v2*1O(-Phgzd{gQxMlg7$kdf+Zifg|+_|z5Bp(fCG
zck1Cb4x^U2zQQ4vqtD}@S|iiadz2?}!|@7LT1$Vb7wuN;s9AJU<aW6odchIAbNUuu
z@*=iN@Z)*gzEQy%sRSw*u{Y>=AKq2fP4G?ES62$QiTPH|p4N;xwX<W9IzU^WO4p0I
zi3Z+=nI)oy`th{px6*3Y0CMhvzQ*}>nzlgN-O%7n8lU^!KYeO>KCM4*f|MK~;iq!B
z^%)aL98v63MWTqVJ`E=S{{UA`8oIMf1vw)KFgY?ZG%_(WlZ+@E2rxM^GBh$VGqbNK
z#0N$>FflVVGeJT{GBGelMm0o3LNzrtI6*`*MnOV2H#SB-AUruRF*7wYK|)0`F)&6(
gHAF)~H8nLjK}0e}K|(k;Hby=mU6WB79+THF*LXLmR{#J2

diff --git a/example.rtf b/example.rtf
index 6ef723a..8f10924 100644
--- a/example.rtf
+++ b/example.rtf
@@ -1 +1 @@
-{\rtf1\deff0{\fonttbl{\f0 TeX Gyre Heros{\*\falt FreeSans}{\*\falt Liberation Sans}{\*\falt Arial};}}\paperw11905\paperh16837\margl1133\margr1133\margt1133\margb1133{\header\f0\fs16\tqr\tx9637 Example Legal Document\tab }{\footer\f0\fs16\tqr\tx9637 \tab\chpgn}\sa198\fs1\~\fs24 {\fs20\li0{\b Note:} This is a note.\par}{\sb566\keepn\b\fs26\qc\caps Part 1\u8212?Preliminary\par}{\keepn\b\fi-566\li566 1\tab Short title\par}{\li566 This is the {\i blah blah}.\par}{\keepn\b\fi-566\li566 2\tab Another heading\par}{\fi-566\li1133 (1)\tab ABC\par}{\li1133 Continued\par}{\fi-566\li1700 (a)\tab asdf\par}{\fi-566\li1700 (b)\tab abcdefg\par}{\li1700 hijkl\par}{\li1133 Continued\par}{\fi-566\li1133 (2)\tab DEF\par}{\keepn\b\fi-566\li566 3\tab Table example\par}{\sa0\trowd\trgaph120\trleft566\clbrdrt\brdrs\clbrdrb\brdrs\cellx5101\clbrdrt\brdrs\clbrdrb\brdrs\cellx9636 {\b Column 1\intbl\cell}{\b Column 2\intbl\cell}\row{\b First column\intbl\cell}{\b Second column\intbl\cell}\row {1. First row\intbl\cell}{Foo bar\intbl\cell}\row {2. Second row\intbl\cell}{Baz qux\intbl\cell}\row }}
+{\rtf1\deff0{\fonttbl{\f0 TeX Gyre Heros{\*\falt FreeSans}{\*\falt Liberation Sans}{\*\falt Arial};}}\paperw11905\paperh16837\margl1133\margr1133\margt1133\margb1133{\header\f0\fs16\tqr\tx9637 Example Legal Document\tab }{\footer\f0\fs16\tqr\tx9637 \tab\chpgn}\sa198\fs1\~\fs24 {\fs20\li566{\b Note:} This is a note.\par}{\sb566\keepn\b\fs26\qc\caps Part 1\u8212?Preliminary\par}{\keepn\b\fi-566\li566 1\tab Short title\par}{\li566 This is the {\i blah blah}.\par}{\keepn\b\fi-566\li566 2\tab Another heading\par}{\fi-566\li1133 (1)\tab ABC\par}{\li1133 Continued\par}{\fi-566\li1700 (a)\tab asdf\par}{\fi-566\li1700 (b)\tab abcdefg\par}{\li1700 hijkl\par}{\li1133 Continued\par}{\fi-566\li1133 (2)\tab DEF\par}{\keepn\b\fi-566\li566 3\tab Table example\par}{\sa0\trowd\trgaph120\trleft566\clbrdrt\brdrs\clbrdrb\brdrs\cellx5101\clbrdrt\brdrs\clbrdrb\brdrs\cellx9636 {\b Column 1\intbl\cell}{\b Column 2\intbl\cell}\row{\b First column\intbl\cell}{\b Second column\intbl\cell}\row {1. First row\intbl\cell}{Foo bar\intbl\cell}\row {2. Second row\intbl\cell}{Baz qux\intbl\cell}\row }}
diff --git a/legalmd/latex_renderer.py b/legalmd/latex_renderer.py
index 514b499..b9b19df 100644
--- a/legalmd/latex_renderer.py
+++ b/legalmd/latex_renderer.py
@@ -97,7 +97,7 @@ class LaTeXRenderer(mistletoe.latex_renderer.LaTeXRenderer):
 	def render_paragraph(self, token):
 		self.heading_last = False
 		
-		return format(r'\N{\par\leftskip=\dimexpr\quotemargin+<lmarg>\relax\updatealign <content>\par}\N',
+		return format(r'\N{\par\leftskip=\dimexpr\quotemargin+<lmarg>\relax <content>\par}\N',
 			content=self.render_inner(token)
 		)
 	
@@ -109,7 +109,7 @@ class LaTeXRenderer(mistletoe.latex_renderer.LaTeXRenderer):
 	def render_definition(self, token):
 		self.heading_last = False
 		
-		return format(r'\N{\par\leftskip=\dimexpr<lmarg>+1cm\relax\hangindent=1cm\updatealign <content>\par}\N',
+		return format(r'\N{\par\leftskip=\dimexpr<lmarg>+1cm\relax\hangindent=1cm <content>\par}\N',
 			content=self.render_inner(token)
 		)
 	
@@ -122,14 +122,14 @@ class LaTeXRenderer(mistletoe.latex_renderer.LaTeXRenderer):
 	
 	def render_subrules_item(self, token):
 		if token.label:
-			return format(r'\N{\par\leftskip=\dimexpr\quotemargin+<lmarg>+<level>cm\relax\hangindent=1cm\updatealign\parskip=<parskip>\makebox[<lmarg>][l]{<label>}<content>\par}\N',
+			return format(r'\N{\par\leftskip=\dimexpr\quotemargin+<lmarg>+<level>cm\relax\hangindent=1cm\parskip=<parskip>\makebox[<lmarg>][l]{<label>}<content>\par}\N',
 				parskip=r'\parskip',# if token.level <= 1 else '0cm',
 				label=token.label,
 				level=token.level,
 				content=self.render_inner(token)
 			)
 		else:
-			return format(r'\N{\par\leftskip=\dimexpr<lmarg>+<level>cm+1cm\relax\updatealign\parskip=<parskip> <content>\par}\N',
+			return format(r'\N{\par\leftskip=\dimexpr<lmarg>+<level>cm+1cm\relax\parskip=<parskip> <content>\par}\N',
 				parskip=r'\parskip',# if token.level <= 1 else '0cm',
 				level=token.level,
 				content=self.render_inner(token)
@@ -138,7 +138,8 @@ class LaTeXRenderer(mistletoe.latex_renderer.LaTeXRenderer):
 	def render_note(self, token):
 		self.heading_last = False
 		
-		return format(r'\N{\nopagebreak\par\footnotesize\selectfont\settowidth{\notetaglength}{\bfseries <label>:}\addtolength{\notetaglength}{1em}\leftskip=\lastalign\hangindent=\notetaglength\makebox[\notetaglength][l]{\bfseries <label>:}<content>\par}\N',
+		return format(r'\N{\nopagebreak\par\footnotesize\selectfont\settowidth{\notetaglength}{\bfseries <label>:}\addtolength{\notetaglength}{1em}\leftskip=\dimexpr1cm+<level>cm\relax\hangindent=\notetaglength\makebox[\notetaglength][l]{\bfseries <label>:}<content>\par}\N',
+			level=token.level,
 			label=token.label,
 			content=self.render_inner(token)
 		)
@@ -205,7 +206,6 @@ class LaTeXRenderer(mistletoe.latex_renderer.LaTeXRenderer):
 \usepackage{longtable}\usepackage{tabu}\usepackage{booktabs}
 \newlength\quotemargin
 \newlength\notetaglength
-\newlength\lastalign\newcommand{\updatealign}{\global\lastalign=\dimexpr\leftskip+\hangindent\relax}
 % TOC format
 \usepackage{titletoc}
 \makeatletter
diff --git a/legalmd/legal_token.py b/legalmd/legal_token.py
index 18f042f..ea5b914 100644
--- a/legalmd/legal_token.py
+++ b/legalmd/legal_token.py
@@ -45,7 +45,6 @@ class NumberedHeading(mistletoe.block_token.BlockToken):
 		
 		return level, label, content
 
-#mistletoe.block_token.remove_token(mistletoe.block_token.Heading)
 mistletoe.block_token.add_token(NumberedHeading)
 
 class Subrules(mistletoe.block_token.BlockToken):
@@ -73,6 +72,8 @@ class Subrules(mistletoe.block_token.BlockToken):
 			
 			lines.reset()
 			
+			if Note.pattern.match(line):
+				break
 			if not SubrulesItem.start(line):
 				break
 			
@@ -115,11 +116,10 @@ class SubrulesItem(mistletoe.block_token.BlockToken):
 		return level, label, children
 
 class Note(mistletoe.block_token.BlockToken):
-	pattern = re.compile(r'([0-9A-Z ]+):\s+(.+)')
+	pattern = re.compile(r'(\t*)([0-9A-Z ]+):\s+(.+)')
 	
 	def __init__(self, match):
-		self.label, content = match
-		self.children = mistletoe.span_token.tokenize_inner(content)
+		self.level, self.label, self.children = match
 	
 	@classmethod
 	def start(cls, line):
@@ -130,9 +130,9 @@ class Note(mistletoe.block_token.BlockToken):
 		line = next(lines)
 		match = cls.pattern.match(line)
 		
-		label, content = match.group(1, 2)
+		level_str, label, content = match.group(1, 2, 3)
 		label = label[0].upper() + label[1:].lower()
-		return label, content
+		return len(level_str), label, mistletoe.span_token.tokenize_inner(content)
 
 mistletoe.block_token.add_token(Note)
 
diff --git a/legalmd/rtf_renderer.py b/legalmd/rtf_renderer.py
index d653910..b04d8d5 100644
--- a/legalmd/rtf_renderer.py
+++ b/legalmd/rtf_renderer.py
@@ -45,7 +45,6 @@ class RTFRenderer(mistletoe.base_renderer.BaseRenderer):
 		self.render_map['Definition'] = self.render_definition
 		
 		self.quotemargin = 0
-		self.lastalign = 0
 		self.heading_last = False
 	
 	def render_strong(self, token):
@@ -136,7 +135,6 @@ class RTFRenderer(mistletoe.base_renderer.BaseRenderer):
 		return inner
 	
 	def render_paragraph(self, token):
-		self.lastalign = LMARG
 		self.heading_last = False
 		
 		return format(r'{\li<leftmargin> <content>\par}',
@@ -219,7 +217,6 @@ class RTFRenderer(mistletoe.base_renderer.BaseRenderer):
 	
 	def render_subrules_item(self, token):
 		if token.label:
-			self.lastalign = LMARG + token.level + 1
 			return format(r'{\fi<fi>\li<li> <label>\tab <content>\par}',
 				fi=cm_to_twip(-1),
 				li=cm_to_twip(LMARG + token.level + 1)+self.quotemargin,
@@ -227,7 +224,6 @@ class RTFRenderer(mistletoe.base_renderer.BaseRenderer):
 				content=self.render_inner(token)
 			)
 		else:
-			self.lastalign = LMARG + token.level + 1
 			return format(r'{\li<li> <content>\par}',
 				li=cm_to_twip(LMARG + token.level + 1)+self.quotemargin,
 				label=token.label,
@@ -237,14 +233,13 @@ class RTFRenderer(mistletoe.base_renderer.BaseRenderer):
 	def render_note(self, token):
 		self.heading_last = False
 		
-		return format(r'{\fs20\li<lastalign>{\b <label>:} <content>\par}',
-			lastalign=cm_to_twip(self.lastalign),
+		return format(r'{\fs20\li<leftindent>{\b <label>:} <content>\par}',
+			leftindent=cm_to_twip(LMARG + token.level),
 			label=token.label,
 			content=self.render_inner(token)
 		)
 	
 	def render_definition(self, token):
-		self.lastalign = LMARG + 2
 		self.heading_last = False
 		
 		return format(r'{\fi<fi>\li<li> <content>\par}',