Better escaping, and such.

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[]'
+

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()
 
-