diff options
author | Austin Clements <[email protected]> | 2010-09-02 03:57:20 -0400 |
---|---|---|
committer | Austin Clements <[email protected]> | 2010-09-02 03:57:20 -0400 |
commit | 9d7a63e0734b4c7abe5ae00eda302e7d7a22a482 (patch) | |
tree | 5464f751f72970710fa19158392422f67542b726 | |
parent | 0fa1ab632f6e328321cdec779e66ed07cac89d04 (diff) | |
download | xv6-labs-9d7a63e0734b4c7abe5ae00eda302e7d7a22a482.tar.gz xv6-labs-9d7a63e0734b4c7abe5ae00eda302e7d7a22a482.tar.bz2 xv6-labs-9d7a63e0734b4c7abe5ae00eda302e7d7a22a482.zip |
Specify in runoff.spec which side sheet 1 is on, since it keeps changing
-rwxr-xr-x | runoff | 17 | ||||
-rw-r--r-- | runoff.spec | 4 |
2 files changed, 12 insertions, 9 deletions
@@ -58,6 +58,13 @@ perl -e ' next; } + if(/sheet1: (left|right)$/){ + print STDERR "assuming that sheet 1 is a $1 page. double-check!\n"; + $left = $1 eq "left" ? "13579" : "02468"; + $right = $1 eq "left" ? "02468" : "13579"; + next; + } + if(/even: (.*)/){ $file = $1; if(!defined($toc{$file})){ @@ -90,17 +97,11 @@ perl -e ' print STDERR "Have no toc for $file\n"; next; } - # 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 right page. double-check!\n"; - } - if($what eq "left" && !($toc{$file} =~ /^\d[02468]$tens/)){ + if($what eq "left" && !($toc{$file} =~ /^\d[$left]$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[13579]$tens/); + $x = ($toc{$file} =~ /^\d[$right]$tens/); if($what eq "right" && !$x){ print STDERR "$file does not start on a fresh right page [$toc{$file}] [$x]\n"; } diff --git a/runoff.spec b/runoff.spec index e6f5a95..17bb821 100644 --- a/runoff.spec +++ b/runoff.spec @@ -1,3 +1,5 @@ +sheet1: left + # types.h either # param.h either # defs.h either @@ -16,7 +18,7 @@ even: main.c # odd: init.c # spinlock.h either -right: spinlock.c # mild preference +left: spinlock.c # mild preference even: proc.h # mild preference # goal is to have two action-packed 2-page spreads, |