From daad0a3062c13a38d4d34f9679b01b2c7d5d14d8 Mon Sep 17 00:00:00 2001
From: Jon Michael Aanes <jonjmaa@gmail.com>
Date: Mon, 20 Nov 2017 13:07:07 +0100
Subject: [PATCH] Better escaping, and such.

---
 TikzPainter.py | 6 +++++-
 main.py        | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/TikzPainter.py b/TikzPainter.py
index ca2f5aa..a68a97c 100644
--- a/TikzPainter.py
+++ b/TikzPainter.py
@@ -1,4 +1,6 @@
 
+import re
+
 REG_STATUS_TO_COLOR = {
 	"insert": "green",
 	"change": "yellow",
@@ -22,7 +24,8 @@ class TikzPainter:
 		self.options = options if options else DEFAULT_OPTIONS
 
 	def addText (self, str, *args):
-		self.text.append(str.format(*args))
+		text = re.sub(r"[^\\]%", "\\%", str.format(*args))
+		self.text.append(text)
 
 	def getRegColor (self, reg_state):
 		return REG_STATUS_TO_COLOR[reg_state]
@@ -122,3 +125,4 @@ class TikzPainter:
 
 	def __str__ (self):
 		return 'TikzPainter[]'
+
diff --git a/main.py b/main.py
index 6668d3d..bc24e67 100755
--- a/main.py
+++ b/main.py
@@ -20,7 +20,7 @@ def parse_args ():
 	# Determine args #
 	registers_init = {}
 	for register in REGISTERS:
-		registers_init[register[1:]] = Junk.Junk('prev '+register)
+            registers_init[register[1:]] = Junk.Junk('old '+register[1:])
 	#
 	registers_init['rip'] = 0
 	registers_init['rsp'] = 0
@@ -79,4 +79,3 @@ def main ():
 if __name__ == "__main__":
 	main()
 
-