From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Thu, 29 Oct 2009 19:12:45 +0000 (+0000)
Subject: Merge branch 'wip.commodclass'
X-Git-Tag: 6.0~36
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=efd685a5df610ffefc545a41be67e2e0d4b69c7c;hp=217ac850a0e5cca6b2eb24d30ac443d263912e4f

Merge branch 'wip.commodclass'
---

diff --git a/yarrg/structure.c b/yarrg/structure.c
index 46b6853..cc1e713 100644
--- a/yarrg/structure.c
+++ b/yarrg/structure.c
@@ -646,15 +646,6 @@ static inline Fixpt find_aa_density(const RgbImage *ri, Point p) {
   Fixpt alpha_mean= fixpt_mul(alpha_total, one_third);
   
   Fixpt thresh= dbl2fixpt(1.5/AAMAXVAL);
-  Fixpt alpha_min= alpha_mean - thresh*2;
-  Fixpt alpha_max= alpha_mean + thresh*2;
-
-  for (i=0; i<3; i++)
-    MUST( alpha_min <= alpha[i] && alpha[i] <= alpha_max,
-	  MP(p);
-	  MRGB(here);MRGB(aa_background);MRGB(aa_foreground);
-	  MFP(aa_alpha_mean_max);MFP(thresh);MFP(alpha_mean);
-	  MFP(alpha_min);MI(i);MFP(alpha[i]);MFP(alpha_max) );
 
   MUST( -thresh <= alpha_mean && alpha_mean <= aa_alpha_mean_max + thresh,
 	MP(p);
diff --git a/yarrg/web/check_capacitystring b/yarrg/web/check_capacitystring
index 321d754..52eab28 100644
--- a/yarrg/web/check_capacitystring
+++ b/yarrg/web/check_capacitystring
@@ -152,7 +152,7 @@ my $parse_term= sub {
 	$first_term= 0;
 };
 
-while ($string =~ s/^(.*?)(\bminus\b|-|\bplus\b|\+)//) {
+while ($string =~ s/^(.*?)(\bminus\b|-|\bplus\b|\+)//i) {
 	my ($lhs)= ($1);
 	my @nextsign= $2 =~ m/^p|^\+/ ? (+1,'+') : (-1,'-');
 	$show_answer= 1;
diff --git a/yarrg/web/intro b/yarrg/web/intro
index 13f553b..8e993a0 100755
--- a/yarrg/web/intro
+++ b/yarrg/web/intro
@@ -71,8 +71,8 @@ website.
 
 <h2>Uploading from Linux</h2>
 
-The YARRG upload client uploads both to YARRG and to the
-<a href="http://pctb.ilk.org/">PCTB testing server</a>.
+The YARRG upload client uploads both to YARRG and
+<a href="http://pctb.crabdance.com/">PCTB</a>.
 
 <p>