--- test/html-webhacc/cc.cgi	2007/07/15 16:39:10	1.9
+++ test/html-webhacc/cc.cgi	2007/07/16 13:56:26	1.12
@@ -15,7 +15,9 @@
   $s =~ s/</&lt;/g;
   $s =~ s/>/&gt;/g;
   $s =~ s/"/&quot;/g;
-  $s =~ s!([\x00-\x09\x0B-\x1F\x7F-\x80])!sprintf '<var>U+%04X</var>', ord $1!ge;
+  $s =~ s{([\x00-\x09\x0B-\x1F\x7F-\xA0\x{FEFF}\x{FFFC}-\x{FFFF}])}{
+    sprintf '<var>U+%04X</var>', ord $1;
+  }ge;
   return $s;
 } # htescape
 
@@ -28,6 +30,8 @@
     exit;
   }
 
+  binmode STDOUT, ':utf8';
+
   require Message::DOM::DOMImplementation;
   my $dom = Message::DOM::DOMImplementation->new;
 
@@ -80,6 +84,8 @@
   if ($input->{media_type} eq 'text/html') {
     require Encode;
     require Whatpm::HTML;
+
+    $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now.
     
     my $t = Encode::decode ($input->{charset}, $input->{s});
 
@@ -87,22 +93,21 @@
 <div id="parse-errors" class="section">
 <h2>Parse Errors</h2>
 
-<dl>
-];
+<dl>];
   push @nav, ['#parse-errors' => 'Parse Error'];
 
   my $onerror = sub {
     my (%opt) = @_;
-    my ($cls, $msg) = get_text ($opt{type}, $opt{level});
+    my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level});
     if ($opt{column} > 0) {
       print STDOUT qq[<dt class="$cls"><a href="#line-$opt{line}">Line $opt{line}</a> column $opt{column}</dt>\n];
     } else {
       $opt{line} = $opt{line} - 1 || 1;
       print STDOUT qq[<dt class="$cls"><a href="#line-$opt{line}">Line $opt{line}</a></dt>\n];
     }
-    $opt{type} =~ tr/ /-/;
-    $opt{type} =~ s/\|/%7C/g;
-    $msg .= qq[ [<a href="../error-description#$opt{type}">Description</a>]];
+    $type =~ tr/ /-/;
+    $type =~ s/\|/%7C/g;
+    $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];
     print STDOUT qq[<dd class="$cls">$msg</dd>\n];
   };
 
@@ -115,8 +120,7 @@
     Whatpm::HTML->parse_string ($t => $doc, $onerror);
   }
 
-  print STDOUT qq[
-</dl>
+  print STDOUT qq[</dl>
 </div>
 ];
 
@@ -185,11 +189,10 @@
     require Whatpm::ContentChecker;
     my $onerror = sub {
       my %opt = @_;
-      my ($cls, $msg) = get_text ($opt{type}, $opt{level});
-      $opt{type} = $opt{level} . ':' . $opt{type} if defined $opt{level};
-      $opt{type} =~ tr/ /-/;
-      $opt{type} =~ s/\|/%7C/g;
-      $msg .= qq[ [<a href="../error-description#$opt{type}">Description</a>]];
+      my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level});
+      $type =~ tr/ /-/;
+      $type =~ s/\|/%7C/g;
+      $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];
       print STDOUT qq[<dt class="$cls">] . get_node_link ($opt{node}) .
           qq[</dt>\n<dd class="$cls">], $msg, "</dd>\n";
     };
@@ -246,6 +249,7 @@
             for (@$_) {
               $_->{id} = refaddr $_->{element} if defined $_->{element};
               delete $_->{element};
+              $_->{is_header} = $_->{is_header} ? 1 : 0;
             }
           }
         }
@@ -493,14 +497,16 @@
   {
     if (defined $Msg->{$type}) {
       my $msg = $Msg->{$type}->[1];
-      $msg =~ s/\$([0-9]+)/defined $arg[$1] ? htescape ($arg[$1]) : '(undef)'/ge;
-      return ($Msg->{$type}->[0], $msg);
+      $msg =~ s{<var>\$([0-9]+)</var>}{
+        defined $arg[$1] ? htescape ($arg[$1]) : '(undef)';
+      }ge;
+      return ($type, $Msg->{$type}->[0], $msg);
     } elsif ($type =~ s/:([^:]*)$//) {
       unshift @arg, $1;
       redo;
     }
   }
-  return ('', htescape ($_[0]));
+  return ($type, '', htescape ($_[0]));
 } # get_text
 
 }
@@ -667,4 +673,4 @@
 
 =cut
 
-## $Date: 2007/07/15 16:39:10 $
+## $Date: 2007/07/16 13:56:26 $