Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6

1 files changed, 9 insertions, 7 deletions

diff --git a/runoff b/runoff
index 21ee8ed..14db252 100755
--- a/runoff
+++ b/runoff
@@ -82,23 +82,25 @@ perl -e '
 			next;
 		}
 		
-		if(/(left|right): (.*)/){
+		if(/(left|right)(\+?): (.*)/){
 			$what = $1;
-			$file = $2;
+			$tens = ($2 eq "+" ? "5" : "0");
+			$file = $3;
 			if(!defined($toc{$file})){
 				print STDERR "Have no toc for $file\n";
 				next;
 			}
-			# this assumes that sheet 1 of code is a left page
-			# double-check the PDF
+			# this assumes that sheet 1 of code is a right page
+			# double-check the PDF.  swap the two regexps below
+			# otherwise.
 			if(!$leftwarn++) {
-				print STDERR "assuming that sheet 1 is a left page.  double-check!\n";
+				print STDERR "assuming that sheet 1 is a right page.  double-check!\n";
 			}
-			if($what eq "left" && !($toc{$file} =~ /^\d[13579]0/)){
+			if($what eq "left" && !($toc{$file} =~ /^\d[02468]$tens/)){
 				print STDERR "$file does not start on a fresh left page [$toc{$file}]\n";
 			}
 			# why does this not work if I inline $x in the if?
-			$x = ($toc{$file} =~ /^\d[02468]0/);
+			$x = ($toc{$file} =~ /^\d[13579]$tens/);
 			if($what eq "right" && !$x){
 				print STDERR "$file does not start on a fresh right page [$toc{$file}] [$x]\n";
 			}