Merge branch 'master' of github.com:SublimeText/LaTeXTools

README.markdown

@@ -35,7 +35,7 @@ Third, follow the OS-specific instructions below.
 
 <br>
 
-On **OSX**, you need to be running the MacTeX distribution (which is pretty much the only one available on the Mac anyway) and the Skim PDF previewer. Just download and install these in the usual way. I have tested MacTeX versions 2010 and 2011, both 32 and 64 bits; these work fine. On the other hand, MacTeX 2008 does *not* seem to work out of the box (compilation fails), so please upgrade.
+On **OSX**, you need to be running the MacTeX distribution (which is pretty much the only one available on the Mac anyway) and the Skim PDF previewer. Just download and install these in the usual way. I have tested MacTeX versions 2010 and 2011, both 32 and 64 bits; these work fine. On the other hand, MacTeX 2008 does *not* seem to work out of the box (compilation fails), so please upgrade. If you don't want to install the entire MacTeX distro, which is pretty big, BasicTeX will also work (of course, as long as the latex packages you need are included). **However**, you need to explicitly add the `latexmk` utility, which is not included by default: from the Terminal, type `sudo tlmgr install latexmk` (you will need to provide your password, assuming you are Administrator on your machine).
 
 To configure inverse search, open the Preferences dialog of the Skim app, select the Sync tab, then:
 

parseTeXlog.py

@@ -102,7 +102,9 @@ def parse_tex_log(data):
 	line_rx_latex_warn = re.compile(r"input line (\d+)\.$") # Warnings, line number
 	matched_parens_rx = re.compile(r"\([^()]*\)") # matched parentheses, to be deleted (note: not if nested)
 	assignment_rx = re.compile(r"\\[^=]*=")	# assignment, heuristics for line merging
-	xypic_rx = re.compile(r"(?:.*? |^)loaded\)(.*)") # crazy xypic way to declare end of file processing
+	# The following is for the xy package, which reports end of processing with "loaded)" or "not reloaded)"
+	xypic_rx = re.compile(r".*?(?:not re)?loaded\)(.*)")
+	#xypic_rx = re.compile(r"(?:.*? |^)(?:not re)?loaded\)(.*)") # crazy xypic way to declare end of file processing
 	#xypic_rx = re.compile(r".*? loaded\)(.*)") # crazy xypic way to declare end of file processing
 
 	files = []
@@ -462,11 +464,11 @@ def handle_warning(l):
 		print ""
 		print "Warnings:"
 		for warn in warnings:
-			print warn
+			print warn.encode('UTF-8')
 		print ""
 		print "Errors:"
 		for err in errors:
-			print err
+			print err.encode('UTF-8')
 
 	except Exception, e:
 		import traceback