Merge branch 'wip.commodclass'

diff --git a/yarrg/structure.c b/yarrg/structure.c
index 46b6853339580cb6df798fc3b28c835b95b7c59b..cc1e71360d6c0c9ff9d6997b76c7438ee8d7489a 100644 (file)
--- 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 321d7540fcf31e9bf953c8574e30015de32351d4..52eab28264836ca8208e49a82a16db9beb8e3597 100644 (file)
--- 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 13f553bafe7d0420f4f84fe7db553affb6fb2eb6..8e993a0034254d7586dd13b315d3d68f13c7d1b1 100755 (executable)
--- 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>